From ebf54a0874c41fb3f9b88a1235ea08fd05119209 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 3 Aug 2026 01:06:02 +0200
Subject: [PATCH] nilfs-utils: update to 2.3.1.

---
 common/shlibs                |  4 ++--
 srcpkgs/nilfs-utils/template | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 58a46de863d..5cb3a450900 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -970,8 +970,8 @@ libomptarget.so.18.1 libomp-18.1.8_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1
-libnilfs.so.0 libnilfs-2.1.0_1
-libnilfsgc.so.0 libnilfs-2.1.0_1
+libnilfs.so.3 libnilfs-2.3.1_1
+libnilfsgc.so.3 libnilfs-2.3.1_1
 libnilfscleaner.so.0 libnilfs-2.1.0_1
 libchicken.so.11 libchicken-5.1.0_1
 libzix-0.so.0 zix-0.4.2_1
diff --git a/srcpkgs/nilfs-utils/template b/srcpkgs/nilfs-utils/template
index 89175e29a44..2665dd5c5bf 100644
--- a/srcpkgs/nilfs-utils/template
+++ b/srcpkgs/nilfs-utils/template
@@ -1,25 +1,27 @@
 # Template file for 'nilfs-utils'
 pkgname=nilfs-utils
-version=2.2.9
+version=2.3.1
 revision=1
 build_style=gnu-configure
-configure_args="--without-selinux"
-make_install_args="sbindir=/usr/bin"
+configure_args="--without-selinux --with-libmount --enable-usrmerge=bin --enable-static"
+hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="libblkid-devel libmount-devel libuuid-devel"
 conf_files="/etc/nilfs_cleanerd.conf"
 short_desc="Log-structured file system for Linux - userspace utils"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only, LGPL-2.1-only"
+license="GPL-2.0-only"
 homepage="https://nilfs.sourceforge.io/"
-distfiles="https://nilfs.sourceforge.io/download/${pkgname}-${version}.tar.bz2"
-checksum=5df63998c2084182c8c608a29b47b1771b825b4b5fa7916c12cca2fcb7577a97
+changelog="https://raw.githubusercontent.com/nilfs-dev/nilfs-utils/refs/heads/master/ChangeLog"
+distfiles="https://github.com/nilfs-dev/nilfs-utils/archive/refs/tags/v${version}.tar.gz"
+checksum=f4488f2978b3054fd97f87d206032cbf376d98479759d2855b57bc24a8d8efb9
 
-post_install() {
-	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin/
+pre_configure() {
+	./autogen.sh
 }
 
 libnilfs_package() {
 	short_desc="${short_desc/utils/libraries}"
+	license="LGPL-2.1-only"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 	}
@@ -28,6 +30,7 @@ libnilfs_package() {
 nilfs-utils-devel_package() {
 	depends="${makedepends} libnilfs>=${version}_${revision}"
 	short_desc="${short_desc/utils/development files}"
+	license="LGPL-2.1-only"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"