Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2022-01-21 01:25:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new.1938 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd" Fri Jan 21 01:25:13 2022 rev:344 rq:947453 version:249.9 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2022-01-12 00:26:28.183894850 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new.1938/systemd.changes 2022-01-21 01:25:34.954520390 +0100 @@ -1,0 +2,53 @@ +Wed Jan 19 14:25:46 UTC 2022 - Franck Bui <f...@suse.com> + +- Move the systemd-network-generator stuff in udev package + + This generator can generate .link files and is mainly used in initrd where + udev is mandatory. + +------------------------------------------------------------------- +Tue Jan 18 17:57:43 UTC 2022 - Franck Bui <f...@suse.com> + +- Restore /sbin/udevadm and /bin/systemctl (obsolete) paths when split_usr is + true (bsc#1194519) + +------------------------------------------------------------------- +Mon Jan 17 09:16:13 UTC 2022 - Franck Bui <f...@suse.com> + +- Import commit 3743acbce3bd44208af453fc6dc384a1236dc83c (merge of v249.9) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/e2ca79dd775d1f7d39861d57f23c43f6cd85a872...3743acbce3bd44208af453fc6dc384a1236dc83c + +------------------------------------------------------------------- +Fri Jan 14 14:55:56 UTC 2022 - Franck Bui <f...@suse.com> + +- Extract bits from 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch + which are not specific to the handling of 'Required-Start:' and move them into a + new patch 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch + +------------------------------------------------------------------- +Thu Jan 13 21:54:06 UTC 2022 - Franck Bui <f...@suse.com> + +- Import commit e2ca79dd775d1f7d39861d57f23c43f6cd85a872 (merge of v249.8) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/458220239c69b8e5fe7be480929348daeccb70d1...e2ca79dd775d1f7d39861d57f23c43f6cd85a872 + +------------------------------------------------------------------- +Thu Jan 13 20:03:51 UTC 2022 - Franck Bui <f...@suse.com> + +- Import commit 458220239c69b8e5fe7be480929348daeccb70d1 + + e95df40b09 shared/rm-rf: loop over nested directories instead of instead of recursing (CVE-2021-3997 bsc#1194178) + 078e04305d shared/rm_rf: refactor rm_rf() to shorten code a bit + 6d560d0aca shared/rm_rf: refactor rm_rf_children_inner() to shorten code a bit + 6666ff056c localectl: don't omit keymaps files that are symlinks (bsc#1191826) + +- Drop the following patches as they have been merged into SUSE/v249 branch: + + 5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch + 5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch + 5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch + +------------------------------------------------------------------- @@ -52 +105 @@ -- Import commit 523f32df573d459551760b072cb62906f4a2cf23 (merge of 249.7) +- Import commit 523f32df573d459551760b072cb62906f4a2cf23 (merge of v249.7) @@ -72 +125 @@ -- Import commit 61c79e68381801428c0bc00a56b9e2e9cfa68373 (merge of 249.6) +- Import commit 61c79e68381801428c0bc00a56b9e2e9cfa68373 (merge of v249.6) Old: ---- 5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch 5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch 5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch systemd-v249.7+suse.66.ga54f80116c.tar.xz New: ---- 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch systemd-v249.9+suse.75.g3743acbce3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.eKKFtN/_old 2022-01-21 01:25:35.754514905 +0100 +++ /var/tmp/diff_new_pack.eKKFtN/_new 2022-01-21 01:25:35.758514878 +0100 @@ -32,7 +32,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.66.ga54f80116c +%define suse_version +suse.75.g3743acbce3 %define _testsuitedir /usr/lib/systemd/tests %if 0%{?bootstrap} @@ -69,7 +69,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 249.7 +Version: 249.9 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -198,10 +198,11 @@ Patch6: 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch -Patch9: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch +Patch9: 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch Patch10: 0001-conf-parser-introduce-early-drop-ins.patch Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +Patch13: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch # Patches listed below are put in quarantine. Normally all changes # must go to upstream first and then are cherry-picked in the SUSE git @@ -210,12 +211,6 @@ # temporary and should be removed as soon as a fix is merged by # upstream. -# The following patches address CVE-2021-3997. They will be moved to the git -# repo once the issue will become public and upstream will release them. -Patch5000: 5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch -Patch5001: 5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch -Patch5002: 5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -746,8 +741,11 @@ done %if %{with split_usr} +mkdir -p %{buildroot}/{bin,sbin} +# Legacy paths +ln -s ../usr/bin/udevadm %{buildroot}/sbin/ +ln -s ../usr/bin/systemctl %{buildroot}/bin/ # Legacy sysvinit tools -mkdir -p %{buildroot}/sbin ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot ln -s ../usr/bin/systemctl %{buildroot}/sbin/halt @@ -787,8 +785,8 @@ # /usr/lib/sysctl.d/99-sysctl.conf. ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf -# The definition of the basic users/groups are defined by system-user -# on SUSE (bsc#1006978). +# The definitions of the basic users/groups are given by system-user package on +# SUSE (bsc#1006978). rm -f %{buildroot}%{_sysusersdir}/basic.conf # Remove README file in init.d as (SUSE) rpm requires executable files @@ -1281,6 +1279,9 @@ %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop %{_bindir}/systemd-cat +%if %{with split_usr} +/bin/systemctl +%endif %dir %{_prefix}/lib/kernel %dir %{_prefix}/lib/kernel/install.d %{_prefix}/lib/kernel/install.d/00-entry-directory.install @@ -1290,6 +1291,8 @@ %dir %{_prefix}/lib/systemd/network %dir %{_unitdir} %{_userunitdir} +%exclude %{_prefix}/lib/systemd/systemd-network-generator +%exclude %{_unitdir}/systemd-network-generator.service %if %{with coredump} %exclude %{_prefix}/lib/systemd/systemd-coredump %exclude %{_unitdir}/systemd-coredump* @@ -1302,6 +1305,7 @@ %exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd %exclude %{_prefix}/lib/systemd/systemd-journal-remote %exclude %{_prefix}/lib/systemd/systemd-journal-upload +%exclude %{_datadir}/systemd/gatewayd %endif %exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_unitdir}/systemd-udev*.* @@ -1330,10 +1334,8 @@ %exclude %{_unitdir}/dbus-org.freedesktop.import1.service %endif %if %{with networkd} -%exclude %{_prefix}/lib/systemd/systemd-network-generator %exclude %{_prefix}/lib/systemd/systemd-networkd %exclude %{_prefix}/lib/systemd/systemd-networkd-wait-online -%exclude %{_unitdir}/systemd-network-generator.service %exclude %{_unitdir}/systemd-networkd.service %exclude %{_unitdir}/systemd-networkd.socket %exclude %{_unitdir}/systemd-networkd-wait-online.service @@ -1475,10 +1477,6 @@ %{_datadir}/systemd %{_datadir}/factory -%if %{with journal_remote} -%exclude %{_datadir}/systemd/gatewayd -%endif - %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service @@ -1503,12 +1501,13 @@ %{_mandir}/man7/[bdfks]* %{_mandir}/man8/kern* %{_mandir}/man8/pam_* -%{_mandir}/man8//rc-local.* +%{_mandir}/man8/rc-local.* %{_mandir}/man8/systemd-[a-gik-tvx]* %{_mandir}/man8/systemd-h[aioy]* %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/30-systemd-environment-d-generator.* +%exclude %{_mandir}/man8/systemd-network-generator.* %if %{with coredump} %exclude %{_mandir}/man1/coredumpctl* %exclude %{_mandir}/man5/coredump.conf* @@ -1623,6 +1622,9 @@ %defattr(-,root,root) %{_bindir}/udevadm %{_bindir}/systemd-hwdb +%if %{with split_usr} +/sbin/udevadm +%endif %dir %{_prefix}/lib/udev/ %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/cdrom_id @@ -1636,6 +1638,8 @@ %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation +%{_prefix}/lib/systemd/systemd-udevd +%{_prefix}/lib/systemd/systemd-network-generator %dir %{_udevrulesdir}/ %doc %{_udevrulesdir}/README %exclude %{_udevrulesdir}/70-uaccess.rules @@ -1648,16 +1652,7 @@ %dir %{_sysconfdir}/udev/rules.d/ %ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin %config(noreplace) %{_sysconfdir}/udev/udev.conf -%if ! 0%{?bootstrap} -%{_mandir}/man5/udev* -%{_mandir}/man7/hwdb* -%{_mandir}/man7/udev* -%{_mandir}/man8/systemd-hwdb* -%{_mandir}/man8/systemd-udev* -%{_mandir}/man8/udev* -%endif %dir %{_unitdir} -%{_prefix}/lib/systemd/systemd-udevd %{_unitdir}/kmod-static-nodes.service %{_unitdir}/sysinit.target.wants/kmod-static-nodes.service %{_tmpfilesdir}/static-nodes-permissions.conf @@ -1665,6 +1660,7 @@ %{_unitdir}/systemd-udevd*.socket %{_unitdir}/systemd-hwdb*.* %{_unitdir}/initrd-udevadm-cleanup-db.service +%{_unitdir}/systemd-network-generator.service %dir %{_unitdir}/sysinit.target.wants %{_unitdir}/sysinit.target.wants/systemd-udev*.service %dir %{_unitdir}/sockets.target.wants @@ -1672,6 +1668,15 @@ %{_unitdir}/*.target.wants/systemd-hwdb*.* %{_prefix}/lib/systemd/network/99-default.link %{_datadir}/pkgconfig/udev.pc +%if ! 0%{?bootstrap} +%{_mandir}/man5/udev* +%{_mandir}/man7/hwdb* +%{_mandir}/man7/udev* +%{_mandir}/man8/systemd-hwdb* +%{_mandir}/man8/systemd-udev* +%{_mandir}/man8/udev* +%{_mandir}/man8/systemd-network-generator.* +%endif %files -n libsystemd0%{?mini} %defattr(-,root,root) @@ -1813,10 +1818,8 @@ %{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules %{_prefix}/lib/systemd/network/*.network %{_prefix}/lib/systemd/network/*.network.example -%{_prefix}/lib/systemd/systemd-network-generator %{_prefix}/lib/systemd/systemd-networkd %{_prefix}/lib/systemd/systemd-networkd-wait-online -%{_unitdir}/systemd-network-generator.service %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service ++++++ 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch ++++++ --- /var/tmp/diff_new_pack.eKKFtN/_old 2022-01-21 01:25:35.786514686 +0100 +++ /var/tmp/diff_new_pack.eKKFtN/_new 2022-01-21 01:25:35.790514659 +0100 @@ -1,59 +1,28 @@ -From 7f59f7b1b506c1394712ad3d6bab81318052a14c Mon Sep 17 00:00:00 2001 +From 9e6a1f4b085b29abaf90ecd05859537b837b39fe Mon Sep 17 00:00:00 2001 From: Thomas Blume <thomas.bl...@suse.com> Date: Wed, 4 May 2016 17:40:04 +0200 -Subject: [PATCH 08/11] sysv-generator: translate "Required-Start" into a - "Wants" dependency +Subject: [PATCH 8/8] sysv-generator: translate "Required-Start" into a "Wants" + dependency -[tblume: Port of SLES12SP1 patch 0018-Make-LSB-Skripts-know-about-Required-and-Should.patch] +'Required-Start:' used to be supported by insserv but this functionality was +dropped when insserv was rewritten into a compat perl wrapper (insserv-compat), +which happened when systemd was introduced in SUSE, I guess. + +It's been decided to add back the support in systemd instead of insserv-compat, +see the comments in bsc#857204. -[fbui: this is needed probably because insserv's behavior has been - sadly changed since SLE11: it now doesn't failed if a - dependency listed by Required-Start is missing.] +[tblume: Port of SLES12SP1 patch 0018-Make-LSB-Skripts-know-about-Required-and-Should.patch] -[fbui: according to Werner "This should fix bnc#858864 and - bnc#857204." (see Base:System changelog)] +[wfink: fixes bsc#857204] --- - src/sysv-generator/sysv-generator.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) + src/sysv-generator/sysv-generator.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index fa5355c964..62755f3652 100644 +index bf23c48662..c6e1953839 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c -@@ -257,6 +257,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, - "remote_fs", SPECIAL_REMOTE_FS_TARGET, - "syslog", NULL, - "time", SPECIAL_TIME_SYNC_TARGET, -+ "all", SPECIAL_DEFAULT_TARGET, - }; - - const char *filename; -@@ -271,6 +272,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, - - filename = basename(s->path); - -+ n = *name == '+' ? ++name : name; - n = *name == '$' ? name + 1 : name; - - for (i = 0; i < ELEMENTSOF(table); i += 2) { -@@ -407,7 +409,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text - - for (;;) { - _cleanup_free_ char *word = NULL, *m = NULL; -- bool is_before; -+ bool is_before, is_wanted; - - r = extract_first_word(&text, &word, NULL, EXTRACT_UNQUOTE|EXTRACT_RELAX); - if (r < 0) -@@ -420,6 +422,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text - continue; - - is_before = startswith_no_case(full_text, "X-Start-Before:"); -+ is_wanted = startswith_no_case(full_text, "Required-Start:"); - - if (streq(m, SPECIAL_NETWORK_ONLINE_TARGET) && !is_before) { - /* the network-online target is special, as it needs to be actively pulled in */ -@@ -428,8 +431,13 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text +@@ -409,8 +409,13 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text return log_oom(); r = strv_extend(&s->wants, m); @@ -61,7 +30,7 @@ + } else { r = strv_extend(is_before ? &s->before : &s->after, m); + -+ if (is_wanted) ++ if (startswith_no_case(full_text, "Required-Start:")) + r = strv_extend(&s->wants, m); + } + @@ -69,6 +38,6 @@ return log_oom(); } -- -2.26.2 +2.31.1 ++++++ 0009-pid1-handle-console-specificities-weirdness-for-s390.patch ++++++ --- /var/tmp/diff_new_pack.eKKFtN/_old 2022-01-21 01:25:35.798514604 +0100 +++ /var/tmp/diff_new_pack.eKKFtN/_new 2022-01-21 01:25:35.802514576 +0100 @@ -24,7 +24,7 @@ See also a short discussion which happened on @systemd-maintainers whose $subject is "[PATCH] support conmode setting on command line". -[ fbui: fixes bsc#860937 ] +[fbui: fixes bsc#860937] --- src/basic/terminal-util.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) ++++++ 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch ++++++ >From 6f4d9d9688ad65bb46d09ac09f570c6ee4bc3671 Mon Sep 17 00:00:00 2001 From: Franck Bui <f...@suse.com> Date: Fri, 14 Jan 2022 08:17:38 +0100 Subject: [PATCH 1010/1010] sysv: add back support for '$all' virtual facility and '+' facitity name prefix '$all' was probably a Debian thing and has probably never been supported by RH, which explains why systemd upstream never supported it too. At least I couldn't find any reference of this facility name in http://refspecs.linux-foundation.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic.html#FACILNAME. OTOH '$all' is described in https://wiki.debian.org/LSBInitScripts Regarding the '+' prefix, I couldn't find any mention of it anywhere. Apparently it was equivalent to '$' in facility names. [wfink: bsc#858864] --- src/sysv-generator/sysv-generator.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index c6e1953839..0aadb397ed 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -243,6 +243,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, "remote_fs", SPECIAL_REMOTE_FS_TARGET, "syslog", NULL, "time", SPECIAL_TIME_SYNC_TARGET, + "all", SPECIAL_DEFAULT_TARGET, }; const char *filename; @@ -257,6 +258,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, filename = basename(s->path); + n = *name == '+' ? ++name : name; n = *name == '$' ? name + 1 : name; for (i = 0; i < ELEMENTSOF(table); i += 2) { -- 2.31.1 ++++++ systemd-sysv-install ++++++ --- /var/tmp/diff_new_pack.eKKFtN/_old 2022-01-21 01:25:35.910513836 +0100 +++ /var/tmp/diff_new_pack.eKKFtN/_new 2022-01-21 01:25:35.910513836 +0100 @@ -2,15 +2,15 @@ # This script is called by "systemctl enable/disable" when the given unit is a # SysV init.d script. It needs to call the distribution's mechanism for -# enabling/disabling those, such as chkconfig, update-rc.d, or similar. This -# can optionally take a --root argument for enabling a SysV init script -# in a chroot or similar. +# enabling/disabling those, such as chkconfig, update-rc.d, or similar. This can +# optionally take a --root argument for enabling a SysV init script in a chroot +# or similar. # -# chkconfig(8) and insserv(8) are no more available hence let's do the -# bare minimum and create/remote the symlinks for the well known -# runlevels and nothing more. Note that we don't take care of -# enabling/disabling the service dependencies as the sysv-generator -# will take care of them for us (openSUSE specific). +# chkconfig(8) and insserv(8) are no more available hence let's do the bare +# minimum and create/remove the symlinks for the well known runlevels and +# nothing more. Note that we don't take care of enabling/disabling the service +# dependencies as the sysv-generator will take care of them for us (openSUSE +# specific). # set -e ++++++ systemd-v249.7+suse.66.ga54f80116c.tar.xz -> systemd-v249.9+suse.75.g3743acbce3.tar.xz ++++++ /work/SRC/openSUSE:Factory/systemd/systemd-v249.7+suse.66.ga54f80116c.tar.xz /work/SRC/openSUSE:Factory/.systemd.new.1938/systemd-v249.9+suse.75.g3743acbce3.tar.xz differ: char 26, line 1
