From: atk <atk@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] util-linux: update to 2.39
Date: Fri, 19 May 2023 21:26:09 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43945@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]
There is a new pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages util-linux-2.39
https://github.com/void-linux/void-packages/pull/43945
util-linux: update to 2.39
<!-- 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, (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/43945.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-util-linux-2.39-43945.patch --]
[-- Type: text/x-diff, Size: 5898 bytes --]
From d19fd215cf2774f4fd0e715939af5429ba4fb4ba Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 19 May 2023 21:25:45 +0200
Subject: [PATCH] util-linux: update to 2.39
---
srcpkgs/util-linux-common/template | 6 +-
srcpkgs/util-linux/patches/logger.patch | 95 -------------------------
srcpkgs/util-linux/template | 6 +-
3 files changed, 6 insertions(+), 101 deletions(-)
delete mode 100644 srcpkgs/util-linux/patches/logger.patch
diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index 90b768803f05..0d3440b89f69 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=3
+version=2.39
+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
@@ -16,7 +16,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=32b30a336cda903182ed61feb3e9b908b762a5e66fe14e43efb88d37162075cb
post_extract() {
# hung inside xbps-src
diff --git a/srcpkgs/util-linux/patches/logger.patch b/srcpkgs/util-linux/patches/logger.patch
deleted file mode 100644
index 48eb80586eae..000000000000
--- 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 29477fc6ea89..7d847ee282c9 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=3
+version=2.39
+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=32b30a336cda903182ed61feb3e9b908b762a5e66fe14e43efb88d37162075cb
# Create uuidd system account for uuidd.
system_accounts="_uuidd"
next reply other threads:[~2023-05-19 19:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-19 19:26 atk [this message]
2023-06-07 10:44 ` leahneukirchen
2023-07-01 15:14 ` [PR PATCH] [Closed]: " atk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43945@inbox.vuxu.org \
--to=atk@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).