3
0
forked from pool/util-linux
Dominique Leuenberger 2021-11-21 22:51:17 +00:00 committed by Git OBS Bridge
commit 11a86efef2
13 changed files with 276 additions and 113 deletions

View File

@ -8,14 +8,14 @@ Signed-off-by: Martin Wilck <mwilck@suse.com>
sys-utils/mount.8 | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
Index: util-linux-2.36/sys-utils/mount.8
Index: util-linux-2.37.2/sys-utils/mount.8
===================================================================
--- util-linux-2.36.orig/sys-utils/mount.8
+++ util-linux-2.36/sys-utils/mount.8
@@ -400,6 +400,32 @@ The
option is similar, with the restriction that the user must be a
member of the group of the special file.
--- util-linux-2.37.2.orig/sys-utils/mount.8
+++ util-linux-2.37.2/sys-utils/mount.8
@@ -203,6 +203,32 @@ Note that \fBmount\fP is very strict abo
Since util\-linux 2.35, \fBmount\fP does not exit when user permissions are inadequate according to libmount\(cqs internal security rules. Instead, it drops suid permissions and continues as regular non\-root user. This behavior supports use\-cases where root permissions are not necessary (e.g., fuse filesystems, user namespaces, etc).
.sp
For more details, see \fBfstab\fP(5). Only the user that mounted a filesystem can unmount it again. If any user should be able to unmount it, then use \fBusers\fP instead of \fBuser\fP in the \fIfstab\fP line. The \fBowner\fP option is similar to the \fBuser\fP option, with the restriction that the user must be the owner of the special file. This may be useful e.g. for \fI/dev/fd\fP if a login script makes the console user owner of this device. The \fBgroup\fP option is similar, with the restriction that the user must be a member of the group of the special file.
+.SS Blacklisted file systems
+In the Linux kernel, file system types are implemented as kernel
+modules. While many of these file systems are well maintained,
@ -42,6 +42,13 @@ Index: util-linux-2.36/sys-utils/mount.8
+.I /etc/modprobe.d
+directory.
+
.SS Bind mount operation
.SS "Bind mount operation"
.sp
Remount part of the file hierarchy somewhere else. The call is:
@@ -2396,4 +2422,4 @@ For bug reports, use the issue tracker a
.SH "AVAILABILITY"
.sp
The \fBmount\fP command is part of the util\-linux package which can be downloaded from \c
-.URL "https://www.kernel.org/pub/linux/utils/util\-linux/" "Linux Kernel Archive" "."
\ No newline at end of file
+.URL "https://www.kernel.org/pub/linux/utils/util\-linux/" "Linux Kernel Archive" "."

View File

@ -1,3 +1,60 @@
-------------------------------------------------------------------
Wed Nov 17 22:20:44 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
- Update to version 2.37.2:
* No longer uses Groff to maintain man-pages.
* New implementation of hardlink.
* lscpu reimplemented.
* uclampset: new util to manipulate the utilization clamping
attributes of the system or a process.
* hexdump automatically uses -C when called as "hd".
* dmesg supports new command-line options --since and --until.
* findmnt supports new command-line options --shadowed to print
only filesystems over-mounted by another filesystem.
* mount supports --read-only command-line option for non-root
users too.
* umount(8) can umount also all over-mounted filesystems (more
filesystems on the the same mount point) when executed with
--recursive.
* libfdisk (and fdisk, sfdisk, cfdisk) supports partition type
names on input, ignoring the case of the characters and all
non-alphanumeric and non-digit characters in the name
(e.g. type="Linux /usr x86" is the same as type="linux usr-x86"
for sfdisk).
* libmount no longer contains a workaround to detect inconsistent
/proc/self/mountinfo reads.
* libblkid supports "probing hints" now. The hints are the
optional way how to force probing functions to check for
example another location -- for example specific session on
multi-session UDF. The command blkid(8) supports this
functionality with a new --hint option. The library has been
also extended to support others ISO9660 and UDF identifiers.
* blkzone provides a new "capacity" command.
* cfdisk is possible to start in read-only mode by a new
command-line option --read-only
* lsblk provides new columns FSROOTS, and MOUNTPOINTS. The column
MOUNTPOINTS is used in the default output now and this new
column prints all mount points where the device is used (btrfs
subvolumes, bind mounts, etc).
* losetup uses LOOP_CONFIG ioctl now.
* column supports a new command-line option --table-columns-limit
to specify a maximal number of the input columns. The last
column will contain all remaining line data if the limit is
smaller than the number of the columns in the input data.
* Many other new features and fixes. For the complete list see
https://www.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.1-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.2-ReleaseNotes
- Update util-linux-login_defs-check.sh and
login_defs-support-for-util-linux to version 2.37
(new variable LOGIN_KEEP_USERNAME).
-------------------------------------------------------------------
Thu Oct 7 00:54:24 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
- Add bc to BuildRequires to run more complete testsuite
(bsc#1178236#c19).
-------------------------------------------------------------------
Thu Sep 9 20:52:00 UTC 2021 - Jan Engelhardt <jengelh@inai.de>

View File

@ -81,6 +81,7 @@ Summary: %main_summary
License: GPL-2.0-or-later
Group: %main_group
BuildRequires: audit-devel
BuildRequires: bc
BuildRequires: binutils-devel
BuildRequires: fdupes
BuildRequires: gettext-devel
@ -126,10 +127,10 @@ BuildRequires: libmount-devel
%endif
%endif
#END SECOND STAGE DEPENDENCIES
Version: 2.36.2
Version: 2.37.2
Release: 0
URL: https://www.kernel.org/pub/linux/utils/util-linux/
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-%{version}.tar.xz
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-%{version}.tar.xz
Source1: util-linux-rpmlintrc
Source2: util-linux-login_defs-check.sh
Source6: etc_filesystems
@ -138,7 +139,7 @@ Source8: login.pamd
Source9: remote.pamd
Source10: su.pamd
Source11: su.default
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-%{version}.tar.sign
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-%{version}.tar.sign
Source13: %{_name}.keyring
Source14: runuser.pamd
Source15: runuser-l.pamd
@ -184,7 +185,10 @@ Obsoletes: uuid-runtime <= 2.19.1
# All login.defs variables require support from shadow side.
# Upgrade this symbol version only if new variables appear!
# Verify by shadow-login_defs-check.sh from shadow source package.
Requires: login_defs-support-for-util-linux >= 2.36
Recommends: login_defs-support-for-util-linux >= 2.37
# The problem with inconsistent /proc/self/mountinfo read is fixed in kernel 5.8.
# util-linux >= 2.37 no more contain work-around.
Conflicts: kernel < 5.8
#
# Using "Requires" here would lend itself to help upgrading, but since
# util-linux is in the initial bootstrap, that is not a good thing to do:
@ -415,6 +419,8 @@ library.
%setup -q -n %{_name}-%{version}
cp -a %{S:2} .
%autopatch -p1
# This test keeps hanging task inside build chroot
rm tests/ts/lsns/ioctl_ns
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
@ -478,7 +484,7 @@ sed -i '/^if BUILD_LIBMOUNT/d
if BUILD_LIBMOUNT
' libmount/Makemodule.am
# Do not install terminal-colors.d.5
sed -i '/dist_man_MANS/d' lib/Makemodule.am
sed -i '/MANPAGES/d' lib/Makemodule.am
%endif
# disable all make modules except wanted ones
sed -i '/^if BUILD_/{
@ -502,7 +508,7 @@ endif\
if TRUE
' sys-utils/Makemodule.am
# Do not install terminal-colors.d.5
sed -i '/dist_man_MANS/d' lib/Makemodule.am
sed -i '/MANPAGES/d' lib/Makemodule.am
%endif
# Use installed first stage libraries
sed -i '
@ -666,11 +672,6 @@ rm -fv "%{buildroot}/%{_sbindir}/raw" "%{buildroot}/sbin/raw" \
install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems
echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb
chmod 755 %{buildroot}%{_sbindir}/flushb
# upstream moved getopt examples from datadir to docdir but we keep
# the old location because we would need to fix the manpage first
mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/
# Stupid hack so we don't have a tcsh dependency
chmod 644 %{buildroot}%{_datadir}/getopt/getopt*.tcsh
%if !0%{?usrmerged}
# login is always and only in /bin
mv %{buildroot}%{_bindir}/login %{buildroot}/bin/
@ -874,6 +875,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%doc Documentation/modems-with-agetty.txt
%doc Documentation/mount.txt
%doc Documentation/pg.txt
%{_docdir}/%{name}/getopt-example.*
%config(noreplace) %{_sysconfdir}/filesystems
%config(noreplace) %{_sysconfdir}/blkid.conf
%if %{defined no_config}
@ -988,6 +990,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_bindir}/setpriv
%{_bindir}/setsid
%{_bindir}/taskset
%{_bindir}/uclampset
%{_bindir}/ul
%verify(not mode) %{_bindir}/umount
%{_bindir}/unshare
@ -1094,8 +1097,9 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_mandir}/man1/write.1.gz
%{_mandir}/man1/ipcmk.1.gz
%{_mandir}/man1/mountpoint.1.gz
%{_mandir}/man1/utmpdump.1.gz
%{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uclampset.1.gz
%{_mandir}/man1/utmpdump.1.gz
%{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man1/uuidparse.1.gz
%{_mandir}/man5/adjtime_config.5.gz
@ -1141,7 +1145,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_mandir}/man8/swapoff.8.gz
%{_mandir}/man8/swapon.8.gz
%{_mandir}/man8/umount.8.gz
%{_mandir}/man8/uname26.8.gz
%{_mandir}/man8/wipefs.8.gz
%{_mandir}/man8/zramctl.8.gz
%{_mandir}/man8/fstrim.8.gz
@ -1150,9 +1153,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_mandir}/man8/wdctl.8.gz
%{_sbindir}/flushb
%{_sbindir}/readprofile
%dir %{_datadir}/getopt
%attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash
%attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh
# These directories should be owned by bash-completion. But we don't want to
# install them on build, so own these two directories:
%dir %{_datadir}/bash-completion

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAmAmjhkACgkQ5LcdXuw5
woST7A//Q1Ob56RDs7nZxYu4g6GMRVAL0vX23k+9hQU8lHj3s6E/3qnFnRQIA8JJ
cUeU6l+TXI0vMLs6s9yf9cAMvfByuG50h/68KFiLrsLlRe648VqMfSoZf1i3WZPD
IqD4amwmz+aqRZcB0x7+EsUL5wxPXsUw/hdJVpcBB/f3OaZNxbpwyfZGtDxmL9BK
DScBub+oyGalUriGb1N1xNNVUscKxuoI+wY1QX6fmQSsletjuaA2kI4IH2jkkVOU
LapJ77wUwicsHVNTIwncJ4DGeNAPr2r0K//Q/U868xvxlGTRQC1eugxM6ZMonT0P
Vqy48v7MhfU2QA3ZDHst+TV72eXeGP3ulj0Fdq1GKECVMLbD7tTkrtMO9vJmuIHe
0bAWs1sRNSfe3L7/bH8hWn/Sbuox2XRL+/K12HITGYhs7CSIJlkBhft814wqkytT
VXcweXfEkf1w5E0+ruLDlH18g06jboQztPsKPbgdXXJmCk9YSMEzHX+LczWNZ0Ze
f7T74NimiLNy/ytOtDU0lawIIqtl9CAztZTFW1d4WyboH4SUoCrgOqNKPopFWhd6
KxZiXm3wlMedTAtAwLdcNfSFqFDwYtTldSxlY1xk1EvXkkYPg7WBHasNIO7Iuwec
W9nCGvLxBCw3HcbResHHmoUtSED8TmQrQdMolCYg+5m+ubv3E9o=
=9GkW
-----END PGP SIGNATURE-----

BIN
util-linux-2.36.2.tar.xz (Stored with Git LFS)

Binary file not shown.

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAmEaadwACgkQ5LcdXuw5
woTRVg//bg/LYBhHKj9o8YfF3EIrQcySrL9hkZ0DnRT2tDEhuGSBZ0SrDI+8KSFn
iAxpGSOwVOlPk9M6E5LGb2BrVwtELtug+DymrNXRgx9TPZvch1Ti5qKDSPj9xPqF
OdRv1+gL6aeaEz+d0FJUUkYtWMXsc/PeZe11BokEfj6To+7D7poZnUL2QiKnl+w4
omyJMpjUrWW+zwWEdDnWWhM9VdxkU/10QOFdb2NibV6kzpdhf80IDfj/PAKXcpNA
CqNKUlMmC2qADWurl1DlY9279z8dRPD/u7CtUpdr4MN/lk/5uRNIwBmVId5axySJ
jWtgYjtsaarELgRGBIYzFR6tsTfuaLn5/ElefSwzdnQh/4jfarEKHTYo/QULFx8/
pXvJVEetQ7GzCduWiEJfQhUcoPY8GmeQcZAj0QyyAvArUc7LwTVDWeh2pNgf6XBR
y3zKUQv6PURFEcvz9625I9iXwtouXRuhz8bx6+ON7eNHE0g7PpZVIGkH3cH4/sCy
XW36piWAi3W6wbaHnI3EMErGtg9IIT2gQS4HKgB05pq7qHdByPDVRqbXUrgZQj5x
umZqCU28/EEtVvO8oJlysycn7nfx1k1S7mvqidmZhndwZrvkKznfq1as+z/bvVwJ
Qi7QUyNlbgwLHKv37vEmOQESRLZ4k3qCPjRe7mj+6TuS2bWUXvM=
=nxA9
-----END PGP SIGNATURE-----

BIN
util-linux-2.37.2.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -15,7 +15,7 @@ echo -n "Checking login.defs variables in util-linux... " >&2
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/ .*$//') != bdea2548d823e727ddf2cc3318dfce4aa6a9b48f ; then
if test $(sha1sum util-linux-login_defs-vars.lst | sed 's/ .*$//') != 8516ca34e059b2dee1d4421a3ab07e88331b1674 ; then
echo "does not match!" >&2
echo "Checksum is: $(sha1sum util-linux-login_defs-vars.lst | sed 's/ .*$//')" >&2

View File

@ -10,10 +10,10 @@ messages to the appropiate console device.
login-utils/sulogin.c | 97 +++++++++++++++++++++++++++++++++++-------
2 files changed, 82 insertions(+), 16 deletions(-)
diff --git a/login-utils/sulogin-consoles.h b/login-utils/sulogin-consoles.h
index 0bfbc3871..12032c997 100644
--- a/login-utils/sulogin-consoles.h
+++ b/login-utils/sulogin-consoles.h
Index: util-linux-2.37.2/login-utils/sulogin-consoles.h
===================================================================
--- util-linux-2.37.2.orig/login-utils/sulogin-consoles.h
+++ util-linux-2.37.2/login-utils/sulogin-consoles.h
@@ -40,6 +40,7 @@ struct console {
int fd, id;
#define CON_SERIAL 0x0001
@ -22,10 +22,10 @@ index 0bfbc3871..12032c997 100644
pid_t pid;
struct chardata cp;
struct termios tio;
diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index 9091caf14..c833796e7 100644
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
Index: util-linux-2.37.2/login-utils/sulogin.c
===================================================================
--- util-linux-2.37.2.orig/login-utils/sulogin.c
+++ util-linux-2.37.2/login-utils/sulogin.c
@@ -52,6 +52,7 @@
#ifdef __linux__
# include <sys/kd.h>
@ -34,7 +34,7 @@ index 9091caf14..c833796e7 100644
#endif
#include "c.h"
@@ -104,6 +105,9 @@ static void tcinit(struct console *con)
@@ -106,6 +107,9 @@ static void tcinit(struct console *con)
int flags = 0, mode = 0;
struct termios *tio = &con->tio;
const int fd = con->fd;
@ -44,7 +44,7 @@ index 9091caf14..c833796e7 100644
#ifdef USE_PLYMOUTH_SUPPORT
struct termios lock;
int i = (plymouth_command(MAGIC_PING)) ? PLYMOUTH_TERMIOS_FLAGS_DELAY : 0;
@@ -123,27 +127,72 @@ static void tcinit(struct console *con)
@@ -125,27 +129,72 @@ static void tcinit(struct console *con)
}
memset(&lock, 0, sizeof(struct termios));
ioctl(fd, TIOCSLCKTRMIOS, &lock);
@ -125,7 +125,7 @@ index 9091caf14..c833796e7 100644
/* Flush input and output queues on modem lines */
tcflush(fd, TCIOFLUSH);
@@ -220,6 +269,8 @@ static void tcfinal(struct console *con)
@@ -222,6 +271,8 @@ static void tcfinal(struct console *con)
struct termios *tio = &con->tio;
const int fd = con->fd;
@ -134,7 +134,7 @@ index 9091caf14..c833796e7 100644
if ((con->flags & CON_SERIAL) == 0) {
xsetenv("TERM", "linux", 1);
return;
@@ -557,12 +608,16 @@ err:
@@ -559,12 +610,16 @@ err:
static void setup(struct console *con)
{
int fd = con->fd;
@ -153,7 +153,7 @@ index 9091caf14..c833796e7 100644
/*
* Only go through this trouble if the new
* tty doesn't fall in this process group.
@@ -585,6 +640,7 @@ static void setup(struct console *con)
@@ -587,6 +642,7 @@ static void setup(struct console *con)
ioctl(fd, TIOCSCTTY, (char *)1);
tcsetpgrp(fd, ppgrp);
}
@ -161,26 +161,20 @@ index 9091caf14..c833796e7 100644
dup2(fd, STDIN_FILENO);
dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO);
@@ -608,20 +664,25 @@ static const char *getpasswd(struct console *con)
struct termios tty;
static char pass[128], *ptr;
struct chardata *cp;
- const char *ret = pass;
+ const char *ret = NULL;
unsigned char tc;
char c, ascval;
@@ -616,15 +672,20 @@ static char *getpasswd(struct console *c
int eightbit;
const int fd = con->fd;
- if (con->flags & CON_NOTTY)
+ if (con->flags & CON_EIO)
goto out;
+
cp = &con->cp;
tty = con->tio;
+ tc = 0;
+ ret = pass;
+
ret = pass;
tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
@ -190,7 +184,7 @@ index 9091caf14..c833796e7 100644
sigemptyset(&sa.sa_mask);
sa.sa_handler = alrm_handler;
@@ -647,11 +708,12 @@ static const char *getpasswd(struct console *con)
@@ -650,11 +711,12 @@ static char *getpasswd(struct console *c
}
ret = NULL;
switch (errno) {
@ -204,16 +198,7 @@ index 9091caf14..c833796e7 100644
break;
default:
warn(_("cannot read %s"), con->tty);
@@ -775,7 +837,7 @@ static void sushell(struct passwd *pwd)
#ifdef HAVE_LIBSELINUX
if (is_selinux_enabled() > 0) {
- security_context_t scon=NULL;
+ char *scon=NULL;
char *seuser=NULL;
char *level=NULL;
if (getseuserbyname("root", &seuser, &level) == 0) {
@@ -968,10 +1030,13 @@ int main(int argc, char **argv)
@@ -976,10 +1038,13 @@ int main(int argc, char **argv)
con = list_entry(ptr, struct console, entry);
if (con->id >= CONMAX)
break;
@ -227,7 +212,7 @@ index 9091caf14..c833796e7 100644
nofork:
setup(con);
while (1) {
@@ -1026,7 +1091,7 @@ int main(int argc, char **argv)
@@ -1040,7 +1105,7 @@ int main(int argc, char **argv)
default:
break;
}

View File

@ -1,3 +1,60 @@
-------------------------------------------------------------------
Wed Nov 17 22:20:44 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
- Update to version 2.37.2:
* No longer uses Groff to maintain man-pages.
* New implementation of hardlink.
* lscpu reimplemented.
* uclampset: new util to manipulate the utilization clamping
attributes of the system or a process.
* hexdump automatically uses -C when called as "hd".
* dmesg supports new command-line options --since and --until.
* findmnt supports new command-line options --shadowed to print
only filesystems over-mounted by another filesystem.
* mount supports --read-only command-line option for non-root
users too.
* umount(8) can umount also all over-mounted filesystems (more
filesystems on the the same mount point) when executed with
--recursive.
* libfdisk (and fdisk, sfdisk, cfdisk) supports partition type
names on input, ignoring the case of the characters and all
non-alphanumeric and non-digit characters in the name
(e.g. type="Linux /usr x86" is the same as type="linux usr-x86"
for sfdisk).
* libmount no longer contains a workaround to detect inconsistent
/proc/self/mountinfo reads.
* libblkid supports "probing hints" now. The hints are the
optional way how to force probing functions to check for
example another location -- for example specific session on
multi-session UDF. The command blkid(8) supports this
functionality with a new --hint option. The library has been
also extended to support others ISO9660 and UDF identifiers.
* blkzone provides a new "capacity" command.
* cfdisk is possible to start in read-only mode by a new
command-line option --read-only
* lsblk provides new columns FSROOTS, and MOUNTPOINTS. The column
MOUNTPOINTS is used in the default output now and this new
column prints all mount points where the device is used (btrfs
subvolumes, bind mounts, etc).
* losetup uses LOOP_CONFIG ioctl now.
* column supports a new command-line option --table-columns-limit
to specify a maximal number of the input columns. The last
column will contain all remaining line data if the limit is
smaller than the number of the columns in the input data.
* Many other new features and fixes. For the complete list see
https://www.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.1-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.2-ReleaseNotes
- Update util-linux-login_defs-check.sh and
login_defs-support-for-util-linux to version 2.37
(new variable LOGIN_KEEP_USERNAME).
-------------------------------------------------------------------
Thu Oct 7 00:54:24 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
- Add bc to BuildRequires to run more complete testsuite
(bsc#1178236#c19).
-------------------------------------------------------------------
Thu Sep 9 20:52:00 UTC 2021 - Jan Engelhardt <jengelh@inai.de>

View File

@ -81,6 +81,7 @@ Summary: %main_summary
License: GPL-2.0-or-later
Group: %main_group
BuildRequires: audit-devel
BuildRequires: bc
BuildRequires: binutils-devel
BuildRequires: fdupes
BuildRequires: gettext-devel
@ -126,10 +127,10 @@ BuildRequires: libmount-devel
%endif
%endif
#END SECOND STAGE DEPENDENCIES
Version: 2.36.2
Version: 2.37.2
Release: 0
URL: https://www.kernel.org/pub/linux/utils/util-linux/
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-%{version}.tar.xz
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-%{version}.tar.xz
Source1: util-linux-rpmlintrc
Source2: util-linux-login_defs-check.sh
Source6: etc_filesystems
@ -138,7 +139,7 @@ Source8: login.pamd
Source9: remote.pamd
Source10: su.pamd
Source11: su.default
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-%{version}.tar.sign
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-%{version}.tar.sign
Source13: %{_name}.keyring
Source14: runuser.pamd
Source15: runuser-l.pamd
@ -184,7 +185,10 @@ Obsoletes: uuid-runtime <= 2.19.1
# All login.defs variables require support from shadow side.
# Upgrade this symbol version only if new variables appear!
# Verify by shadow-login_defs-check.sh from shadow source package.
Requires: login_defs-support-for-util-linux >= 2.36
Recommends: login_defs-support-for-util-linux >= 2.37
# The problem with inconsistent /proc/self/mountinfo read is fixed in kernel 5.8.
# util-linux >= 2.37 no more contain work-around.
Conflicts: kernel < 5.8
#
# Using "Requires" here would lend itself to help upgrading, but since
# util-linux is in the initial bootstrap, that is not a good thing to do:
@ -415,6 +419,8 @@ library.
%setup -q -n %{_name}-%{version}
cp -a %{S:2} .
%autopatch -p1
# This test keeps hanging task inside build chroot
rm tests/ts/lsns/ioctl_ns
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
@ -478,7 +484,7 @@ sed -i '/^if BUILD_LIBMOUNT/d
if BUILD_LIBMOUNT
' libmount/Makemodule.am
# Do not install terminal-colors.d.5
sed -i '/dist_man_MANS/d' lib/Makemodule.am
sed -i '/MANPAGES/d' lib/Makemodule.am
%endif
# disable all make modules except wanted ones
sed -i '/^if BUILD_/{
@ -502,7 +508,7 @@ endif\
if TRUE
' sys-utils/Makemodule.am
# Do not install terminal-colors.d.5
sed -i '/dist_man_MANS/d' lib/Makemodule.am
sed -i '/MANPAGES/d' lib/Makemodule.am
%endif
# Use installed first stage libraries
sed -i '
@ -666,11 +672,6 @@ rm -fv "%{buildroot}/%{_sbindir}/raw" "%{buildroot}/sbin/raw" \
install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems
echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb
chmod 755 %{buildroot}%{_sbindir}/flushb
# upstream moved getopt examples from datadir to docdir but we keep
# the old location because we would need to fix the manpage first
mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/
# Stupid hack so we don't have a tcsh dependency
chmod 644 %{buildroot}%{_datadir}/getopt/getopt*.tcsh
%if !0%{?usrmerged}
# login is always and only in /bin
mv %{buildroot}%{_bindir}/login %{buildroot}/bin/
@ -874,6 +875,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%doc Documentation/modems-with-agetty.txt
%doc Documentation/mount.txt
%doc Documentation/pg.txt
%{_docdir}/%{name}/getopt-example.*
%config(noreplace) %{_sysconfdir}/filesystems
%config(noreplace) %{_sysconfdir}/blkid.conf
%if %{defined no_config}
@ -988,6 +990,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_bindir}/setpriv
%{_bindir}/setsid
%{_bindir}/taskset
%{_bindir}/uclampset
%{_bindir}/ul
%verify(not mode) %{_bindir}/umount
%{_bindir}/unshare
@ -1094,8 +1097,9 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_mandir}/man1/write.1.gz
%{_mandir}/man1/ipcmk.1.gz
%{_mandir}/man1/mountpoint.1.gz
%{_mandir}/man1/utmpdump.1.gz
%{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uclampset.1.gz
%{_mandir}/man1/utmpdump.1.gz
%{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man1/uuidparse.1.gz
%{_mandir}/man5/adjtime_config.5.gz
@ -1141,7 +1145,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_mandir}/man8/swapoff.8.gz
%{_mandir}/man8/swapon.8.gz
%{_mandir}/man8/umount.8.gz
%{_mandir}/man8/uname26.8.gz
%{_mandir}/man8/wipefs.8.gz
%{_mandir}/man8/zramctl.8.gz
%{_mandir}/man8/fstrim.8.gz
@ -1150,9 +1153,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_mandir}/man8/wdctl.8.gz
%{_sbindir}/flushb
%{_sbindir}/readprofile
%dir %{_datadir}/getopt
%attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash
%attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh
# These directories should be owned by bash-completion. But we don't want to
# install them on build, so own these two directories:
%dir %{_datadir}/bash-completion

View File

@ -1,3 +1,60 @@
-------------------------------------------------------------------
Wed Nov 17 22:20:44 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
- Update to version 2.37.2:
* No longer uses Groff to maintain man-pages.
* New implementation of hardlink.
* lscpu reimplemented.
* uclampset: new util to manipulate the utilization clamping
attributes of the system or a process.
* hexdump automatically uses -C when called as "hd".
* dmesg supports new command-line options --since and --until.
* findmnt supports new command-line options --shadowed to print
only filesystems over-mounted by another filesystem.
* mount supports --read-only command-line option for non-root
users too.
* umount(8) can umount also all over-mounted filesystems (more
filesystems on the the same mount point) when executed with
--recursive.
* libfdisk (and fdisk, sfdisk, cfdisk) supports partition type
names on input, ignoring the case of the characters and all
non-alphanumeric and non-digit characters in the name
(e.g. type="Linux /usr x86" is the same as type="linux usr-x86"
for sfdisk).
* libmount no longer contains a workaround to detect inconsistent
/proc/self/mountinfo reads.
* libblkid supports "probing hints" now. The hints are the
optional way how to force probing functions to check for
example another location -- for example specific session on
multi-session UDF. The command blkid(8) supports this
functionality with a new --hint option. The library has been
also extended to support others ISO9660 and UDF identifiers.
* blkzone provides a new "capacity" command.
* cfdisk is possible to start in read-only mode by a new
command-line option --read-only
* lsblk provides new columns FSROOTS, and MOUNTPOINTS. The column
MOUNTPOINTS is used in the default output now and this new
column prints all mount points where the device is used (btrfs
subvolumes, bind mounts, etc).
* losetup uses LOOP_CONFIG ioctl now.
* column supports a new command-line option --table-columns-limit
to specify a maximal number of the input columns. The last
column will contain all remaining line data if the limit is
smaller than the number of the columns in the input data.
* Many other new features and fixes. For the complete list see
https://www.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.1-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.2-ReleaseNotes
- Update util-linux-login_defs-check.sh and
login_defs-support-for-util-linux to version 2.37
(new variable LOGIN_KEEP_USERNAME).
-------------------------------------------------------------------
Thu Oct 7 00:54:24 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
- Add bc to BuildRequires to run more complete testsuite
(bsc#1178236#c19).
-------------------------------------------------------------------
Thu Sep 9 20:52:00 UTC 2021 - Jan Engelhardt <jengelh@inai.de>

View File

@ -81,6 +81,7 @@ Summary: %main_summary
License: GPL-2.0-or-later
Group: %main_group
BuildRequires: audit-devel
BuildRequires: bc
BuildRequires: binutils-devel
BuildRequires: fdupes
BuildRequires: gettext-devel
@ -126,10 +127,10 @@ BuildRequires: libmount-devel
%endif
%endif
#END SECOND STAGE DEPENDENCIES
Version: 2.36.2
Version: 2.37.2
Release: 0
URL: https://www.kernel.org/pub/linux/utils/util-linux/
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-%{version}.tar.xz
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-%{version}.tar.xz
Source1: util-linux-rpmlintrc
Source2: util-linux-login_defs-check.sh
Source6: etc_filesystems
@ -138,7 +139,7 @@ Source8: login.pamd
Source9: remote.pamd
Source10: su.pamd
Source11: su.default
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-%{version}.tar.sign
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-%{version}.tar.sign
Source13: %{_name}.keyring
Source14: runuser.pamd
Source15: runuser-l.pamd
@ -184,7 +185,10 @@ Obsoletes: uuid-runtime <= 2.19.1
# All login.defs variables require support from shadow side.
# Upgrade this symbol version only if new variables appear!
# Verify by shadow-login_defs-check.sh from shadow source package.
Requires: login_defs-support-for-util-linux >= 2.36
Recommends: login_defs-support-for-util-linux >= 2.37
# The problem with inconsistent /proc/self/mountinfo read is fixed in kernel 5.8.
# util-linux >= 2.37 no more contain work-around.
Conflicts: kernel < 5.8
#
# Using "Requires" here would lend itself to help upgrading, but since
# util-linux is in the initial bootstrap, that is not a good thing to do:
@ -415,6 +419,8 @@ library.
%setup -q -n %{_name}-%{version}
cp -a %{S:2} .
%autopatch -p1
# This test keeps hanging task inside build chroot
rm tests/ts/lsns/ioctl_ns
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
@ -478,7 +484,7 @@ sed -i '/^if BUILD_LIBMOUNT/d
if BUILD_LIBMOUNT
' libmount/Makemodule.am
# Do not install terminal-colors.d.5
sed -i '/dist_man_MANS/d' lib/Makemodule.am
sed -i '/MANPAGES/d' lib/Makemodule.am
%endif
# disable all make modules except wanted ones
sed -i '/^if BUILD_/{
@ -502,7 +508,7 @@ endif\
if TRUE
' sys-utils/Makemodule.am
# Do not install terminal-colors.d.5
sed -i '/dist_man_MANS/d' lib/Makemodule.am
sed -i '/MANPAGES/d' lib/Makemodule.am
%endif
# Use installed first stage libraries
sed -i '
@ -666,11 +672,6 @@ rm -fv "%{buildroot}/%{_sbindir}/raw" "%{buildroot}/sbin/raw" \
install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems
echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb
chmod 755 %{buildroot}%{_sbindir}/flushb
# upstream moved getopt examples from datadir to docdir but we keep
# the old location because we would need to fix the manpage first
mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/
# Stupid hack so we don't have a tcsh dependency
chmod 644 %{buildroot}%{_datadir}/getopt/getopt*.tcsh
%if !0%{?usrmerged}
# login is always and only in /bin
mv %{buildroot}%{_bindir}/login %{buildroot}/bin/
@ -874,6 +875,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%doc Documentation/modems-with-agetty.txt
%doc Documentation/mount.txt
%doc Documentation/pg.txt
%{_docdir}/%{name}/getopt-example.*
%config(noreplace) %{_sysconfdir}/filesystems
%config(noreplace) %{_sysconfdir}/blkid.conf
%if %{defined no_config}
@ -988,6 +990,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_bindir}/setpriv
%{_bindir}/setsid
%{_bindir}/taskset
%{_bindir}/uclampset
%{_bindir}/ul
%verify(not mode) %{_bindir}/umount
%{_bindir}/unshare
@ -1094,8 +1097,9 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_mandir}/man1/write.1.gz
%{_mandir}/man1/ipcmk.1.gz
%{_mandir}/man1/mountpoint.1.gz
%{_mandir}/man1/utmpdump.1.gz
%{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uclampset.1.gz
%{_mandir}/man1/utmpdump.1.gz
%{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man1/uuidparse.1.gz
%{_mandir}/man5/adjtime_config.5.gz
@ -1141,7 +1145,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_mandir}/man8/swapoff.8.gz
%{_mandir}/man8/swapon.8.gz
%{_mandir}/man8/umount.8.gz
%{_mandir}/man8/uname26.8.gz
%{_mandir}/man8/wipefs.8.gz
%{_mandir}/man8/zramctl.8.gz
%{_mandir}/man8/fstrim.8.gz
@ -1150,9 +1153,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_mandir}/man8/wdctl.8.gz
%{_sbindir}/flushb
%{_sbindir}/readprofile
%dir %{_datadir}/getopt
%attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash
%attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh
# These directories should be owned by bash-completion. But we don't want to
# install them on build, so own these two directories:
%dir %{_datadir}/bash-completion