Hello community, here is the log from the commit of package haveged for openSUSE:Factory checked in at 2018-07-18 22:36:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haveged (Old) and /work/SRC/openSUSE:Factory/.haveged.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haveged" Wed Jul 18 22:36:16 2018 rev:50 rq:622459 version:1.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/haveged/haveged.changes 2018-03-26 11:58:48.080041796 +0200 +++ /work/SRC/openSUSE:Factory/.haveged.new/haveged.changes 2018-07-18 22:36:18.734466663 +0200 @@ -1,0 +2,15 @@ +Mon Jul 2 13:37:19 UTC 2018 - [email protected] + +- Add patch change-sysroot.patch to + move forward to socket communication within private network +- Add haveged-switch-root.service which send the new root location + to running haveged process + +------------------------------------------------------------------- +Wed Jun 27 08:51:36 UTC 2018 - [email protected] + +- Make haveged survive switch root within initrd (boo#1075359) + added change-sysroot.patch + haveged-switch-root.service + +------------------------------------------------------------------- New: ---- change-sysroot.patch haveged-switch-root.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haveged.spec ++++++ --- /var/tmp/diff_new_pack.K6K13p/_old 2018-07-18 22:36:19.610463761 +0200 +++ /var/tmp/diff_new_pack.K6K13p/_new 2018-07-18 22:36:19.618463734 +0200 @@ -28,11 +28,13 @@ Source2: %{name}.service Source3: 90-haveged.rules Source4: haveged-dracut.module +Source5: %{name}-switch-root.service Patch0: ppc64le.patch # PATCH-FIX-UPSTREAM: ent tests randomly fail so make them conditional [email protected] bnc#876674 Patch1: haveged-conditional-enttest.patch # PATCH-FIX-UPSTREAM: don't write to syslog at startup to avoid deadlocks [email protected] bnc#959237 -Patch3: haveged-no-syslog.patch +Patch2: haveged-no-syslog.patch +Patch3: change-sysroot.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -80,11 +82,12 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch3 -p1 +%patch2 -p1 +%patch3 -p0 %build autoreconf -fvi -export CFLAGS="%{optflags} -fpie" +export CFLAGS="%{optflags} -fpie -D_DEFAULT_SOURCE -D_GNU_SOURCE" export LDFLAGS="-Wl,-z,relro,-z,now -pie" # ENT randomly fails so disable the test %configure \ @@ -109,6 +112,7 @@ %make_install install -D -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service install -D -m0644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/90-%{name}.rules +install -D -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}-switch-root.service rm -f %{buildroot}%{_libdir}/libhavege.*a ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} @@ -118,10 +122,12 @@ %post %{?udev_rules_update:%udev_rules_update} %service_add_post %{name}.service +%service_add_post %{name}-switch-root.service %{?regenerate_initrd_post} %postun %service_del_postun %{name}.service +%service_del_postun %{name}-switch-root.service %{?regenerate_initrd_post} %posttrans @@ -129,9 +135,11 @@ %pre %service_add_pre %{name}.service +%service_add_pre %{name}-switch-root.service %preun %service_del_preun %{name}.service +%service_del_preun %{name}-switch-root.service %post -n libhavege1 -p /sbin/ldconfig %postun -n libhavege1 -p /sbin/ldconfig @@ -142,6 +150,7 @@ %{_sbindir}/%{name} %{_mandir}/man8/%{name}.8%{ext_man} %{_unitdir}/%{name}.service +%{_unitdir}/%{name}-switch-root.service %{_udevrulesdir}/90-%{name}.rules %dir %{_prefix}/lib/dracut %dir %{_prefix}/lib/dracut/modules.d ++++++ change-sysroot.patch ++++++ ++++ 676 lines (skipped) ++++++ haveged-conditional-enttest.patch ++++++ --- /var/tmp/diff_new_pack.K6K13p/_old 2018-07-18 22:36:19.666463575 +0200 +++ /var/tmp/diff_new_pack.K6K13p/_new 2018-07-18 22:36:19.666463575 +0200 @@ -1,7 +1,10 @@ -diff -urN haveged-1.9.1/configure.ac haveged-1.9.1.new/configure.ac ---- haveged-1.9.1/configure.ac 2014-02-11 16:06:58.000000000 +0100 -+++ haveged-1.9.1.new/configure.ac 2014-05-12 12:57:40.111268914 +0200 -@@ -60,6 +60,11 @@ +--- + haveged-1.9.2/configure.ac | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- haveged-1.9.2/configure.ac ++++ haveged-1.9.2/configure.ac 2018-06-26 08:06:45.195289211 +0000 +@@ -61,6 +61,11 @@ AC_ARG_ENABLE(nistest, AS_HELP_STRING([--enable-nistest=[no/yes]],[Run NIST test suite [default=no]]), , enable_nistest="no") @@ -13,7 +16,7 @@ ## Make self test features configurable AC_ARG_ENABLE(olt, AS_HELP_STRING([--enable-olt=[yes/no]],[Enable online tests [default=yes]]), -@@ -225,7 +230,7 @@ +@@ -228,7 +233,7 @@ AM_CONDITIONAL(ENABLE_SYSV, test "$init_ AM_CONDITIONAL(ENABLE_SYSTEMD, test "$init_type" = "systemd") AM_CONDITIONAL(ENABLE_SYSTEMD_LOOKUP, test "$enable_initdir" = "?") AM_CONDITIONAL(ENABLE_NOINIT, test "$init_type" = "none") ++++++ haveged-dracut.module ++++++ --- /var/tmp/diff_new_pack.K6K13p/_old 2018-07-18 22:36:19.690463496 +0200 +++ /var/tmp/diff_new_pack.K6K13p/_new 2018-07-18 22:36:19.690463496 +0200 @@ -15,7 +15,11 @@ install() { inst_multiple -o \ /usr/sbin/haveged \ - $systemdsystemunitdir/haveged.service - mkdir "$initdir/$systemdsystemunitdir/systemd-journald.service.wants" + $systemdsystemunitdir/haveged.service \ + $systemdsystemunitdir/haveged-switch-root.service + mkdir -p "$initdir/$systemdsystemunitdir/sysinit.target.wants" + mkdir -p "$initdir/$systemdsystemunitdir/initrd-switch-root.target.wants" + mkdir -p "$initdir/$systemdsystemunitdir/systemd-journald.service.wants" ln_r "$systemdsystemunitdir/haveged.service" "$systemdsystemunitdir/systemd-journald.service.wants/haveged.service" + ln_r "$systemdsystemunitdir/haveged-switch-root.service" "$systemdsystemunitdir/initrd-switch-root.target.wants/haveged-switch-root.service" } ++++++ haveged-no-syslog.patch ++++++ --- /var/tmp/diff_new_pack.K6K13p/_old 2018-07-18 22:36:19.702463455 +0200 +++ /var/tmp/diff_new_pack.K6K13p/_new 2018-07-18 22:36:19.702463455 +0200 @@ -1,7 +1,11 @@ Index: haveged-1.9.1/src/haveged.c =================================================================== ---- haveged-1.9.1.orig/src/haveged.c -+++ haveged-1.9.1/src/haveged.c +--- + haveged-1.9.2/src/haveged.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- haveged-1.9.2/src/haveged.c ++++ haveged-1.9.2/src/haveged.c 2018-06-26 08:07:51.430076528 +0000 @@ -361,8 +361,10 @@ static void daemonize( /* RETURN: no void) /* IN: nothing */ { @@ -13,7 +17,7 @@ if (daemon(0, 0) == -1) error_exit("Cannot fork into the background"); fh = fopen(params->pid_file, "w"); -@@ -499,7 +501,9 @@ static void error_exit( /* RETURN: no +@@ -501,7 +503,9 @@ static void error_exit( /* RETURN: no #ifndef NO_DAEMON if (params->detached!=0) { unlink(params->pid_file); @@ -23,7 +27,7 @@ } else #endif -@@ -609,11 +613,13 @@ static void print_msg( /* RETURN: no +@@ -611,11 +615,13 @@ static void print_msg( /* RETURN: no va_list ap; va_start(ap, format); snprintf(buffer, sizeof(buffer), "%s: %s", params->daemon, format); ++++++ haveged-switch-root.service ++++++ [Unit] Description=Tell haveged about new root DefaultDependencies=no ConditionPathExists=/etc/initrd-release Before=initrd-switch-root.service JoinsNamespaceOf=haveged.service [Service] ExecStart=-/usr/sbin/haveged -c root=/sysroot PrivateNetwork=yes Type=oneshot StandardInput=null StandardOutput=null StandardError=null [Install] WantedBy=initrd-switch-root.target ++++++ haveged.service ++++++ --- /var/tmp/diff_new_pack.K6K13p/_old 2018-07-18 22:36:19.746463310 +0200 +++ /var/tmp/diff_new_pack.K6K13p/_new 2018-07-18 22:36:19.746463310 +0200 @@ -10,7 +10,7 @@ [Service] ExecStart=/usr/sbin/haveged -w 1024 -v 0 -F -CapabilityBoundingSet=CAP_SYS_ADMIN +CapabilityBoundingSet=CAP_SYS_ADMIN CAP_SYS_CHROOT PrivateNetwork=yes Restart=always SuccessExitStatus=137 143 ++++++ ppc64le.patch ++++++ --- /var/tmp/diff_new_pack.K6K13p/_old 2018-07-18 22:36:19.762463257 +0200 +++ /var/tmp/diff_new_pack.K6K13p/_new 2018-07-18 22:36:19.766463244 +0200 @@ -1,8 +1,12 @@ Index: haveged-1.9.1/configure.ac =================================================================== ---- haveged-1.9.1.orig/configure.ac -+++ haveged-1.9.1/configure.ac -@@ -156,7 +156,7 @@ case "$host" in +--- + haveged-1.9.2/configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- haveged-1.9.2/configure.ac ++++ haveged-1.9.2/configure.ac 2018-06-26 08:05:43.668415539 +0000 +@@ -157,7 +157,7 @@ case "$host" in AC_DEFINE(HAVE_ISA_IA64, 1, [Define to 1 for ia64]) ;;
