From 1bb5e87f3fac3b64f94c4af4c36b40dae4d86a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 23 Jul 2021 18:43:11 +0700
Subject: [PATCH] util-linux-common: update to 2.37.1.

Rename the ${sourcepkg} to util-linux-common to avoid the trickiness
of do_configure. When util-linux-libs was invented, I was puzzled
about picking something to be the ${sourcepkg} but none of them
can satisfy the requirements.

Turn out, some of util-linux's libraries use those translated messages.

Let's invent a new package: util-linux-common, and make it the sourcepkg
for those libraries.

This package will contain all the translated message for util-linux.
---
 srcpkgs/libblkid                              |  2 +-
 srcpkgs/libblkid-devel                        |  2 +-
 srcpkgs/libfdisk                              |  2 +-
 srcpkgs/libfdisk-devel                        |  2 +-
 srcpkgs/libmount                              |  2 +-
 srcpkgs/libmount-devel                        |  2 +-
 srcpkgs/libsmartcols                          |  2 +-
 srcpkgs/libsmartcols-devel                    |  2 +-
 srcpkgs/libuuid                               |  2 +-
 srcpkgs/libuuid-devel                         |  2 +-
 .../template                                  | 96 +++++++++----------
 .../update                                    |  0
 srcpkgs/util-linux-libs                       |  1 +
 srcpkgs/util-linux-libs/patches               |  1 -
 14 files changed, 54 insertions(+), 64 deletions(-)
 rename srcpkgs/{util-linux-libs => util-linux-common}/template (58%)
 rename srcpkgs/{util-linux-libs => util-linux-common}/update (100%)
 create mode 120000 srcpkgs/util-linux-libs
 delete mode 120000 srcpkgs/util-linux-libs/patches

diff --git a/srcpkgs/libblkid b/srcpkgs/libblkid
index d3d5b40f1ef..9b555374738 120000
--- a/srcpkgs/libblkid
+++ b/srcpkgs/libblkid
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libblkid-devel b/srcpkgs/libblkid-devel
index d3d5b40f1ef..9b555374738 120000
--- a/srcpkgs/libblkid-devel
+++ b/srcpkgs/libblkid-devel
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libfdisk b/srcpkgs/libfdisk
index d3d5b40f1ef..9b555374738 120000
--- a/srcpkgs/libfdisk
+++ b/srcpkgs/libfdisk
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libfdisk-devel b/srcpkgs/libfdisk-devel
index d3d5b40f1ef..9b555374738 120000
--- a/srcpkgs/libfdisk-devel
+++ b/srcpkgs/libfdisk-devel
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libmount b/srcpkgs/libmount
index d3d5b40f1ef..9b555374738 120000
--- a/srcpkgs/libmount
+++ b/srcpkgs/libmount
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libmount-devel b/srcpkgs/libmount-devel
index d3d5b40f1ef..9b555374738 120000
--- a/srcpkgs/libmount-devel
+++ b/srcpkgs/libmount-devel
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libsmartcols b/srcpkgs/libsmartcols
index d3d5b40f1ef..9b555374738 120000
--- a/srcpkgs/libsmartcols
+++ b/srcpkgs/libsmartcols
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libsmartcols-devel b/srcpkgs/libsmartcols-devel
index d3d5b40f1ef..9b555374738 120000
--- a/srcpkgs/libsmartcols-devel
+++ b/srcpkgs/libsmartcols-devel
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libuuid b/srcpkgs/libuuid
index d3d5b40f1ef..9b555374738 120000
--- a/srcpkgs/libuuid
+++ b/srcpkgs/libuuid
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/libuuid-devel b/srcpkgs/libuuid-devel
index d3d5b40f1ef..9b555374738 120000
--- a/srcpkgs/libuuid-devel
+++ b/srcpkgs/libuuid-devel
@@ -1 +1 @@
-util-linux-libs
\ No newline at end of file
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/util-linux-libs/template b/srcpkgs/util-linux-common/template
similarity index 58%
rename from srcpkgs/util-linux-libs/template
rename to srcpkgs/util-linux-common/template
index ad8c4512a35..4edf7bb7556 100644
--- a/srcpkgs/util-linux-libs/template
+++ b/srcpkgs/util-linux-common/template
@@ -1,59 +1,31 @@
-# Template file for 'util-linux-libs'
+# Template file for 'util-linux-common'
 # Keep this package sync with util-linux
-pkgname=util-linux-libs
-version=2.36.2
+pkgname=util-linux-common
+version=2.37.1
 revision=1
 wrksrc="util-linux-$version"
-build_style=meta
-hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
+build_style=gnu-configure
+configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
+ --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
+ --enable-vipw --enable-newgrp --enable-chfn-chsh --with-systemdsystemunitdir=no
+ --without-udev --without-python --enable-write"
+hostmakedepends="gettext pkg-config"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
-depends="libfdisk-${version}_${revision} libblkid-${version}_${revision}
- libmount-${version}_${revision} libsmartcols-${version}_${revision}
- libuuid-${version}_${revision}"
-short_desc="Miscellaneous linux utilities - meta libraries"
+checkdepends="xz tar iproute2 socat procps-ng bc"
+short_desc="Miscellaneous linux utilities - common files"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
-checksum=f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f
+checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
 
-pre_configure() {
-	local _cfgdir="$XBPS_COMMONDIR/environment/configure"
-	NOCONFIGURE=1 ./autogen.sh
-	for f in ./**/*config*.sub; do
-		if [ -f "$f" ]; then
-			cp -f "$_cfgdir/automake/config.sub" "$f"
-		fi
-	done
-	for f in ./**/*config*.guess; do
-		if [ -f "$f" ]; then
-			cp -f "$_cfgdir/automake/config.guess" "$f"
-		fi
-	done
-	# We want to keep basepkg as meta but we also needs below helper
-	unset build_style
-	. "$_cfgdir/gnu-configure-args.sh"
-}
-
-do_configure() {
-	./configure ${configure_args} \
-		--exec-prefix=/usr --libdir=/usr/lib \
-		--bindir=/usr/bin --sbindir=/usr/bin \
-		--enable-libuuid --disable-makeinstall-chown \
-		--enable-libblkid --enable-fsck --disable-rpath \
-		--enable-fs-paths-extra=/usr/sbin:/usr/bin \
-		--enable-vipw --enable-newgrp --enable-chfn-chsh \
-		--with-systemdsystemunitdir=no \
-		--without-udev --without-python \
-		--enable-write
-}
-
-do_build() {
-	make ${makejobs}
-}
-
-do_check() {
-	make -k check
+post_extract() {
+	# hung inside xbps-src
+	rm -f tests/ts/lsns/ioctl_ns
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		# Known broken
+		rm -f tests/ts/col/multibyte
+	fi
 }
 
 do_install() {
@@ -64,18 +36,30 @@ do_install() {
 	rm -rf "$DESTDIR/usr/share/man/man5"
 	rm -rf "$DESTDIR/usr/share/man/man8"
 	rm -rf "$DESTDIR/usr/share/bash-completion"
-	rm -rf "$DESTDIR/usr/share/locale"
 	rm -rf "$DESTDIR/usr/share/doc/"
+	# Some libraries have i18n text
+	# rm -rf "$DESTDIR/usr/share/locale"
+}
+
+util-linux-libs_package() {
+	short_desc+=" - meta libraries"
+	build_style=meta
+	depends="libfdisk-${version}_${revision} libblkid-${version}_${revision}
+	 libmount-${version}_${revision} libsmartcols-${version}_${revision}
+	 libuuid-${version}_${revision}"
 }
 
 libfdisk_package() {
 	short_desc="Library for fdisk(8)"
+	depends="${sourcepkg}>=${version}_1<=${version}_9999"
 	pkg_install() {
 		vmove "usr/lib/libfdisk.so.*"
 	}
 }
+
 libfdisk-devel_package() {
-	depends="libblkid-devel-${version}_${revision} libfdisk-${version}_${revision}"
+	depends="libblkid-devel>=${version}_1<=${version}_9999
+	 libfdisk>=${version}_1<=${version}_9999"
 	short_desc="Library for fdisk(8) - development files"
 	pkg_install() {
 		vmove usr/lib/libfdisk.a
@@ -86,12 +70,14 @@ libfdisk-devel_package() {
 }
 libmount_package() {
 	short_desc="Library for mount(8)"
+	depends="${sourcepkg}>=${version}_1<=${version}_9999"
 	pkg_install() {
 		vmove "usr/lib/libmount.so.*"
 	}
 }
 libmount-devel_package() {
-	depends="libblkid-devel-${version}_${revision} libmount-${version}_${revision}"
+	depends="libblkid-devel>=${version}_1<=${version}_9999
+	 libmount>=${version}_1<=${version}_9999"
 	short_desc="Library for mount(8) - development files"
 	pkg_install() {
 		vmove usr/lib/libmount.a
@@ -102,12 +88,14 @@ libmount-devel_package() {
 }
 libblkid_package() {
 	short_desc="Library to handle device identification"
+	depends="${sourcepkg}>=${version}_1<=${version}_9999"
 	pkg_install() {
 		vmove "usr/lib/libblkid.so.*"
 	}
 }
 libblkid-devel_package() {
-	depends="zlib-devel libuuid-devel-${version}_${revision} libblkid-${version}_${revision}"
+	depends="zlib-devel libuuid-devel>=${version}_1<=${version}_9999
+	 libblkid>=${version}_1<=${version}_9999"
 	short_desc="Library to handle device identification - development files"
 	pkg_install() {
 		vmove usr/include/blkid
@@ -119,12 +107,13 @@ libblkid-devel_package() {
 }
 libuuid_package() {
 	short_desc="UUID library"
+	depends="${sourcepkg}>=${version}_1<=${version}_9999"
 	pkg_install() {
 		vmove "usr/lib/libuuid.so.*"
 	}
 }
 libuuid-devel_package() {
-	depends="libuuid-${version}_${revision}"
+	depends="libuuid>=${version}_${revision}<=${version}_9999"
 	short_desc="UUID library development files"
 	pkg_install() {
 		vmove usr/lib/libuuid.a
@@ -135,7 +124,7 @@ libuuid-devel_package() {
 	}
 }
 libsmartcols-devel_package() {
-	depends="libsmartcols>=${version}_${revision}"
+	depends="libsmartcols>=${version}_${revision}<=${version}_9999"
 	short_desc="Table or Tree library from util-linux - development files"
 	pkg_install() {
 		vmove usr/lib/libsmartcols.a
@@ -146,6 +135,7 @@ libsmartcols-devel_package() {
 }
 libsmartcols_package() {
 	short_desc="Table or Tree library from util-linux"
+	depends="${sourcepkg}>=${version}_1<=${version}_9999"
 	pkg_install() {
 		vmove usr/lib/libsmartcols.so.*
 	}
diff --git a/srcpkgs/util-linux-libs/update b/srcpkgs/util-linux-common/update
similarity index 100%
rename from srcpkgs/util-linux-libs/update
rename to srcpkgs/util-linux-common/update
diff --git a/srcpkgs/util-linux-libs b/srcpkgs/util-linux-libs
new file mode 120000
index 00000000000..9b555374738
--- /dev/null
+++ b/srcpkgs/util-linux-libs
@@ -0,0 +1 @@
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/util-linux-libs/patches b/srcpkgs/util-linux-libs/patches
deleted file mode 120000
index 33edac3e592..00000000000
--- a/srcpkgs/util-linux-libs/patches
+++ /dev/null
@@ -1 +0,0 @@
-../util-linux/patches
\ No newline at end of file