From a95b5f34c25a25236f227f0e12483dfa2a9ee7970e445e9496f098dded17fa95 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 28 Mar 2023 16:14:46 +0000 Subject: [PATCH 1/5] - Import commit 8b01686dd20124efc300d21ef38d85c1f75c372f 8b01686dd2 test: don't export $TOOLS_DIR 7a56b1b2f0 test: clean up $STATEDIR too 324bb19eb8 test: $STATEDIR should not point to /usr/lib/systemd/tests when NO_BUILD=1 2251735482 test: install symlinks with valid targets on SUSE and Debian c30905a269 test: on openSUSE install the collection of unit test binaries in the target only for TEST-02-UNITTESTS 797ced15d8 meson: make sure the unit test scripts find testdata/ even if they are not installed in the same directory 04dc5b44b7 meson: define testdata_dir globally 69643c6c96 test: install unit tests in a dedicated subdirectory below '$testsdir' OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1364 --- systemd-v253.1+suse.14.g8b01686dd2.tar.xz | 3 +++ systemd-v253.1+suse.6.gd914e29c33.tar.xz | 3 --- systemd.changes | 14 ++++++++++++++ systemd.spec | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 systemd-v253.1+suse.14.g8b01686dd2.tar.xz delete mode 100644 systemd-v253.1+suse.6.gd914e29c33.tar.xz diff --git a/systemd-v253.1+suse.14.g8b01686dd2.tar.xz b/systemd-v253.1+suse.14.g8b01686dd2.tar.xz new file mode 100644 index 00000000..a9fad76e --- /dev/null +++ b/systemd-v253.1+suse.14.g8b01686dd2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebbf20d2d10f6bced7a3a001b5ed122a52a5732ff36e1e48fb2cb69cb747b0bd +size 8202120 diff --git a/systemd-v253.1+suse.6.gd914e29c33.tar.xz b/systemd-v253.1+suse.6.gd914e29c33.tar.xz deleted file mode 100644 index 3499edab..00000000 --- a/systemd-v253.1+suse.6.gd914e29c33.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79ae68b276a576457d6036e830dd95d377dcaacc716056c1d66633e65f10709a -size 8202064 diff --git a/systemd.changes b/systemd.changes index 17bc1df5..6c641cd6 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Mar 28 16:01:58 UTC 2023 - Franck Bui + +- Import commit 8b01686dd20124efc300d21ef38d85c1f75c372f + + 8b01686dd2 test: don't export $TOOLS_DIR + 7a56b1b2f0 test: clean up $STATEDIR too + 324bb19eb8 test: $STATEDIR should not point to /usr/lib/systemd/tests when NO_BUILD=1 + 2251735482 test: install symlinks with valid targets on SUSE and Debian + c30905a269 test: on openSUSE install the collection of unit test binaries in the target only for TEST-02-UNITTESTS + 797ced15d8 meson: make sure the unit test scripts find testdata/ even if they are not installed in the same directory + 04dc5b44b7 meson: define testdata_dir globally + 69643c6c96 test: install unit tests in a dedicated subdirectory below '$testsdir' + ------------------------------------------------------------------- Thu Mar 23 07:07:34 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index b69ba771..a74f9bc7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version +suse.6.gd914e29c33 +%define archive_version +suse.14.g8b01686dd2 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit From 77c37392a4c37589312967e7a13605bccc2d8f53c43c453dfb8480210b5a309d Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 31 Mar 2023 13:08:07 +0000 Subject: [PATCH 2/5] - Include pam_keyinit.so in our systemd-user PAM service (bsc#1209741) That way "systemd --user" instances get their own session keyring instead of the user default session keyring. For some reasons cifscreds refuses to work with the latter. That's what is expected for every PAM session anyway. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1365 --- systemd-user | 1 + systemd.changes | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/systemd-user b/systemd-user index 2e1fb802..6a91d1e5 100644 --- a/systemd-user +++ b/systemd-user @@ -21,4 +21,5 @@ account include common-account session required pam_selinux.so close session required pam_selinux.so nottys open session required pam_loginuid.so +session optional pam_keyinit.so force revoke session include common-session diff --git a/systemd.changes b/systemd.changes index 6c641cd6..27b768ca 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Mar 31 12:55:21 UTC 2023 - Franck Bui + +- Include pam_keyinit.so in our systemd-user PAM service (bsc#1209741) + + That way "systemd --user" instances get their own session keyring instead of + the user default session keyring. For some reasons cifscreds refuses to work + with the latter. That's what is expected for every PAM session anyway. + ------------------------------------------------------------------- Tue Mar 28 16:01:58 UTC 2023 - Franck Bui From ddd1e277bdede951dac8323d0cfab3b680f3ce65115ff4eb3e71b37ec3132ceb Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 31 Mar 2023 15:15:32 +0000 Subject: [PATCH 3/5] - Import commit b63f58661b08037d8cb04ed97b5e39d9bf415fdc (merge of v253.2) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/8b01686dd20124efc300d21ef38d85c1f75c372f...b63f58661b08037d8cb04ed97b5e39d9bf415fdc - Move systemd-fsck stuff to udev sub-package. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1366 --- files.systemd | 7 ------- files.udev | 9 +++++++++ systemd-v253.1+suse.14.g8b01686dd2.tar.xz | 3 --- systemd-v253.2+suse.15.gb63f58661b.tar.xz | 3 +++ systemd.changes | 10 ++++++++++ systemd.spec | 4 ++-- 6 files changed, 24 insertions(+), 12 deletions(-) delete mode 100644 systemd-v253.1+suse.14.g8b01686dd2.tar.xz create mode 100644 systemd-v253.2+suse.15.gb63f58661b.tar.xz diff --git a/files.systemd b/files.systemd index 6d2276f1..e2be4037 100644 --- a/files.systemd +++ b/files.systemd @@ -363,9 +363,6 @@ %{_mandir}/man8/systemd-boot-check-no-failures.service.8.gz %{_mandir}/man8/systemd-debug-generator.8.gz %{_mandir}/man8/systemd-environment-d-generator.8.gz -%{_mandir}/man8/systemd-fsck-root.service.8.gz -%{_mandir}/man8/systemd-fsck.8.gz -%{_mandir}/man8/systemd-fsck@.service.8.gz %{_mandir}/man8/systemd-getty-generator.8.gz %{_mandir}/man8/systemd-halt.service.8.gz %{_mandir}/man8/systemd-hibernate-resume-generator.8.gz @@ -450,7 +447,6 @@ %{_systemd_util_dir}/systemd-binfmt %{_systemd_util_dir}/systemd-boot-check-no-failures %{_systemd_util_dir}/systemd-cgroups-agent -%{_systemd_util_dir}/systemd-fsck %{_systemd_util_dir}/systemd-hibernate-resume %{_systemd_util_dir}/systemd-hostnamed %{_systemd_util_dir}/systemd-journald @@ -633,9 +629,6 @@ %{_unitdir}/systemd-binfmt.service %{_unitdir}/systemd-boot-check-no-failures.service %{_unitdir}/systemd-exit.service -%{_unitdir}/systemd-firstboot.service -%{_unitdir}/systemd-fsck-root.service -%{_unitdir}/systemd-fsck@.service %{_unitdir}/systemd-halt.service %{_unitdir}/systemd-hibernate-resume@.service %{_unitdir}/systemd-hibernate.service diff --git a/files.udev b/files.udev index a793d096..ed8b2918 100644 --- a/files.udev +++ b/files.udev @@ -54,8 +54,13 @@ %{_mandir}/man8/systemd-cryptsetup-generator.8.gz %{_mandir}/man8/systemd-cryptsetup.8.gz %{_mandir}/man8/systemd-cryptsetup@.service.8.gz +%{_mandir}/man8/systemd-fsck-root.service.8.gz +%{_mandir}/man8/systemd-fsck-usr.service.8.gz +%{_mandir}/man8/systemd-fsck.8.gz +%{_mandir}/man8/systemd-fsck@.service.8.gz %{_mandir}/man8/systemd-fstab-generator.8.gz %{_mandir}/man8/systemd-gpt-auto-generator.8.gz +%{_mandir}/man8/systemd-growfs-root.service.8.gz %{_mandir}/man8/systemd-growfs.8.gz %{_mandir}/man8/systemd-growfs@.service.8.gz %{_mandir}/man8/systemd-hwdb.8.gz @@ -101,6 +106,7 @@ %if %{without bootstrap} %{_systemd_util_dir}/systemd-cryptsetup %endif +%{_systemd_util_dir}/systemd-fsck %{_systemd_util_dir}/systemd-growfs %if %{without bootstrap} %{_systemd_util_dir}/systemd-integritysetup @@ -224,6 +230,9 @@ %{_unitdir}/system-systemd\x2dcryptsetup.slice %endif %{_unitdir}/systemd-backlight@.service +%{_unitdir}/systemd-firstboot.service +%{_unitdir}/systemd-fsck-root.service +%{_unitdir}/systemd-fsck@.service %{_unitdir}/systemd-growfs-root.service %{_unitdir}/systemd-growfs@.service %{_unitdir}/systemd-hwdb-update.service diff --git a/systemd-v253.1+suse.14.g8b01686dd2.tar.xz b/systemd-v253.1+suse.14.g8b01686dd2.tar.xz deleted file mode 100644 index a9fad76e..00000000 --- a/systemd-v253.1+suse.14.g8b01686dd2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebbf20d2d10f6bced7a3a001b5ed122a52a5732ff36e1e48fb2cb69cb747b0bd -size 8202120 diff --git a/systemd-v253.2+suse.15.gb63f58661b.tar.xz b/systemd-v253.2+suse.15.gb63f58661b.tar.xz new file mode 100644 index 00000000..85aba6bf --- /dev/null +++ b/systemd-v253.2+suse.15.gb63f58661b.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cf4c490eb720a0148eda7af657ccea4fc355eec2b7986727e5efc3e158d792b +size 8205900 diff --git a/systemd.changes b/systemd.changes index 27b768ca..2105e60a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Mar 31 14:41:49 UTC 2023 - Franck Bui + +- Import commit b63f58661b08037d8cb04ed97b5e39d9bf415fdc (merge of v253.2) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/8b01686dd20124efc300d21ef38d85c1f75c372f...b63f58661b08037d8cb04ed97b5e39d9bf415fdc + +- Move systemd-fsck stuff to udev sub-package. + ------------------------------------------------------------------- Fri Mar 31 12:55:21 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index a74f9bc7..dde8a250 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version +suse.14.g8b01686dd2 +%define archive_version +suse.15.gb63f58661b %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -72,7 +72,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 253.1 +Version: 253.2 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later From 678bd7c8e45abd7c467b367e61f708911169fa0ba5d31876aeae2915de247014 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 3 Apr 2023 09:21:41 +0000 Subject: [PATCH 4/5] - systemd.spec: add files.coredump OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1367 --- files.coredump | 22 ++++++++++++++++++++++ systemd.changes | 5 +++++ systemd.spec | 21 ++++----------------- 3 files changed, 31 insertions(+), 17 deletions(-) create mode 100644 files.coredump diff --git a/files.coredump b/files.coredump new file mode 100644 index 00000000..32b62d7e --- /dev/null +++ b/files.coredump @@ -0,0 +1,22 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%config(noreplace) %{_sysconfdir}/systemd/coredump.conf +%dir %{_localstatedir}/lib/systemd/coredump +%{_bindir}/coredumpctl +%if %{without bootstrap} +%{_datadir}/bash-completion/completions/coredumpctl +%{_datadir}/zsh/site-functions/_coredumpctl +%{_mandir}/man1/coredumpctl.1.gz +%{_mandir}/man5/coredump.conf.5.gz +%{_mandir}/man5/coredump.conf.d.5.gz +%{_mandir}/man8/systemd-coredump.8.gz +%{_mandir}/man8/systemd-coredump.socket.8.gz +%{_mandir}/man8/systemd-coredump@.service.8.gz +%endif +%{_sysctldir}/50-coredump.conf +%{_systemd_util_dir}/systemd-coredump +%{_sysusersdir}/systemd-coredump.conf +%{_unitdir}/sockets.target.wants/systemd-coredump.socket +%{_unitdir}/systemd-coredump.socket +%{_unitdir}/systemd-coredump@.service diff --git a/systemd.changes b/systemd.changes index 2105e60a..5a22e741 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 3 09:20:59 UTC 2023 - Franck Bui + +- systemd.spec: add files.coredump + ------------------------------------------------------------------- Fri Mar 31 14:41:49 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index dde8a250..204dbb85 100644 --- a/systemd.spec +++ b/systemd.spec @@ -187,6 +187,7 @@ Source204: files.devel Source205: files.sysvcompat Source206: files.uefi-boot Source207: files.experimental +Source208: files.coredump # # All changes backported from upstream are tracked by the git repository, which @@ -381,7 +382,7 @@ Provides: systemd:%{_bindir}/coredumpctl %description coredump Systemd tools to store and manage coredumps. -This package contains systemd-coredump, coredumpctl. +Visit https://systemd.io/COREDUMP for more details. %endif %package container @@ -1188,7 +1189,7 @@ fi %systemd_post systemd-journal-remote.socket systemd-journal-remote.service %systemd_post systemd-journal-upload.service -%preun journal-remote +%preun journal-remote %systemd_preun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %systemd_preun systemd-journal-remote.socket systemd-journal-remote.service %systemd_preun systemd-journal-upload.service @@ -1329,21 +1330,7 @@ fi %if %{with coredump} %files coredump %defattr(-,root,root) -%{_bindir}/coredumpctl -%{_prefix}/lib/systemd/systemd-coredump -%{_unitdir}/systemd-coredump* -%{_unitdir}/sockets.target.wants/systemd-coredump.socket -%{_sysctldir}/50-coredump.conf -%{_sysusersdir}/systemd-coredump.conf -%config(noreplace) %{_sysconfdir}/systemd/coredump.conf -%dir %{_localstatedir}/lib/systemd/coredump -%if %{without bootstrap} -%{_datadir}/bash-completion/completions/coredumpctl -%{_datadir}/zsh/site-functions/_coredumpctl -%{_mandir}/man1/coredumpctl* -%{_mandir}/man5/coredump.conf* -%{_mandir}/man8/systemd-coredump* -%endif +%include %{SOURCE208} %endif %if %{without bootstrap} From d46d22ae3edcbd61b83161706d4297f7297a85f9aa30af2b1453c9dcf4db350c Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 3 Apr 2023 09:38:08 +0000 Subject: [PATCH 5/5] - Import commit 03cfbe767327d01d5a71131d91bf06fdc0047ca1 03cfbe7673 test: use setpriv instead of su for user switch from root 857843834c test: wrap mkfs.*/mksquashfs/mkswap binaries when running w/ ASan be7388f8c5 test: do not remove state directory on failure 1b2885bd16 test: fix regexp in testsuite-74.mount.sh 41142f8013 test: drop extraneous bracket in testsuite-74.mount.sh OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1368 --- systemd-v253.2+suse.15.gb63f58661b.tar.xz | 3 --- systemd-v253.2+suse.20.g03cfbe7673.tar.xz | 3 +++ systemd.changes | 11 +++++++++++ systemd.spec | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 systemd-v253.2+suse.15.gb63f58661b.tar.xz create mode 100644 systemd-v253.2+suse.20.g03cfbe7673.tar.xz diff --git a/systemd-v253.2+suse.15.gb63f58661b.tar.xz b/systemd-v253.2+suse.15.gb63f58661b.tar.xz deleted file mode 100644 index 85aba6bf..00000000 --- a/systemd-v253.2+suse.15.gb63f58661b.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cf4c490eb720a0148eda7af657ccea4fc355eec2b7986727e5efc3e158d792b -size 8205900 diff --git a/systemd-v253.2+suse.20.g03cfbe7673.tar.xz b/systemd-v253.2+suse.20.g03cfbe7673.tar.xz new file mode 100644 index 00000000..2acb1f54 --- /dev/null +++ b/systemd-v253.2+suse.20.g03cfbe7673.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c4d378e16528a3ee1b5e13568e57f7edc71686fe10072bac63f2b600228155a +size 8205740 diff --git a/systemd.changes b/systemd.changes index 5a22e741..0ca37f7f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Apr 3 09:36:03 UTC 2023 - Franck Bui + +- Import commit 03cfbe767327d01d5a71131d91bf06fdc0047ca1 + + 03cfbe7673 test: use setpriv instead of su for user switch from root + 857843834c test: wrap mkfs.*/mksquashfs/mkswap binaries when running w/ ASan + be7388f8c5 test: do not remove state directory on failure + 1b2885bd16 test: fix regexp in testsuite-74.mount.sh + 41142f8013 test: drop extraneous bracket in testsuite-74.mount.sh + ------------------------------------------------------------------- Mon Apr 3 09:20:59 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 204dbb85..3b65f598 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version +suse.15.gb63f58661b +%define archive_version +suse.20.g03cfbe7673 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit