Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] util-linux: update to 2.28
@ 2022-04-20  9:21 marmeladema
  2022-04-20  9:23 ` [PR PATCH] [Updated] " marmeladema
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: marmeladema @ 2022-04-20  9:21 UTC (permalink / raw)
  To: ml

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

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

https://github.com/marmeladema/void-packages util-linux-2.38
https://github.com/void-linux/void-packages/pull/36775

util-linux: update to 2.28
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64 (crossbuild) + tested on aarch64 bare metal board


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

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

From 2b868c512cf44d5042c42203a8168d69ee35e551 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 20 Apr 2022 11:19:18 +0200
Subject: [PATCH] util-linux: update to 2.28

---
 srcpkgs/util-linux-common/template            |  4 +-
 ...t-before-reading-stdin-and-fix-unini.patch | 37 -------------------
 ...ush-stdout-before-reading-from-stdin.patch | 27 --------------
 ...w-flush-stdout-before-getting-answer.patch | 35 ------------------
 srcpkgs/util-linux/template                   |  6 +--
 5 files changed, 5 insertions(+), 104 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch
 delete mode 100644 srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch
 delete mode 100644 srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch

diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index 0d94f16d34e8..b6e0f73d6cf4 100644
--- a/srcpkgs/util-linux-common/template
+++ b/srcpkgs/util-linux-common/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux-common'
 # Keep this package sync with util-linux
 pkgname=util-linux-common
-version=2.37.2
+version=2.38
 revision=1
 wrksrc="util-linux-$version"
 build_style=gnu-configure
@@ -17,7 +17,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=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
+checksum=6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64
 
 post_extract() {
 	# hung inside xbps-src
diff --git a/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch b/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch
deleted file mode 100644
index 0a99aa7fae56..000000000000
--- a/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 05907d0d9e7c85f33e168feab1eb36b464425054 Mon Sep 17 00:00:00 2001
-From: Lorenzo Beretta <vc.net.loreb@gmail.com>
-Date: Mon, 25 Oct 2021 14:06:00 +0200
-Subject: [PATCH] chfn: flush stdout before reading stdin and fix uninitialized
- variable
-
-Same problem as described in https://github.com/karelzak/util-linux/pull/1481
-
-Signed-off-by: Lorenzo Beretta <vc.net.loreb@gmail.com>
----
- login-utils/chfn.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/login-utils/chfn.c b/login-utils/chfn.c
-index 2508e14c9..ece5cdce0 100644
---- a/login-utils/chfn.c
-+++ b/login-utils/chfn.c
-@@ -227,7 +227,7 @@ static char *ask_new_field(struct chfn_control *ctl, const char *question,
- 			   char *def_val)
- {
- 	int len;
--	char *buf;
-+	char *buf = NULL; /* leave initialized to NULL or getline segfaults */
- #ifndef HAVE_LIBREADLINE
- 	size_t dummy = 0;
- #endif
-@@ -242,6 +242,7 @@ static char *ask_new_field(struct chfn_control *ctl, const char *question,
- 		if ((buf = readline(" ")) == NULL)
- #else
- 		putchar(' ');
-+		fflush(stdout);
- 		if (getline(&buf, &dummy, stdin) < 0)
- #endif
- 			errx(EXIT_FAILURE, _("Aborted."));
--- 
-2.33.0
-
diff --git a/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch b/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch
deleted file mode 100644
index 280c7fd0a62a..000000000000
--- a/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0a08200bd5664d1849e477f7f776ab4d13bb8422 Mon Sep 17 00:00:00 2001
-From: Lorenzo Beretta <vc.net.loreb@gmail.com>
-Date: Mon, 25 Oct 2021 15:28:02 +0200
-Subject: [PATCH] chsh: fflush stdout before reading from stdin
-
-Same problem as described in https://github.com/karelzak/util-linux/pull/1481
-
-Signed-off-by: Lorenzo Beretta <vc.net.loreb@gmail.com>
----
- login-utils/chsh.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/chsh.c b/login-utils/chsh.c
-index 349712072..3b446beeb 100644
---- a/login-utils/chsh.c
-+++ b/login-utils/chsh.c
-@@ -210,6 +210,7 @@ static char *ask_new_shell(char *question, char *oldshell)
- 	if ((ans = readline(" ")) == NULL)
- #else
- 	putchar(' ');
-+	fflush(stdout);
- 	if (getline(&ans, &dummy, stdin) < 0)
- #endif
- 		return NULL;
--- 
-2.33.0
-
diff --git a/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch b/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch
deleted file mode 100644
index e17c31291bcf..000000000000
--- a/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 34a9b65587a7d704db0344e859511af4a6756c89 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Fri, 22 Oct 2021 14:28:50 -0300
-Subject: [PATCH] vipw: flush stdout before getting answer.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise the question is displayed only after the user presses Return,
-and the program looks like it's hanging.
-
-This happens at least on musl libc.
-
-Reported by @loreb.
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- login-utils/vipw.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/vipw.c b/login-utils/vipw.c
-index 8e63efde2..f59948a44 100644
---- a/login-utils/vipw.c
-+++ b/login-utils/vipw.c
-@@ -353,6 +353,7 @@ int main(int argc, char *argv[])
- 		 * which means they can be translated. */
- 		printf(_("Would you like to edit %s now [y/n]? "), orig_file);
- 
-+		fflush(stdout);
- 		if (fgets(response, sizeof(response), stdin) &&
- 		    rpmatch(response) == RPMATCH_YES)
- 			edit_file(1);
--- 
-2.33.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index ae39761e102d..63b38ec67f4a 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.37.2
-revision=2
+version=2.38
+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=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
+checksum=6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-05-13 14:00 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-20  9:21 [PR PATCH] util-linux: update to 2.28 marmeladema
2022-04-20  9:23 ` [PR PATCH] [Updated] " marmeladema
2022-04-25 14:57 ` util-linux: update to 2.38 paper42
2022-04-25 15:04 ` marmeladema
2022-04-25 15:09 ` paper42
2022-04-27 22:07 ` [PR PATCH] [Updated] " marmeladema
2022-04-27 22:07 ` marmeladema
2022-05-13 14:00 ` [PR PATCH] [Closed]: " ericonr
2022-05-13 14:00 ` ericonr

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).