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

2024-03-28 18:19:05 +01:00 · 2024-03-28 18:19:05 +01:00 · 4d74a147b9
commit 4d74a147b9
parent d292f0473f f7591a7da6
14 changed files with 104 additions and 197 deletions
--- a/curl/.footprint
+++ b/curl/.footprint
@ -31,7 +31,6 @@ drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/curl-config.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/curl.1.gz
-rw-r--r--	root/root	usr/share/man/man1/mk-ca-bundle.1.gz
 drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/CURLINFO_ACTIVESOCKET.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/CURLINFO_APPCONNECT_TIME.3.gz
@ -104,6 +103,7 @@ drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/CURLINFO_TLS_SSL_PTR.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/CURLINFO_TOTAL_TIME.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/CURLINFO_TOTAL_TIME_T.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/CURLINFO_USED_PROXY.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/CURLINFO_XFER_ID.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3.gz
--- a/curl/.signature
+++ b/curl/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqtNJVOYqAX0EF507iw/wLoI2s4Bo11li06bsxFc+ZSA/4hqBOg+Wfue/pdGA/bm6LgCRGYyS7X9ATuGKxdiM7w4=
-SHA256 (Pkgfile) = 0d9be75a33942a0398fd9f6f56f9c62e9f2698ec4d824e815601cc982e77b4db
-SHA256 (.footprint) = b93ccc07e39082f05d6a6485e1432f9b322edc85dc9d8861968bd505382e8b67
-SHA256 (curl-8.6.0.tar.xz) = 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15
+RWRJc1FUaeVeqnsrglDX/egknUJt3P5wbndJW7ucdacLDV/uXO4oYrcZaTCbpdUEIDM0Naaq7Dirtgvrx5sziujZVW8NEz0k1ws=
+SHA256 (Pkgfile) = e47fab096f245274d66f964ff3f9b2674ce6085fb5f3ecdd21e12333533152f0
+SHA256 (.footprint) = 7bf6f69189269aaf5998978a93f736148b69edc3d69130d742141e18069c187a
+SHA256 (curl-8.7.1.tar.xz) = 6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd
--- a/curl/Pkgfile
+++ b/curl/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: libnghttp2 openssl zstd

 name=curl
-version=8.6.0
+version=8.7.1
 release=1
 source=(https://curl.haxx.se/download/$name-$version.tar.xz)

--- a/pkgconf/.footprint
+++ b/pkgconf/.footprint
@ -13,9 +13,9 @@ drwxr-xr-x	root/root	usr/include/pkgconf/libpkgconf/
 -rw-r--r--	root/root	usr/include/pkgconf/libpkgconf/libpkgconf.h
 -rw-r--r--	root/root	usr/include/pkgconf/libpkgconf/stdinc.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libpkgconf.so -> libpkgconf.so.4
-lrwxrwxrwx	root/root	usr/lib/libpkgconf.so.4 -> libpkgconf.so.4.0.0
-rwxr-xr-x	root/root	usr/lib/libpkgconf.so.4.0.0
+lrwxrwxrwx	root/root	usr/lib/libpkgconf.so -> libpkgconf.so.5
+lrwxrwxrwx	root/root	usr/lib/libpkgconf.so.5 -> libpkgconf.so.5.0.0
+-rwxr-xr-x	root/root	usr/lib/libpkgconf.so.5.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpkgconf.pc
 drwxr-xr-x	root/root	usr/share/
--- a/pkgconf/.signature
+++ b/pkgconf/.signature
@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqjUj3etidF5qrD2X4BALyrsqOxjS+xDyawqZWMgPuC+ZrpzK6LlySBDKdYr7NbutzIu+kc02e+sfGrKfdry4bgo=
-SHA256 (Pkgfile) = d65cfa938cc16b52d2df3936199ad2d4086457ae44df223ce7d2d80d70269d0b
-SHA256 (.footprint) = f3bc795dc574418696dc219d19d75f55bcaa137837d18ddb6db00c233707006d
-SHA256 (pkgconf-2.1.1.tar.xz) = 3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5
+RWRJc1FUaeVeqiKqwLRP8spC6eVMETMpG23TB2mjyVZaL4qqQmG6KI8XWoJyjtyqaAINIwUbTe9Wib6dE5gXsow1dXjJ1OY/AgI=
+SHA256 (Pkgfile) = 586bddbaefb271fef1216ce02bbfda3f0cb1aed3d4cfcaebe4c2a96ab40498ab
+SHA256 (.footprint) = d86192b4391572ed34a89cad984a7800d8b039214c9c947adffd37c5930050ec
+SHA256 (pkgconf-2.2.0.tar.xz) = b06ff63a83536aa8c2f6422fa80ad45e4833f590266feb14eaddfe1d4c853c69
 SHA256 (i686-pc-linux-gnu.personality) = 6697c6db7deaae269ea75624a70e80949241f2cf59a537f31ecfcac726d90bc1
 SHA256 (x86_64-pc-linux-gnu.personality) = c8297817ba0b57d003878db247ff34b4c47a7594c9f67dcfe8ff8d6567956cd5
--- a/pkgconf/Pkgfile
+++ b/pkgconf/Pkgfile
@ -3,7 +3,7 @@
 # Maintainer: CRUX System Team, core-ports at crux dot nu

 name=pkgconf
-version=2.1.1
+version=2.2.0
 release=1
 source=(https://distfiles.ariadne.space/pkgconf/pkgconf-$version.tar.xz
    i686-pc-linux-gnu.personality x86_64-pc-linux-gnu.personality)
--- a/sysvinit/.signature
+++ b/sysvinit/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqlSTdLm+H5kWCrUy5cX1O6F5pwE331OMTXMHhUwx2JHSIVXN+o5xb7ueuhsWa7ymu4F7U6X0LM9JDclSl4dcZwo=
-SHA256 (Pkgfile) = 58544f6b74859451aa2709cd5f483138208d90aebc342cddd1c5a1d331995a26
+RWRJc1FUaeVeqoxBqsolb6cCyUe6UhuQUOheiiMNu3D/hOUoTlNWcv32uSPlqhD9ngzMhFUmTS6Mp2Tj9qds3TU2pAYZTqP+YgI=
+SHA256 (Pkgfile) = 308cdd9a56988f2b8dacdbf120b00a3f6f82fcf2d90a6e9129fb8bfee3efe312
 SHA256 (.footprint) = 051ae17d05a81c4e51e98abb1a3950f865504b070eb3369b3e64db88fe05dc26
-SHA256 (sysvinit-3.08.tar.xz) = 60ae974f146ff2b0cb072d3ffb6cdd81ba00a2fca55e989c76505bb9bca9fc6c
+SHA256 (sysvinit-3.09.tar.xz) = 231652662e04e38af126978dde5417dbeb03c256337756625cb236717b50cd50
--- a/sysvinit/Pkgfile
+++ b/sysvinit/Pkgfile
@ -4,15 +4,13 @@
 # Depends on: libxcrypt

 name=sysvinit
-version=3.08
-release=2
+version=3.09
+release=1
 source=(https://github.com/slicer69/sysvinit/releases/download/$version/$name-$version.tar.xz)

 build() {
    cd $name-$version

-    find man -type d -name '??' -exec rm -r {} +
-
    make
    make ROOT=$PKG install

--- a/util-linux/.footprint
+++ b/util-linux/.footprint
@ -10,19 +10,21 @@ drwxr-xr-x	root/root	bin/
 -rwxr-xr-x	root/root	bin/pipesz
 -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/
 lrwxrwxrwx	root/root	lib/libblkid.so.1 -> libblkid.so.1.1.0
 -rwxr-xr-x	root/root	lib/libblkid.so.1.1.0
 lrwxrwxrwx	root/root	lib/libfdisk.so.1 -> libfdisk.so.1.1.0
 -rwxr-xr-x	root/root	lib/libfdisk.so.1.1.0
+lrwxrwxrwx	root/root	lib/liblastlog2.so.2 -> liblastlog2.so.2.0.0
+-rwxr-xr-x	root/root	lib/liblastlog2.so.2.0.0
 lrwxrwxrwx	root/root	lib/libmount.so.1 -> libmount.so.1.1.0
 -rwxr-xr-x	root/root	lib/libmount.so.1.1.0
 lrwxrwxrwx	root/root	lib/libsmartcols.so.1 -> libsmartcols.so.1.1.0
 -rwxr-xr-x	root/root	lib/libsmartcols.so.1.1.0
 lrwxrwxrwx	root/root	lib/libuuid.so.1 -> libuuid.so.1.3.0
 -rwxr-xr-x	root/root	lib/libuuid.so.1.3.0
+drwxr-xr-x	root/root	lib/security/
+-rwxr-xr-x	root/root	lib/security/pam_lastlog2.so
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/agetty
 -rwxr-xr-x	root/root	sbin/blkdiscard
@ -50,6 +52,7 @@ drwxr-xr-x	root/root	sbin/
 -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/tunelp
 -rwxr-xr-x	root/root	sbin/wipefs
 -rwxr-xr-x	root/root	sbin/zramctl
 drwxr-xr-x	root/root	usr/
@ -63,6 +66,8 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/colrm
 -rwxr-xr-x	root/root	usr/bin/column
 -rwxr-xr-x	root/root	usr/bin/eject
+-rwxr-xr-x	root/root	usr/bin/enosys
+-rwxr-xr-x	root/root	usr/bin/exch
 -rwxr-xr-x	root/root	usr/bin/fadvise
 -rwxr-xr-x	root/root	usr/bin/fallocate
 -rwxr-xr-x	root/root	usr/bin/fincore
@ -79,10 +84,13 @@ lrwxrwxrwx	root/root	usr/bin/i386 -> setarch
 -rwxr-xr-x	root/root	usr/bin/isosize
 -rwxr-xr-x	root/root	usr/bin/last
 lrwxrwxrwx	root/root	usr/bin/lastb -> last
+-rwxr-xr-x	root/root	usr/bin/lastlog2
+-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/lsclocks
 -rwxr-xr-x	root/root	usr/bin/lscpu
 -rwxr-xr-x	root/root	usr/bin/lsipc
 -rwxr-xr-x	root/root	usr/bin/lsirq
@ -94,6 +102,7 @@ lrwxrwxrwx	root/root	usr/bin/linux64 -> setarch
 -rwxr-xr-x	root/root	usr/bin/mesg
 -rwxr-xr-x	root/root	usr/bin/namei
 -rwxr-xr-x	root/root	usr/bin/nsenter
+-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
@ -102,6 +111,7 @@ lrwxrwxrwx	root/root	usr/bin/linux64 -> setarch
 -rwxr-xr-x	root/root	usr/bin/scriptlive
 -rwxr-xr-x	root/root	usr/bin/scriptreplay
 -rwxr-xr-x	root/root	usr/bin/setarch
+-rwxr-xr-x	root/root	usr/bin/setpgid
 -rwxr-xr-x	root/root	usr/bin/setsid
 -rwxr-xr-x	root/root	usr/bin/setterm
 -rwxr-xr-x	root/root	usr/bin/taskset
@ -122,6 +132,8 @@ drwxr-xr-x	root/root	usr/include/blkid/
 -rw-r--r--	root/root	usr/include/blkid/blkid.h
 drwxr-xr-x	root/root	usr/include/libfdisk/
 -rw-r--r--	root/root	usr/include/libfdisk/libfdisk.h
+drwxr-xr-x	root/root	usr/include/liblastlog2/
+-rw-r--r--	root/root	usr/include/liblastlog2/lastlog2.h
 drwxr-xr-x	root/root	usr/include/libmount/
 -rw-r--r--	root/root	usr/include/libmount/libmount.h
 drwxr-xr-x	root/root	usr/include/libsmartcols/
@ -130,26 +142,29 @@ drwxr-xr-x	root/root	usr/include/uuid/
 -rw-r--r--	root/root	usr/include/uuid/uuid.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libblkid.a
-rwxr-xr-x	root/root	usr/lib/libblkid.la
-lrwxrwxrwx	root/root	usr/lib/libblkid.so -> ../../lib/libblkid.so.1.1.0
-rw-r--r--	root/root	usr/lib/libfdisk.a
-rwxr-xr-x	root/root	usr/lib/libfdisk.la
-lrwxrwxrwx	root/root	usr/lib/libfdisk.so -> ../../lib/libfdisk.so.1.1.0
-rw-r--r--	root/root	usr/lib/libmount.a
-rwxr-xr-x	root/root	usr/lib/libmount.la
-lrwxrwxrwx	root/root	usr/lib/libmount.so -> ../../lib/libmount.so.1.1.0
+lrwxrwxrwx	root/root	usr/lib/libblkid.so -> ../../lib/libblkid.so.1
+lrwxrwxrwx	root/root	usr/lib/libfdisk.so -> ../../lib/libfdisk.so.1
+-rw-r--r--	root/root	usr/lib/liblastlog2.a
+lrwxrwxrwx	root/root	usr/lib/liblastlog2.so -> ../../lib/liblastlog2.so.2
+lrwxrwxrwx	root/root	usr/lib/libmount.so -> ../../lib/libmount.so.1
 -rw-r--r--	root/root	usr/lib/libsmartcols.a
-rwxr-xr-x	root/root	usr/lib/libsmartcols.la
-lrwxrwxrwx	root/root	usr/lib/libsmartcols.so -> ../../lib/libsmartcols.so.1.1.0
+lrwxrwxrwx	root/root	usr/lib/libsmartcols.so -> ../../lib/libsmartcols.so.1
 -rw-r--r--	root/root	usr/lib/libuuid.a
-rwxr-xr-x	root/root	usr/lib/libuuid.la
-lrwxrwxrwx	root/root	usr/lib/libuuid.so -> ../../lib/libuuid.so.1.3.0
+lrwxrwxrwx	root/root	usr/lib/libuuid.so -> ../../lib/libuuid.so.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/blkid.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/fdisk.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/lastlog2.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/mount.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/smartcols.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/uuid.pc
+drwxr-xr-x	root/root	usr/lib/python3.12/
+drwxr-xr-x	root/root	usr/lib/python3.12/site-packages/
+drwxr-xr-x	root/root	usr/lib/python3.12/site-packages/libmount/
+-rw-r--r--	root/root	usr/lib/python3.12/site-packages/libmount/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.12/site-packages/libmount/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.12/site-packages/libmount/__pycache__/__init__.cpython-312.pyc
+-rwxr-xr-x	root/root	usr/lib/python3.12/site-packages/libmount/pylibmount.cpython-312-x86_64-linux-gnu.so
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/addpart
 -rwxr-xr-x	root/root	usr/sbin/delpart
@ -161,133 +176,3 @@ drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/rtcwake
 -rwxr-xr-x	root/root	usr/sbin/uuidd
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
-rw-r--r--	root/root	usr/share/man/man1/cal.1.gz
-rw-r--r--	root/root	usr/share/man/man1/choom.1.gz
-rw-r--r--	root/root	usr/share/man/man1/chrt.1.gz
-rw-r--r--	root/root	usr/share/man/man1/col.1.gz
-rw-r--r--	root/root	usr/share/man/man1/colcrt.1.gz
-rw-r--r--	root/root	usr/share/man/man1/colrm.1.gz
-rw-r--r--	root/root	usr/share/man/man1/column.1.gz
-rw-r--r--	root/root	usr/share/man/man1/dmesg.1.gz
-rw-r--r--	root/root	usr/share/man/man1/eject.1.gz
-rw-r--r--	root/root	usr/share/man/man1/fadvise.1.gz
-rw-r--r--	root/root	usr/share/man/man1/fallocate.1.gz
-rw-r--r--	root/root	usr/share/man/man1/fincore.1.gz
-rw-r--r--	root/root	usr/share/man/man1/flock.1.gz
-rw-r--r--	root/root	usr/share/man/man1/getopt.1.gz
-rw-r--r--	root/root	usr/share/man/man1/hardlink.1.gz
-rw-r--r--	root/root	usr/share/man/man1/hexdump.1.gz
-rw-r--r--	root/root	usr/share/man/man1/ionice.1.gz
-rw-r--r--	root/root	usr/share/man/man1/ipcmk.1.gz
-rw-r--r--	root/root	usr/share/man/man1/ipcrm.1.gz
-rw-r--r--	root/root	usr/share/man/man1/ipcs.1.gz
-rw-r--r--	root/root	usr/share/man/man1/irqtop.1.gz
-rw-r--r--	root/root	usr/share/man/man1/kill.1.gz
-rw-r--r--	root/root	usr/share/man/man1/last.1.gz
-rw-r--r--	root/root	usr/share/man/man1/lastb.1.gz
-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
-rw-r--r--	root/root	usr/share/man/man1/lsmem.1.gz
-rw-r--r--	root/root	usr/share/man/man1/mcookie.1.gz
-rw-r--r--	root/root	usr/share/man/man1/mesg.1.gz
-rw-r--r--	root/root	usr/share/man/man1/more.1.gz
-rw-r--r--	root/root	usr/share/man/man1/mountpoint.1.gz
-rw-r--r--	root/root	usr/share/man/man1/namei.1.gz
-rw-r--r--	root/root	usr/share/man/man1/nsenter.1.gz
-rw-r--r--	root/root	usr/share/man/man1/pipesz.1.gz
-rw-r--r--	root/root	usr/share/man/man1/prlimit.1.gz
-rw-r--r--	root/root	usr/share/man/man1/rename.1.gz
-rw-r--r--	root/root	usr/share/man/man1/renice.1.gz
-rw-r--r--	root/root	usr/share/man/man1/rev.1.gz
-rw-r--r--	root/root	usr/share/man/man1/script.1.gz
-rw-r--r--	root/root	usr/share/man/man1/scriptlive.1.gz
-rw-r--r--	root/root	usr/share/man/man1/scriptreplay.1.gz
-rw-r--r--	root/root	usr/share/man/man1/setsid.1.gz
-rw-r--r--	root/root	usr/share/man/man1/setterm.1.gz
-rw-r--r--	root/root	usr/share/man/man1/taskset.1.gz
-rw-r--r--	root/root	usr/share/man/man1/uclampset.1.gz
-rw-r--r--	root/root	usr/share/man/man1/ul.1.gz
-rw-r--r--	root/root	usr/share/man/man1/unshare.1.gz
-rw-r--r--	root/root	usr/share/man/man1/utmpdump.1.gz
-rw-r--r--	root/root	usr/share/man/man1/uuidgen.1.gz
-rw-r--r--	root/root	usr/share/man/man1/uuidparse.1.gz
-rw-r--r--	root/root	usr/share/man/man1/waitpid.1.gz
-rw-r--r--	root/root	usr/share/man/man1/wall.1.gz
-rw-r--r--	root/root	usr/share/man/man1/whereis.1.gz
-rw-r--r--	root/root	usr/share/man/man1/write.1.gz
-drwxr-xr-x	root/root	usr/share/man/man3/
-rw-r--r--	root/root	usr/share/man/man3/libblkid.3.gz
-rw-r--r--	root/root	usr/share/man/man3/uuid.3.gz
-rw-r--r--	root/root	usr/share/man/man3/uuid_clear.3.gz
-rw-r--r--	root/root	usr/share/man/man3/uuid_compare.3.gz
-rw-r--r--	root/root	usr/share/man/man3/uuid_copy.3.gz
-rw-r--r--	root/root	usr/share/man/man3/uuid_generate.3.gz
-rw-r--r--	root/root	usr/share/man/man3/uuid_generate_random.3.gz
-rw-r--r--	root/root	usr/share/man/man3/uuid_generate_time.3.gz
-rw-r--r--	root/root	usr/share/man/man3/uuid_generate_time_safe.3.gz
-rw-r--r--	root/root	usr/share/man/man3/uuid_is_null.3.gz
-rw-r--r--	root/root	usr/share/man/man3/uuid_parse.3.gz
-rw-r--r--	root/root	usr/share/man/man3/uuid_time.3.gz
-rw-r--r--	root/root	usr/share/man/man3/uuid_unparse.3.gz
-drwxr-xr-x	root/root	usr/share/man/man5/
-rw-r--r--	root/root	usr/share/man/man5/adjtime_config.5.gz
-rw-r--r--	root/root	usr/share/man/man5/fstab.5.gz
-rw-r--r--	root/root	usr/share/man/man5/terminal-colors.d.5.gz
-drwxr-xr-x	root/root	usr/share/man/man8/
-rw-r--r--	root/root	usr/share/man/man8/addpart.8.gz
-rw-r--r--	root/root	usr/share/man/man8/agetty.8.gz
-rw-r--r--	root/root	usr/share/man/man8/blkdiscard.8.gz
-rw-r--r--	root/root	usr/share/man/man8/blkid.8.gz
-rw-r--r--	root/root	usr/share/man/man8/blkpr.8.gz
-rw-r--r--	root/root	usr/share/man/man8/blkzone.8.gz
-rw-r--r--	root/root	usr/share/man/man8/blockdev.8.gz
-rw-r--r--	root/root	usr/share/man/man8/cfdisk.8.gz
-rw-r--r--	root/root	usr/share/man/man8/chcpu.8.gz
-rw-r--r--	root/root	usr/share/man/man8/chmem.8.gz
-rw-r--r--	root/root	usr/share/man/man8/ctrlaltdel.8.gz
-rw-r--r--	root/root	usr/share/man/man8/delpart.8.gz
-rw-r--r--	root/root	usr/share/man/man8/fdisk.8.gz
-rw-r--r--	root/root	usr/share/man/man8/findfs.8.gz
-rw-r--r--	root/root	usr/share/man/man8/findmnt.8.gz
-rw-r--r--	root/root	usr/share/man/man8/fsck.8.gz
-rw-r--r--	root/root	usr/share/man/man8/fsck.cramfs.8.gz
-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/isosize.8.gz
-rw-r--r--	root/root	usr/share/man/man8/ldattach.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
-rw-r--r--	root/root	usr/share/man/man8/lsns.8.gz
-rw-r--r--	root/root	usr/share/man/man8/mkfs.8.gz
-rw-r--r--	root/root	usr/share/man/man8/mkfs.cramfs.8.gz
-rw-r--r--	root/root	usr/share/man/man8/mkswap.8.gz
-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/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
-rw-r--r--	root/root	usr/share/man/man8/rtcwake.8.gz
-rw-r--r--	root/root	usr/share/man/man8/setarch.8.gz
-rw-r--r--	root/root	usr/share/man/man8/sfdisk.8.gz
-rw-r--r--	root/root	usr/share/man/man8/swaplabel.8.gz
-rw-r--r--	root/root	usr/share/man/man8/swapoff.8.gz
-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/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/zramctl.8.gz
-drwxr-xr-x	root/root	var/
-drwxr-xr-x	root/root	var/lib/
-drwxr-xr-x	root/root	var/lib/libuuid/
--- a/util-linux/.signature
+++ b/util-linux/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqhmPn5GagUUfPXgy+sPvwBCR8kU+oXvUo3eue4lAhWBAz+zpuyyf1/YPzkB5O6Q5UP8IcBDwvNruip+L+EUPKAg=
-SHA256 (Pkgfile) = ec309dabb37b21d9b54e45f492f743249bcb45846dcc7793906d53ce88de5267
-SHA256 (.footprint) = e553d85df6281553a197cbda3788a811b29d70267c551f26937f2c792105471a
-SHA256 (util-linux-2.39.3.tar.xz) = 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
+RWRJc1FUaeVeqg84IH/3idxtC9OZeiA/cA+CqJVe5X9P5lNsmlslnmwjJNCSSl0YHd12Bes3GUCa/Ye9YCzhhYMd7h4Ff0daRgg=
+SHA256 (Pkgfile) = 4bdd1226eb6d9c616a8acf2b082f0d7eab5664678c21ec4314962858d20d8cb3
+SHA256 (.footprint) = ca5bd40cca4da643caee794661a1f4a0f03a03dd62b55c5ea9273bc33a059fc9
+SHA256 (util-linux-2.40.tar.gz) = f7ff8573289313e38ee3378cbc2938f34444a8cb546e1236e46151834be69784
--- a/util-linux/Pkgfile
+++ b/util-linux/Pkgfile
@ -1,33 +1,57 @@
 # Description: Miscellaneous system utilities
 # URL: https://github.com/karelzak/util-linux
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Depends on: bzip2 eudev file readline xz
+# Depends on: bzip2 eudev file linux-pam readline sqlite3 xz

 name=util-linux
-version=2.39.3
+version=2.40
 release=1
-source=(https://www.kernel.org/pub/linux/utils/$name/v${version:0:4}/$name-$version.tar.xz)
+source=(https://github.com/util-linux/util-linux/archive/refs/tags/v$version/$name-$version.tar.gz)

 build() {
-    cd $name-$version
-
-    ./configure \
+    meson setup $name-$version build \
        --prefix=/usr \
-        --enable-{write,kill} \
-        --disable-nls \
-        --disable-asciidoc \
-        --disable-{login,su,sulogin,nologin,runuser,raw} \
-        --disable-chfn-chsh \
-        --without-python
+        --bindir=/usr/bin \
+        --sbindir=/sbin \
+        --libdir=/lib \
+        --buildtype=plain \
+        --wrap-mode=nodownload \
+        -D b_lto=true \
+        -D b_pie=true \
+        -D nls=disabled \
+        -D pamlibdir=/lib/security \
+        -D cryptsetup=disabled \
+        -D build-chfn-chsh=disabled \
+        -D build-login=disabled \
+        -D build-su=disabled \
+        -D build-sulogin=disabled \
+        -D build-nologin=disabled \
+        -D build-runuser=disabled \
+        -D build-vipw=disabled \
+        -D build-raw=disabled \
+        -D build-newgrp=disabled \
+        -D build-bfs=disabled \
+        -D build-minix=disabled

-    make
-    make DESTDIR=$PKG install

-    install -d $PKG/{etc,var/lib/libuuid}
-    touch $PKG/etc/adjtime
+    meson compile -C build -j ${JOBS:-1}
+    DESTDIR=$PKG meson install -C build

-    prt-get isinst bash-completion || rm -r $PKG/usr/share/bash-completion
-    rm -r $PKG/usr/share/doc
-    rm $PKG/sbin/{mkfs.bfs,mkfs.minix,fsck.minix}
-    rm $PKG/usr/share/man/man8/{fsck.minix,mkfs.bfs,mkfs.minix}.8
+    rm -r $PKG/usr/share/{doc,locale}
+
+    install -d $PKG/{bin,usr/sbin,usr/lib}
+
+    mv $PKG/usr/bin/{dmesg,findmnt,kill,lsblk,lsfd,more} $PKG/bin
+    mv $PKG/usr/bin/{mount,mountpoint,pipesz,umount,wdctl} $PKG/bin
+    mv $PKG/sbin/{addpart,delpart,ldattach,partx,readprofile} $PKG/usr/sbin
+    mv $PKG/sbin/{resizepart,rfkill,rtcwake,uuidd} $PKG/usr/sbin
+
+    mv $PKG/lib/pkgconfig $PKG/usr/lib
+
+    mv $PKG/lib/*.a $PKG/usr/lib
+    cd $PKG/lib
+    local LIB
+    for LIB in lib*.so; do
+        ln -s ../../lib/$(readlink $LIB) $PKG/usr/lib/$LIB && rm $LIB
+    done
 }
--- a/zstd/.footprint
+++ b/zstd/.footprint
@ -13,9 +13,9 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/zstd_errors.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libzstd.a
-lrwxrwxrwx	root/root	usr/lib/libzstd.so -> libzstd.so.1.5.5
-lrwxrwxrwx	root/root	usr/lib/libzstd.so.1 -> libzstd.so.1.5.5
-rwxr-xr-x	root/root	usr/lib/libzstd.so.1.5.5
+lrwxrwxrwx	root/root	usr/lib/libzstd.so -> libzstd.so.1.5.6
+lrwxrwxrwx	root/root	usr/lib/libzstd.so.1 -> libzstd.so.1.5.6
+-rwxr-xr-x	root/root	usr/lib/libzstd.so.1.5.6
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libzstd.pc
 drwxr-xr-x	root/root	usr/share/
--- a/zstd/.signature
+++ b/zstd/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqo/b/dEX97BTkT6rVl2mtUFsnt2Kc4t3wHoqtPPq9KZcC6D9NBG9BuIzyJ9spKe6W3huhDOuY0vo2PpUKALk7wc=
-SHA256 (Pkgfile) = f8270ec55a2663a7f48fca01e93b9cd096213cae14bd8a489488f40729896dfb
-SHA256 (.footprint) = 4c787f956cffb3ae6dbbef6355e6cf2ad0d848a5020a8b93020221ad5f1f652e
-SHA256 (zstd-v1.5.5.tar.gz) = 98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1
+RWRJc1FUaeVeqmltso8//oljCVdDIRM5LZlw57WMYY3mj+5RSwoeoGOPlbZ4l8dcudom2dpR5JZvsQN6nLHXp4xp027ivAWoxwM=
+SHA256 (Pkgfile) = 21cf122598ffc6747d1a54bf7f4d8ea5edd1ab52ccd5fd37297a8849710d7fde
+SHA256 (.footprint) = 1785b74900409d421c245457216d1e59e88b74a14d2b4431c4a8701c15fdf98c
+SHA256 (zstd-v1.5.6.tar.gz) = 30f35f71c1203369dc979ecde0400ffea93c27391bfd2ac5a9715d2173d92ff7
--- a/zstd/Pkgfile
+++ b/zstd/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: xz zlib

 name=zstd
-version=1.5.5
+version=1.5.6
 release=1
 source=(https://github.com/facebook/zstd/archive/v$version/$name-v$version.tar.gz)