util-linux: updated to 2.22.2 and aligned with upstream

diff --git a/util-linux/.footprint b/util-linux/.footprint
index c70c3507f246eb9469f61bd8cb512713a1c2faa6..1177cb310d9e6f98ca3efb54045ad609df2f67de 100644 (file)
--- a/util-linux/.footprint
+++ b/util-linux/.footprint
@@ -5,7 +5,9 @@ drwxr-xr-x      root/root       bin/
 -rwxr-xr-x     root/root       bin/lsblk
 -rwxr-xr-x     root/root       bin/more
 -rwsr-xr-x     root/root       bin/mount
+-rwxr-xr-x     root/root       bin/mountpoint
 -rwsr-xr-x     root/root       bin/umount
+-rwxr-xr-x     root/root       bin/wdctl
 drwxr-xr-x     root/root       etc/
 -rw-r--r--     root/root       etc/adjtime (EMPTY)
 drwxr-xr-x     root/root       lib/
@@ -20,6 +22,7 @@ drwxr-xr-x    root/root       sbin/
 -rwxr-xr-x     root/root       sbin/blkid
 -rwxr-xr-x     root/root       sbin/blockdev
 -rwxr-xr-x     root/root       sbin/cfdisk
+-rwxr-xr-x     root/root       sbin/chcpu
 -rwxr-xr-x     root/root       sbin/ctrlaltdel
 -rwxr-xr-x     root/root       sbin/fdisk
 -rwxr-xr-x     root/root       sbin/findfs
@@ -35,22 +38,23 @@ drwxr-xr-x  root/root       sbin/
 -rwxr-xr-x     root/root       sbin/pivot_root
 -rwxr-xr-x     root/root       sbin/raw
 -rwxr-xr-x     root/root       sbin/sfdisk
+-rwxr-xr-x     root/root       sbin/sulogin
 -rwxr-xr-x     root/root       sbin/swaplabel
-lrwxrwxrwx     root/root       sbin/swapoff -> swapon
+-rwxr-xr-x     root/root       sbin/swapoff
 -rwxr-xr-x     root/root       sbin/swapon
 -rwxr-xr-x     root/root       sbin/switch_root
 -rwxr-xr-x     root/root       sbin/wipefs
 drwxr-xr-x     root/root       usr/
 drwxr-xr-x     root/root       usr/bin/
 -rwxr-xr-x     root/root       usr/bin/cal
--rwxr-xr-x     root/root       usr/bin/chkdupexe
 -rwxr-xr-x     root/root       usr/bin/chrt
 -rwxr-xr-x     root/root       usr/bin/col
 -rwxr-xr-x     root/root       usr/bin/colcrt
 -rwxr-xr-x     root/root       usr/bin/colrm
 -rwxr-xr-x     root/root       usr/bin/column
 -rwxr-xr-x     root/root       usr/bin/cytune
--rwxr-xr-x     root/root       usr/bin/ddate
+-rwxr-xr-x     root/root       usr/bin/eject
+-rwxr-xr-x     root/root       usr/bin/fallocate
 -rwxr-xr-x     root/root       usr/bin/flock
 -rwxr-xr-x     root/root       usr/bin/getopt
 -rwxr-xr-x     root/root       usr/bin/hexdump
@@ -59,15 +63,16 @@ drwxr-xr-x  root/root       usr/bin/
 -rwxr-xr-x     root/root       usr/bin/ipcrm
 -rwxr-xr-x     root/root       usr/bin/ipcs
 -rwxr-xr-x     root/root       usr/bin/isosize
--rwxr-xr-x     root/root       usr/bin/line
 lrwxrwxrwx     root/root       usr/bin/linux32 -> setarch
 lrwxrwxrwx     root/root       usr/bin/linux64 -> setarch
 -rwxr-xr-x     root/root       usr/bin/logger
 -rwxr-xr-x     root/root       usr/bin/look
 -rwxr-xr-x     root/root       usr/bin/lscpu
+-rwxr-xr-x     root/root       usr/bin/lslocks
 -rwxr-xr-x     root/root       usr/bin/mcookie
 -rwxr-xr-x     root/root       usr/bin/namei
 -rwxr-xr-x     root/root       usr/bin/pg
+-rwxr-xr-x     root/root       usr/bin/prlimit
 -rwxr-xr-x     root/root       usr/bin/rename
 -rwxr-xr-x     root/root       usr/bin/renice
 -rwxr-xr-x     root/root       usr/bin/rev
@@ -80,7 +85,9 @@ lrwxrwxrwx    root/root       usr/bin/linux64 -> setarch
 -rwxr-xr-x     root/root       usr/bin/taskset
 -rwxr-xr-x     root/root       usr/bin/ul
 -rwxr-xr-x     root/root       usr/bin/unshare
+-rwxr-xr-x     root/root       usr/bin/utmpdump
 -rwxr-xr-x     root/root       usr/bin/uuidgen
+-rwxr-sr-x     root/tty        usr/bin/wall
 -rwxr-xr-x     root/root       usr/bin/whereis
 -rwxr-sr-x     root/tty        usr/bin/write
 drwxr-xr-x     root/root       usr/include/
@@ -107,14 +114,14 @@ drwxr-xr-x        root/root       usr/lib/pkgconfig/
 drwxr-xr-x     root/root       usr/man/
 drwxr-xr-x     root/root       usr/man/man1/
 -rw-r--r--     root/root       usr/man/man1/cal.1.gz
--rw-r--r--     root/root       usr/man/man1/chkdupexe.1.gz
 -rw-r--r--     root/root       usr/man/man1/chrt.1.gz
 -rw-r--r--     root/root       usr/man/man1/col.1.gz
 -rw-r--r--     root/root       usr/man/man1/colcrt.1.gz
 -rw-r--r--     root/root       usr/man/man1/colrm.1.gz
 -rw-r--r--     root/root       usr/man/man1/column.1.gz
--rw-r--r--     root/root       usr/man/man1/ddate.1.gz
 -rw-r--r--     root/root       usr/man/man1/dmesg.1.gz
+-rw-r--r--     root/root       usr/man/man1/eject.1.gz
+-rw-r--r--     root/root       usr/man/man1/fallocate.1.gz
 -rw-r--r--     root/root       usr/man/man1/flock.1.gz
 -rw-r--r--     root/root       usr/man/man1/getopt.1.gz
 -rw-r--r--     root/root       usr/man/man1/hexdump.1.gz
@@ -123,15 +130,15 @@ drwxr-xr-x        root/root       usr/man/man1/
 -rw-r--r--     root/root       usr/man/man1/ipcrm.1.gz
 -rw-r--r--     root/root       usr/man/man1/ipcs.1.gz
 -rw-r--r--     root/root       usr/man/man1/kill.1.gz
--rw-r--r--     root/root       usr/man/man1/line.1.gz
 -rw-r--r--     root/root       usr/man/man1/logger.1.gz
 -rw-r--r--     root/root       usr/man/man1/look.1.gz
 -rw-r--r--     root/root       usr/man/man1/lscpu.1.gz
 -rw-r--r--     root/root       usr/man/man1/mcookie.1.gz
 -rw-r--r--     root/root       usr/man/man1/more.1.gz
+-rw-r--r--     root/root       usr/man/man1/mountpoint.1.gz
 -rw-r--r--     root/root       usr/man/man1/namei.1.gz
 -rw-r--r--     root/root       usr/man/man1/pg.1.gz
--rw-r--r--     root/root       usr/man/man1/readprofile.1.gz
+-rw-r--r--     root/root       usr/man/man1/prlimit.1.gz
 -rw-r--r--     root/root       usr/man/man1/rename.1.gz
 -rw-r--r--     root/root       usr/man/man1/renice.1.gz
 -rw-r--r--     root/root       usr/man/man1/rev.1.gz
@@ -143,7 +150,9 @@ drwxr-xr-x  root/root       usr/man/man1/
 -rw-r--r--     root/root       usr/man/man1/taskset.1.gz
 -rw-r--r--     root/root       usr/man/man1/ul.1.gz
 -rw-r--r--     root/root       usr/man/man1/unshare.1.gz
+-rw-r--r--     root/root       usr/man/man1/utmpdump.1.gz
 -rw-r--r--     root/root       usr/man/man1/uuidgen.1.gz
+-rw-r--r--     root/root       usr/man/man1/wall.1.gz
 -rw-r--r--     root/root       usr/man/man1/whereis.1.gz
 -rw-r--r--     root/root       usr/man/man1/write.1.gz
 drwxr-xr-x     root/root       usr/man/man3/
@@ -155,6 +164,7 @@ drwxr-xr-x  root/root       usr/man/man3/
 -rw-r--r--     root/root       usr/man/man3/uuid_generate.3.gz
 -rw-r--r--     root/root       usr/man/man3/uuid_generate_random.3.gz
 -rw-r--r--     root/root       usr/man/man3/uuid_generate_time.3.gz
+-rw-r--r--     root/root       usr/man/man3/uuid_generate_time_safe.3.gz
 -rw-r--r--     root/root       usr/man/man3/uuid_is_null.3.gz
 -rw-r--r--     root/root       usr/man/man3/uuid_parse.3.gz
 -rw-r--r--     root/root       usr/man/man3/uuid_time.3.gz
@@ -167,6 +177,7 @@ drwxr-xr-x  root/root       usr/man/man8/
 -rw-r--r--     root/root       usr/man/man8/blkid.8.gz
 -rw-r--r--     root/root       usr/man/man8/blockdev.8.gz
 -rw-r--r--     root/root       usr/man/man8/cfdisk.8.gz
+-rw-r--r--     root/root       usr/man/man8/chcpu.8.gz
 -rw-r--r--     root/root       usr/man/man8/ctrlaltdel.8.gz
 -rw-r--r--     root/root       usr/man/man8/cytune.8.gz
 -rw-r--r--     root/root       usr/man/man8/delpart.8.gz
@@ -184,14 +195,19 @@ drwxr-xr-x        root/root       usr/man/man8/
 -rw-r--r--     root/root       usr/man/man8/linux64.8.gz
 -rw-r--r--     root/root       usr/man/man8/losetup.8.gz
 -rw-r--r--     root/root       usr/man/man8/lsblk.8.gz
+-rw-r--r--     root/root       usr/man/man8/lslocks.8.gz
 -rw-r--r--     root/root       usr/man/man8/mkfs.8.gz
 -rw-r--r--     root/root       usr/man/man8/mkswap.8.gz
 -rw-r--r--     root/root       usr/man/man8/mount.8.gz
+-rw-r--r--     root/root       usr/man/man8/partx.8.gz
 -rw-r--r--     root/root       usr/man/man8/pivot_root.8.gz
 -rw-r--r--     root/root       usr/man/man8/raw.8.gz
+-rw-r--r--     root/root       usr/man/man8/readprofile.8.gz
+-rw-r--r--     root/root       usr/man/man8/resizepart.8.gz
 -rw-r--r--     root/root       usr/man/man8/rtcwake.8.gz
 -rw-r--r--     root/root       usr/man/man8/setarch.8.gz
 -rw-r--r--     root/root       usr/man/man8/sfdisk.8.gz
+-rw-r--r--     root/root       usr/man/man8/sulogin.8.gz
 -rw-r--r--     root/root       usr/man/man8/swaplabel.8.gz
 -rw-r--r--     root/root       usr/man/man8/swapoff.8.gz
 -rw-r--r--     root/root       usr/man/man8/swapon.8.gz
@@ -199,13 +215,16 @@ drwxr-xr-x        root/root       usr/man/man8/
 -rw-r--r--     root/root       usr/man/man8/tunelp.8.gz
 -rw-r--r--     root/root       usr/man/man8/umount.8.gz
 -rw-r--r--     root/root       usr/man/man8/uuidd.8.gz
+-rw-r--r--     root/root       usr/man/man8/wdctl.8.gz
 -rw-r--r--     root/root       usr/man/man8/wipefs.8.gz
 drwxr-xr-x     root/root       usr/sbin/
 -rwxr-xr-x     root/root       usr/sbin/addpart
 -rwxr-xr-x     root/root       usr/sbin/delpart
 -rwxr-xr-x     root/root       usr/sbin/fdformat
 -rwxr-xr-x     root/root       usr/sbin/ldattach
+-rwxr-xr-x     root/root       usr/sbin/partx
 -rwxr-xr-x     root/root       usr/sbin/readprofile
+-rwxr-xr-x     root/root       usr/sbin/resizepart
 -rwxr-xr-x     root/root       usr/sbin/rtcwake
 -rwxr-xr-x     root/root       usr/sbin/tunelp
 -rwxr-xr-x     root/root       usr/sbin/uuidd

diff --git a/util-linux/.md5sum b/util-linux/.md5sum
index d6dee7bae51df217fc025a86028519622eb8bbd3..d9d75b6f5e7e4f92db4ed8477bb2beacf3b585a4 100644 (file)
--- a/util-linux/.md5sum
+++ b/util-linux/.md5sum
@@ -1 +1 @@
-3eab06f05163dfa65479c44e5231932c  util-linux-2.19.1.tar.bz2
+eeacbfdd2556acd899a2d0ffdb446185  util-linux-2.22.2.tar.xz

diff --git a/util-linux/Pkgfile b/util-linux/Pkgfile
index d7de016c57f83eb37970eb033680dad8ba174058..8290280746ddc2fba76dd52f048eeadded86f7fc 100644 (file)
--- a/util-linux/Pkgfile
+++ b/util-linux/Pkgfile
@@ -4,10 +4,10 @@
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on: ncurses zlib
 
-name=util-linux-ng
-version=2.19.1
+name=util-linux
+version=2.22.2
 release=1
-source=(http://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/util-linux-$version.tar.bz2)
+source=(http://ftp.kernel.org/pub/linux/utils/util-linux/v2.22/util-linux-$version.tar.xz)
 
 build() {
   cd util-linux-$version
@@ -15,8 +15,8 @@ build() {
               --host=$CTARGET \
               --prefix=/usr \
               --mandir=/usr/man \
-              --disable-{nls,elvtune,wall,fallocate} \
-              --enable-{write,rdev,raw,kill}
+              --disable-{login,su,su} \
+              --enable-{write,raw,kill}
 
   make
   make DESTDIR=$PKG install
@@ -24,7 +24,7 @@ build() {
   install -d $PKG/{etc,var/{lib/libuuid,run/uuidd}}
   touch $PKG/etc/adjtime
 
-  rm -r $PKG/usr/{share,man/ru}
+  rm -r $PKG/usr/share
   rm $PKG/sbin/{mkfs.bfs,mkfs.minix,fsck.minix}
   rm $PKG/usr/man/man8/{fsck.minix,mkfs.bfs,mkfs.minix}.8
 }