From 7c9a303384b205404399b7db50bbc8e31d462402 Mon Sep 17 00:00:00 2001
From: Tanish Yadav <devtany@gmail.com>
Date: Mon, 27 May 2024 19:27:46 +0530
Subject: [PATCH] util-linux-common: update to 2.40.1

---
 common/shlibs                      |  1 +
 srcpkgs/liblastlog2                |  1 +
 srcpkgs/liblastlog2-devel          |  1 +
 srcpkgs/util-linux-common/template | 44 ++++++++++++++++++++++++++----
 4 files changed, 42 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/liblastlog2
 create mode 120000 srcpkgs/liblastlog2-devel

diff --git a/common/shlibs b/common/shlibs
index 5e2fc36f9da..b1a5f30d97d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -209,6 +209,7 @@ libpsx.so.2 libcap-2.45_1
 liblzma.so.5 liblzma-5.0.0_1
 libuuid.so.1 libuuid-2.18_1
 libblkid.so.1 libblkid-2.18_1
+liblastlog2.so.2 liblastlog2-2.40.1_1
 libidn.so.12 libidn-1.35_1
 libusb-1.0.so.0 libusb-1.0.0_1
 libusb-0.1.so.4 libusb-compat-0.1.0_1
diff --git a/srcpkgs/liblastlog2 b/srcpkgs/liblastlog2
new file mode 120000
index 00000000000..9b555374738
--- /dev/null
+++ b/srcpkgs/liblastlog2
@@ -0,0 +1 @@
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/liblastlog2-devel b/srcpkgs/liblastlog2-devel
new file mode 120000
index 00000000000..9b555374738
--- /dev/null
+++ b/srcpkgs/liblastlog2-devel
@@ -0,0 +1 @@
+util-linux-common
\ No newline at end of file
diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index a166247a5d0..d85f3a9a60b 100644
--- a/srcpkgs/util-linux-common/template
+++ b/srcpkgs/util-linux-common/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux-common'
 # Keep this package sync with util-linux
 pkgname=util-linux-common
-version=2.39.3
-revision=2
+version=2.40.1
+revision=1
 build_style=gnu-configure
 configure_args="
  --disable-all-programs
@@ -14,19 +14,24 @@ configure_args="
  --enable-libmount
  --enable-libsmartcols
  --enable-libuuid
+ --enable-liblastlog2
  --exec-prefix=\${prefix}
  --with-systemdsystemunitdir=no
  --without-python
- --without-udev --disable-libmount-mountfd-support"
+ --without-udev"
 hostmakedepends="gettext pkg-config"
-makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
+makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel sqlite-devel"
 checkdepends="xz tar iproute2 socat procps-ng bc"
 short_desc="Miscellaneous linux utilities - common files"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-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=7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
+checksum=59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_WORDSIZE" -eq 32 ]; then
+	configure_args+=" --disable-year2038"
+fi
 
 post_extract() {
 	# hung inside xbps-src
@@ -77,6 +82,7 @@ libfdisk-devel_package() {
 		vmove usr/include/libfdisk
 	}
 }
+
 libmount_package() {
 	short_desc="Library for mount(8)"
 	depends="${sourcepkg}>=${version}_1"
@@ -84,6 +90,7 @@ libmount_package() {
 		vmove "usr/lib/libmount.so.*"
 	}
 }
+
 libmount-devel_package() {
 	depends="libblkid-devel>=${version}_1<=${version}_9999
 	 libmount>=${version}_1<=${version}_9999"
@@ -95,6 +102,7 @@ libmount-devel_package() {
 		vmove usr/include/libmount
 	}
 }
+
 libblkid_package() {
 	short_desc="Library to handle device identification"
 	depends="${sourcepkg}>=${version}_1"
@@ -102,6 +110,7 @@ libblkid_package() {
 		vmove "usr/lib/libblkid.so.*"
 	}
 }
+
 libblkid-devel_package() {
 	depends="zlib-devel libuuid-devel>=${version}_1<=${version}_9999
 	 libblkid>=${version}_1<=${version}_9999"
@@ -114,6 +123,7 @@ libblkid-devel_package() {
 		vmove usr/share/man/man3/libblkid.3
 	}
 }
+
 libuuid_package() {
 	short_desc="UUID library"
 	depends="${sourcepkg}>=${version}_1"
@@ -127,6 +137,7 @@ libuuid_package() {
 		vmove "usr/lib/libuuid.so.*"
 	}
 }
+
 libuuid-devel_package() {
 	depends="libuuid>=${version}_${revision}<=${version}_9999"
 	short_desc="UUID library development files"
@@ -139,6 +150,7 @@ libuuid-devel_package() {
 		vmove usr/share/man/man3/uuid*
 	}
 }
+
 libsmartcols-devel_package() {
 	depends="libsmartcols>=${version}_${revision}<=${version}_9999"
 	short_desc="Table or Tree library from util-linux - development files"
@@ -149,6 +161,7 @@ libsmartcols-devel_package() {
 		vmove usr/lib/pkgconfig/smartcols*
 	}
 }
+
 libsmartcols_package() {
 	short_desc="Table or Tree library from util-linux"
 	depends="${sourcepkg}>=${version}_1"
@@ -156,3 +169,24 @@ libsmartcols_package() {
 		vmove usr/lib/libsmartcols.so.*
 	}
 }
+
+liblastlog2-devel_package() {
+	depends="libsmartcols>=${version}_${revision}<=${version}_9999"
+	short_desc+="Lastlog replacement library from util-linux - development files"
+	pkg_install() {
+		vmove usr/share/man/man3/lastlog2*
+		vmove usr/share/man/man3/ll2*
+		vmove usr/include/liblastlog2
+		vmove usr/lib/pkgconfig/lastlog2*
+		vmove usr/lib/liblastlog2.a
+		vmove usr/lib/liblastlog2.so
+	}
+}
+
+liblastlog2_package() {
+	short_desc="Lastlog replacement library from util-linux"
+	depends="${sourcepkg}>=${version}_1"
+	pkg_install() {
+		vmove usr/lib/liblastlog2.so.*
+	}
+}