util-linux-32: 2.39.3 -> 2.40

util-linux-32/.footprint

@@ -1,28 +1,21 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 -rw-r--r--	root/root	usr/lib32/libblkid.a
--rwxr-xr-x	root/root	usr/lib32/libblkid.la
-lrwxrwxrwx	root/root	usr/lib32/libblkid.so -> libblkid.so.1.1.0
+lrwxrwxrwx	root/root	usr/lib32/libblkid.so -> libblkid.so.1
 lrwxrwxrwx	root/root	usr/lib32/libblkid.so.1 -> libblkid.so.1.1.0
 -rwxr-xr-x	root/root	usr/lib32/libblkid.so.1.1.0
--rw-r--r--	root/root	usr/lib32/libfdisk.a
--rwxr-xr-x	root/root	usr/lib32/libfdisk.la
-lrwxrwxrwx	root/root	usr/lib32/libfdisk.so -> libfdisk.so.1.1.0
+lrwxrwxrwx	root/root	usr/lib32/libfdisk.so -> libfdisk.so.1
 lrwxrwxrwx	root/root	usr/lib32/libfdisk.so.1 -> libfdisk.so.1.1.0
 -rwxr-xr-x	root/root	usr/lib32/libfdisk.so.1.1.0
--rw-r--r--	root/root	usr/lib32/libmount.a
--rwxr-xr-x	root/root	usr/lib32/libmount.la
-lrwxrwxrwx	root/root	usr/lib32/libmount.so -> libmount.so.1.1.0
+lrwxrwxrwx	root/root	usr/lib32/libmount.so -> libmount.so.1
 lrwxrwxrwx	root/root	usr/lib32/libmount.so.1 -> libmount.so.1.1.0
 -rwxr-xr-x	root/root	usr/lib32/libmount.so.1.1.0
 -rw-r--r--	root/root	usr/lib32/libsmartcols.a
--rwxr-xr-x	root/root	usr/lib32/libsmartcols.la
-lrwxrwxrwx	root/root	usr/lib32/libsmartcols.so -> libsmartcols.so.1.1.0
+lrwxrwxrwx	root/root	usr/lib32/libsmartcols.so -> libsmartcols.so.1
 lrwxrwxrwx	root/root	usr/lib32/libsmartcols.so.1 -> libsmartcols.so.1.1.0
 -rwxr-xr-x	root/root	usr/lib32/libsmartcols.so.1.1.0
 -rw-r--r--	root/root	usr/lib32/libuuid.a
--rwxr-xr-x	root/root	usr/lib32/libuuid.la
-lrwxrwxrwx	root/root	usr/lib32/libuuid.so -> libuuid.so.1.3.0
+lrwxrwxrwx	root/root	usr/lib32/libuuid.so -> libuuid.so.1
 lrwxrwxrwx	root/root	usr/lib32/libuuid.so.1 -> libuuid.so.1.3.0
 -rwxr-xr-x	root/root	usr/lib32/libuuid.so.1.3.0
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/

util-linux-32/.signature

@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXTj2uK0pmD3LFjXSpReepEa3n/wR53twwKBFSrV3tTUpkw4y08NY8fnLcKBUjd5BCq2mCORVwJfvRKebCqjDsAE=
-SHA256 (Pkgfile) = bf8db8b22655db32425b294d2010ec34412bb1a2b7f11b2b3cefa82afab140b9
-SHA256 (.footprint) = 6fcc4cff6c08b68224526805923d6c8c8121146aa27f51afdb1ccb9ccfd80288
-SHA256 (util-linux-2.39.3.tar.xz) = 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
+RWSwxGo/zH7eXbSMZe4M8cCkMYwm8E4GpNyLbRK63URoyZ3acC/C3yEWNT2gZ4rVmewQnw2biogT4oh8empYOhy617uWsXIK5g0=
+SHA256 (Pkgfile) = 143a322efd246c4f7a41734714827bbd3fbb8f0a1a91ff340bc4d3ac969552d5
+SHA256 (.footprint) = b64ef9df9c7010cb060ac425cadbf7c953f8b1c80dd33970f35950559f7562eb
+SHA256 (util-linux-2.40.tar.gz) = f7ff8573289313e38ee3378cbc2938f34444a8cb546e1236e46151834be69784
+SHA256 (syscalls.patch) = 6ae6fbcbf892f50d4ab2e7c63a117750db21e495ab4ae20a447894bef7d5e0ad

util-linux-32/Pkgfile

@@ -1,34 +1,36 @@
 # Description: Miscellaneous system utilities
 # URL: https://github.com/karelzak/util-linux
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: eudev-32 readline-32 zlib-32
+# Depends on: bzip2-32 eudev-32 sqlite3-32 xz-32 zlib-32
 
 name=util-linux-32
-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/v$version/util-linux-$version.tar.gz
+	syscalls.patch)
 
 build() {
-	cd ${name%-*}-$version
+	patch -Np1 -d util-linux-$version -i $SRC/syscalls.patch
 
-	./configure \
+	meson setup util-linux-$version build \
 		--prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/sbin \
 		--libdir=/usr/lib32 \
-		--disable-nls \
-		--disable-asciidoc \
-		--disable-{login,su,sulogin,nologin,runuser,raw} \
-		--disable-chfn-chsh \
-		--enable-{write,kill} \
-		--without-python
+		--libexecdir=/usr/lib32 \
+		--buildtype=plain \
+		--wrap-mode=nodownload \
+		--auto-features disabled \
+		-D b_lto=false \
+		-D b_pie=true \
+		-D build-libblkid=enabled \
+		-D build-libuuid=enabled \
+		-D build-libmount=enabled \
+		-D build-libsmartcols=enabled \
+		-D build-libfdisk=enabled \
+		-D nls=disabled
+	meson compile -C build -j ${JOBS:-1}
+	DESTDIR=$PKG meson install -C build
 
-	make
-	make DESTDIR=$PKG install
-
-	rm -r \
-		$PKG/{bin,sbin} \
-		$PKG/usr/{bin,sbin,include} \
-		$PKG//usr/share/{bash-completion,doc}
-
-	rm -rf $PKG/usr/share/man
-	rmdir $PKG/usr/share
+	rm -rf $PKG/{sbin,usr/{bin,include,share}}
 }

util-linux-32/syscalls.patch

@@ -0,0 +1,11 @@
+--- a/meson.build
++++ b/meson.build
+@@ -3026,7 +3026,7 @@ endif
+ syscalls_h = custom_target('syscalls.h',
+   input : 'tools/all_syscalls',
+   output : 'syscalls.h',
+-  command : ['tools/all_syscalls', cc.cmd_array()] 
++  command : ['tools/all_syscalls', cc.cmd_array(), get_option('c_args')],
+ )
+ 
+ if cc.compiles(fs.read('include/audit-arch.h'), name : 'has AUDIT_ARCH_NATIVE')