* Re: [PR REVIEW] util-linux: update to 2.36.
2020-07-23 10:39 [PR PATCH] util-linux: update to 2.36 ailiop-git
@ 2020-07-23 13:41 ` sgn
2020-07-23 13:53 ` [PR PATCH] [Updated] " ailiop-git
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2020-07-23 13:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/23760#discussion_r459457632
Comment:
`v${version%.${version#*.*.}}`
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] util-linux: update to 2.36.
2020-07-23 10:39 [PR PATCH] util-linux: update to 2.36 ailiop-git
2020-07-23 13:41 ` [PR REVIEW] " sgn
@ 2020-07-23 13:53 ` ailiop-git
2020-07-28 7:56 ` sgn
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: ailiop-git @ 2020-07-23 13:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
There is an updated pull request by ailiop-git against master on the void-packages repository
https://github.com/ailiop-git/void-packages util-linux
https://github.com/void-linux/void-packages/pull/23760
util-linux: update to 2.36.
A patch file from https://github.com/void-linux/void-packages/pull/23760.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-util-linux-23760.patch --]
[-- Type: text/x-diff, Size: 4437 bytes --]
From ce6c09e8eceb7834e5683895e650854a19e79542 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 23 Jul 2020 12:35:25 +0200
Subject: [PATCH 1/2] util-linux-libs: update to 2.36.
---
srcpkgs/util-linux-libs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/util-linux-libs/template b/srcpkgs/util-linux-libs/template
index 11a924cef5e..a6aab135393 100644
--- a/srcpkgs/util-linux-libs/template
+++ b/srcpkgs/util-linux-libs/template
@@ -1,7 +1,7 @@
# Template file for 'util-linux-libs'
# Keep this package sync with util-linux
pkgname=util-linux-libs
-version=2.35.2
+version=2.36
revision=1
wrksrc="util-linux-$version"
build_style=meta
@@ -13,8 +13,8 @@ short_desc="Miscellaneous linux utilities - meta libraries"
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/v2.35/util-linux-${version}.tar.xz"
-checksum=21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a
+distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
+checksum=9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1
pre_configure() {
local _cfgdir="$XBPS_COMMONDIR/environment/configure"
From c31198b6259524c808b55a21df6f0f9f8f7e4ebe Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 23 Jul 2020 12:32:51 +0200
Subject: [PATCH 2/2] util-linux: update to 2.36.
---
.../patches/cleanup-pidfd-includes.patch | 44 -------------------
srcpkgs/util-linux/template | 6 +--
2 files changed, 3 insertions(+), 47 deletions(-)
delete mode 100644 srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch
diff --git a/srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch b/srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch
deleted file mode 100644
index 0285447d4ea..00000000000
--- a/srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-upstream: yes
-reason: fixes compilation for armv6-musl
-
-From 0a4035ff2e4fd5b5ae0cf8f8665696c2aff53b75 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 10 Mar 2020 11:43:16 +0100
-Subject: include: cleanup pidfd inckudes
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- include/pidfd-utils.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-(limited to 'include/pidfd-utils.h')
-
-diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h
-index 0baedd2c9..4a6c3a604 100644
---- include/pidfd-utils.h
-+++ include/pidfd-utils.h
-@@ -3,10 +3,10 @@
-
- #if defined(__linux__)
- # include <sys/syscall.h>
--# if defined(SYS_pidfd_send_signal)
-+# if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open)
- # include <sys/types.h>
-
--# ifndef HAVE_PIDFD_OPEN
-+# ifndef HAVE_PIDFD_SEND_SIGNAL
- static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
- unsigned int flags)
- {
-@@ -14,7 +14,7 @@ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
- }
- # endif
-
--# ifndef HAVE_PIDFD_SEND_SIGNAL
-+# ifndef HAVE_PIDFD_OPEN
- static inline int pidfd_open(pid_t pid, unsigned int flags)
- {
- return syscall(SYS_pidfd_open, pid, flags);
---
-cgit 1.2.3-1.el7
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index bb09d12d418..8a9a2e30415 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,7 +1,7 @@
# Template file for 'util-linux'
# Keep this package sync with util-linux-libs
pkgname=util-linux
-version=2.35.2
+version=2.36
revision=1
hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
@@ -12,8 +12,8 @@ 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}/v2.35/${pkgname}-${version}.tar.xz"
-checksum=21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a
+distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
+checksum=9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1
# Create uuidd system account for uuidd.
system_accounts="_uuidd"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: util-linux: update to 2.36.
2020-07-23 10:39 [PR PATCH] util-linux: update to 2.36 ailiop-git
2020-07-23 13:41 ` [PR REVIEW] " sgn
2020-07-23 13:53 ` [PR PATCH] [Updated] " ailiop-git
@ 2020-07-28 7:56 ` sgn
2020-07-28 9:16 ` ailiop-git
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2020-07-28 7:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/23760#issuecomment-664841428
Comment:
`getopt` check failed on musl, `column` check failed on glibc.
I haven't looked further.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: util-linux: update to 2.36.
2020-07-23 10:39 [PR PATCH] util-linux: update to 2.36 ailiop-git
` (2 preceding siblings ...)
2020-07-28 7:56 ` sgn
@ 2020-07-28 9:16 ` ailiop-git
2020-07-28 10:01 ` sgn
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: ailiop-git @ 2020-07-28 9:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 341 bytes --]
New comment by ailiop-git on void-packages repository
https://github.com/void-linux/void-packages/pull/23760#issuecomment-664910054
Comment:
> `getopt` check failed on musl, `column` check failed on glibc.
not sure what you mean "check failed", both binaries are compiling and running fine on both glibc/musl (for x86_64 at least).
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: util-linux: update to 2.36.
2020-07-23 10:39 [PR PATCH] util-linux: update to 2.36 ailiop-git
` (3 preceding siblings ...)
2020-07-28 9:16 ` ailiop-git
@ 2020-07-28 10:01 ` sgn
2020-07-28 12:21 ` ailiop-git
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2020-07-28 10:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/23760#issuecomment-664948416
Comment:
On 2020-07-28 02:17:02-0700, ailiop-git <notifications@github.com> wrote:
> > `getopt` check failed on musl, `column` check failed on glibc.
>
> not sure what you mean "check failed", both binaries are compiling
> and running fine on both glibc/musl (for x86_64 at least).
I meant:
./xbps-src check util-linux
./xbps-src -m musl check util-linux
--
Danh
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: util-linux: update to 2.36.
2020-07-23 10:39 [PR PATCH] util-linux: update to 2.36 ailiop-git
` (4 preceding siblings ...)
2020-07-28 10:01 ` sgn
@ 2020-07-28 12:21 ` ailiop-git
2020-07-28 14:32 ` sgn
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: ailiop-git @ 2020-07-28 12:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1190 bytes --]
New comment by ailiop-git on void-packages repository
https://github.com/void-linux/void-packages/pull/23760#issuecomment-665007457
Comment:
Ah ok, so the particular failure on glibc is on `column/invalid-multibyte` test, due to missing locale:
`/bin/sh: warning: setlocale: LC_ALL: cannot change locale (C.UTF-8)`
this was changed in commit `6ef9a9e18471b9 ("tests: (column) use actually invalid multibytes to test encoding")`, which means it has been failing since v2.35.
This can be fixed with:
```
sed -i s/^#C.UTF-8/C.UTF-8/ masterdir/etc/default/libc-locales
xbps-reconfigure -r masterdir/ glibc-locales -f
```
The second issue on musl, is the `getopt/options-posix_correctly `test failing. This is due to the ordering of the options processing, see diff of failing test below:
```
- -a -b '1' -c '2' --a-long --b-long '3' --c-long '' -- 'foo' 'bar' 'xyxxy' '--a-long'
+ -a -b '1' -c '2' --a-long --b-long '3' --c-long '' --a-long -- 'foo' 'bar' 'xyxxy'
```
This happens as musl doesn't implement `POSIXLY_CORRECT` (which influences the ordering). It also means that the particular test has always been failing on musl.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: util-linux: update to 2.36.
2020-07-23 10:39 [PR PATCH] util-linux: update to 2.36 ailiop-git
` (5 preceding siblings ...)
2020-07-28 12:21 ` ailiop-git
@ 2020-07-28 14:32 ` sgn
2020-07-28 16:22 ` ailiop-git
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2020-07-28 14:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1450 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/23760#issuecomment-665076339
Comment:
On 2020-07-28 05:22:04-0700, ailiop-git <notifications@github.com> wrote:
> Ah ok, so the particular failure on glibc is on `column/invalid-multibyte` test, due to missing locale:
>
> `/bin/sh: warning: setlocale: LC_ALL: cannot change locale (C.UTF-8)`
>
> this was changed in commit `6ef9a9e18471b9 ("tests: (column) use
> actually invalid multibytes to test encoding")`, which means it has
> been failing since v2.35.
>
> This can be fixed with:
>
> ```
> sed -i s/^#C.UTF-8/C.UTF-8/ masterdir/etc/default/libc-locales
> xbps-reconfigure -r masterdir/ glibc-locales -f
> ```
OK, I'll ask for a change to glibc masterdir.
>
> The second issue on musl, is the `getopt/options-posix_correctly
> `test failing. This is due to the ordering of the options
> processing, see diff of failing test below:
>
> ```
> - -a -b '1' -c '2' --a-long --b-long '3' --c-long '' -- 'foo' 'bar' 'xyxxy' '--a-long'
> + -a -b '1' -c '2' --a-long --b-long '3' --c-long '' --a-long -- 'foo' 'bar' 'xyxxy'
> ```
> This happens as musl doesn't implement `POSIXLY_CORRECT` (which
> influences the ordering). It also means that the particular test has
> always been failing on musl.
Hm, the check was added by me, and my daily driver is musl one,
I think it must be passed that time.
--
Danh
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: util-linux: update to 2.36.
2020-07-23 10:39 [PR PATCH] util-linux: update to 2.36 ailiop-git
` (6 preceding siblings ...)
2020-07-28 14:32 ` sgn
@ 2020-07-28 16:22 ` ailiop-git
2020-07-28 17:00 ` ericonr
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: ailiop-git @ 2020-07-28 16:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
New comment by ailiop-git on void-packages repository
https://github.com/void-linux/void-packages/pull/23760#issuecomment-665138335
Comment:
> OK, I'll ask for a change to glibc masterdir.
Is this required? I assume we don't run checks by default in travis (and probably shouldn't).
> Hm, the check was added by me, and my daily driver is musl one, I think it must be passed that time.
I've just checked musl with util-linux 2.35.2 and getopt/options-posix_correctly fails as expected. There's also misc/mountpoint-default that fails there for whatever reason.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: util-linux: update to 2.36.
2020-07-23 10:39 [PR PATCH] util-linux: update to 2.36 ailiop-git
` (7 preceding siblings ...)
2020-07-28 16:22 ` ailiop-git
@ 2020-07-28 17:00 ` ericonr
2020-07-28 17:14 ` ailiop-git
2020-07-29 14:50 ` [PR PATCH] [Closed]: " sgn
10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2020-07-28 17:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23760#issuecomment-665158304
Comment:
> Is this required? I assume we don't run checks by default in travis (and probably shouldn't).
If it wouldn't lead to timeouts for most stuff, we should definitely run tests in travis. Still, we need to be able to run tests for essential software like this, at least locally, without having to figure out which tests are allowed to fail and whatnot.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: util-linux: update to 2.36.
2020-07-23 10:39 [PR PATCH] util-linux: update to 2.36 ailiop-git
` (8 preceding siblings ...)
2020-07-28 17:00 ` ericonr
@ 2020-07-28 17:14 ` ailiop-git
2020-07-29 14:50 ` [PR PATCH] [Closed]: " sgn
10 siblings, 0 replies; 12+ messages in thread
From: ailiop-git @ 2020-07-28 17:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 753 bytes --]
New comment by ailiop-git on void-packages repository
https://github.com/void-linux/void-packages/pull/23760#issuecomment-665165500
Comment:
> If it wouldn't lead to timeouts for most stuff, we should definitely run tests in travis. Still, we need to be able to run tests for essential software like this, at least locally, without having to figure out which tests are allowed to fail and whatnot.
Sure, but this is more of an upstream development issue, rather than an issue at this packaging level. If those failures are a real concern (for example the getopt posix ordering doesn't seem worrysome), then they should be addressed upstream and properly fixed either by addressing the real root cause, or by marking them as known-fails under musl.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Closed]: util-linux: update to 2.36.
2020-07-23 10:39 [PR PATCH] util-linux: update to 2.36 ailiop-git
` (9 preceding siblings ...)
2020-07-28 17:14 ` ailiop-git
@ 2020-07-29 14:50 ` sgn
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2020-07-29 14:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
There's a closed pull request on the void-packages repository
util-linux: update to 2.36.
https://github.com/void-linux/void-packages/pull/23760
Description:
^ permalink raw reply [flat|nested] 12+ messages in thread