Merge remote-tracking branch 'origin/3.6' into 3.7

4 files changed, 8 insertions, 17 deletions

diff --git a/util-linux/.footprint b/util-linux/.footprint
index ad3b290d..178746b5 100644
--- a/util-linux/.footprint
+++ b/util-linux/.footprint
@@ -3,6 +3,7 @@ drwxr-xr-x	root/root	bin/
 -rwxr-xr-x	root/root	bin/findmnt
 -rwxr-xr-x	root/root	bin/kill
 -rwxr-xr-x	root/root	bin/lsblk
+-rwxr-xr-x	root/root	bin/lsfd
 -rwxr-xr-x	root/root	bin/more
 -rwsr-xr-x	root/root	bin/mount
 -rwxr-xr-x	root/root	bin/mountpoint
@@ -184,6 +185,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/logger.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/look.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/lscpu.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/lsfd.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/lsipc.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/lsirq.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/lslogins.1.gz
@@ -251,11 +253,8 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/fsfreeze.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/fstrim.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/hwclock.8.gz
--rw-r--r--	root/root	usr/share/man/man8/i386.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/isosize.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ldattach.8.gz
--rw-r--r--	root/root	usr/share/man/man8/linux32.8.gz
--rw-r--r--	root/root	usr/share/man/man8/linux64.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/losetup.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/lsblk.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/lslocks.8.gz
@@ -266,7 +265,6 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/mount.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/partx.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/pivot_root.8.gz
--rw-r--r--	root/root	usr/share/man/man8/raw.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/readprofile.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/resizepart.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/rfkill.8.gz
@@ -278,11 +276,9 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/swapon.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/switch_root.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/umount.8.gz
--rw-r--r--	root/root	usr/share/man/man8/uname26.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/uuidd.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/wdctl.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/wipefs.8.gz
--rw-r--r--	root/root	usr/share/man/man8/x86_64.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/zramctl.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
diff --git a/util-linux/.signature b/util-linux/.signature
index f9af80cf..d451b2dd 100644
--- a/util-linux/.signature
+++ b/util-linux/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqoCtFFCJVMiFV/QQ+hA6azY91FX33cl2FOe+kQm/hHJ7dZcLdSCypPoaUHl+2KlLMNvL/AIqvbZhAsFaRoHMzQg=
-SHA256 (Pkgfile) = bb57136320ad614c776fbcbb1a7feff3041307d131812c23ef0a513f3b3561dd
-SHA256 (.footprint) = eef570ea79683451632929814c019d3435cb9535dff8a569114930772f377b2c
-SHA256 (util-linux-2.37.4.tar.xz) = 634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83
-SHA256 (util-linux-man-2.37.4.tar.xz) = 484f3df077df75b955afd696d5cec43987ea17dec908c25667c0f36a16637a30
+RWRJc1FUaeVeqr6/kNTozhO8WMtrymQIvvvRukO7WQG8Vc22gAMtKFKKpus8sRFXA2PFqMCrB/zn8dTzS0sy2VeL7n1YUI3Rlg0=
+SHA256 (Pkgfile) = fdf416c193bf843420a2c632eb2fdbbcc6f20d96ed3356b0f2043faa112624df
+SHA256 (.footprint) = 864be3e513e27108780b44eac58752ca10ce644df473ba5f920adabb1bf01a30
+SHA256 (util-linux-2.38.tar.xz) = 6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64
diff --git a/util-linux/Pkgfile b/util-linux/Pkgfile
index bd8f9acd..837be711 100644
--- a/util-linux/Pkgfile
+++ b/util-linux/Pkgfile
@@ -4,16 +4,13 @@
 # Depends on: bzip2 eudev file readline xz
 
 name=util-linux
-version=2.37.4
+version=2.38
 release=1
-source=(https://www.kernel.org/pub/linux/utils/$name/v${version:0:4}/$name-$version.tar.xz
-	$name-man-$version.tar.xz)
+source=(https://www.kernel.org/pub/linux/utils/$name/v${version:0:4}/$name-$version.tar.xz)
 
 build() {
 	cd $name-$version
 
-	#touch disk-utils/raw.8
-
 	./configure \
 		--prefix=/usr \
 		--enable-{write,kill} \
@@ -28,7 +25,6 @@ build() {
 
 	install -d $PKG/{etc,var/lib/libuuid}
 	touch $PKG/etc/adjtime
-	cp -r $SRC/man $PKG/usr/share
 
 	prt-get isinst bash-completion || rm -r $PKG/usr/share/bash-completion
 	rm -r $PKG/usr/share/doc
diff --git a/util-linux/util-linux-man-2.37.4.tar.xz b/util-linux/util-linux-man-2.37.4.tar.xz
deleted file mode 100644
index 966100cf..00000000
--- a/util-linux/util-linux-man-2.37.4.tar.xz
+++ /dev/null