Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] util-linux 2.37.1
@ 2021-07-23 15:00 sgn
  2021-07-23 15:05 ` ericonr
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: sgn @ 2021-07-23 15:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1598 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages util-linux-2.37.1
https://github.com/void-linux/void-packages/pull/32158

util-linux 2.37.1
<!-- Mark items with [x] where applicable -->

Close #31462 

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32158.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-util-linux-2.37.1-32158.patch --]
[-- Type: text/x-diff, Size: 14939 bytes --]

From 9b74c011f73a05de2dbcb7d735cb60cfed2c2e38 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 1/2] util-linux-common: update to 2.37.1.

---
 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 ad8c4512a35c..4edf7bb75564 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 000000000000..9b5553747383
--- /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 33edac3e5923..000000000000
--- a/srcpkgs/util-linux-libs/patches
+++ /dev/null
@@ -1 +0,0 @@
-../util-linux/patches
\ No newline at end of file

From 97d9504e9ca10fdbc1fb5fa239139b01af9eaf86 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:23 +0700
Subject: [PATCH 2/2] util-linux: update to 2.37.1.

---
 srcpkgs/util-linux/patches/fix-musl.patch | 20 ---------
 srcpkgs/util-linux/template               | 53 ++++++++++-------------
 2 files changed, 24 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/fix-musl.patch

diff --git a/srcpkgs/util-linux/patches/fix-musl.patch b/srcpkgs/util-linux/patches/fix-musl.patch
deleted file mode 100644
index 8d1eeb9d2740..000000000000
--- a/srcpkgs/util-linux/patches/fix-musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Define __SWORD_TYPE for musl.
-
---- a/sys-utils/switch_root.c.orig	2014-09-20 21:33:27.551345526 +0200
-+++ b/sys-utils/switch_root.c	2014-09-20 21:34:17.958584374 +0200
-@@ -47,6 +47,15 @@
- #define MNT_DETACH       0x00000002	/* Just detach from the tree */
- #endif
- 
-+#ifndef __SWORD_TYPE
-+# if __WORDSIZE == 32	/* System word size */
-+#  define __SWORD_TYPE	int
-+# else /* __WORDSIZE == 64 */
-+#  define __SWORD_TYPE	long int
-+# endif
-+#endif
-+
-+
- /* remove all files/directories below dirName -- don't cross mountpoints */
- static int recursiveRemove(int fd)
- {
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 4fb8292531ba..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,19 +1,28 @@
 # Template file for 'util-linux'
-# Keep this package sync with util-linux-libs
+# Keep this package sync with util-linux-common
 pkgname=util-linux
-version=2.36.2
+version=2.37.1
 revision=1
-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
+ --with-udev --without-python --enable-write"
+hostmakedepends="gettext pkg-config"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
  eudev-libudev-devel"
-# FIXME: don't be so strict on the dependency
-depends="util-linux-libs-${version}_${revision}"
+depends="libfdisk>=${version}_1<=${version}_9999
+ libblkid>=${version}_1<=${version}_9999
+ libmount>=${version}_1<=${version}_9999
+ libsmartcols>=${version}_1<=${version}_9999
+ libuuid>=${version}_1<=${version}_9999"
+checkdepends="xz tar iproute2 socat procps-ng bc"
 short_desc="Miscellaneous linux utilities"
 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/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
-checksum=f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f
+checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"
@@ -30,29 +39,13 @@ alternatives="
  logger:logger.1:/usr/share/man/man1/${pkgname}-logger.1
 "
 
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.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 \
-		--with-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() {
@@ -75,4 +68,6 @@ do_install() {
 	rm -rf "$DESTDIR/usr/include"
 	rm -rf "$DESTDIR/usr/lib"
 	rm -rf "$DESTDIR/usr/share/man/man3"
+	# Provided by util-linux-common
+	rm -rf "$DESTDIR/usr/share/locale"
 }

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: util-linux 2.37.1
  2021-07-23 15:00 [PR PATCH] util-linux 2.37.1 sgn
@ 2021-07-23 15:05 ` ericonr
  2021-07-23 15:14 ` [PR PATCH] [Updated] " sgn
  2021-07-25  4:23 ` [PR PATCH] [Merged]: " sgn
  2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-07-23 15:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 201 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32158#issuecomment-885704302

Comment:
I think commit should explain why the renaming is happening.

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] util-linux 2.37.1
  2021-07-23 15:00 [PR PATCH] util-linux 2.37.1 sgn
  2021-07-23 15:05 ` ericonr
@ 2021-07-23 15:14 ` sgn
  2021-07-25  4:23 ` [PR PATCH] [Merged]: " sgn
  2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2021-07-23 15:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages util-linux-2.37.1
https://github.com/void-linux/void-packages/pull/32158

util-linux 2.37.1
<!-- Mark items with [x] where applicable -->

Close #31462 

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32158.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-util-linux-2.37.1-32158.patch --]
[-- Type: text/x-diff, Size: 15406 bytes --]

From 1b2186214eb21405992bf0941ad778f4289dcdb3 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 1/2] 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 d3d5b40f1ef2..9b5553747383 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 ad8c4512a35c..4edf7bb75564 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 000000000000..9b5553747383
--- /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 33edac3e5923..000000000000
--- a/srcpkgs/util-linux-libs/patches
+++ /dev/null
@@ -1 +0,0 @@
-../util-linux/patches
\ No newline at end of file

From 50a43770a04c0010a0d2fac7082aa4b30dbe8ba0 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:23 +0700
Subject: [PATCH 2/2] util-linux: update to 2.37.1.

---
 srcpkgs/util-linux/patches/fix-musl.patch | 20 ---------
 srcpkgs/util-linux/template               | 53 ++++++++++-------------
 2 files changed, 24 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/fix-musl.patch

diff --git a/srcpkgs/util-linux/patches/fix-musl.patch b/srcpkgs/util-linux/patches/fix-musl.patch
deleted file mode 100644
index 8d1eeb9d2740..000000000000
--- a/srcpkgs/util-linux/patches/fix-musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Define __SWORD_TYPE for musl.
-
---- a/sys-utils/switch_root.c.orig	2014-09-20 21:33:27.551345526 +0200
-+++ b/sys-utils/switch_root.c	2014-09-20 21:34:17.958584374 +0200
-@@ -47,6 +47,15 @@
- #define MNT_DETACH       0x00000002	/* Just detach from the tree */
- #endif
- 
-+#ifndef __SWORD_TYPE
-+# if __WORDSIZE == 32	/* System word size */
-+#  define __SWORD_TYPE	int
-+# else /* __WORDSIZE == 64 */
-+#  define __SWORD_TYPE	long int
-+# endif
-+#endif
-+
-+
- /* remove all files/directories below dirName -- don't cross mountpoints */
- static int recursiveRemove(int fd)
- {
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 4fb8292531ba..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,19 +1,28 @@
 # Template file for 'util-linux'
-# Keep this package sync with util-linux-libs
+# Keep this package sync with util-linux-common
 pkgname=util-linux
-version=2.36.2
+version=2.37.1
 revision=1
-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
+ --with-udev --without-python --enable-write"
+hostmakedepends="gettext pkg-config"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
  eudev-libudev-devel"
-# FIXME: don't be so strict on the dependency
-depends="util-linux-libs-${version}_${revision}"
+depends="libfdisk>=${version}_1<=${version}_9999
+ libblkid>=${version}_1<=${version}_9999
+ libmount>=${version}_1<=${version}_9999
+ libsmartcols>=${version}_1<=${version}_9999
+ libuuid>=${version}_1<=${version}_9999"
+checkdepends="xz tar iproute2 socat procps-ng bc"
 short_desc="Miscellaneous linux utilities"
 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/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
-checksum=f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f
+checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"
@@ -30,29 +39,13 @@ alternatives="
  logger:logger.1:/usr/share/man/man1/${pkgname}-logger.1
 "
 
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.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 \
-		--with-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() {
@@ -75,4 +68,6 @@ do_install() {
 	rm -rf "$DESTDIR/usr/include"
 	rm -rf "$DESTDIR/usr/lib"
 	rm -rf "$DESTDIR/usr/share/man/man3"
+	# Provided by util-linux-common
+	rm -rf "$DESTDIR/usr/share/locale"
 }

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: util-linux 2.37.1
  2021-07-23 15:00 [PR PATCH] util-linux 2.37.1 sgn
  2021-07-23 15:05 ` ericonr
  2021-07-23 15:14 ` [PR PATCH] [Updated] " sgn
@ 2021-07-25  4:23 ` sgn
  2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2021-07-25  4:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1445 bytes --]

There's a merged pull request on the void-packages repository

util-linux 2.37.1
https://github.com/void-linux/void-packages/pull/32158

Description:
<!-- Mark items with [x] where applicable -->

Close #31462 

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-25  4:23 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-23 15:00 [PR PATCH] util-linux 2.37.1 sgn
2021-07-23 15:05 ` ericonr
2021-07-23 15:14 ` [PR PATCH] [Updated] " sgn
2021-07-25  4:23 ` [PR PATCH] [Merged]: " sgn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).