From e0eedbb342038d238089c488a2d345216c0ba3f040e57f719b7b7d16d09dfd2d Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 22 Jul 2019 16:53:23 +0000 Subject: [PATCH] Accepting request 717649 from home:sbrabec:branches:Base:System - Fix /etc/default/su comments and create /etc/default/runuser (bsc#1121197#31). OBS-URL: https://build.opensuse.org/request/show/717649 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=410 --- python3-libmount.changes | 6 ++++++ python3-libmount.spec | 9 +++++++-- su.default | 8 +++----- util-linux-systemd.changes | 6 ++++++ util-linux-systemd.spec | 9 +++++++-- util-linux.changes | 6 ++++++ util-linux.spec | 9 +++++++-- 7 files changed, 42 insertions(+), 11 deletions(-) diff --git a/python3-libmount.changes b/python3-libmount.changes index 21dd598..cad36c7 100644 --- a/python3-libmount.changes +++ b/python3-libmount.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 22 17:19:22 CEST 2019 - sbrabec@suse.com + +- Fix /etc/default/su comments and create /etc/default/runuser + (bsc#1121197#31). + ------------------------------------------------------------------- Wed Jul 17 19:14:24 CEST 2019 - sbrabec@suse.com diff --git a/python3-libmount.spec b/python3-libmount.spec index 9ecb776..d17d679 100644 --- a/python3-libmount.spec +++ b/python3-libmount.spec @@ -170,7 +170,7 @@ Provides: rfkill = 0.5 Obsoletes: eject <= 2.1.0 # File conflict of login (up to 12.1 and SLE11). Obsoletes: login <= 4.0 -# File confluct (man page) of rfkill (up to Leap 15 and SLE 15). +# File conflict (man page) of rfkill (up to Leap 15 and SLE 15). Obsoletes: rfkill <= 0.5 # bnc#805684: %ifarch s390x @@ -629,6 +629,8 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pam.d/runuser-l install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su +sed 's/\bsu\b/runuser/g' <%{SOURCE11} >runuser.default +install -m 644 runuser.default %{buildroot}%{_sysconfdir}/default/runuser %endif # # util-linux install @@ -759,9 +761,11 @@ ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # -# %{_sysconfdir}/default/su is tagged as noreplace. +# /etc/default/su is tagged as noreplace. # But we want to migrate variables to /etc/login.defs (bsc#1121197). # Perform one-time config replace. +# Applies for: Update from SLE11, online update for SLE15 SP1, Leap15.1. +# Not needed for /etc/default/runuser. It was first packaged after the change. if ! grep -q "^# /etc/default/su is an override" %{_sysconfdir}/default/su ; then if test -f %{_sysconfdir}/default/su.rpmnew ; then if ! test -f %{_sysconfdir}/default/su.rpmorig ; then @@ -877,6 +881,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %config %{_sysconfdir}/pam.d/runuser-l %config %{_sysconfdir}/pam.d/su %config %{_sysconfdir}/pam.d/su-l +%config(noreplace) %{_sysconfdir}/default/runuser %config(noreplace) %{_sysconfdir}/default/su %config %dir %{_sysconfdir}/issue.d #UsrMerge diff --git a/su.default b/su.default index 0840fb4..3eb5b7f 100644 --- a/su.default +++ b/su.default @@ -1,8 +1,6 @@ -# /etc/default/su is an override for /etc/login.defs for su and runuser -# (It is also read as a fallback for login.) +# /etc/default/su is an override of /etc/login.defs for su. +# See /etc/login.defs and su(1) for more. # -# See /etc/login.defs, su(1) or runuser(1) for more. -# -# List of su/runuser variables: +# List of supported variables: # ALWAYS_SET_PATH, ENV_PATH, ENV_ROOTPATH, ENV_SUPATH, FAIL_DELAY # diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 21dd598..cad36c7 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 22 17:19:22 CEST 2019 - sbrabec@suse.com + +- Fix /etc/default/su comments and create /etc/default/runuser + (bsc#1121197#31). + ------------------------------------------------------------------- Wed Jul 17 19:14:24 CEST 2019 - sbrabec@suse.com diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index e764e0b..aad918a 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -170,7 +170,7 @@ Provides: rfkill = 0.5 Obsoletes: eject <= 2.1.0 # File conflict of login (up to 12.1 and SLE11). Obsoletes: login <= 4.0 -# File confluct (man page) of rfkill (up to Leap 15 and SLE 15). +# File conflict (man page) of rfkill (up to Leap 15 and SLE 15). Obsoletes: rfkill <= 0.5 # bnc#805684: %ifarch s390x @@ -629,6 +629,8 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pam.d/runuser-l install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su +sed 's/\bsu\b/runuser/g' <%{SOURCE11} >runuser.default +install -m 644 runuser.default %{buildroot}%{_sysconfdir}/default/runuser %endif # # util-linux install @@ -759,9 +761,11 @@ ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # -# %{_sysconfdir}/default/su is tagged as noreplace. +# /etc/default/su is tagged as noreplace. # But we want to migrate variables to /etc/login.defs (bsc#1121197). # Perform one-time config replace. +# Applies for: Update from SLE11, online update for SLE15 SP1, Leap15.1. +# Not needed for /etc/default/runuser. It was first packaged after the change. if ! grep -q "^# /etc/default/su is an override" %{_sysconfdir}/default/su ; then if test -f %{_sysconfdir}/default/su.rpmnew ; then if ! test -f %{_sysconfdir}/default/su.rpmorig ; then @@ -877,6 +881,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %config %{_sysconfdir}/pam.d/runuser-l %config %{_sysconfdir}/pam.d/su %config %{_sysconfdir}/pam.d/su-l +%config(noreplace) %{_sysconfdir}/default/runuser %config(noreplace) %{_sysconfdir}/default/su %config %dir %{_sysconfdir}/issue.d #UsrMerge diff --git a/util-linux.changes b/util-linux.changes index 21dd598..cad36c7 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 22 17:19:22 CEST 2019 - sbrabec@suse.com + +- Fix /etc/default/su comments and create /etc/default/runuser + (bsc#1121197#31). + ------------------------------------------------------------------- Wed Jul 17 19:14:24 CEST 2019 - sbrabec@suse.com diff --git a/util-linux.spec b/util-linux.spec index c859d95..037f634 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -170,7 +170,7 @@ Provides: rfkill = 0.5 Obsoletes: eject <= 2.1.0 # File conflict of login (up to 12.1 and SLE11). Obsoletes: login <= 4.0 -# File confluct (man page) of rfkill (up to Leap 15 and SLE 15). +# File conflict (man page) of rfkill (up to Leap 15 and SLE 15). Obsoletes: rfkill <= 0.5 # bnc#805684: %ifarch s390x @@ -629,6 +629,8 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pam.d/runuser-l install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su +sed 's/\bsu\b/runuser/g' <%{SOURCE11} >runuser.default +install -m 644 runuser.default %{buildroot}%{_sysconfdir}/default/runuser %endif # # util-linux install @@ -759,9 +761,11 @@ ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # -# %{_sysconfdir}/default/su is tagged as noreplace. +# /etc/default/su is tagged as noreplace. # But we want to migrate variables to /etc/login.defs (bsc#1121197). # Perform one-time config replace. +# Applies for: Update from SLE11, online update for SLE15 SP1, Leap15.1. +# Not needed for /etc/default/runuser. It was first packaged after the change. if ! grep -q "^# /etc/default/su is an override" %{_sysconfdir}/default/su ; then if test -f %{_sysconfdir}/default/su.rpmnew ; then if ! test -f %{_sysconfdir}/default/su.rpmorig ; then @@ -877,6 +881,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %config %{_sysconfdir}/pam.d/runuser-l %config %{_sysconfdir}/pam.d/su %config %{_sysconfdir}/pam.d/su-l +%config(noreplace) %{_sysconfdir}/default/runuser %config(noreplace) %{_sysconfdir}/default/su %config %dir %{_sysconfdir}/issue.d #UsrMerge