Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package blog for openSUSE:Factory checked in at 2021-10-04 18:39:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blog (Old) and /work/SRC/openSUSE:Factory/.blog.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blog" Mon Oct 4 18:39:03 2021 rev:14 rq:922331 version:2.21 Changes: -------- --- /work/SRC/openSUSE:Factory/blog/blog.changes 2021-04-22 18:03:05.458425547 +0200 +++ /work/SRC/openSUSE:Factory/.blog.new.2443/blog.changes 2021-10-04 18:39:26.118005899 +0200 @@ -1,0 +2,13 @@ +Thu Sep 30 10:01:29 UTC 2021 - Dr. Werner Fink <[email protected]> + +- Move to /usr for UsrMerge (boo#1191057) + +------------------------------------------------------------------- +Fri Apr 9 08:53:45 UTC 2021 - Dr. Werner Fink <[email protected]> + +- Update to version 2.21 + * Merge pull request #4 from samueldr/fix/makefile + Fixup Makefile for better build system support + * Silent new gcc compiler + +------------------------------------------------------------------- Old: ---- showconsole-2.20.tar.gz New: ---- showconsole-2.21.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blog.spec ++++++ --- /var/tmp/diff_new_pack.iVryao/_old 2021-10-04 18:39:26.898007166 +0200 +++ /var/tmp/diff_new_pack.iVryao/_new 2021-10-04 18:39:26.902007173 +0200 @@ -17,7 +17,7 @@ Name: blog -Version: 2.20 +Version: 2.21 %define sonum 2 Release: 0 Summary: Boot logging @@ -91,6 +91,9 @@ %make_install \ MANPATH=%{_mandir} \ INSTBINFLAGS="-m 0744" \ +%if 0%{?usrmerged} + SBINDIR=%{_sbindir} \ +%endif LIBDIR=%{_libdir} \ INCDIR=%{_includedir} \ SYSDUNITS=%{_unitdir} \ @@ -114,12 +117,21 @@ %defattr(-,root,root) %license COPYING %doc README +%if !0%{?usrmerged} /sbin/blogctl /sbin/blogd /sbin/blogger /sbin/isserial /sbin/setconsole /sbin/showconsole +%else +%{_sbindir}/blogctl +%{_sbindir}/blogd +%{_sbindir}/blogger +%{_sbindir}/isserial +%{_sbindir}/setconsole +%{_sbindir}/showconsole +%endif %doc %{_mandir}/man8/blogctl.8.gz %doc %{_mandir}/man8/blogd.8.gz %doc %{_mandir}/man8/blogger.8.gz ++++++ showconsole-2.20.tar.gz -> showconsole-2.21.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.20/Makefile new/showconsole-2.21/Makefile --- old/showconsole-2.20/Makefile 2020-01-09 12:22:44.000000000 +0100 +++ new/showconsole-2.21/Makefile 2021-04-09 10:41:58.000000000 +0200 @@ -15,7 +15,7 @@ DEBUG = DESTDIR = MAJOR := 2 -MINOR := 18 +MINOR := 21 VERSION := $(MAJOR).$(MINOR) DATE = $(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]') COPTS = @@ -36,7 +36,7 @@ CFLAGS += -DBLOGGER endif SEDOPTS = s|@@BOOT_LOGFILE@@|$(BOOT_LOGFILE)|;s|@@BOOT_OLDLOGFILE@@|$(BOOT_OLDLOGFILE)| - CC = gcc -g3 + CC ?= gcc -g3 RM = rm -f MKDIR = mkdir -p RMDIR = rm -rf @@ -49,21 +49,22 @@ INSTSCRFLAGS = -c -m 0755 INSTSCR = install $(INSTSCRFLAGS) LINK = ln -sf - AR = ar - LD = ld -shared -O2 + AR ?= ar + LD ?= ld -shared -O2 SED = sed -r SO = echo .so man8/ # - MANPATH = /usr/share/man + PREFIX ?= / + MANPATH = $(PREFIX)usr/share/man SDOCDIR = $(MANPATH)/man8 - SBINDIR = /sbin - CONFDIR = /etc - LSBDIR = /usr/lib/lsb - LIBDIR = /usr/lib - INCDIR = /usr/include - DRACUTMOD = /usr/lib/dracut/modules.d/99blog - SYSDUNITS = /usr/lib/systemd/system + SBINDIR = $(PREFIX)sbin + CONFDIR = $(PREFIX)etc + LSBDIR = $(PREFIX)usr/lib/lsb + LIBDIR = $(PREFIX)usr/lib + INCDIR = $(PREFIX)usr/include + DRACUTMOD = $(PREFIX)usr/lib/dracut/modules.d/99blog + SYSDUNITS = $(PREFIX)usr/lib/systemd/system # # # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.20/blogd.c new/showconsole-2.21/blogd.c --- old/showconsole-2.20/blogd.c 2020-01-09 12:22:44.000000000 +0100 +++ new/showconsole-2.21/blogd.c 2021-04-09 10:41:58.000000000 +0200 @@ -351,10 +351,10 @@ set_signal(SIGQUIT, &saved_sigquit, sighandle); set_signal(SIGTERM, &saved_sigterm, sighandle); set_signal(SIGSYS, &saved_sigsys, sigsys); - (void)siginterrupt(SIGINT, 0); - (void)siginterrupt(SIGQUIT, 0); - (void)siginterrupt(SIGTERM, 0); - (void)siginterrupt(SIGSYS, 0); + (void)restart_sig(SIGINT, 1); + (void)restart_sig(SIGQUIT, 1); + (void)restart_sig(SIGTERM, 1); + (void)restart_sig(SIGSYS, 1); list_for_each_entry(c, &cons->node, node) { struct termios oldtio; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.20/libconsole/libconsole.h new/showconsole-2.21/libconsole/libconsole.h --- old/showconsole-2.20/libconsole/libconsole.h 2020-01-09 12:22:44.000000000 +0100 +++ new/showconsole-2.21/libconsole/libconsole.h 2021-04-09 10:41:58.000000000 +0200 @@ -181,6 +181,7 @@ /* signals.c */ extern void set_signal(int sig, struct sigaction *old, sighandler_t handler); extern void reset_signal(int sig, struct sigaction *old); +extern int restart_sig(int sig, int flag); /* socket.c */ extern int open_un_socket_and_listen(void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.20/libconsole/log.c new/showconsole-2.21/libconsole/log.c --- old/showconsole-2.20/libconsole/log.c 2020-01-09 12:22:44.000000000 +0100 +++ new/showconsole-2.21/libconsole/log.c 2021-04-09 10:41:58.000000000 +0200 @@ -470,7 +470,8 @@ do { len = read(fd, buf, sizeof(buf)-1); } while (len < 0 && errno == EPIPE); - buf[len] = '\0'; + if (len >= 0) + buf[len] = '\0'; while (len > 0) { char *p = &buf[0]; @@ -540,7 +541,8 @@ do { len = read(fd, buf, sizeof(buf)-1); } while (len < 0 && errno == EPIPE); - buf[len] = '\0'; + if (len >= 0) + buf[len] = '\0'; } close(fd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/showconsole-2.20/libconsole/signals.c new/showconsole-2.21/libconsole/signals.c --- old/showconsole-2.20/libconsole/signals.c 2020-01-09 12:22:44.000000000 +0100 +++ new/showconsole-2.21/libconsole/signals.c 2021-04-09 10:41:58.000000000 +0200 @@ -67,3 +67,26 @@ } while (errno == EINTR); } } + +int restart_sig(int sig, int flag) +{ + struct sigaction cur; + int ret = 0; + + do { + if (sigaction(sig, NULL, &cur) == 0) + break; + } while (errno == EINTR); + + if (flag) + cur.sa_flags |= SA_RESTART; + else + cur.sa_flags &= ~SA_RESTART; + + do { + if ((ret = sigaction(sig, &cur, NULL)) == 0) + break; + } while (errno == EINTR); + + return ret; +}
