[PR PATCH] util-linux: update to 2.39.3

[PR PATCH] util-linux: update to 2.39.3

[paxet]

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

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

https://github.com/paxet/void-packages master
https://github.com/void-linux/void-packages/pull/48770

util-linux: update to 2.39.3
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64-musl
  - armv7l
  - armv7l-musl
  - armv6l
  - armv6l-musl

#### Patches
- _fix_manpage_redirects.patch_ still needed for man pages to work.
- _logger.patch_ removed because it's integrated in the 2.39 release


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-48770.patch --]
[-- Type: text/x-diff, Size: 6068 bytes --]

From 13b85c34b3b0749b444a6b4aad7caaaa7a202bf5 Mon Sep 17 00:00:00 2001
From: Javier Caballero <jacallo@protonmail.com>
Date: Fri, 16 Feb 2024 15:40:18 +0100
Subject: [PATCH 1/2] util-linux-common: update to 2.39.3

---
 srcpkgs/util-linux-common/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index efe98a4e23e1e0..a5cbdb8675d0c9 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.38.1
-revision=4
+version=2.39.3
+revision=1
 build_style=gnu-configure
 configure_args="
  --disable-all-programs
@@ -26,7 +26,7 @@ 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=60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f
+checksum=7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
 
 post_extract() {
 	# hung inside xbps-src

From a679ba75ba09b31c5699129939776ba0d7ddb568 Mon Sep 17 00:00:00 2001
From: Javier Caballero <jacallo@protonmail.com>
Date: Fri, 16 Feb 2024 15:40:45 +0100
Subject: [PATCH 2/2] util-linux: update to 2.39.3

---
 srcpkgs/util-linux/patches/logger.patch | 95 -------------------------
 srcpkgs/util-linux/template             |  6 +-
 2 files changed, 3 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/logger.patch

diff --git a/srcpkgs/util-linux/patches/logger.patch b/srcpkgs/util-linux/patches/logger.patch
deleted file mode 100644
index 48eb80586eae93..00000000000000
--- a/srcpkgs/util-linux/patches/logger.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 96ccdc00e1fcf1684f9734a189baf90e00ff0c9a Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 1 Nov 2022 10:30:06 +0100
-Subject: [PATCH] logger: always update header when read from stdin
-
-The current code updates the header only when the priority has been
-changed. It's incorrect because wanted is a valid header or each entry
-(don't forget that logger for stdin use-case is used in pipe to log
-long-time running processes).
-
-This patch also fixes the initial timestamp; it was originally generated
-on logger startup, it now generates the header on the first message.
-
-$ (sleep 2; date; sleep 2; date; sleep 2; date) | logger --stderr --no-act
-
-old:
-<13>Nov  1 10:42:14 kzak: Tue Nov  1 10:42:16 AM CET 2022
-<13>Nov  1 10:42:14 kzak: Tue Nov  1 10:42:18 AM CET 2022
-<13>Nov  1 10:42:14 kzak: Tue Nov  1 10:42:20 AM CET 2022
-
-new:
-<13>Nov  1 10:19:02 kzak: Tue Nov  1 10:19:02 AM CET 2022
-<13>Nov  1 10:19:04 kzak: Tue Nov  1 10:19:04 AM CET 2022
-<13>Nov  1 10:19:06 kzak: Tue Nov  1 10:19:06 AM CET 2022
-
-Fixes: https://github.com/util-linux/util-linux/issues/1866
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- misc-utils/logger.c | 18 +++++++-----------
- 1 file changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/misc-utils/logger.c b/misc-utils/logger.c
-index bec684f15b..e2b0b41abe 100644
---- a/misc-utils/logger.c
-+++ b/misc-utils/logger.c
-@@ -945,8 +945,6 @@ static void logger_open(struct logger_ctl *ctl)
- 		ctl->tag = ctl->login = xgetlogin();
- 	if (!ctl->tag)
- 		ctl->tag = "<someone>";
--
--	generate_syslog_header(ctl);
- }
- 
- /* re-open; usually after failed connection */
-@@ -996,10 +994,8 @@ static void logger_stdin(struct logger_ctl *ctl)
- {
- 	/* note: we re-generate the syslog header for each log message to
- 	 * update header timestamps and to reflect possible priority changes.
--	 * The initial header is generated by logger_open().
- 	 */
- 	int default_priority = ctl->pri;
--	int last_pri = default_priority;
- 	char *buf = xmalloc(ctl->max_message_size + 2 + 2);
- 	int pri;
- 	int c;
-@@ -1026,10 +1022,6 @@ static void logger_stdin(struct logger_ctl *ctl)
- 			} else
- 				ctl->pri = default_priority;
- 
--			if (ctl->pri != last_pri) {
--				generate_syslog_header(ctl);
--				last_pri = ctl->pri;
--			}
- 			if (c != EOF && c != '\n')
- 				c = getchar();
- 		}
-@@ -1040,8 +1032,10 @@ static void logger_stdin(struct logger_ctl *ctl)
- 		}
- 		buf[i] = '\0';
- 
--		if (i > 0 || !ctl->skip_empty_lines)
-+		if (i > 0 || !ctl->skip_empty_lines) {
-+			generate_syslog_header(ctl);
- 			write_output(ctl, buf);
-+		}
- 
- 		if (c == '\n')	/* discard line terminator */
- 			c = getchar();
-@@ -1317,12 +1311,14 @@ int main(int argc, char **argv)
- 		abort();
- 	}
- 	logger_open(&ctl);
--	if (0 < argc)
-+	if (0 < argc) {
-+		generate_syslog_header(&ctl);
- 		logger_command_line(&ctl, argv);
--	else
-+	} else
- 		/* Note. --file <arg> reopens stdin making the below
- 		 * function to be used for file inputs. */
- 		logger_stdin(&ctl);
-+
- 	logger_close(&ctl);
- 	return EXIT_SUCCESS;
- }
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 358a75a3fb51bd..768c0acfae071a 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-common
 pkgname=util-linux
-version=2.38.1
-revision=6
+version=2.39.3
+revision=1
 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
@@ -22,7 +22,7 @@ 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=60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f
+checksum=7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
 
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	makedepends+=" libxcrypt-devel"

Re: util-linux: update to 2.39.3

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/48770#issuecomment-1951346505

Comment:
Please rebase.

Re: [PR PATCH] [Updated] util-linux: update to 2.39.3

[paxet]

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

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

https://github.com/paxet/void-packages master
https://github.com/void-linux/void-packages/pull/48770

util-linux: update to 2.39.3
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64-musl
  - armv7l
  - armv7l-musl
  - armv6l
  - armv6l-musl

#### Patches
- _fix_manpage_redirects.patch_ still needed for man pages to work.
- _logger.patch_ removed because it's integrated in the 2.39 release


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-48770.patch --]
[-- Type: text/x-diff, Size: 6062 bytes --]

From 3f5d2373b084a910df83b2da0cbaeacc63a924a2 Mon Sep 17 00:00:00 2001
From: Javier Caballero <jacallo@protonmail.com>
Date: Fri, 16 Feb 2024 15:40:18 +0100
Subject: [PATCH 1/2] util-linux-common: update to 2.39.3

---
 srcpkgs/util-linux-common/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index efe98a4e23e1e..a5cbdb8675d0c 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.38.1
-revision=4
+version=2.39.3
+revision=1
 build_style=gnu-configure
 configure_args="
  --disable-all-programs
@@ -26,7 +26,7 @@ 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=60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f
+checksum=7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
 
 post_extract() {
 	# hung inside xbps-src

From 67d307fbf87975c050df392e475c53624dc6ee28 Mon Sep 17 00:00:00 2001
From: Javier Caballero <jacallo@protonmail.com>
Date: Fri, 16 Feb 2024 15:40:45 +0100
Subject: [PATCH 2/2] util-linux: update to 2.39.3

---
 srcpkgs/util-linux/patches/logger.patch | 95 -------------------------
 srcpkgs/util-linux/template             |  6 +-
 2 files changed, 3 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/logger.patch

diff --git a/srcpkgs/util-linux/patches/logger.patch b/srcpkgs/util-linux/patches/logger.patch
deleted file mode 100644
index 48eb80586eae9..0000000000000
--- a/srcpkgs/util-linux/patches/logger.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 96ccdc00e1fcf1684f9734a189baf90e00ff0c9a Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 1 Nov 2022 10:30:06 +0100
-Subject: [PATCH] logger: always update header when read from stdin
-
-The current code updates the header only when the priority has been
-changed. It's incorrect because wanted is a valid header or each entry
-(don't forget that logger for stdin use-case is used in pipe to log
-long-time running processes).
-
-This patch also fixes the initial timestamp; it was originally generated
-on logger startup, it now generates the header on the first message.
-
-$ (sleep 2; date; sleep 2; date; sleep 2; date) | logger --stderr --no-act
-
-old:
-<13>Nov  1 10:42:14 kzak: Tue Nov  1 10:42:16 AM CET 2022
-<13>Nov  1 10:42:14 kzak: Tue Nov  1 10:42:18 AM CET 2022
-<13>Nov  1 10:42:14 kzak: Tue Nov  1 10:42:20 AM CET 2022
-
-new:
-<13>Nov  1 10:19:02 kzak: Tue Nov  1 10:19:02 AM CET 2022
-<13>Nov  1 10:19:04 kzak: Tue Nov  1 10:19:04 AM CET 2022
-<13>Nov  1 10:19:06 kzak: Tue Nov  1 10:19:06 AM CET 2022
-
-Fixes: https://github.com/util-linux/util-linux/issues/1866
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- misc-utils/logger.c | 18 +++++++-----------
- 1 file changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/misc-utils/logger.c b/misc-utils/logger.c
-index bec684f15b..e2b0b41abe 100644
---- a/misc-utils/logger.c
-+++ b/misc-utils/logger.c
-@@ -945,8 +945,6 @@ static void logger_open(struct logger_ctl *ctl)
- 		ctl->tag = ctl->login = xgetlogin();
- 	if (!ctl->tag)
- 		ctl->tag = "<someone>";
--
--	generate_syslog_header(ctl);
- }
- 
- /* re-open; usually after failed connection */
-@@ -996,10 +994,8 @@ static void logger_stdin(struct logger_ctl *ctl)
- {
- 	/* note: we re-generate the syslog header for each log message to
- 	 * update header timestamps and to reflect possible priority changes.
--	 * The initial header is generated by logger_open().
- 	 */
- 	int default_priority = ctl->pri;
--	int last_pri = default_priority;
- 	char *buf = xmalloc(ctl->max_message_size + 2 + 2);
- 	int pri;
- 	int c;
-@@ -1026,10 +1022,6 @@ static void logger_stdin(struct logger_ctl *ctl)
- 			} else
- 				ctl->pri = default_priority;
- 
--			if (ctl->pri != last_pri) {
--				generate_syslog_header(ctl);
--				last_pri = ctl->pri;
--			}
- 			if (c != EOF && c != '\n')
- 				c = getchar();
- 		}
-@@ -1040,8 +1032,10 @@ static void logger_stdin(struct logger_ctl *ctl)
- 		}
- 		buf[i] = '\0';
- 
--		if (i > 0 || !ctl->skip_empty_lines)
-+		if (i > 0 || !ctl->skip_empty_lines) {
-+			generate_syslog_header(ctl);
- 			write_output(ctl, buf);
-+		}
- 
- 		if (c == '\n')	/* discard line terminator */
- 			c = getchar();
-@@ -1317,12 +1311,14 @@ int main(int argc, char **argv)
- 		abort();
- 	}
- 	logger_open(&ctl);
--	if (0 < argc)
-+	if (0 < argc) {
-+		generate_syslog_header(&ctl);
- 		logger_command_line(&ctl, argv);
--	else
-+	} else
- 		/* Note. --file <arg> reopens stdin making the below
- 		 * function to be used for file inputs. */
- 		logger_stdin(&ctl);
-+
- 	logger_close(&ctl);
- 	return EXIT_SUCCESS;
- }
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index d2436dcab6e35..768c0acfae071 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-common
 pkgname=util-linux
-version=2.38.1
-revision=7
+version=2.39.3
+revision=1
 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
@@ -22,7 +22,7 @@ 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=60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f
+checksum=7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
 
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	makedepends+=" libxcrypt-devel"

Re: util-linux: update to 2.39.3

[paxet]

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

New comment by paxet on void-packages repository

https://github.com/void-linux/void-packages/pull/48770#issuecomment-1951846747

Comment:
Done :+1: 

Re: [PR PATCH] [Merged]: util-linux: update to 2.39.3

[leahneukirchen]

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

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

util-linux: update to 2.39.3
https://github.com/void-linux/void-packages/pull/48770

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
  - aarch64-musl
  - armv7l
  - armv7l-musl
  - armv6l
  - armv6l-musl

#### Patches
- _fix_manpage_redirects.patch_ still needed for man pages to work.
- _logger.patch_ removed because it's integrated in the 2.39 release