From 397c17e983607b2b7b42d42b7204c4635b50fbdb66069fdb2a592c15088c8a01 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 11 Jun 2020 08:53:53 +0000 Subject: [PATCH 1/4] Accepting request 813288 from home:fbui:systemd:openSUSE-Factory - Fix build when resolved is disabled While at it sort the build conditionals. OBS-URL: https://build.opensuse.org/request/show/813288 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1101 --- systemd-mini.changes | 7 +++++++ systemd-mini.spec | 41 ++++++++++++++++++++++------------------- systemd.changes | 7 +++++++ systemd.spec | 41 ++++++++++++++++++++++------------------- 4 files changed, 58 insertions(+), 38 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index c85941eb..a0694e21 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 29 14:32:41 UTC 2020 - Franck Bui + +- Fix build when resolved is disabled + + While at it sort the build conditionals. + ------------------------------------------------------------------- Thu May 28 09:30:33 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 5f5aca7f..71c1af45 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -31,25 +31,25 @@ %bcond_with gnuefi %if 0%{?bootstrap} %bcond_with coredump -%bcond_with sysvcompat -%bcond_with machined %bcond_with importd +%bcond_with journal_remote +%bcond_with machined %bcond_with networkd %bcond_with portabled %bcond_with resolved -%bcond_with journal_remote +%bcond_with sysvcompat %else %bcond_without coredump -%bcond_without sysvcompat -%bcond_without machined -%bcond_without importd -%bcond_without networkd -%bcond_without portabled -%bcond_without resolved -%bcond_without journal_remote %ifarch %{ix86} x86_64 %bcond_without gnuefi %endif +%bcond_without importd +%bcond_without journal_remote +%bcond_without machined +%bcond_without networkd +%bcond_without portabled +%bcond_without resolved +%bcond_without sysvcompat %endif %bcond_with parentpathid @@ -861,15 +861,18 @@ fi # This includes all hacks needed when upgrading from SysV. %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : -# Migrate i18n settings that could be previously configured in -# /etc/sysconfig but now is defined only in the systemd official -# places (/etc/locale.conf, /etc/vconsole.conf, etc...). This is done -# only once usually during package updates but might be also needed -# during installations when we upgrade from a distro using SysV init. -test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { +# Migrate old i18n settings previously configured in /etc/sysconfig to +# the new locations used by systemd (/etc/locale.conf, +# /etc/vconsole.conf, ...). Recent version of systemd parse the new +# locations only. +# +# This is needed both at package updates and package installations +# because we might be upgrading from a system which was running SysV +# init (systemd package is being installed). +if ! test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done; then %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh && touch %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || : -} +fi %postun %systemd_postun @@ -1569,8 +1572,6 @@ fi %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service -%{_prefix}/lib/systemd/systemd-resolved -%{_unitdir}/systemd-resolved.service %endif %if %{with resolved} %{_bindir}/resolvectl @@ -1580,6 +1581,8 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy %{_prefix}/lib/systemd/resolv.conf +%{_prefix}/lib/systemd/systemd-resolved +%{_unitdir}/systemd-resolved.service %endif %endif diff --git a/systemd.changes b/systemd.changes index c85941eb..a0694e21 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 29 14:32:41 UTC 2020 - Franck Bui + +- Fix build when resolved is disabled + + While at it sort the build conditionals. + ------------------------------------------------------------------- Thu May 28 09:30:33 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 0e2921e5..3f937fcf 100644 --- a/systemd.spec +++ b/systemd.spec @@ -29,25 +29,25 @@ %bcond_with gnuefi %if 0%{?bootstrap} %bcond_with coredump -%bcond_with sysvcompat -%bcond_with machined %bcond_with importd +%bcond_with journal_remote +%bcond_with machined %bcond_with networkd %bcond_with portabled %bcond_with resolved -%bcond_with journal_remote +%bcond_with sysvcompat %else %bcond_without coredump -%bcond_without sysvcompat -%bcond_without machined -%bcond_without importd -%bcond_without networkd -%bcond_without portabled -%bcond_without resolved -%bcond_without journal_remote %ifarch %{ix86} x86_64 %bcond_without gnuefi %endif +%bcond_without importd +%bcond_without journal_remote +%bcond_without machined +%bcond_without networkd +%bcond_without portabled +%bcond_without resolved +%bcond_without sysvcompat %endif %bcond_with parentpathid @@ -859,15 +859,18 @@ fi # This includes all hacks needed when upgrading from SysV. %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : -# Migrate i18n settings that could be previously configured in -# /etc/sysconfig but now is defined only in the systemd official -# places (/etc/locale.conf, /etc/vconsole.conf, etc...). This is done -# only once usually during package updates but might be also needed -# during installations when we upgrade from a distro using SysV init. -test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { +# Migrate old i18n settings previously configured in /etc/sysconfig to +# the new locations used by systemd (/etc/locale.conf, +# /etc/vconsole.conf, ...). Recent version of systemd parse the new +# locations only. +# +# This is needed both at package updates and package installations +# because we might be upgrading from a system which was running SysV +# init (systemd package is being installed). +if ! test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done; then %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh && touch %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || : -} +fi %postun %systemd_postun @@ -1567,8 +1570,6 @@ fi %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service -%{_prefix}/lib/systemd/systemd-resolved -%{_unitdir}/systemd-resolved.service %endif %if %{with resolved} %{_bindir}/resolvectl @@ -1578,6 +1579,8 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy %{_prefix}/lib/systemd/resolv.conf +%{_prefix}/lib/systemd/systemd-resolved +%{_unitdir}/systemd-resolved.service %endif %endif From cf0b23a0c205896188824dba8f2941a489c64a5bf58406d5d11bce7cd8da528b Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 15 Jun 2020 09:45:22 +0000 Subject: [PATCH 2/4] Accepting request 814110 from home:mgerstner:branches:Base:System - no longer explicitly package setgid directory /var/log/journal (bsc#1172550). The bit will be set during %post by way of the systemd-tmpfiles invocation. This avoids a conflict with the permissions package and an rpmlint error popping up. OBS-URL: https://build.opensuse.org/request/show/814110 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1102 --- systemd-mini.changes | 8 ++++++++ systemd-mini.spec | 3 ++- systemd.changes | 8 ++++++++ systemd.spec | 3 ++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index a0694e21..aa841df0 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jun 4 15:29:03 UTC 2020 - matthias.gerstner@suse.com + +- no longer explicitly package setgid directory /var/log/journal (bsc#1172550). + The bit will be set during %post by way of the systemd-tmpfiles invocation. + This avoids a conflict with the permissions package and an rpmlint error + popping up. + ------------------------------------------------------------------- Fri May 29 14:32:41 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 71c1af45..b9307498 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1502,7 +1502,8 @@ fi %files logger %defattr(-,root,root) -%dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ +# package without explicit setgid bit / attrs (see bsc#1172550) +%dir %{_localstatedir}/log/journal/ %doc %{_localstatedir}/log/README %files -n nss-myhostname diff --git a/systemd.changes b/systemd.changes index a0694e21..aa841df0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jun 4 15:29:03 UTC 2020 - matthias.gerstner@suse.com + +- no longer explicitly package setgid directory /var/log/journal (bsc#1172550). + The bit will be set during %post by way of the systemd-tmpfiles invocation. + This avoids a conflict with the permissions package and an rpmlint error + popping up. + ------------------------------------------------------------------- Fri May 29 14:32:41 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 3f937fcf..3af23b69 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1500,7 +1500,8 @@ fi %files logger %defattr(-,root,root) -%dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ +# package without explicit setgid bit / attrs (see bsc#1172550) +%dir %{_localstatedir}/log/journal/ %doc %{_localstatedir}/log/README %files -n nss-myhostname From bcaf132ae9010175a91cf4bb068b777846bbc06bf77f05276383c014ca651a4e Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 17 Jun 2020 20:38:48 +0000 Subject: [PATCH 3/4] Accepting request 815609 from home:fbui:systemd:openSUSE-Factory - Don't restart udevd sockets during package update Otherwise we might miss kernel events as the daemon need to be stopped as well. - Import commit b12cd8b89b4bccfcf972b47153a2b01cd7775932 (include merge of v245.6) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/a6d31d1a02c2718a064bbbc40d003668acf72769...b12cd8b89b4bccfcf972b47153a2b01cd7775932 OBS-URL: https://build.opensuse.org/request/show/815609 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1103 --- systemd-mini.changes | 16 ++++++++++++++++ systemd-mini.spec | 16 +++++++--------- systemd-v245+suse.122.ga6d31d1a02.tar.xz | 3 --- systemd-v245+suse.250.gb12cd8b89b.tar.xz | 3 +++ systemd.changes | 16 ++++++++++++++++ systemd.spec | 16 +++++++--------- 6 files changed, 49 insertions(+), 21 deletions(-) delete mode 100644 systemd-v245+suse.122.ga6d31d1a02.tar.xz create mode 100644 systemd-v245+suse.250.gb12cd8b89b.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index aa841df0..d88a1384 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Jun 17 18:54:11 UTC 2020 - Franck Bui + +- Don't restart udevd sockets during package update + + Otherwise we might miss kernel events as the daemon need to be + stopped as well. + +------------------------------------------------------------------- +Wed Jun 17 09:03:40 UTC 2020 - Franck Bui + +- Import commit b12cd8b89b4bccfcf972b47153a2b01cd7775932 (include merge of v245.6) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/a6d31d1a02c2718a064bbbc40d003668acf72769...b12cd8b89b4bccfcf972b47153a2b01cd7775932 + ------------------------------------------------------------------- Thu Jun 4 15:29:03 UTC 2020 - matthias.gerstner@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index b9307498..6f87f766 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.122.ga6d31d1a02 +%define suse_version +suse.250.gb12cd8b89b %bcond_with gnuefi %if 0%{?bootstrap} @@ -863,7 +863,7 @@ fi # Migrate old i18n settings previously configured in /etc/sysconfig to # the new locations used by systemd (/etc/locale.conf, -# /etc/vconsole.conf, ...). Recent version of systemd parse the new +# /etc/vconsole.conf, ...). Recent versions of systemd parse the new # locations only. # # This is needed both at package updates and package installations @@ -903,13 +903,11 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n udev%{?mini} %regenerate_initrd_post -systemctl daemon-reload || : -# On package update: the restart of the socket units will probably -# fail as the daemon is most likely running. It's not really an issue -# since we restart systemd-udevd right after and that will pull in the -# socket units again. We should be informed at that time if something -# really went wrong the first time we started the socket units. -%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket 2>/dev/null +# Restarting udevd sockets means also stopping the daemon. But we +# don't want the sockets and the daemon to be inactive at the same +# time because we might loose new events sent by the kernel during the +# package update otherwise. Hence we accept the fact that the socket +# properties might not be updated. They are unlikely changed anyway. %systemd_postun_with_restart systemd-udevd.service %posttrans -n udev%{?mini} diff --git a/systemd-v245+suse.122.ga6d31d1a02.tar.xz b/systemd-v245+suse.122.ga6d31d1a02.tar.xz deleted file mode 100644 index 879f9814..00000000 --- a/systemd-v245+suse.122.ga6d31d1a02.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edf10c3da62bb0cd6dcff78c0e836f79cb0ed65fb6b9ea5cdbbd12514a702025 -size 6173184 diff --git a/systemd-v245+suse.250.gb12cd8b89b.tar.xz b/systemd-v245+suse.250.gb12cd8b89b.tar.xz new file mode 100644 index 00000000..ddca6617 --- /dev/null +++ b/systemd-v245+suse.250.gb12cd8b89b.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9eb8a3563fad5b1e983b9fcc6c10851759580988417c84b16afed8ed7145986 +size 6175724 diff --git a/systemd.changes b/systemd.changes index aa841df0..d88a1384 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Jun 17 18:54:11 UTC 2020 - Franck Bui + +- Don't restart udevd sockets during package update + + Otherwise we might miss kernel events as the daemon need to be + stopped as well. + +------------------------------------------------------------------- +Wed Jun 17 09:03:40 UTC 2020 - Franck Bui + +- Import commit b12cd8b89b4bccfcf972b47153a2b01cd7775932 (include merge of v245.6) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/a6d31d1a02c2718a064bbbc40d003668acf72769...b12cd8b89b4bccfcf972b47153a2b01cd7775932 + ------------------------------------------------------------------- Thu Jun 4 15:29:03 UTC 2020 - matthias.gerstner@suse.com diff --git a/systemd.spec b/systemd.spec index 3af23b69..2a42825f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.122.ga6d31d1a02 +%define suse_version +suse.250.gb12cd8b89b %bcond_with gnuefi %if 0%{?bootstrap} @@ -861,7 +861,7 @@ fi # Migrate old i18n settings previously configured in /etc/sysconfig to # the new locations used by systemd (/etc/locale.conf, -# /etc/vconsole.conf, ...). Recent version of systemd parse the new +# /etc/vconsole.conf, ...). Recent versions of systemd parse the new # locations only. # # This is needed both at package updates and package installations @@ -901,13 +901,11 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n udev%{?mini} %regenerate_initrd_post -systemctl daemon-reload || : -# On package update: the restart of the socket units will probably -# fail as the daemon is most likely running. It's not really an issue -# since we restart systemd-udevd right after and that will pull in the -# socket units again. We should be informed at that time if something -# really went wrong the first time we started the socket units. -%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket 2>/dev/null +# Restarting udevd sockets means also stopping the daemon. But we +# don't want the sockets and the daemon to be inactive at the same +# time because we might loose new events sent by the kernel during the +# package update otherwise. Hence we accept the fact that the socket +# properties might not be updated. They are unlikely changed anyway. %systemd_postun_with_restart systemd-udevd.service %posttrans -n udev%{?mini} From 298b94d60c9b57612f83f0a2416ece9377a0053b8825ebfa4847967fad3a2bef Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 19 Jun 2020 11:23:11 +0000 Subject: [PATCH 4/4] Accepting request 815928 from home:fbui:systemd:openSUSE-Factory - Include in the package version the stable minor (if any). Also update the version shown by various command such as 'systemctl --version' to show the stable number. OBS-URL: https://build.opensuse.org/request/show/815928 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1104 --- systemd-mini.changes | 8 ++++++++ systemd-mini.spec | 6 +++--- systemd-v245+suse.250.gb12cd8b89b.tar.xz | 3 --- systemd-v245.6+suse.48.gb12cd8b89b.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 6 +++--- 6 files changed, 25 insertions(+), 9 deletions(-) delete mode 100644 systemd-v245+suse.250.gb12cd8b89b.tar.xz create mode 100644 systemd-v245.6+suse.48.gb12cd8b89b.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index d88a1384..ca453cf5 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jun 19 09:59:29 UTC 2020 - Franck Bui + +- Include in the package version the stable minor (if any). + + Also update the version shown by various command such as 'systemctl + --version' to show the stable number. + ------------------------------------------------------------------- Wed Jun 17 18:54:11 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 6f87f766..09fa9f68 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.250.gb12cd8b89b +%define suse_version +suse.48.gb12cd8b89b %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 245 +Version: 245.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -492,7 +492,7 @@ ntp_servers=({0..3}.suse.pool.ntp.org) # keep split-usr until all packages have moved their systemd rules to /usr %meson \ - -Dversion-tag=%{suse_version} \ + -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -Dsplit-usr=true \ diff --git a/systemd-v245+suse.250.gb12cd8b89b.tar.xz b/systemd-v245+suse.250.gb12cd8b89b.tar.xz deleted file mode 100644 index ddca6617..00000000 --- a/systemd-v245+suse.250.gb12cd8b89b.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9eb8a3563fad5b1e983b9fcc6c10851759580988417c84b16afed8ed7145986 -size 6175724 diff --git a/systemd-v245.6+suse.48.gb12cd8b89b.tar.xz b/systemd-v245.6+suse.48.gb12cd8b89b.tar.xz new file mode 100644 index 00000000..5f55a69c --- /dev/null +++ b/systemd-v245.6+suse.48.gb12cd8b89b.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc34032d49edabf9df4d2342063084b79040abbebcb56fc417449d0e08f2815e +size 6175556 diff --git a/systemd.changes b/systemd.changes index d88a1384..ca453cf5 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jun 19 09:59:29 UTC 2020 - Franck Bui + +- Include in the package version the stable minor (if any). + + Also update the version shown by various command such as 'systemctl + --version' to show the stable number. + ------------------------------------------------------------------- Wed Jun 17 18:54:11 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 2a42825f..2fce83cf 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.250.gb12cd8b89b +%define suse_version +suse.48.gb12cd8b89b %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 245 +Version: 245.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -490,7 +490,7 @@ ntp_servers=({0..3}.suse.pool.ntp.org) # keep split-usr until all packages have moved their systemd rules to /usr %meson \ - -Dversion-tag=%{suse_version} \ + -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -Dsplit-usr=true \