[packages/util-linux] up to 2.37

atler atler at pld-linux.org
Sun Jul 4 13:20:11 CEST 2021 

commit 028b554f7856e58a64a311cb829871867d108117
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Jul 4 13:18:01 2021 +0200

    up to 2.37

 util-linux-fdformat-ide.patch | 40 +++++++++++------------
 util-linux-fhs.patch          | 23 +++++++------
 util-linux-pl.po.patch        | 19 -----------
 util-linux.spec               | 75 +++++++++++++++++++++++++++++++++++--------
 4 files changed, 91 insertions(+), 66 deletions(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index 91858cd..1d04d2d 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -40,13 +40,13 @@ Summary(ru.UTF-8):	Набор базовых системных утилит д
 Summary(tr.UTF-8):	Temel sistem araçları
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux
-Version:	2.36.2
-Release:	3
+Version:	2.37
+Release:	1
 License:	GPL v2+, GPL v3 (hwclock)
 Group:		Applications/System
 # https://github.com/karelzak/util-linux (GitHub backup)
-Source0:	https://www.kernel.org/pub/linux/utils/util-linux/v2.36/%{name}-%{version}.tar.xz
-# Source0-md5:	f78419af679ac9678190ad961eb3cf27
+Source0:	https://www.kernel.org/pub/linux/utils/util-linux/v2.37/%{name}-%{version}.tar.xz
+# Source0-md5:	75eb0a648098332d4042f1646eca4069
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	3c940c7e7fe699eaa2ddb1bffb3de2fe
 Source2:	login.pamd
@@ -67,10 +67,9 @@ Patch3:		%{name}-procpartitions.patch
 Patch4:		su-paths.patch
 Patch5:		%{name}-ac.patch
 Patch6:		%{name}-diet.patch
-Patch7:		%{name}-pl.po.patch
 URL:		https://github.com/karelzak/util-linux
 BuildRequires:	audit-libs-devel >= 1.0.6
-BuildRequires:	autoconf >= 2.60
+BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake >= 1:1.10
 BuildRequires:	gettext-tools >= 0.18.3
 %{?with_fallocate:BuildRequires:	glibc-devel >= 6:2.11}
@@ -83,17 +82,20 @@ BuildRequires:	libcap-ng-devel
 # for lscpu
 BuildRequires:	librtas-devel
 %endif
-%{?with_selinux:BuildRequires:	libselinux-devel >= 2.0}
+%{?with_selinux:BuildRequires:	libselinux-devel >= 2.5}
 %{?with_selinux:BuildRequires:	libsepol-devel}
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	linux-libc-headers >= 7:2.6.27
 BuildRequires:	ncurses-devel >= 5.0
 BuildRequires:	pam-devel >= %{pam_ver}
+BuildRequires:	pcre2-posix-devel
 BuildRequires:	pkgconfig
+BuildRequires:	po4a
 BuildRequires:	python3-devel
 BuildRequires:	readline-devel
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	ruby-asciidoctor
 BuildRequires:	sed >= 4.0
 %{?with_systemd:BuildRequires:	systemd-devel >= 1:209}
 BuildRequires:	tar >= 1:1.22
@@ -114,7 +116,7 @@ BuildRequires:	glibc-static
 Requires:	libblkid = %{version}-%{release}
 Requires:	libfdisk = %{version}-%{release}
 Requires:	libmount = %{version}-%{release}
-%{?with_selinux:Requires:	libselinux >= 2.0}
+%{?with_selinux:Requires:	libselinux >= 2.5}
 Requires:	libsmartcols = %{version}-%{release}
 Requires:	pam >= %{pam_ver}
 Provides:	eject = %{version}-%{release}
@@ -809,7 +811,6 @@ Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux.
 %patch4 -p1
 %patch5 -p1
 %{?with_initrd:%patch6 -p1}
-%patch7 -p1
 
 cp -p %{SOURCE10} nologin.c
 
@@ -904,6 +905,7 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE
 	--disable-use-tty-group \
 	--disable-wall \
 	--enable-chfn-chsh \
+	--enable-fdformat \
 	%{?with_apidocs:--enable-gtk-doc} \
 	--enable-kill \
 	--enable-libblkid \
@@ -912,6 +914,7 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE
 	--enable-login-chown-vcs \
 	--enable-newgrp \
 	--enable-partx \
+	--enable-poman \
 	--enable-pg \
 	--enable-runuser%{!?with_su:=no} \
 	--enable-su%{!?with_su:=no} \
@@ -1010,7 +1013,8 @@ echo '.so man8/swapon.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/swapoff.8
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/{chfn,chsh,newgrp} \
 	$RPM_BUILD_ROOT%{_sbindir}/{vigr,vipw} \
 	$RPM_BUILD_ROOT%{_mandir}/man1/{chfn,chsh,newgrp}.1 \
-	$RPM_BUILD_ROOT%{_mandir}/man8/{vigr,vipw}.8 \
+	$RPM_BUILD_ROOT%{_mandir}/de/man1/{chsh,wall}.1 \
+	$RPM_BUILD_ROOT%{_mandir}/{,de/}man8/{vigr,vipw}.8 \
 	$RPM_BUILD_ROOT%{_mandir}/*/man1/{arch,chkdupexe,ddate,reset}.1 \
 	$RPM_BUILD_ROOT%{_mandir}/*/man5/nfs.5 \
 	$RPM_BUILD_ROOT%{_mandir}/*/man8/{cytune,elvtune,setfdprm,sln,ramsize,raw,rdev,rootflags,vidmode}.8 \
@@ -1023,9 +1027,9 @@ echo '.so man8/swapon.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/swapoff.8
 
 %if %{with apidocs}
 # examples
-%{__rm} -r $RPM_BUILD_ROOT%{_gtkdocdir}/getopt
+%{__rm} $RPM_BUILD_ROOT%{_gtkdocdir}/getopt-example.{bash,tcsh}
 %else
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}/getopt
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/getopt-example.{bash,tcsh}
 %endif
 
 %if %{with initrd}
@@ -1099,7 +1103,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README README.licensing Documentation misc-utils/getopt-parse.{bash,tcsh}
+%doc AUTHORS ChangeLog NEWS README README.licensing Documentation misc-utils/getopt-example.{bash,tcsh}
 %dir /etc/terminal-colors.d
 
 %attr(755,root,root) /sbin/clock
@@ -1119,6 +1123,7 @@ fi
 %attr(755,root,root) /sbin/findfs
 %{_mandir}/man8/blkid.8*
 %{_mandir}/man8/findfs.8*
+%lang(de) %{_mandir}/de/man8/findfs.8*
 
 %attr(755,root,root) %{_bindir}/linux*
 %attr(755,root,root) %{_bindir}/setarch
@@ -1226,6 +1231,7 @@ fi
 %attr(755,root,root) %{_bindir}/setsid
 %attr(755,root,root) %{_bindir}/setterm
 %attr(755,root,root) %{_bindir}/taskset
+%attr(755,root,root) %{_bindir}/uclampset
 %attr(755,root,root) %{_bindir}/uuidparse
 %attr(755,root,root) %{_bindir}/ul
 %attr(755,root,root) %{_bindir}/uname26
@@ -1294,6 +1300,7 @@ fi
 %{_mandir}/man1/scriptreplay.1*
 %{_mandir}/man1/setterm.1*
 %{_mandir}/man1/taskset.1*
+%{_mandir}/man1/uclampset.1*
 %{_mandir}/man1/ul.1*
 %{_mandir}/man1/unshare.1*
 %{_mandir}/man1/utmpdump.1*
@@ -1334,10 +1341,36 @@ fi
 %{_mandir}/man8/wipefs.8*
 %{_mandir}/man8/zramctl.8*
 
+%lang(de) %{_mandir}/de/man1/chrt.1*
+%lang(de) %{_mandir}/de/man1/colcrt.1*
+%lang(de) %{_mandir}/de/man1/colrm.1*
+%lang(de) %{_mandir}/de/man1/fincore.1*
+%lang(de) %{_mandir}/de/man1/ionice.1*
+%lang(de) %{_mandir}/de/man1/ipcmk.1*
+%lang(de) %{_mandir}/de/man1/ipcs.1*
+%lang(de) %{_mandir}/de/man1/irqtop.1*
 %lang(de) %{_mandir}/de/man1/kill.1*
+%lang(de) %{_mandir}/de/man1/line.1*
+%lang(de) %{_mandir}/de/man1/lsipc.1*
+%lang(de) %{_mandir}/de/man8/lsns.8*
+%lang(de) %{_mandir}/de/man1/mesg.1*
 %lang(de) %{_mandir}/de/man1/more.1*
+%lang(de) %{_mandir}/de/man1/nsenter.1*
+%lang(de) %{_mandir}/de/man1/renice.1*
+%lang(de) %{_mandir}/de/man1/rev.1*
+%lang(de) %{_mandir}/de/man1/setsid.1*
+%lang(de) %{_mandir}/de/man1/taskset.1*
+%lang(de) %{_mandir}/de/man1/ul.1*
+%lang(de) %{_mandir}/de/man1/whereis.1*
 %lang(de) %{_mandir}/de/man1/write.1*
+%lang(de) %{_mandir}/de/man5/terminal-colors.d.5*
+%lang(de) %{_mandir}/de/man8/addpart.8*
+%lang(de) %{_mandir}/de/man8/ctrlaltdel.8*
+%lang(de) %{_mandir}/de/man8/delpart.8*
 %lang(de) %{_mandir}/de/man8/fdformat.8*
+%lang(de) %{_mandir}/de/man8/isosize.8*
+%lang(de) %{_mandir}/de/man8/ldattach.8*
+%lang(de) %{_mandir}/de/man8/resizepart.8*
 
 %lang(es) %{_mandir}/es/man1/*.1*
 %exclude  %{_mandir}/es/man1/login.1*
@@ -1428,6 +1461,14 @@ fi
 %{_mandir}/man8/mkfs.minix.8*
 %{_mandir}/man8/mkfs.8*
 
+%lang(de) %{_mandir}/de/man8/fdisk.8*
+%ifnarch sparc sparc64
+%lang(de) %{_mandir}/de/man8/cfdisk.8*
+%endif
+%lang(de) %{_mandir}/de/man8/fsck.minix.8*
+%lang(de) %{_mandir}/de/man8/mkfs.bfs.8*
+%lang(de) %{_mandir}/de/man8/mkfs.8*
+
 %lang(es) %{_mandir}/es/man8/fdisk.8*
 %lang(es) %{_mandir}/es/man8/fsck.minix.8*
 %lang(es) %{_mandir}/es/man8/mkfs.minix.8*
@@ -1473,6 +1514,8 @@ fi
 %attr(755,root,root) /sbin/mkfs.bfs
 %{_mandir}/man8/fsck.cramfs.8*
 %{_mandir}/man8/mkfs.cramfs.8*
+%lang(de) %{_mandir}/de/man8/fsck.cramfs.8*
+%lang(de) %{_mandir}/de/man8/mkfs.cramfs.8*
 
 %if %{with su}
 %attr(755,root,root) /bin/runuser
@@ -1494,6 +1537,7 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/blockdev
 %attr(755,root,root) /sbin/blockdev
 %{_mandir}/man8/blockdev.8*
+%lang(de) %{_mandir}/de/man8/blockdev.8*
 %lang(ja) %{_mandir}/ja/man8/blockdev.8*
 %{systemdunitdir}/blockdev.service
 %attr(755,root,root) /lib/systemd/pld-helpers.d/blockdev.sh
@@ -1520,6 +1564,8 @@ fi
 %lang(cs) %{_mandir}/cs/man5/fstab.5*
 
 %lang(de) %{_mandir}/de/man5/fstab.5*
+%lang(de) %{_mandir}/de/man1/mountpoint.1*
+%lang(de) %{_mandir}/de/man8/pivot_root.8*
 
 %lang(es) %{_mandir}/es/man5/fstab.5*
 %lang(es) %{_mandir}/es/man8/mount.8*
@@ -1610,6 +1656,7 @@ fi
 %{_includedir}/blkid
 %{_pkgconfigdir}/blkid.pc
 %{_mandir}/man3/libblkid.3*
+%lang(de) %{_mandir}/de/man3/libblkid.3*
 
 %files -n libblkid-static
 %defattr(644,root,root,755)
@@ -1641,6 +1688,7 @@ fi
 %{_includedir}/uuid
 %{_pkgconfigdir}/uuid.pc
 %{_mandir}/man3/uuid*.3*
+%lang(de) %{_mandir}/de/man3/uuid*.3*
 
 %files -n libuuid-static
 %defattr(644,root,root,755)
@@ -1858,6 +1906,7 @@ fi
 %{bash_compdir}/swapon
 %{bash_compdir}/taskset
 %{bash_compdir}/tunelp
+%{bash_compdir}/uclampset
 %{bash_compdir}/ul
 %{bash_compdir}/umount
 %{bash_compdir}/unshare
diff --git a/util-linux-fdformat-ide.patch b/util-linux-fdformat-ide.patch
index 905d83b..e1ae2f4 100644
--- a/util-linux-fdformat-ide.patch
+++ b/util-linux-fdformat-ide.patch
@@ -1,23 +1,19 @@
-diff -urNp -x '*.orig' util-linux-2.36.2.org/disk-utils/fdformat.8 util-linux-2.36.2/disk-utils/fdformat.8
---- util-linux-2.36.2.org/disk-utils/fdformat.8	2021-02-02 16:41:37.963357493 +0100
-+++ util-linux-2.36.2/disk-utils/fdformat.8	2021-02-28 14:21:08.782332493 +0100
-@@ -43,6 +43,11 @@ when a non-standard format is being used
- autodetected earlier.  In this case, use
- .BR setfdprm (8)
- to load the disk parameters.
+--- util-linux-2.37/disk-utils/fdformat.8.adoc.orig	2021-05-06 12:55:46.873423530 +0200
++++ util-linux-2.37/disk-utils/fdformat.8.adoc	2021-07-04 11:06:10.579563791 +0200
+@@ -47,6 +47,8 @@
+ 
+ The generic floppy devices, _/dev/fd0_ and _/dev/fd1_, will fail to work with *fdformat* when a non-standard format is being used, or if the format has not been autodetected earlier. In this case, use *setfdprm*(8) to load the disk parameters.
+ 
++For ATAPI IDE floppy driver (also known as LS-120 drives or "Superdisk" drives) you have to use the *floppy*(8).
 +
-+For ATAPI IDE floppy driver (also known as LS-120 drives or "Superdisk"
-+drives) you have to use the
-+.BR floppy (8).
-+
- .SH OPTIONS
- .TP
- \fB\-f\fR, \fB\-\-from\fR \fIN\fR
-@@ -71,6 +76,7 @@ Werner Almesberger (almesber at nessie.cs.i
- .SH SEE ALSO
- .BR fd (4),
- .BR emkfs (8),
-+.BR floppy (8),
- .BR mkfs (8),
- .BR setfdprm (8),
- .BR ufiformat (8)
+ == OPTIONS
+ 
+ *-f*, *--from* _N_::
+@@ -79,6 +81,7 @@
+ 
+ *fd*(4),
+ *emkfs*(8),
++*floppy*(8),
+ *mkfs*(8),
+ *setfdprm*(8),
+ *ufiformat*(8)
diff --git a/util-linux-fhs.patch b/util-linux-fhs.patch
index 1dc23fc..057aece 100644
--- a/util-linux-fhs.patch
+++ b/util-linux-fhs.patch
@@ -10,15 +10,14 @@ diff -urNp -x '*.orig' util-linux-2.36.2.org/include/pathnames.h util-linux-2.36
  #endif
  #define	_PATH_MOTDFILE		"/usr/share/misc/motd:/run/motd:/etc/motd"
  #ifndef _PATH_NOLOGIN
-diff -urNp -x '*.orig' util-linux-2.36.2.org/login-utils/login.1 util-linux-2.36.2/login-utils/login.1
---- util-linux-2.36.2.org/login-utils/login.1	2021-02-12 12:32:01.748988728 +0100
-+++ util-linux-2.36.2/login-utils/login.1	2021-02-28 14:21:31.543044005 +0100
-@@ -347,7 +347,7 @@ the superuser logs in.  ENV_ROOTPATH tak
- .I /var/run/utmp
- .I /var/log/wtmp
- .I /var/log/lastlog
--.I /var/spool/mail/*
-+.I /var/mail/*
- .I /etc/motd
- .I /etc/passwd
- .I /etc/nologin
+--- util-linux-2.37/login-utils/login.1.adoc.orig	2021-05-06 12:55:46.912423336 +0200
++++ util-linux-2.37/login-utils/login.1.adoc	2021-07-04 11:07:54.188129931 +0200
+@@ -141,7 +141,7 @@
+ _/var/run/utmp_,
+ _/var/log/wtmp_,
+ _/var/log/lastlog_,
+-_/var/spool/mail/*_,
++_/var/mail/*_,
+ _/etc/motd_,
+ _/etc/passwd_,
+ _/etc/nologin_,
diff --git a/util-linux-pl.po.patch b/util-linux-pl.po.patch
deleted file mode 100644
index d2bc331..0000000
--- a/util-linux-pl.po.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- util-linux-2.36/po/pl.po.orig	2020-08-22 19:27:40.016610780 +0200
-+++ util-linux-2.36/po/pl.po	2020-08-22 19:29:39.402630677 +0200
-@@ -12053,7 +12053,7 @@
- msgstr "%s: ioctl %s nie powiódł się"
- 
- #: sys-utils/blkzone.c:345
--#, fuzzy, c-format
-+#, c-format
- msgid "%s: successful %s of zones in range from %<PRIu64>, to %<PRIu64>"
- msgstr "%s: operacja %s na strefach w przedziale od %<PRIu64> do %<PRIu64> powiodła się"
- 
-@@ -14753,7 +14753,6 @@
- msgstr "nie udało się dodać linii do wyjścia"
- 
- #: sys-utils/irq-common.c:348
--#, fuzzy
- msgid "unsupported column name to sort output"
- msgstr "nie obsługiwana nazwa kolumny do sortowania wyjścia"
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/util-linux.git/commitdiff/028b554f7856e58a64a311cb829871867d108117

More information about the pld-cvs-commit mailing list