Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package blog for openSUSE:Factory checked in at 2023-11-30 21:59:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blog (Old) and /work/SRC/openSUSE:Factory/.blog.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blog" Thu Nov 30 21:59:40 2023 rev:18 rq:1129802 version:2.28 Changes: -------- --- /work/SRC/openSUSE:Factory/blog/blog.changes 2023-07-11 15:56:34.232915624 +0200 +++ /work/SRC/openSUSE:Factory/.blog.new.25432/blog.changes 2023-11-30 22:00:39.683601295 +0100 @@ -1,0 +2,7 @@ +Wed Nov 29 12:27:52 UTC 2023 - Dr. Werner Fink <wer...@suse.de> + +- Update to version 2.28 + * UTMP support is gone, remove dependency also add support for + initramfs at shutdown. + +------------------------------------------------------------------- Old: ---- showconsole-2.27.tar.gz New: ---- showconsole-2.28.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blog.spec ++++++ --- /var/tmp/diff_new_pack.UI4Z76/_old 2023-11-30 22:00:40.367626493 +0100 +++ /var/tmp/diff_new_pack.UI4Z76/_new 2023-11-30 22:00:40.367626493 +0100 @@ -17,7 +17,7 @@ Name: blog -Version: 2.27 +Version: 2.28 %define sonum 2 Release: 0 Summary: Boot logging @@ -163,6 +163,9 @@ %dir %{_unitdir}/rescue.target.wants/ %dir %{_unitdir}/sysinit.target.wants/ %dir %{_unitdir}/shutdown.target.wants/ +%dir %{_unitdir}/reboot.target.wants/ +%dir %{_unitdir}/poweroff.target.wants/ +%dir %{_unitdir}/kexec.target.wants/ %dir %{_unitdir}/local-fs-pre.target.wants/ %dir %{_unitdir}/systemd-ask-password-blog.service.wants/ %{_prefix}/lib/dracut/modules.d/99blog/module-setup.sh @@ -170,6 +173,7 @@ %{_unitdir}/blog-quit.service %{_unitdir}/blog-store-messages.service %{_unitdir}/blog-switch-root.service +%{_unitdir}/blog-switch-initramfs.service %{_unitdir}/blog.service %{_unitdir}/systemd-ask-password-blog.path %{_unitdir}/systemd-ask-password-blog.service @@ -183,6 +187,13 @@ %{_unitdir}/sysinit.target.wants/blog-store-messages.service %{_unitdir}/sysinit.target.wants/systemd-ask-password-blog.path %{_unitdir}/shutdown.target.wants/blog-final.service +%{_unitdir}/reboot.target.wants/blog-final.service +%{_unitdir}/poweroff.target.wants/blog-final.service +%{_unitdir}/kexec.target.wants/blog-final.service +%{_unitdir}/shutdown.target.wants/blog-switch-initramfs.service +%{_unitdir}/reboot.target.wants/blog-switch-initramfs.service +%{_unitdir}/poweroff.target.wants/blog-switch-initramfs.service +%{_unitdir}/kexec.target.wants/blog-switch-initramfs.service %{_unitdir}/local-fs-pre.target.wants/blog-umount.service %ghost %{_unitdir}/systemd-ask-password-blog.service.wants/systemd-vconsole-setup.service ++++++ blog-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.UI4Z76/_old 2023-11-30 22:00:40.395627525 +0100 +++ /var/tmp/diff_new_pack.UI4Z76/_new 2023-11-30 22:00:40.399627672 +0100 @@ -1,5 +1,3 @@ addFilter(".*systemd-service-without-service_del_p.*") addFilter(".*systemd-service-without-service_add_p.*") -addFilter(".*suse-missing-rclink.*") -addFilter(".*E:.*unused-rpmlintrc-filter.*suse-missing-rclink.*") ++++++ showconsole-2.27.tar.gz -> showconsole-2.28.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/Makefile new/showconsole-2.28/Makefile --- old/showconsole-2.27/Makefile 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/Makefile 2023-11-29 13:17:01.000000000 +0100 @@ -15,7 +15,7 @@ DEBUG = DESTDIR = MAJOR := 2 -MINOR := 24 +MINOR := 28 VERSION := $(MAJOR).$(MINOR) DATE = $(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]') COPTS = @@ -137,13 +137,13 @@ $(INSTSCR) module-setup.sh $(DESTDIR)$(DRACUTMOD)/ $(LINK) libblogger.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblogger.so.$(MAJOR) $(LINK) libblogger.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblogger.so - for unit in blog blog-final blog-quit blog-store-messages blog-switch-root blog-umount ; do \ + for unit in blog blog-final blog-quit blog-store-messages blog-switch-root blog-switch-initramfs blog-umount ; do \ $(INSTCON) $${unit}.service $(DESTDIR)$(SYSDUNITS)/ ; \ done for unit in systemd-ask-password-blog.path systemd-ask-password-blog.service ; do \ $(INSTCON) $${unit} $(DESTDIR)$(SYSDUNITS)/ ; \ done - for target in default sysinit basic local-fs-pre rescue shutdown emergency initrd-switch-root; do \ + for target in default sysinit basic local-fs-pre rescue shutdown reboot poweroff kexec emergency initrd-switch-root; do \ $(MKDIR) $(DESTDIR)$(SYSDUNITS)/$${target}.target.wants ; \ done for service in systemd-ask-password-blog ; do \ @@ -163,8 +163,11 @@ for unit in blog-umount.service ; do \ $(LINK) ../$${unit} $(DESTDIR)$(SYSDUNITS)/local-fs-pre.target.wants/$${unit} ; \ done - for unit in blog-final.service ; do \ + for unit in blog-final.service blog-switch-initramfs.service ; do \ $(LINK) ../$${unit} $(DESTDIR)$(SYSDUNITS)/shutdown.target.wants/$${unit} ; \ + $(LINK) ../$${unit} $(DESTDIR)$(SYSDUNITS)/reboot.target.wants/$${unit} ; \ + $(LINK) ../$${unit} $(DESTDIR)$(SYSDUNITS)/poweroff.target.wants/$${unit} ; \ + $(LINK) ../$${unit} $(DESTDIR)$(SYSDUNITS)/kexec.target.wants/$${unit} ; \ done for target in systemd-ask-password-blog.service ; do \ $(MKDIR) $(DESTDIR)$(SYSDUNITS)/$${target}.wants ; \ @@ -203,7 +206,8 @@ blog-quit.service \ blog-store-messages.service.in \ blog-switch-root.service \ - blog-umount.service.in \ + blog-switch-initramfs.service \ + blog-umount.service.in \ systemd-ask-password-blog.path \ systemd-ask-password-blog.service \ module-setup.sh \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog-final.service new/showconsole-2.28/blog-final.service --- old/showconsole-2.27/blog-final.service 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blog-final.service 2023-11-29 13:17:01.000000000 +0100 @@ -8,6 +8,3 @@ Type=forking SendSIGKILL=no ExecStart=/sbin/blogd -f - -[Install] -WantedBy=shutdown.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog-quit.service new/showconsole-2.28/blog-quit.service --- old/showconsole-2.27/blog-quit.service 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blog-quit.service 2023-11-29 13:17:01.000000000 +0100 @@ -12,8 +12,3 @@ TimeoutSec=20 RemainAfterExit=yes ExecStart=/sbin/blogctl quit - -[Install] -WantedBy=default.target -WantedBy=emergency.target -WantedBy=rescue.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog-store-messages.service.in new/showconsole-2.28/blog-store-messages.service.in --- old/showconsole-2.27/blog-store-messages.service.in 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blog-store-messages.service.in 2023-11-29 13:17:01.000000000 +0100 @@ -3,17 +3,13 @@ DefaultDependencies=no RequiresMountsFor=@@BOOT_LOGFILE@@ Conflicts=shutdown.target -Requisite=systemd-update-utmp.service -After=systemd-update-utmp.service After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service Before=sysinit.target shutdown.target ConditionPathExists=!/etc/initrd-release +ConditionPathIsReadWrite=/var/log [Service] Type=oneshot TimeoutSec=20 RemainAfterExit=yes ExecStart=/sbin/blogctl ready - -[Install] -WantedBy=sysinit.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog-switch-initramfs.service new/showconsole-2.28/blog-switch-initramfs.service --- old/showconsole-2.27/blog-switch-initramfs.service 1970-01-01 01:00:00.000000000 +0100 +++ new/showconsole-2.28/blog-switch-initramfs.service 2023-11-29 13:17:01.000000000 +0100 @@ -0,0 +1,17 @@ +[Unit] +Description=Tell blogd to switch to initramfs +DefaultDependencies=no +# dracut-shutdown.service restores the initramfs when it is _stopped_ +# use Conflicts to make sure its ExecStop has run before we do +Conflicts=dracut-shutdown.service +After=plymouth-final.service blog-umount.service dracut-shutdown.service mkinitcpio-generate-shutdown-ramfs.service +ConditionPathExists=|/run/initramfs/bin/sh +ConditionPathExists=|/run/initramfs/shutdown + +[Service] +Type=oneshot +StandardInput=null +StandardOutput=null +StandardError=null +RemainAfterExit=yes +ExecStart=-/sbin/blogctl root=/run/initramfs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog-switch-root.service new/showconsole-2.28/blog-switch-root.service --- old/showconsole-2.27/blog-switch-root.service 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blog-switch-root.service 2023-11-29 13:17:01.000000000 +0100 @@ -5,8 +5,8 @@ Before=initrd-switch-root.service [Service] -ExecStart=-/sbin/blogctl root=/sysroot Type=oneshot StandardInput=null StandardOutput=null StandardError=null +ExecStart=-/sbin/blogctl root=/sysroot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog-umount.service.in new/showconsole-2.28/blog-umount.service.in --- old/showconsole-2.27/blog-umount.service.in 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blog-umount.service.in 2023-11-29 13:17:01.000000000 +0100 @@ -4,12 +4,10 @@ Conflicts=shutdown.target Before=systemd-tmpfiles-setup.service RequiresMountsFor=@@BOOT_OLDLOGFILE@@ +ConditionPathIsReadWrite=/var/log [Service] Type=oneshot TimeoutSec=0 RemainAfterExit=yes ExecStop=/sbin/blogctl close - -[Install] -WantedBy=local-fs-pre.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blog.service new/showconsole-2.28/blog.service --- old/showconsole-2.27/blog.service 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blog.service 2023-11-29 13:17:01.000000000 +0100 @@ -15,6 +15,3 @@ SendSIGKILL=no RemainAfterExit=yes ExecStart=/sbin/blogd - -[Install] -WantedBy=basic.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/blogd.c new/showconsole-2.28/blogd.c --- old/showconsole-2.27/blogd.c 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/blogd.c 2023-11-29 13:17:01.000000000 +0100 @@ -342,9 +342,18 @@ /* * Reconnecting to stdin aka ptm to 0 is done after we fork away */ - - dup2(pts, 1); - dup2(pts, 2); /* Now we are blind upto safeIO() loop */ +#ifdef DEBUG + int l; + if ((l = open("/dev/shm/blog.out", O_WRONLY|O_NOCTTY|O_NONBLOCK|O_CREAT|O_APPEND, S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH)) >= 0) { + dup2(l, STDOUT_FILENO); + dup2(l, STDERR_FILENO); + close(l); + } else +#endif + { + dup2(pts, 1); + dup2(pts, 2); /* Now we are blind upto safeIO() loop */ + } if (pts > 2) close(pts); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/libconsole/log.c new/showconsole-2.28/libconsole/log.c --- old/showconsole-2.27/libconsole/log.c 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/libconsole/log.c 2023-11-29 13:17:01.000000000 +0100 @@ -608,7 +608,7 @@ unlock(&ljoin); ljoin.canceled = 1; pthread_cond_broadcast(&lcond); - pthread_yield(); + sched_yield(); if (ljoin.used && lthread) pthread_cancel(lthread); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.27/libconsole/shm.c new/showconsole-2.28/libconsole/shm.c --- old/showconsole-2.27/libconsole/shm.c 2023-07-10 15:24:36.000000000 +0200 +++ new/showconsole-2.28/libconsole/shm.c 2023-11-29 13:17:01.000000000 +0100 @@ -97,7 +97,7 @@ if (area == MAP_FAILED) error("can not map shared memory object into memory"); - shm_unlink(template); + /* shm_ */ unlink(template); free(template); return area; }