forked from pool/util-linux
Accepting request 716105 from home:sbrabec:branches:util-linux-pam_d-b1082293
- Prevent outdated pam files (bsc#1082293, boo#1081947#c68):
* Remove "(noreplace)". It will enforce update whenever package
changes it.
* Expand tabs to trigger a change and replace potentially
outdated files just now.
* Remove script that migrates old coreutils su pam files.
OBS-URL: https://build.opensuse.org/request/show/716105
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=407
This commit is contained in:
Git OBS Bridge
parent
d0f4a733b6
commit
59936b0f48
18
login.pamd
18
login.pamd
@ -1,10 +1,10 @@
|
||||
#%PAM-1.0
|
||||
auth requisite pam_nologin.so
|
||||
auth include common-auth
|
||||
account include common-account
|
||||
password include common-password
|
||||
session required pam_loginuid.so
|
||||
session optional pam_keyinit.so force revoke
|
||||
session include common-session
|
||||
#session optional pam_lastlog.so nowtmp showfailed
|
||||
session optional pam_mail.so standard
|
||||
auth requisite pam_nologin.so
|
||||
auth include common-auth
|
||||
account include common-account
|
||||
password include common-password
|
||||
session required pam_loginuid.so
|
||||
session optional pam_keyinit.so force revoke
|
||||
session include common-session
|
||||
#session optional pam_lastlog.so nowtmp showfailed
|
||||
session optional pam_mail.so standard
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 17 19:14:24 CEST 2019 - sbrabec@suse.com
|
||||
|
||||
- Prevent outdated pam files (bsc#1082293, boo#1081947#c68):
|
||||
* Remove "(noreplace)". It will enforce update whenever package
|
||||
changes it.
|
||||
* Expand tabs to trigger a change and replace potentially
|
||||
outdated files just now.
|
||||
* Remove script that migrates old coreutils su pam files.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 1 23:45:55 CEST 2019 - sbrabec@suse.com
|
||||
|
||||
|
||||
@ -216,16 +216,16 @@ mount program, the fdisk configuration tool, and more.
|
||||
|
||||
%package -n libblkid1
|
||||
Summary: Filesystem detection library
|
||||
Group: System/Libraries
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libblkid1
|
||||
Library for filesystem detection.
|
||||
|
||||
%package -n libblkid-devel
|
||||
Summary: Development files for the filesystem detection library
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libblkid1 = %{version}
|
||||
|
||||
%description -n libblkid-devel
|
||||
@ -234,8 +234,8 @@ detection.
|
||||
|
||||
%package -n libblkid-devel-static
|
||||
Summary: Development files for the filesystem detection library
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libblkid-devel = %{version}
|
||||
|
||||
%description -n libblkid-devel-static
|
||||
@ -244,16 +244,16 @@ detection.
|
||||
|
||||
%package -n libuuid1
|
||||
Summary: Library to generate UUIDs
|
||||
Group: System/Libraries
|
||||
License: BSD-3-Clause
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libuuid1
|
||||
A library to generate universally unique IDs (UUIDs).
|
||||
|
||||
%package -n libuuid-devel
|
||||
Summary: Development files for libuuid
|
||||
Group: Development/Libraries/C and C++
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libuuid1 = %{version}
|
||||
|
||||
%description -n libuuid-devel
|
||||
@ -262,8 +262,8 @@ unique IDs (UUIDs).
|
||||
|
||||
%package -n libuuid-devel-static
|
||||
Summary: Development files for libuuid
|
||||
Group: Development/Libraries/C and C++
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libuuid-devel = %{version}
|
||||
|
||||
%description -n libuuid-devel-static
|
||||
@ -272,8 +272,8 @@ unique IDs (UUIDs).
|
||||
|
||||
%package -n libmount1
|
||||
Summary: Device mount library
|
||||
Group: System/Libraries
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libmount1
|
||||
Library designed to be used in low-level utils like
|
||||
@ -281,8 +281,8 @@ mount(8) and /usr/sbin/mount.<type> helpers.
|
||||
|
||||
%package -n libmount-devel
|
||||
Summary: Development files for libmount
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libmount1 = %{version}
|
||||
|
||||
%description -n libmount-devel
|
||||
@ -290,8 +290,8 @@ Files to develop applications using the libmount library.
|
||||
|
||||
%package -n libmount-devel-static
|
||||
Summary: Development files for libmount
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libmount-devel = %{version}
|
||||
|
||||
%description -n libmount-devel-static
|
||||
@ -299,16 +299,16 @@ Files to develop applications using the libmount library.
|
||||
|
||||
%package -n libsmartcols1
|
||||
Summary: Column-based text sort engine
|
||||
Group: System/Libraries
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libsmartcols1
|
||||
Library to sort human readable column-based text output.
|
||||
|
||||
%package -n libsmartcols-devel
|
||||
Summary: Development files for libsmartcols
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libsmartcols1 = %{version}
|
||||
|
||||
%description -n libsmartcols-devel
|
||||
@ -316,8 +316,8 @@ Files to develop applications using the libsmartcols library.
|
||||
|
||||
%package -n libsmartcols-devel-static
|
||||
Summary: Development files for libsmartcols
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libsmartcols-devel = %{version}
|
||||
|
||||
%description -n libsmartcols-devel-static
|
||||
@ -325,16 +325,16 @@ Files to develop applications using the libsmartcols library.
|
||||
|
||||
%package -n libfdisk1
|
||||
Summary: Filesystem detection library
|
||||
Group: System/Libraries
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libfdisk1
|
||||
Library for filesystem detection.
|
||||
|
||||
%package -n libfdisk-devel
|
||||
Summary: Development files for the filesystem detection library
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libfdisk1 = %{version}
|
||||
|
||||
%description -n libfdisk-devel
|
||||
@ -343,8 +343,8 @@ detection.
|
||||
|
||||
%package -n libfdisk-devel-static
|
||||
Summary: Development files for the filesystem detection library
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libfdisk-devel = %{version}
|
||||
|
||||
%description -n libfdisk-devel-static
|
||||
@ -357,6 +357,7 @@ detection.
|
||||
%if %build_util_linux
|
||||
%package systemd
|
||||
Summary: %summary_uls
|
||||
License: GPL-2.0-or-later
|
||||
Group: %group_uls
|
||||
Supplements: packageand(util-linux:systemd)
|
||||
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
|
||||
@ -372,6 +373,7 @@ This package contains low-level util-linux utilities that use systemd.
|
||||
|
||||
%package -n uuidd
|
||||
Summary: Helper daemon to guarantee uniqueness of time-based UUIDs
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/Filesystems
|
||||
%if 0%{?suse_version} >= 1330
|
||||
Requires(pre): group(uuidd)
|
||||
@ -393,6 +395,7 @@ SMP systems.
|
||||
%if %build_util_linux
|
||||
%package -n python3-libmount
|
||||
Summary: %summary_pl
|
||||
License: GPL-2.0-or-later
|
||||
Group: %group_pl
|
||||
|
||||
%description -n python3-libmount
|
||||
@ -417,7 +420,6 @@ cp -a %{S:2} .
|
||||
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
|
||||
bash ./util-linux-login_defs-check.sh
|
||||
%if %build_util_linux
|
||||
#
|
||||
#BEGIN SYSTEMD SAFETY CHECK
|
||||
# With systemd, some utilities are built differently. Keep track of these
|
||||
# sources to prevent building of systemd-less versions.
|
||||
@ -756,23 +758,7 @@ ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim
|
||||
%service_add_post raw.service
|
||||
%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
|
||||
%set_permissions %{_bindir}/su
|
||||
# Safely migrate PAM files from coreutils to util-linux
|
||||
# (openSUSE 12.3->13.1, SLE11->SLE12)
|
||||
#
|
||||
# coreutils with su were upgraded (and su removed) before util-linux
|
||||
# with su was installed (see the Conflicts above). If the admin edited
|
||||
# the PAM file, the seemingly no more used modified file was saved as
|
||||
# .rpmsave and the new clean file was installed. As we want
|
||||
# "noreplace" upgrade, and the contents of the clean file contents has
|
||||
# no changes, we should restore admin modification, and rename the
|
||||
# clean file to .rpmnew, as it would happen if the file was not moved
|
||||
# from one package to another.
|
||||
for PAM_FILE in default/su pam.d/su pam.d/su-l ; do
|
||||
if test -f %{_sysconfdir}/$PAM_FILE.rpmsave ; then
|
||||
mv %{_sysconfdir}/$PAM_FILE %{_sysconfdir}/$PAM_FILE.rpmnew
|
||||
mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE
|
||||
fi
|
||||
done
|
||||
# %{_sysconfdir}/default/su is tagged as noreplace.
|
||||
# But we want to migrate variables to /etc/login.defs (bsc#1121197).
|
||||
# Perform one-time config replace.
|
||||
@ -885,12 +871,12 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw
|
||||
%config(noreplace) %{_sysconfdir}/filesystems
|
||||
%config(noreplace) %{_sysconfdir}/blkid.conf
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/login
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/remote
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/runuser
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/su
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/su-l
|
||||
%config %{_sysconfdir}/pam.d/login
|
||||
%config %{_sysconfdir}/pam.d/remote
|
||||
%config %{_sysconfdir}/pam.d/runuser
|
||||
%config %{_sysconfdir}/pam.d/runuser-l
|
||||
%config %{_sysconfdir}/pam.d/su
|
||||
%config %{_sysconfdir}/pam.d/su-l
|
||||
%config(noreplace) %{_sysconfdir}/default/su
|
||||
%config %dir %{_sysconfdir}/issue.d
|
||||
#UsrMerge
|
||||
|
||||
20
remote.pamd
20
remote.pamd
@ -1,13 +1,13 @@
|
||||
#%PAM-1.0
|
||||
# This file is used by /bin/login in case of remote logins (means where
|
||||
# the -h option is used
|
||||
auth requisite pam_nologin.so
|
||||
auth [user_unknown=ignore success=ok ignore=ignore auth_err=die default=bad] pam_securetty.so
|
||||
auth include common-auth
|
||||
account include common-account
|
||||
password include common-password
|
||||
session required pam_loginuid.so
|
||||
session optional pam_keyinit.so force revoke
|
||||
session include common-session
|
||||
session optional pam_lastlog.so nowtmp showfailed
|
||||
session optional pam_mail.so standard
|
||||
auth requisite pam_nologin.so
|
||||
auth [user_unknown=ignore success=ok ignore=ignore auth_err=die default=bad] pam_securetty.so
|
||||
auth include common-auth
|
||||
account include common-account
|
||||
password include common-password
|
||||
session required pam_loginuid.so
|
||||
session optional pam_keyinit.so force revoke
|
||||
session include common-session
|
||||
session optional pam_lastlog.so nowtmp showfailed
|
||||
session optional pam_mail.so standard
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#%PAM-1.0
|
||||
# Note that runuser requires only "session" setting (and for example "auth sufficient pam_rootok.so" dummy line).
|
||||
auth sufficient pam_rootok.so
|
||||
session optional pam_keyinit.so force revoke
|
||||
session include common-session
|
||||
session optional pam_xauth.so
|
||||
auth sufficient pam_rootok.so
|
||||
session optional pam_keyinit.so force revoke
|
||||
session include common-session
|
||||
session optional pam_xauth.so
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#%PAM-1.0
|
||||
# Note that runuser requires only "session" setting (and for example "auth sufficient pam_rootok.so" dummy line).
|
||||
auth sufficient pam_rootok.so
|
||||
session optional pam_keyinit.so revoke
|
||||
session include common-session
|
||||
session optional pam_xauth.so
|
||||
auth sufficient pam_rootok.so
|
||||
session optional pam_keyinit.so revoke
|
||||
session include common-session
|
||||
session optional pam_xauth.so
|
||||
|
||||
16
su-l.pamd
16
su-l.pamd
@ -1,9 +1,9 @@
|
||||
#%PAM-1.0
|
||||
auth sufficient pam_rootok.so
|
||||
auth include common-auth
|
||||
account sufficient pam_rootok.so
|
||||
account include common-account
|
||||
password include common-password
|
||||
session optional pam_keyinit.so force revoke
|
||||
session include common-session
|
||||
session optional pam_xauth.so
|
||||
auth sufficient pam_rootok.so
|
||||
auth include common-auth
|
||||
account sufficient pam_rootok.so
|
||||
account include common-account
|
||||
password include common-password
|
||||
session optional pam_keyinit.so force revoke
|
||||
session include common-session
|
||||
session optional pam_xauth.so
|
||||
|
||||
14
su.pamd
14
su.pamd
@ -1,8 +1,8 @@
|
||||
#%PAM-1.0
|
||||
auth sufficient pam_rootok.so
|
||||
auth include common-auth
|
||||
account sufficient pam_rootok.so
|
||||
account include common-account
|
||||
password include common-password
|
||||
session include common-session
|
||||
session optional pam_xauth.so
|
||||
auth sufficient pam_rootok.so
|
||||
auth include common-auth
|
||||
account sufficient pam_rootok.so
|
||||
account include common-account
|
||||
password include common-password
|
||||
session include common-session
|
||||
session optional pam_xauth.so
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 17 19:14:24 CEST 2019 - sbrabec@suse.com
|
||||
|
||||
- Prevent outdated pam files (bsc#1082293, boo#1081947#c68):
|
||||
* Remove "(noreplace)". It will enforce update whenever package
|
||||
changes it.
|
||||
* Expand tabs to trigger a change and replace potentially
|
||||
outdated files just now.
|
||||
* Remove script that migrates old coreutils su pam files.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 1 23:45:55 CEST 2019 - sbrabec@suse.com
|
||||
|
||||
|
||||
@ -216,16 +216,16 @@ mount program, the fdisk configuration tool, and more.
|
||||
|
||||
%package -n libblkid1
|
||||
Summary: Filesystem detection library
|
||||
Group: System/Libraries
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libblkid1
|
||||
Library for filesystem detection.
|
||||
|
||||
%package -n libblkid-devel
|
||||
Summary: Development files for the filesystem detection library
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libblkid1 = %{version}
|
||||
|
||||
%description -n libblkid-devel
|
||||
@ -234,8 +234,8 @@ detection.
|
||||
|
||||
%package -n libblkid-devel-static
|
||||
Summary: Development files for the filesystem detection library
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libblkid-devel = %{version}
|
||||
|
||||
%description -n libblkid-devel-static
|
||||
@ -244,16 +244,16 @@ detection.
|
||||
|
||||
%package -n libuuid1
|
||||
Summary: Library to generate UUIDs
|
||||
Group: System/Libraries
|
||||
License: BSD-3-Clause
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libuuid1
|
||||
A library to generate universally unique IDs (UUIDs).
|
||||
|
||||
%package -n libuuid-devel
|
||||
Summary: Development files for libuuid
|
||||
Group: Development/Libraries/C and C++
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libuuid1 = %{version}
|
||||
|
||||
%description -n libuuid-devel
|
||||
@ -262,8 +262,8 @@ unique IDs (UUIDs).
|
||||
|
||||
%package -n libuuid-devel-static
|
||||
Summary: Development files for libuuid
|
||||
Group: Development/Libraries/C and C++
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libuuid-devel = %{version}
|
||||
|
||||
%description -n libuuid-devel-static
|
||||
@ -272,8 +272,8 @@ unique IDs (UUIDs).
|
||||
|
||||
%package -n libmount1
|
||||
Summary: Device mount library
|
||||
Group: System/Libraries
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libmount1
|
||||
Library designed to be used in low-level utils like
|
||||
@ -281,8 +281,8 @@ mount(8) and /usr/sbin/mount.<type> helpers.
|
||||
|
||||
%package -n libmount-devel
|
||||
Summary: Development files for libmount
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libmount1 = %{version}
|
||||
|
||||
%description -n libmount-devel
|
||||
@ -290,8 +290,8 @@ Files to develop applications using the libmount library.
|
||||
|
||||
%package -n libmount-devel-static
|
||||
Summary: Development files for libmount
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libmount-devel = %{version}
|
||||
|
||||
%description -n libmount-devel-static
|
||||
@ -299,16 +299,16 @@ Files to develop applications using the libmount library.
|
||||
|
||||
%package -n libsmartcols1
|
||||
Summary: Column-based text sort engine
|
||||
Group: System/Libraries
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libsmartcols1
|
||||
Library to sort human readable column-based text output.
|
||||
|
||||
%package -n libsmartcols-devel
|
||||
Summary: Development files for libsmartcols
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libsmartcols1 = %{version}
|
||||
|
||||
%description -n libsmartcols-devel
|
||||
@ -316,8 +316,8 @@ Files to develop applications using the libsmartcols library.
|
||||
|
||||
%package -n libsmartcols-devel-static
|
||||
Summary: Development files for libsmartcols
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libsmartcols-devel = %{version}
|
||||
|
||||
%description -n libsmartcols-devel-static
|
||||
@ -325,16 +325,16 @@ Files to develop applications using the libsmartcols library.
|
||||
|
||||
%package -n libfdisk1
|
||||
Summary: Filesystem detection library
|
||||
Group: System/Libraries
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libfdisk1
|
||||
Library for filesystem detection.
|
||||
|
||||
%package -n libfdisk-devel
|
||||
Summary: Development files for the filesystem detection library
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libfdisk1 = %{version}
|
||||
|
||||
%description -n libfdisk-devel
|
||||
@ -343,8 +343,8 @@ detection.
|
||||
|
||||
%package -n libfdisk-devel-static
|
||||
Summary: Development files for the filesystem detection library
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libfdisk-devel = %{version}
|
||||
|
||||
%description -n libfdisk-devel-static
|
||||
@ -357,6 +357,7 @@ detection.
|
||||
%if %build_util_linux
|
||||
%package systemd
|
||||
Summary: %summary_uls
|
||||
License: GPL-2.0-or-later
|
||||
Group: %group_uls
|
||||
Supplements: packageand(util-linux:systemd)
|
||||
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
|
||||
@ -372,6 +373,7 @@ This package contains low-level util-linux utilities that use systemd.
|
||||
|
||||
%package -n uuidd
|
||||
Summary: Helper daemon to guarantee uniqueness of time-based UUIDs
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/Filesystems
|
||||
%if 0%{?suse_version} >= 1330
|
||||
Requires(pre): group(uuidd)
|
||||
@ -393,6 +395,7 @@ SMP systems.
|
||||
%if %build_util_linux
|
||||
%package -n python3-libmount
|
||||
Summary: %summary_pl
|
||||
License: GPL-2.0-or-later
|
||||
Group: %group_pl
|
||||
|
||||
%description -n python3-libmount
|
||||
@ -417,7 +420,6 @@ cp -a %{S:2} .
|
||||
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
|
||||
bash ./util-linux-login_defs-check.sh
|
||||
%if %build_util_linux
|
||||
#
|
||||
#BEGIN SYSTEMD SAFETY CHECK
|
||||
# With systemd, some utilities are built differently. Keep track of these
|
||||
# sources to prevent building of systemd-less versions.
|
||||
@ -756,23 +758,7 @@ ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim
|
||||
%service_add_post raw.service
|
||||
%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
|
||||
%set_permissions %{_bindir}/su
|
||||
# Safely migrate PAM files from coreutils to util-linux
|
||||
# (openSUSE 12.3->13.1, SLE11->SLE12)
|
||||
#
|
||||
# coreutils with su were upgraded (and su removed) before util-linux
|
||||
# with su was installed (see the Conflicts above). If the admin edited
|
||||
# the PAM file, the seemingly no more used modified file was saved as
|
||||
# .rpmsave and the new clean file was installed. As we want
|
||||
# "noreplace" upgrade, and the contents of the clean file contents has
|
||||
# no changes, we should restore admin modification, and rename the
|
||||
# clean file to .rpmnew, as it would happen if the file was not moved
|
||||
# from one package to another.
|
||||
for PAM_FILE in default/su pam.d/su pam.d/su-l ; do
|
||||
if test -f %{_sysconfdir}/$PAM_FILE.rpmsave ; then
|
||||
mv %{_sysconfdir}/$PAM_FILE %{_sysconfdir}/$PAM_FILE.rpmnew
|
||||
mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE
|
||||
fi
|
||||
done
|
||||
# %{_sysconfdir}/default/su is tagged as noreplace.
|
||||
# But we want to migrate variables to /etc/login.defs (bsc#1121197).
|
||||
# Perform one-time config replace.
|
||||
@ -885,12 +871,12 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw
|
||||
%config(noreplace) %{_sysconfdir}/filesystems
|
||||
%config(noreplace) %{_sysconfdir}/blkid.conf
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/login
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/remote
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/runuser
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/su
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/su-l
|
||||
%config %{_sysconfdir}/pam.d/login
|
||||
%config %{_sysconfdir}/pam.d/remote
|
||||
%config %{_sysconfdir}/pam.d/runuser
|
||||
%config %{_sysconfdir}/pam.d/runuser-l
|
||||
%config %{_sysconfdir}/pam.d/su
|
||||
%config %{_sysconfdir}/pam.d/su-l
|
||||
%config(noreplace) %{_sysconfdir}/default/su
|
||||
%config %dir %{_sysconfdir}/issue.d
|
||||
#UsrMerge
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 17 19:14:24 CEST 2019 - sbrabec@suse.com
|
||||
|
||||
- Prevent outdated pam files (bsc#1082293, boo#1081947#c68):
|
||||
* Remove "(noreplace)". It will enforce update whenever package
|
||||
changes it.
|
||||
* Expand tabs to trigger a change and replace potentially
|
||||
outdated files just now.
|
||||
* Remove script that migrates old coreutils su pam files.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 1 23:45:55 CEST 2019 - sbrabec@suse.com
|
||||
|
||||
|
||||
@ -216,16 +216,16 @@ mount program, the fdisk configuration tool, and more.
|
||||
|
||||
%package -n libblkid1
|
||||
Summary: Filesystem detection library
|
||||
Group: System/Libraries
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libblkid1
|
||||
Library for filesystem detection.
|
||||
|
||||
%package -n libblkid-devel
|
||||
Summary: Development files for the filesystem detection library
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libblkid1 = %{version}
|
||||
|
||||
%description -n libblkid-devel
|
||||
@ -234,8 +234,8 @@ detection.
|
||||
|
||||
%package -n libblkid-devel-static
|
||||
Summary: Development files for the filesystem detection library
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libblkid-devel = %{version}
|
||||
|
||||
%description -n libblkid-devel-static
|
||||
@ -244,16 +244,16 @@ detection.
|
||||
|
||||
%package -n libuuid1
|
||||
Summary: Library to generate UUIDs
|
||||
Group: System/Libraries
|
||||
License: BSD-3-Clause
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libuuid1
|
||||
A library to generate universally unique IDs (UUIDs).
|
||||
|
||||
%package -n libuuid-devel
|
||||
Summary: Development files for libuuid
|
||||
Group: Development/Libraries/C and C++
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libuuid1 = %{version}
|
||||
|
||||
%description -n libuuid-devel
|
||||
@ -262,8 +262,8 @@ unique IDs (UUIDs).
|
||||
|
||||
%package -n libuuid-devel-static
|
||||
Summary: Development files for libuuid
|
||||
Group: Development/Libraries/C and C++
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libuuid-devel = %{version}
|
||||
|
||||
%description -n libuuid-devel-static
|
||||
@ -272,8 +272,8 @@ unique IDs (UUIDs).
|
||||
|
||||
%package -n libmount1
|
||||
Summary: Device mount library
|
||||
Group: System/Libraries
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libmount1
|
||||
Library designed to be used in low-level utils like
|
||||
@ -281,8 +281,8 @@ mount(8) and /usr/sbin/mount.<type> helpers.
|
||||
|
||||
%package -n libmount-devel
|
||||
Summary: Development files for libmount
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libmount1 = %{version}
|
||||
|
||||
%description -n libmount-devel
|
||||
@ -290,8 +290,8 @@ Files to develop applications using the libmount library.
|
||||
|
||||
%package -n libmount-devel-static
|
||||
Summary: Development files for libmount
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libmount-devel = %{version}
|
||||
|
||||
%description -n libmount-devel-static
|
||||
@ -299,16 +299,16 @@ Files to develop applications using the libmount library.
|
||||
|
||||
%package -n libsmartcols1
|
||||
Summary: Column-based text sort engine
|
||||
Group: System/Libraries
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libsmartcols1
|
||||
Library to sort human readable column-based text output.
|
||||
|
||||
%package -n libsmartcols-devel
|
||||
Summary: Development files for libsmartcols
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libsmartcols1 = %{version}
|
||||
|
||||
%description -n libsmartcols-devel
|
||||
@ -316,8 +316,8 @@ Files to develop applications using the libsmartcols library.
|
||||
|
||||
%package -n libsmartcols-devel-static
|
||||
Summary: Development files for libsmartcols
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libsmartcols-devel = %{version}
|
||||
|
||||
%description -n libsmartcols-devel-static
|
||||
@ -325,16 +325,16 @@ Files to develop applications using the libsmartcols library.
|
||||
|
||||
%package -n libfdisk1
|
||||
Summary: Filesystem detection library
|
||||
Group: System/Libraries
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libfdisk1
|
||||
Library for filesystem detection.
|
||||
|
||||
%package -n libfdisk-devel
|
||||
Summary: Development files for the filesystem detection library
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libfdisk1 = %{version}
|
||||
|
||||
%description -n libfdisk-devel
|
||||
@ -343,8 +343,8 @@ detection.
|
||||
|
||||
%package -n libfdisk-devel-static
|
||||
Summary: Development files for the filesystem detection library
|
||||
Group: Development/Libraries/C and C++
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libfdisk-devel = %{version}
|
||||
|
||||
%description -n libfdisk-devel-static
|
||||
@ -357,6 +357,7 @@ detection.
|
||||
%if %build_util_linux
|
||||
%package systemd
|
||||
Summary: %summary_uls
|
||||
License: GPL-2.0-or-later
|
||||
Group: %group_uls
|
||||
Supplements: packageand(util-linux:systemd)
|
||||
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
|
||||
@ -372,6 +373,7 @@ This package contains low-level util-linux utilities that use systemd.
|
||||
|
||||
%package -n uuidd
|
||||
Summary: Helper daemon to guarantee uniqueness of time-based UUIDs
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/Filesystems
|
||||
%if 0%{?suse_version} >= 1330
|
||||
Requires(pre): group(uuidd)
|
||||
@ -393,6 +395,7 @@ SMP systems.
|
||||
%if %build_util_linux
|
||||
%package -n python3-libmount
|
||||
Summary: %summary_pl
|
||||
License: GPL-2.0-or-later
|
||||
Group: %group_pl
|
||||
|
||||
%description -n python3-libmount
|
||||
@ -417,7 +420,6 @@ cp -a %{S:2} .
|
||||
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
|
||||
bash ./util-linux-login_defs-check.sh
|
||||
%if %build_util_linux
|
||||
#
|
||||
#BEGIN SYSTEMD SAFETY CHECK
|
||||
# With systemd, some utilities are built differently. Keep track of these
|
||||
# sources to prevent building of systemd-less versions.
|
||||
@ -756,23 +758,7 @@ ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim
|
||||
%service_add_post raw.service
|
||||
%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
|
||||
%set_permissions %{_bindir}/su
|
||||
# Safely migrate PAM files from coreutils to util-linux
|
||||
# (openSUSE 12.3->13.1, SLE11->SLE12)
|
||||
#
|
||||
# coreutils with su were upgraded (and su removed) before util-linux
|
||||
# with su was installed (see the Conflicts above). If the admin edited
|
||||
# the PAM file, the seemingly no more used modified file was saved as
|
||||
# .rpmsave and the new clean file was installed. As we want
|
||||
# "noreplace" upgrade, and the contents of the clean file contents has
|
||||
# no changes, we should restore admin modification, and rename the
|
||||
# clean file to .rpmnew, as it would happen if the file was not moved
|
||||
# from one package to another.
|
||||
for PAM_FILE in default/su pam.d/su pam.d/su-l ; do
|
||||
if test -f %{_sysconfdir}/$PAM_FILE.rpmsave ; then
|
||||
mv %{_sysconfdir}/$PAM_FILE %{_sysconfdir}/$PAM_FILE.rpmnew
|
||||
mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE
|
||||
fi
|
||||
done
|
||||
# %{_sysconfdir}/default/su is tagged as noreplace.
|
||||
# But we want to migrate variables to /etc/login.defs (bsc#1121197).
|
||||
# Perform one-time config replace.
|
||||
@ -885,12 +871,12 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw
|
||||
%config(noreplace) %{_sysconfdir}/filesystems
|
||||
%config(noreplace) %{_sysconfdir}/blkid.conf
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/login
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/remote
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/runuser
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/su
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/su-l
|
||||
%config %{_sysconfdir}/pam.d/login
|
||||
%config %{_sysconfdir}/pam.d/remote
|
||||
%config %{_sysconfdir}/pam.d/runuser
|
||||
%config %{_sysconfdir}/pam.d/runuser-l
|
||||
%config %{_sysconfdir}/pam.d/su
|
||||
%config %{_sysconfdir}/pam.d/su-l
|
||||
%config(noreplace) %{_sysconfdir}/default/su
|
||||
%config %dir %{_sysconfdir}/issue.d
|
||||
#UsrMerge
|
||||
|
||||
Loading…
Reference in New Issue
Block a user