rpm/util-linux
SHA256
1
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 717649 from home:sbrabec:branches:Base:System

Browse Source 
- 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
This commit is contained in:
Stanislav Brabec 2019-07-22 16:53:23 +00:00 committed by Git OBS Bridge
parent b214399d43
commit e0eedbb342
7 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python3-libmount.changes
View File

@ -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

9
python3-libmount.spec
View File

@ -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

8
su.default
View File

@ -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
#

6
util-linux-systemd.changes
View File

@ -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

9
util-linux-systemd.spec
View File

@ -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

6
util-linux.changes
View File

@ -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

9
util-linux.spec
View File

@ -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