Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package haveged for openSUSE:Factory checked in at 2021-11-08 17:23:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haveged (Old) and /work/SRC/openSUSE:Factory/.haveged.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haveged" Mon Nov 8 17:23:54 2021 rev:59 rq:928677 version:1.9.14 Changes: -------- --- /work/SRC/openSUSE:Factory/haveged/haveged.changes 2021-10-31 22:56:12.987724729 +0100 +++ /work/SRC/openSUSE:Factory/.haveged.new.1890/haveged.changes 2021-11-08 17:24:11.748693758 +0100 @@ -1,0 +2,6 @@ +Tue Nov 2 08:18:49 UTC 2021 - Marcus Meissner <meiss...@suse.com> + +- revert last change, e.g. for VMs where we are not being fed entropy + from the host or similar setups. + +-------------------------------------------------------------------- New: ---- 90-haveged.rules haveged-dracut.module haveged-switch-root.service haveged.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haveged.spec ++++++ --- /var/tmp/diff_new_pack.4pEhPb/_old 2021-11-08 17:24:12.232694075 +0100 +++ /var/tmp/diff_new_pack.4pEhPb/_new 2021-11-08 17:24:12.236694079 +0100 @@ -25,6 +25,10 @@ Group: System/Daemons URL: https://github.com/jirka-h/haveged Source0: https://github.com/jirka-h/haveged/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source2: %{name}.service +Source3: 90-haveged.rules +Source4: haveged-dracut.module +Source5: %{name}-switch-root.service Patch0: ppc64le.patch # PATCH-FIX-UPSTREAM: don't write to syslog at startup to avoid deadlocks psim...@suse.com bnc#959237 Patch2: haveged-no-syslog.patch @@ -35,7 +39,14 @@ BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) Requires(post): coreutils -Requires(postun):coreutils +Requires(postun): coreutils +Enhances: apache2 +Enhances: gpg2 +Enhances: openssl +Enhances: openvpn +Enhances: php5 +Enhances: smtp_daemon +Enhances: systemd %{?systemd_requires} %description @@ -76,6 +87,7 @@ --disable-static \ --disable-enttest \ --enable-nistest \ + --enable-daemon \ --enable-clock_gettime make %{?_smp_mflags} @@ -91,15 +103,54 @@ %install %make_install +install -Dpm 0644 %{SOURCE2} \ + %{buildroot}%{_unitdir}/%{name}.service +install -Dpm 0644 %{SOURCE3} \ + %{buildroot}%{_udevrulesdir}/90-%{name}.rules +install -Dpm 0644 %{SOURCE5} \ + %{buildroot}%{_unitdir}/%{name}-switch-root.service +install -Dpm 0755 %{SOURCE4} \ + %{buildroot}%{_prefix}/lib/dracut/modules.d/98%{name}/module-setup.sh rm -f %{buildroot}%{_libdir}/libhavege.*a +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} + +%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 +%{?regenerate_initrd_posttrans} + +%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 libhavege2 -p /sbin/ldconfig %postun -n libhavege2 -p /sbin/ldconfig %files %license COPYING +%{_sbindir}/rc%{name} %{_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 +%dir %{_prefix}/lib/dracut/modules.d/98%{name} +%{_prefix}/lib/dracut/modules.d/98%{name}/module-setup.sh %files devel %license COPYING ++++++ 90-haveged.rules ++++++ ACTION=="add", KERNEL=="random" , SUBSYSTEM=="mem", TAG+="systemd", ENV{SYSTEMD_WANTS}+="haveged.service" ++++++ haveged-dracut.module ++++++ #!/bin/bash # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # ex: ts=8 sw=4 sts=4 et filetype=sh # called by dracut depends() { return 0 } installkernel() { return 0 } # called by dracut install() { inst_multiple -o \ /usr/sbin/haveged \ $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-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 ++++++ [Unit] Description=Entropy Daemon based on the HAVEGE algorithm Documentation=man:haveged(8) http://www.issihosts.com/haveged/ DefaultDependencies=no ConditionVirtualization=!container #Conflicts=shutdown.target # Don't wait for systemd-random-seed.service, leads to deadlock with fips=1 #After=systemd-random-seed.service Before=sysinit.target shutdown.target systemd-journald.service [Service] ExecStart=/usr/sbin/haveged -w 1024 -v 0 -F CapabilityBoundingSet=CAP_SYS_ADMIN CAP_SYS_CHROOT PrivateNetwork=yes Restart=always SuccessExitStatus=137 143 [Install] WantedBy=sysinit.target
