From b628eded9731f03055d05fdfb4b6b330b31dd0207093f5db752f1bfbbcac4c03 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 11 Feb 2017 00:24:29 +0000 Subject: [PATCH] Accepting request 456350 from openSUSE:Factory Revert introduction of systemd-resolv; see boo#1024897 OBS-URL: https://build.opensuse.org/request/show/456350 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=248 --- systemd-232.tar.xz | 4 ++-- systemd-mini-rpmlintrc | 1 - systemd-mini.changes | 38 -------------------------------------- systemd-mini.spec | 16 +++++++++------- systemd-rpmlintrc | 1 - systemd.changes | 38 -------------------------------------- systemd.spec | 16 +++++++++------- 7 files changed, 20 insertions(+), 94 deletions(-) diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz index c5917f5e..04c9ac5d 100644 --- a/systemd-232.tar.xz +++ b/systemd-232.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce282eea299d1e50f206a96e8f860f45c44e0a08c6ab8356582775f924d2d795 -size 3211444 +oid sha256:cc6ee1dab9013b879e3ae500b79875651c4462e23a9b9fbeab06597828ee00a3 +size 3211676 diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc index a2cefb37..5b7980e5 100644 --- a/systemd-mini-rpmlintrc +++ b/systemd-mini-rpmlintrc @@ -19,7 +19,6 @@ addFilter("libudev-mini.*shlib-policy-name-error.*") addFilter("nss-systemd.*shlib-policy-name-error.*") addFilter("nss-myhostname.*shlib-policy-name-error.*") addFilter("nss-mymachines.*shlib-policy-name-error.*") -addFilter("nss-resolve.*shlib-policy-name-error.*") addFilter("systemd-logger.*useless-provides sysvinit(syslog).*") addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*") addFilter(".*script-without-shebang.*/usr/lib/udev/rule_generator.functions.*") diff --git a/systemd-mini.changes b/systemd-mini.changes index c46097d3..b7ed294e 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,41 +1,3 @@ -------------------------------------------------------------------- -Wed Feb 8 08:45:09 CET 2017 - kukuk@suse.de - -- Remove obsolete insserv requirements for udev again [bsc#999841] - -------------------------------------------------------------------- -Mon Feb 6 14:13:00 UTC 2017 - fbui@suse.com - -- Import commit cd97d5d5fef79ab9d957bf6504d085c0faca6bfc - - e587b6ce0 disable RestrictAddressFamilies on all architectures but x86_64 one (bsc#1023460) - c8ae05632 journald: don't flush to /var/log/journal before we get asked to (bsc#1004094) - 7261eaf3e sd-event: fix sd_event_source_get_priority() (#4712) - -------------------------------------------------------------------- -Fri Feb 3 08:37:22 UTC 2017 - fbui@suse.com - -- Move fix for permission set on /var/lib/systemd/linger/* (no functional changes) - - Move that part after the fix on timer timestamp files otherwise the - comment doesn't make sense. - -------------------------------------------------------------------- -Wed Feb 1 15:06:06 UTC 2017 - fbui@suse.com - -- Import commit 028fd9b60580976dffb09b3576a2b652ee35137c - - cc2ca55ff build-sys: do not install ctrl-alt-del.target symlink twice - ececae77a device: Avoid calling unit_free(NULL) in device setup logic (#4748) - -------------------------------------------------------------------- -Wed Feb 1 14:32:28 UTC 2017 - fbui@suse.com - -- Ship systemd-resolved but it's disabled by default (bsc#1018387) - - The NSS plugin will also be disabled, users need to enable it - manually. - ------------------------------------------------------------------- Wed Jan 25 15:37:23 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index c04e4129..a0b92de5 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -33,19 +33,18 @@ %bcond_with machined %bcond_with importd %bcond_with networkd -%bcond_with resolved %bcond_with journal_remote %else %bcond_without sysvcompat %bcond_without machined %bcond_without importd %bcond_without networkd -%bcond_without resolved %bcond_without journal_remote %ifarch %{ix86} x86_64 %bcond_without gnuefi %endif %endif +%bcond_with resolved %bcond_with parentpathid Name: systemd-mini @@ -231,6 +230,7 @@ Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/bin/getent Requires(post): sed Requires(post): /usr/bin/systemctl +Requires(postun): %insserv_prereq Requires(post): coreutils Requires(postun): coreutils @@ -706,6 +706,11 @@ enabled) ;; *) rm -f %{_prefix}/lib/systemd/system/tmp.mount esac +# Same for user lingering created by logind. +for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do + chmod 0644 $username +done + # v228 wrongly set world writable suid root permissions on timestamp # files used by permanent timers. Fix the timestamps that might have # been created by the affected versions of systemd (bsc#1020601). @@ -713,11 +718,6 @@ for stamp in $(ls /var/lib/systemd/timers/stamp-*.timer 2>/dev/null); do chmod 0644 $stamp done -# Same for user lingering created by logind. -for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do - chmod 0644 $username -done - # Convert /var/lib/machines subvolume to make it suitable for # rollbacks, if needed. See bsc#992573. The installer has been fixed # to create it at installation time. @@ -797,6 +797,7 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n udev%{?mini} %regenerate_initrd_post +%insserv_cleanup 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 @@ -1001,6 +1002,7 @@ fi %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd +%{_sysconfdir}/systemd/system/ctrl-alt-del.target %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index a2cefb37..5b7980e5 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -19,7 +19,6 @@ addFilter("libudev-mini.*shlib-policy-name-error.*") addFilter("nss-systemd.*shlib-policy-name-error.*") addFilter("nss-myhostname.*shlib-policy-name-error.*") addFilter("nss-mymachines.*shlib-policy-name-error.*") -addFilter("nss-resolve.*shlib-policy-name-error.*") addFilter("systemd-logger.*useless-provides sysvinit(syslog).*") addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*") addFilter(".*script-without-shebang.*/usr/lib/udev/rule_generator.functions.*") diff --git a/systemd.changes b/systemd.changes index c46097d3..b7ed294e 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,41 +1,3 @@ -------------------------------------------------------------------- -Wed Feb 8 08:45:09 CET 2017 - kukuk@suse.de - -- Remove obsolete insserv requirements for udev again [bsc#999841] - -------------------------------------------------------------------- -Mon Feb 6 14:13:00 UTC 2017 - fbui@suse.com - -- Import commit cd97d5d5fef79ab9d957bf6504d085c0faca6bfc - - e587b6ce0 disable RestrictAddressFamilies on all architectures but x86_64 one (bsc#1023460) - c8ae05632 journald: don't flush to /var/log/journal before we get asked to (bsc#1004094) - 7261eaf3e sd-event: fix sd_event_source_get_priority() (#4712) - -------------------------------------------------------------------- -Fri Feb 3 08:37:22 UTC 2017 - fbui@suse.com - -- Move fix for permission set on /var/lib/systemd/linger/* (no functional changes) - - Move that part after the fix on timer timestamp files otherwise the - comment doesn't make sense. - -------------------------------------------------------------------- -Wed Feb 1 15:06:06 UTC 2017 - fbui@suse.com - -- Import commit 028fd9b60580976dffb09b3576a2b652ee35137c - - cc2ca55ff build-sys: do not install ctrl-alt-del.target symlink twice - ececae77a device: Avoid calling unit_free(NULL) in device setup logic (#4748) - -------------------------------------------------------------------- -Wed Feb 1 14:32:28 UTC 2017 - fbui@suse.com - -- Ship systemd-resolved but it's disabled by default (bsc#1018387) - - The NSS plugin will also be disabled, users need to enable it - manually. - ------------------------------------------------------------------- Wed Jan 25 15:37:23 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 7dd89cb4..c1a405c6 100644 --- a/systemd.spec +++ b/systemd.spec @@ -31,19 +31,18 @@ %bcond_with machined %bcond_with importd %bcond_with networkd -%bcond_with resolved %bcond_with journal_remote %else %bcond_without sysvcompat %bcond_without machined %bcond_without importd %bcond_without networkd -%bcond_without resolved %bcond_without journal_remote %ifarch %{ix86} x86_64 %bcond_without gnuefi %endif %endif +%bcond_with resolved %bcond_with parentpathid Name: systemd @@ -229,6 +228,7 @@ Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/bin/getent Requires(post): sed Requires(post): /usr/bin/systemctl +Requires(postun): %insserv_prereq Requires(post): coreutils Requires(postun): coreutils @@ -704,6 +704,11 @@ enabled) ;; *) rm -f %{_prefix}/lib/systemd/system/tmp.mount esac +# Same for user lingering created by logind. +for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do + chmod 0644 $username +done + # v228 wrongly set world writable suid root permissions on timestamp # files used by permanent timers. Fix the timestamps that might have # been created by the affected versions of systemd (bsc#1020601). @@ -711,11 +716,6 @@ for stamp in $(ls /var/lib/systemd/timers/stamp-*.timer 2>/dev/null); do chmod 0644 $stamp done -# Same for user lingering created by logind. -for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do - chmod 0644 $username -done - # Convert /var/lib/machines subvolume to make it suitable for # rollbacks, if needed. See bsc#992573. The installer has been fixed # to create it at installation time. @@ -795,6 +795,7 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n udev%{?mini} %regenerate_initrd_post +%insserv_cleanup 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 @@ -999,6 +1000,7 @@ fi %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd +%{_sysconfdir}/systemd/system/ctrl-alt-del.target %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh