Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2019-08-27 11:58:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "util-linux" Tue Aug 27 11:58:52 2019 rev:239 rq:723396 version:2.34 Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/python3-libmount.changes 2019-07-08 15:09:22.595250187 +0200 +++ /work/SRC/openSUSE:Factory/.util-linux.new.7948/python3-libmount.changes 2019-08-27 11:59:06.963669822 +0200 @@ -1,0 +2,46 @@ +Tue Aug 6 03:39:25 UTC 2019 - Stanislav Brabec <sbra...@suse.com> + +- Issue a warning for outdated pam files + (bsc#1082293, boo#1081947#c68). +- Fix comments and unify look of PAM files (login.pamd, + remote.pamd, runuser-l.pamd, runuser.pamd, su-l.pamd, su.pamd). + +------------------------------------------------------------------- +Wed Jul 31 18:08:29 CEST 2019 - sbra...@suse.com + +- Update to version 2.34: + * new command hardlink + * rewrite of lsblk, now supports --dedup + * support for FUSE in umount + * support for "--all -o remount" in mount + * su: prefer /etc/default/su over /etc/login.defs and ENV_SUPATH + over ENV_ROOTPATH (bsc#1121197), improved --pty + * unshare: add -S/--setuid, -G/--setgid, -R/--root and -w/--wd + * fstrim: do not suppress warnings unless --quiet is used + * lscpu: print 'Frequency boost' and 'Vulnerability' fields, add + --caches + * logger: merge multiple MESSAGE= lines + * libblkid: do not depend on libuuid, supports DRBD9 detection + * libsmartcols: support N:M relationships in tree-like output + * fstrim and uuidd systemd services: hardening settings to + improve security and service isolation + * fstrim: trim root filesystem on --fstab, check for read-only + filesystems on --all and --fstab (boo#1106214). + * fstrim -A: properly de-duplicate sub-volumes (boo#1127701). + * Obsoletes util-linux-login_defs-priority1.patch, + util-linux-login_defs-priority2.patch and + util-linux-login_defs-SYS_UID.patch. + * Many Other fixes, see + https://www.kernel.org/pub/linux/utils/util-linux/v2.34/v2.34-ReleaseNotes +- Provide and obsolete hardlink package. +- util-linux-login_defs-check.sh: Update checksum, login now + supports LASTLOG_UID_MAX. + +------------------------------------------------------------------- +Mon Jul 22 17:19:22 CEST 2019 - sbra...@suse.com + +- Fix /etc/default/su comments and create /etc/default/runuser + (bsc#1121197#31). +- Remove /etc/default/su migration from coreutils. + +------------------------------------------------------------------- util-linux-systemd.changes: same change util-linux.changes: same change Old: ---- util-linux-2.33.2.tar.sign util-linux-2.33.2.tar.xz util-linux-login_defs-SYS_UID.patch util-linux-login_defs-priority1.patch util-linux-login_defs-priority2.patch New: ---- util-linux-2.34.tar.sign util-linux-2.34.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-libmount.spec ++++++ --- /var/tmp/diff_new_pack.Ln175d/_old 2019-08-27 11:59:23.723667509 +0200 +++ /var/tmp/diff_new_pack.Ln175d/_new 2019-08-27 11:59:23.727667509 +0200 @@ -115,7 +115,7 @@ %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.33.2 +Version: 2.34 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -124,7 +124,7 @@ # these tools as well #!BuildIgnore: pwdutils Url: https://www.kernel.org/pub/linux/utils/util-linux/ -Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-%{version}.tar.xz +Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source2: util-linux-login_defs-check.sh Source4: raw.service @@ -135,7 +135,7 @@ Source9: remote.pamd Source10: su.pamd Source11: su.default -Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-%{version}.tar.sign +Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.sign Source13: %{_name}.keyring Source14: runuser.pamd Source15: runuser-l.pamd @@ -145,12 +145,6 @@ Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch -# PATCH-FIX-UPSTREAM util-linux-login_defs-priority1.patch bsc1121197 sbra...@suse.com -- Fix priorities of login.defs values. -Patch3: util-linux-login_defs-priority1.patch -# PATCH-FIX-UPSTREAM util-linux-login_defs-priority2.patch bsc1121197 sbra...@suse.com -- Fix priorities of login.defs values. -Patch4: util-linux-login_defs-priority2.patch -# PATCH-FIX-UPSTREAM util-linux-login_defs-SYS_UID.patch bsc1121197 sbra...@suse.com -- Fix discrepancies in SYS_UID* fallback. -Patch5: util-linux-login_defs-SYS_UID.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -170,8 +164,12 @@ 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 +# util-linux-2.34 integrates hardlink (up to Leap 15.1 and SLE 15.1). +# The last version was 1.0+git.e66999f. +Provides: hardlink = 1.1 +Obsoletes: hardlink < 1.1 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -216,16 +214,16 @@ %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 +232,8 @@ %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 +242,16 @@ %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 +260,8 @@ %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 +270,8 @@ %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 +279,8 @@ %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 +288,8 @@ %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 +297,16 @@ %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 +314,8 @@ %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 +323,16 @@ %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 +341,8 @@ %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 +355,7 @@ %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 +371,7 @@ %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 +393,7 @@ %if %build_util_linux %package -n python3-libmount Summary: %summary_pl +License: GPL-2.0-or-later Group: %group_pl %description -n python3-libmount @@ -409,15 +410,11 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %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. @@ -627,6 +624,8 @@ 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 @@ -756,6 +755,7 @@ %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) # @@ -767,15 +767,25 @@ # 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 +for PAM_FILE in su su-l ; do + if test -f %{_sysconfdir}/pam.d/$PAM_FILE.rpmsave ; then + mv %{_sysconfdir}/pam.d/$PAM_FILE %{_sysconfdir}/pam.d/$PAM_FILE.rpmnew + mv %{_sysconfdir}/pam.d/$PAM_FILE.rpmsave %{_sysconfdir}/pam.d/$PAM_FILE fi done -# %{_sysconfdir}/default/su is tagged as noreplace. +# +# If outdated PAM file is detected, issue a warning. +for PAM_FILE in login remote runuser runuser-l su su-l ; do + if test -f %{_sysconfdir}/pam.d/$PAM_FILE.rpmnew ; then + echo "Your %{_sysconfdir}/pam.d/$PAM_FILE is outdated. Please check %{_sysconfdir}/pam.d/$PAM_FILE.rpmnew!" >&2 + fi +done +# +# /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 @@ -891,6 +901,7 @@ %config(noreplace) %{_sysconfdir}/pam.d/runuser-l %config(noreplace) %{_sysconfdir}/pam.d/su %config(noreplace) %{_sysconfdir}/pam.d/su-l +%config(noreplace) %{_sysconfdir}/default/runuser %config(noreplace) %{_sysconfdir}/default/su %config %dir %{_sysconfdir}/issue.d #UsrMerge @@ -946,6 +957,7 @@ %{_bindir}/findmnt %{_bindir}/flock %{_bindir}/getopt +%{_bindir}/hardlink %{_bindir}/hexdump %{_bindir}/ionice %{_bindir}/ipcmk @@ -1048,6 +1060,7 @@ %{_mandir}/man1/fincore.1.gz %{_mandir}/man1/flock.1.gz %{_mandir}/man1/getopt.1.gz +%{_mandir}/man1/hardlink.1.gz %{_mandir}/man1/hexdump.1.gz %{_mandir}/man1/ipcrm.1.gz %{_mandir}/man1/ipcs.1.gz ++++++ util-linux-systemd.spec ++++++ --- /var/tmp/diff_new_pack.Ln175d/_old 2019-08-27 11:59:23.751667506 +0200 +++ /var/tmp/diff_new_pack.Ln175d/_new 2019-08-27 11:59:23.755667505 +0200 @@ -115,7 +115,7 @@ %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.33.2 +Version: 2.34 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -124,7 +124,7 @@ # these tools as well #!BuildIgnore: pwdutils Url: https://www.kernel.org/pub/linux/utils/util-linux/ -Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-%{version}.tar.xz +Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source2: util-linux-login_defs-check.sh Source4: raw.service @@ -135,7 +135,7 @@ Source9: remote.pamd Source10: su.pamd Source11: su.default -Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-%{version}.tar.sign +Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.sign Source13: %{_name}.keyring Source14: runuser.pamd Source15: runuser-l.pamd @@ -145,12 +145,6 @@ Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch -# PATCH-FIX-UPSTREAM util-linux-login_defs-priority1.patch bsc1121197 sbra...@suse.com -- Fix priorities of login.defs values. -Patch3: util-linux-login_defs-priority1.patch -# PATCH-FIX-UPSTREAM util-linux-login_defs-priority2.patch bsc1121197 sbra...@suse.com -- Fix priorities of login.defs values. -Patch4: util-linux-login_defs-priority2.patch -# PATCH-FIX-UPSTREAM util-linux-login_defs-SYS_UID.patch bsc1121197 sbra...@suse.com -- Fix discrepancies in SYS_UID* fallback. -Patch5: util-linux-login_defs-SYS_UID.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -170,8 +164,12 @@ 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 +# util-linux-2.34 integrates hardlink (up to Leap 15.1 and SLE 15.1). +# The last version was 1.0+git.e66999f. +Provides: hardlink = 1.1 +Obsoletes: hardlink < 1.1 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -216,16 +214,16 @@ %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 +232,8 @@ %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 +242,16 @@ %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 +260,8 @@ %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 +270,8 @@ %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 +279,8 @@ %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 +288,8 @@ %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 +297,16 @@ %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 +314,8 @@ %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 +323,16 @@ %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 +341,8 @@ %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 +355,7 @@ %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 +371,7 @@ %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 +393,7 @@ %if %build_util_linux %package -n python3-libmount Summary: %summary_pl +License: GPL-2.0-or-later Group: %group_pl %description -n python3-libmount @@ -409,15 +410,11 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %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. @@ -627,6 +624,8 @@ 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 @@ -756,6 +755,7 @@ %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) # @@ -767,15 +767,25 @@ # 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 +for PAM_FILE in su su-l ; do + if test -f %{_sysconfdir}/pam.d/$PAM_FILE.rpmsave ; then + mv %{_sysconfdir}/pam.d/$PAM_FILE %{_sysconfdir}/pam.d/$PAM_FILE.rpmnew + mv %{_sysconfdir}/pam.d/$PAM_FILE.rpmsave %{_sysconfdir}/pam.d/$PAM_FILE fi done -# %{_sysconfdir}/default/su is tagged as noreplace. +# +# If outdated PAM file is detected, issue a warning. +for PAM_FILE in login remote runuser runuser-l su su-l ; do + if test -f %{_sysconfdir}/pam.d/$PAM_FILE.rpmnew ; then + echo "Your %{_sysconfdir}/pam.d/$PAM_FILE is outdated. Please check %{_sysconfdir}/pam.d/$PAM_FILE.rpmnew!" >&2 + fi +done +# +# /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 @@ -891,6 +901,7 @@ %config(noreplace) %{_sysconfdir}/pam.d/runuser-l %config(noreplace) %{_sysconfdir}/pam.d/su %config(noreplace) %{_sysconfdir}/pam.d/su-l +%config(noreplace) %{_sysconfdir}/default/runuser %config(noreplace) %{_sysconfdir}/default/su %config %dir %{_sysconfdir}/issue.d #UsrMerge @@ -946,6 +957,7 @@ %{_bindir}/findmnt %{_bindir}/flock %{_bindir}/getopt +%{_bindir}/hardlink %{_bindir}/hexdump %{_bindir}/ionice %{_bindir}/ipcmk @@ -1048,6 +1060,7 @@ %{_mandir}/man1/fincore.1.gz %{_mandir}/man1/flock.1.gz %{_mandir}/man1/getopt.1.gz +%{_mandir}/man1/hardlink.1.gz %{_mandir}/man1/hexdump.1.gz %{_mandir}/man1/ipcrm.1.gz %{_mandir}/man1/ipcs.1.gz ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.Ln175d/_old 2019-08-27 11:59:23.771667503 +0200 +++ /var/tmp/diff_new_pack.Ln175d/_new 2019-08-27 11:59:23.775667502 +0200 @@ -115,7 +115,7 @@ %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.33.2 +Version: 2.34 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -124,7 +124,7 @@ # these tools as well #!BuildIgnore: pwdutils Url: https://www.kernel.org/pub/linux/utils/util-linux/ -Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-%{version}.tar.xz +Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source2: util-linux-login_defs-check.sh Source4: raw.service @@ -135,7 +135,7 @@ Source9: remote.pamd Source10: su.pamd Source11: su.default -Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-%{version}.tar.sign +Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.sign Source13: %{_name}.keyring Source14: runuser.pamd Source15: runuser-l.pamd @@ -145,12 +145,6 @@ Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch -# PATCH-FIX-UPSTREAM util-linux-login_defs-priority1.patch bsc1121197 sbra...@suse.com -- Fix priorities of login.defs values. -Patch3: util-linux-login_defs-priority1.patch -# PATCH-FIX-UPSTREAM util-linux-login_defs-priority2.patch bsc1121197 sbra...@suse.com -- Fix priorities of login.defs values. -Patch4: util-linux-login_defs-priority2.patch -# PATCH-FIX-UPSTREAM util-linux-login_defs-SYS_UID.patch bsc1121197 sbra...@suse.com -- Fix discrepancies in SYS_UID* fallback. -Patch5: util-linux-login_defs-SYS_UID.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -170,8 +164,12 @@ 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 +# util-linux-2.34 integrates hardlink (up to Leap 15.1 and SLE 15.1). +# The last version was 1.0+git.e66999f. +Provides: hardlink = 1.1 +Obsoletes: hardlink < 1.1 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -216,16 +214,16 @@ %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 +232,8 @@ %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 +242,16 @@ %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 +260,8 @@ %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 +270,8 @@ %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 +279,8 @@ %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 +288,8 @@ %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 +297,16 @@ %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 +314,8 @@ %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 +323,16 @@ %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 +341,8 @@ %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 +355,7 @@ %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 +371,7 @@ %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 +393,7 @@ %if %build_util_linux %package -n python3-libmount Summary: %summary_pl +License: GPL-2.0-or-later Group: %group_pl %description -n python3-libmount @@ -409,15 +410,11 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %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. @@ -627,6 +624,8 @@ 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 @@ -756,6 +755,7 @@ %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) # @@ -767,15 +767,25 @@ # 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 +for PAM_FILE in su su-l ; do + if test -f %{_sysconfdir}/pam.d/$PAM_FILE.rpmsave ; then + mv %{_sysconfdir}/pam.d/$PAM_FILE %{_sysconfdir}/pam.d/$PAM_FILE.rpmnew + mv %{_sysconfdir}/pam.d/$PAM_FILE.rpmsave %{_sysconfdir}/pam.d/$PAM_FILE fi done -# %{_sysconfdir}/default/su is tagged as noreplace. +# +# If outdated PAM file is detected, issue a warning. +for PAM_FILE in login remote runuser runuser-l su su-l ; do + if test -f %{_sysconfdir}/pam.d/$PAM_FILE.rpmnew ; then + echo "Your %{_sysconfdir}/pam.d/$PAM_FILE is outdated. Please check %{_sysconfdir}/pam.d/$PAM_FILE.rpmnew!" >&2 + fi +done +# +# /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 @@ -891,6 +901,7 @@ %config(noreplace) %{_sysconfdir}/pam.d/runuser-l %config(noreplace) %{_sysconfdir}/pam.d/su %config(noreplace) %{_sysconfdir}/pam.d/su-l +%config(noreplace) %{_sysconfdir}/default/runuser %config(noreplace) %{_sysconfdir}/default/su %config %dir %{_sysconfdir}/issue.d #UsrMerge @@ -946,6 +957,7 @@ %{_bindir}/findmnt %{_bindir}/flock %{_bindir}/getopt +%{_bindir}/hardlink %{_bindir}/hexdump %{_bindir}/ionice %{_bindir}/ipcmk @@ -1048,6 +1060,7 @@ %{_mandir}/man1/fincore.1.gz %{_mandir}/man1/flock.1.gz %{_mandir}/man1/getopt.1.gz +%{_mandir}/man1/hardlink.1.gz %{_mandir}/man1/hexdump.1.gz %{_mandir}/man1/ipcrm.1.gz %{_mandir}/man1/ipcs.1.gz ++++++ login.pamd ++++++ --- /var/tmp/diff_new_pack.Ln175d/_old 2019-08-27 11:59:23.839667493 +0200 +++ /var/tmp/diff_new_pack.Ln175d/_new 2019-08-27 11:59:23.839667493 +0200 @@ -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 ++++++ remote.pamd ++++++ --- /var/tmp/diff_new_pack.Ln175d/_old 2019-08-27 11:59:23.871667489 +0200 +++ /var/tmp/diff_new_pack.Ln175d/_new 2019-08-27 11:59:23.871667489 +0200 @@ -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 +# 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 ++++++ runuser-l.pamd ++++++ --- /var/tmp/diff_new_pack.Ln175d/_old 2019-08-27 11:59:23.887667486 +0200 +++ /var/tmp/diff_new_pack.Ln175d/_new 2019-08-27 11:59:23.887667486 +0200 @@ -1,6 +1,7 @@ #%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 +# 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 ++++++ runuser.pamd ++++++ --- /var/tmp/diff_new_pack.Ln175d/_old 2019-08-27 11:59:23.903667485 +0200 +++ /var/tmp/diff_new_pack.Ln175d/_new 2019-08-27 11:59:23.903667485 +0200 @@ -1,6 +1,7 @@ #%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 +# 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 ++++++ su-l.pamd ++++++ --- /var/tmp/diff_new_pack.Ln175d/_old 2019-08-27 11:59:23.919667482 +0200 +++ /var/tmp/diff_new_pack.Ln175d/_new 2019-08-27 11:59:23.919667482 +0200 @@ -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 ++++++ su.default ++++++ --- /var/tmp/diff_new_pack.Ln175d/_old 2019-08-27 11:59:23.931667481 +0200 +++ /var/tmp/diff_new_pack.Ln175d/_new 2019-08-27 11:59:23.935667480 +0200 @@ -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 # ++++++ su.pamd ++++++ --- /var/tmp/diff_new_pack.Ln175d/_old 2019-08-27 11:59:23.947667478 +0200 +++ /var/tmp/diff_new_pack.Ln175d/_new 2019-08-27 11:59:23.951667478 +0200 @@ -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 ++++++ util-linux-2.33.2.tar.xz -> util-linux-2.34.tar.xz ++++++ ++++ 316959 lines of diff (skipped) ++++++ util-linux-login_defs-check.sh ++++++ --- /var/tmp/diff_new_pack.Ln175d/_old 2019-08-27 11:59:25.547667258 +0200 +++ /var/tmp/diff_new_pack.Ln175d/_new 2019-08-27 11:59:25.547667258 +0200 @@ -15,7 +15,7 @@ sed -n 's/^.*logindefs_setenv*("[A-Z0-9_]*", "\([A-Z0-9_]*\)".*$/\1/p' ) | LC_ALL=C sort -u >util-linux-login_defs-vars.lst -if test $(sha1sum util-linux-login_defs-vars.lst | sed 's/ .*$//') != a9c56a10a4b5a0afb63c9208b8ca0cb1b46a8429 ; then +if test $(sha1sum util-linux-login_defs-vars.lst | sed 's/ .*$//') != ca9ea2bf3ee8c8c0c623ace938cdf0f04869f8cf ; then echo "does not match!" >&2 echo "Checksum is: $(sha1sum util-linux-login_defs-vars.lst | sed 's/ .*$//')" >&2
