[gentoo-commits] repo/gentoo:master commit in: sys-apps/keyutils/, sys-apps/keyutils/files/

2024-03-07 Thread Sam James 
commit: 54100ec0210ba43083d5b5c65792670674b80f10
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  7 20:20:00 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  7 20:21:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54100ec0

sys-apps/keyutils: backport test fix

Closes: https://bugs.gentoo.org/926278
Signed-off-by: Sam James  gentoo.org>

 sys-apps/keyutils/files/keyutils-1.6.3-tests.patch | 76 ++
 sys-apps/keyutils/keyutils-1.6.3-r1.ebuild |  1 +
 2 files changed, 77 insertions(+)

diff --git a/sys-apps/keyutils/files/keyutils-1.6.3-tests.patch 
b/sys-apps/keyutils/files/keyutils-1.6.3-tests.patch
new file mode 100644
index ..d9414e800a6c
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.6.3-tests.patch
@@ -0,0 +1,76 @@
+https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/commit/?id=c076dff259e99d84d3822b4d2ad7f3f66532f411
+
+From c076dff259e99d84d3822b4d2ad7f3f66532f411 Mon Sep 17 00:00:00 2001
+From: Pavel Reichl 
+Date: Tue, 20 Dec 2022 14:13:29 +0100
+Subject: test: Fix test expectation based on kernel config
+
+Some test results are dependent on the kernel configuration option
+CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE.
+
+Check the kernel configuration file for its presence and expect appropriate
+test results.
+
+Function has_kernel_config is based on its xfstsests counterpart.
+
+Signed-off-by: Pavel Reichl 
+Signed-off-by: David Howells 
+--- a/tests/features/builtin_trusted/runtest.sh
 b/tests/features/builtin_trusted/runtest.sh
+@@ -33,7 +33,11 @@ expect_error EACCES
+ create_key --fail user a a $stk
+ expect_error EOPNOTSUPP
+ create_key --fail user a a $blk
+-expect_error EACCES
++if has_kernel_config "CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE"; then
++  expect_error EOPNOTSUPP
++else
++  expect_error EACCES
++fi
+ 
+ # Try adding a key to the keyrings
+ marker "TRY ADDING ASYMMETRIC KEYS"
+@@ -89,7 +93,11 @@ expect_error EACCES
+ create_key --fail -x asymmetric "" "$x509" $stk
+ expect_error ENOKEY
+ create_key --fail -x asymmetric "" "$x509" $blk
+-expect_error EACCES
++if has_kernel_config "CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE"; then
++  expect_error EOPNOTSUPP
++else
++  expect_error EACCES
++fi
+ 
+ echo " FINISHED TEST: $result" >>$OUTPUTFILE
+ 
+--- a/tests/prepare.inc.sh
 b/tests/prepare.inc.sh
+@@ -4,6 +4,26 @@
+ includes=${BASH_SOURCE[0]}
+ includes=${includes%/*}/
+ 
++# Check if currently running kernel has option set
++function has_kernel_config()
++{
++local option=$1
++local uname=$(uname -r)
++local config_list="$KCONFIG_PATH
++ /lib/modules/$uname/build/.config
++ /boot/config-$uname
++ /lib/kernel/config-$uname"
++
++for config in $config_list; do
++[ ! -f $config ] && continue
++grep -qE "^${option}=[my]" $config
++return
++done
++
++echo "Failed to find kernel configuration file"
++return false
++}
++
+ # --- need to run in own session keyring
+ watch_fd=0
+ if [ "$1" != "--inside-test-session" ]
+-- 
+cgit 1.2.3-korg

diff --git a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
index b0f539de7b97..c8d82212103a 100644
--- a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
@@ -23,6 +23,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
"${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
"${FILESDIR}"/${PN}-1.6.3-fix-rpmspec-check.patch
+   "${FILESDIR}"/${P}-tests.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/keyutils/, sys-apps/keyutils/files/

2019-11-23 Thread Matt Turner 
commit: 8cb46b587527c80a84aa8c02ae712119050679c9
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 23 20:04:28 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 23 20:06:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb46b58

sys-apps/keyutils: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 sys-apps/keyutils/Manifest |   3 -
 .../files/keyutils-1.5.10-endian-check-1.patch |  20 
 .../files/keyutils-1.5.10-makefile-fixup.patch |  25 -
 .../files/keyutils-1.5.10-silence-rpm-check.patch  |  20 
 .../files/keyutils-1.5.5-makefile-fixup.patch  |  27 -
 .../files/keyutils-1.5.9-disable-tests.patch   |  51 -
 .../files/keyutils-1.5.9-endian-check-1.patch  |  43 
 .../files/keyutils-1.5.9-endian-check-2.patch  |  38 ---
 sys-apps/keyutils/keyutils-1.5.11-r1.ebuild| 122 -
 sys-apps/keyutils/keyutils-1.5.9-r4.ebuild |  99 -
 sys-apps/keyutils/keyutils-1.6.ebuild  | 121 
 11 files changed, 569 deletions(-)

diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index e04efd6f15c..2d430658d3b 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,4 +1 @@
-DIST keyutils-1.5.11.tar.bz2 87644 BLAKE2B 
1a601b7036bcfe69b6272ae2b4fad44cbb22877aa94722fa26460f8addf105ff8898e851ad7c4f28bc755f7fe293c74bc70cffbe877978e462bc21c428c9a11d
 SHA512 
5f0dc5d5ceb673cf0ba71d3a0b525d09adc8d501a795372aa3dc29215ef393cb8577c72051cecabdb9a46dca4fcaa11e629291fb857290872475a7e445f47d43
-DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 
8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb
 SHA512 
d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B 
b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9
 SHA512 
a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
-DIST keyutils-1.6.tar.bz2 93973 BLAKE2B 
250275852d13fb5f77786350e64175c9c0909d1a7e44750e44b09f79217acb9c40536bd61e15d1abdfe36b9e161832f4c59f11b73915d457356a273ad490
 SHA512 
ee50da165099ea26904066d24b27c5165cb1eb78df6768cba3a534aa318a5c8d926ec6e5322a38c8cedaa768cd79bdcb26ef918aa8447df2e5dfbbe7b8f200ff

diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch 
b/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch
deleted file mode 100644
index 99cf23fbb21..000
--- a/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-fix regexp match against `file /proc/$$/exe` for -fPIE bash
-Now that bash is built with PIE enabled, keyutils' check for endianness
-fails because file no longer returns "executable", but instead returns
-"shared object" for file << 5.33 and "pie executable" for file >= 5.33.
-
 a/tests/toolbox.inc.sh
-+++ b/tests/toolbox.inc.sh
-@@ -13,10 +13,10 @@
- echo === $OUTPUTFILE ===
- 
- endian=`file -L /proc/$$/exe`
--if expr "$endian" : '.* MSB \+\(executable\|shared object).*' >&/dev/null
-+if expr "$endian" : '.* MSB \+\(executable\|shared object\|pie 
executable\).*' >&/dev/null
- then
- endian=BE
--elif expr "$endian" : '.* LSB \+\(executable\|shared object\).*' >&/dev/null
-+elif expr "$endian" : '.* LSB \+\(executable\|shared object\|pie 
executable\).*' >&/dev/null
- then
- endian=LE
- else

diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-makefile-fixup.patch 
b/sys-apps/keyutils/files/keyutils-1.5.10-makefile-fixup.patch
deleted file mode 100644
index c37cca0dbfd..000
--- a/sys-apps/keyutils/files/keyutils-1.5.10-makefile-fixup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 19b92eb56ca53cb4967e7bd27e3bc5e3b0e29736 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Thu, 16 Mar 2017 09:55:42 +0100
-Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils
-

- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 824bbbf..8ce3a13 100644
 a/Makefile
-+++ b/Makefile
-@@ -167,7 +167,7 @@ ifeq ($(NO_SOLIB),0)
-   $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
-   $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
-   mkdir -p $(DESTDIR)$(USRLIBDIR)
--  $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
-+  $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
- endif
-   $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
-   $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
--- 
-2.12.0
-

diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch 
b/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch
deleted file mode 100644

[gentoo-commits] repo/gentoo:master commit in: sys-apps/keyutils/, sys-apps/keyutils/files/

2019-08-03 Thread Lars Wendler 
commit: 4210c50f3da3805e7570247e9f68b482919f33d8
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Aug  3 17:10:14 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Aug  3 17:10:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4210c50f

sys-apps/keyutils: Bump to version 1.6.1

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/keyutils/Manifest |   1 +
 .../files/keyutils-1.6.1-silence-rpm-check.patch   |  20 
 sys-apps/keyutils/keyutils-1.6.1.ebuild| 121 +
 3 files changed, 142 insertions(+)

diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 7354bfc3ddf..e04efd6f15c 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,3 +1,4 @@
 DIST keyutils-1.5.11.tar.bz2 87644 BLAKE2B 
1a601b7036bcfe69b6272ae2b4fad44cbb22877aa94722fa26460f8addf105ff8898e851ad7c4f28bc755f7fe293c74bc70cffbe877978e462bc21c428c9a11d
 SHA512 
5f0dc5d5ceb673cf0ba71d3a0b525d09adc8d501a795372aa3dc29215ef393cb8577c72051cecabdb9a46dca4fcaa11e629291fb857290872475a7e445f47d43
 DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 
8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb
 SHA512 
d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
+DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B 
b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9
 SHA512 
a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
 DIST keyutils-1.6.tar.bz2 93973 BLAKE2B 
250275852d13fb5f77786350e64175c9c0909d1a7e44750e44b09f79217acb9c40536bd61e15d1abdfe36b9e161832f4c59f11b73915d457356a273ad490
 SHA512 
ee50da165099ea26904066d24b27c5165cb1eb78df6768cba3a534aa318a5c8d926ec6e5322a38c8cedaa768cd79bdcb26ef918aa8447df2e5dfbbe7b8f200ff

diff --git a/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch 
b/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch
new file mode 100644
index 000..f68d7d111a0
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch
@@ -0,0 +1,20 @@
+Hide
+
+> grep: /etc/rpm: No such file or directory
+> grep: /usr/lib/rpm: No such file or directory
+
+errors.
+
+Bug: https://bugs.gentoo.org/656446
+
+--- keyutils-1.6.1/Makefile
 keyutils-1.6.1/Makefile
+@@ -267,7 +267,7 @@
+ ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL)
+ 
+ BUILDID   := .local
+-dist  := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm))
++dist  := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm 2>/dev/null))
+ release3:= $(word 2,$(shell grep ^Release: $(SPECFILE)))
+ release2:= $(subst %{?dist},$(dist),$(release3))
+ release1:= $(subst %{?buildid},$(BUILDID),$(release2))

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
new file mode 100644
index 000..9bb0b02d677
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs linux-info multilib-minimal usr-ldscript
+
+DESCRIPTION="Linux Key Management Utilities"
+HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git;
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${P}.tar.gz;
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/1.9"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static static-libs test"
+
+RDEPEND=""
+DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.6-endian-check-1.patch
+   "${FILESDIR}"/${PN}-1.6-makefile-fixup.patch
+   "${FILESDIR}"/${PN}-1.6.1-silence-rpm-check.patch #656446
+   "${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
+   "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
+)
+
+pkg_setup() {
+   # To prevent a failure in test phase and false positive bug reports
+   # we are enforcing the following options because testsuite expects
+   # that these options are available. I.e. testsuite only decides based
+   # on kernel version which tests will be called, no feature checking.
+   if use test ; then
+   CONFIG_CHECK="KEYS"
+   ERROR_KEYS="You must have CONFIG_KEYS to run the package 
testsuite!"
+
+   if kernel_is -ge 2 6 10 && kernel_is -lt 4 0 0 ; then
+   CONFIG_CHECK="${CONFIG_CHECK} KEYS_DEBUG_PROC_KEYS"
+   ERROR_KEYS_DEBUG_PROC_KEYS="You must have 
CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/keyutils/, sys-apps/keyutils/files/

2018-08-31 Thread Thomas Deutschmann 
commit: 6f3e61be9b817232b5147586cbf9dbc3b28d1885
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug 31 14:17:11 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug 31 14:54:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f3e61be

sys-apps/keyutils: silence check for /etc/rpm & /usr/lib/rpm

Closes: https://bugs.gentoo.org/656446
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 .../files/keyutils-1.5.10-silence-rpm-check.patch| 20 
 sys-apps/keyutils/keyutils-1.5.10.ebuild |  1 +
 sys-apps/keyutils/keyutils-1.5.11.ebuild |  1 +
 3 files changed, 22 insertions(+)

diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch 
b/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch
new file mode 100644
index 000..dafd7de8dd9
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch
@@ -0,0 +1,20 @@
+Hide
+
+> grep: /etc/rpm: No such file or directory
+> grep: /usr/lib/rpm: No such file or directory
+
+errors.
+
+Bug: https://bugs.gentoo.org/656446
+
+--- a/Makefile
 b/Makefile
+@@ -245,7 +245,7 @@ SRCBALL:= rpmbuild/SOURCES/$(TARBALL)
+ ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL)
+ 
+ BUILDID   := .local
+-dist  := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm))
++dist  := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm 2>/dev/null))
+ release   := $(word 2,$(shell grep ^Release: $(SPECFILE)))
+ release   := $(subst %{?dist},$(dist),$(release))
+ release   := $(subst %{?buildid},$(BUILDID),$(release))

diff --git a/sys-apps/keyutils/keyutils-1.5.10.ebuild 
b/sys-apps/keyutils/keyutils-1.5.10.ebuild
index f2610937efe..eb922e7c5c4 100644
--- a/sys-apps/keyutils/keyutils-1.5.10.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.10.ebuild
@@ -20,6 +20,7 @@ DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
 PATCHES=(
"${FILESDIR}"/${PN}-1.5.10-endian-check-1.patch
"${FILESDIR}"/${PN}-1.5.10-makefile-fixup.patch
+   "${FILESDIR}"/${PN}-1.5.10-silence-rpm-check.patch #656446
"${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
"${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
 )

diff --git a/sys-apps/keyutils/keyutils-1.5.11.ebuild 
b/sys-apps/keyutils/keyutils-1.5.11.ebuild
index 4d30cfbe2eb..dc870fbcc6f 100644
--- a/sys-apps/keyutils/keyutils-1.5.11.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.11.ebuild
@@ -20,6 +20,7 @@ DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
 PATCHES=(
"${FILESDIR}"/${PN}-1.5.10-endian-check-1.patch
"${FILESDIR}"/${PN}-1.5.10-makefile-fixup.patch
+   "${FILESDIR}"/${PN}-1.5.10-silence-rpm-check.patch #656446
"${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
"${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
 )

[gentoo-commits] repo/gentoo:master commit in: sys-apps/keyutils/, sys-apps/keyutils/files/

2018-08-30 Thread Thomas Deutschmann 
commit: 6262e565b291b4d4bfdacf86d40cc49714906d86
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug 31 02:50:42 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug 31 02:54:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6262e565

sys-apps/keyutils: bump to v1.5.11

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 sys-apps/keyutils/Manifest |   1 +
 .../files/keyutils-1.5.10-endian-check-1.patch |  20 +
 sys-apps/keyutils/keyutils-1.5.11.ebuild   | 100 +
 3 files changed, 121 insertions(+)

diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 6142fc4ba25..3892769c71a 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,2 +1,3 @@
 DIST keyutils-1.5.10.tar.bz2 74190 BLAKE2B 
8eeab02ef363b785152ac4576f1ce9792711f482e27c3ba71d906624ecc88ef4ce2ee909d7bc3a35b42b50e971c0bd0600cfdefa9a3db35b25553bfcbe7d2d13
 SHA512 
7f6f956c7e76cdc2aeb52e74fe670b20a5f9a5d9b543fd2ce971d80c48745f37d05235a42f0a8f152b1128a109c7d8bf07e751282a20d2d3f433a99a5308ae8d
+DIST keyutils-1.5.11.tar.bz2 87644 BLAKE2B 
1a601b7036bcfe69b6272ae2b4fad44cbb22877aa94722fa26460f8addf105ff8898e851ad7c4f28bc755f7fe293c74bc70cffbe877978e462bc21c428c9a11d
 SHA512 
5f0dc5d5ceb673cf0ba71d3a0b525d09adc8d501a795372aa3dc29215ef393cb8577c72051cecabdb9a46dca4fcaa11e629291fb857290872475a7e445f47d43
 DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 
8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb
 SHA512 
d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2

diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch 
b/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch
new file mode 100644
index 000..99cf23fbb21
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch
@@ -0,0 +1,20 @@
+fix regexp match against `file /proc/$$/exe` for -fPIE bash
+Now that bash is built with PIE enabled, keyutils' check for endianness
+fails because file no longer returns "executable", but instead returns
+"shared object" for file << 5.33 and "pie executable" for file >= 5.33.
+
+--- a/tests/toolbox.inc.sh
 b/tests/toolbox.inc.sh
+@@ -13,10 +13,10 @@
+ echo === $OUTPUTFILE ===
+ 
+ endian=`file -L /proc/$$/exe`
+-if expr "$endian" : '.* MSB \+\(executable\|shared object).*' >&/dev/null
++if expr "$endian" : '.* MSB \+\(executable\|shared object\|pie 
executable\).*' >&/dev/null
+ then
+ endian=BE
+-elif expr "$endian" : '.* LSB \+\(executable\|shared object\).*' >&/dev/null
++elif expr "$endian" : '.* LSB \+\(executable\|shared object\|pie 
executable\).*' >&/dev/null
+ then
+ endian=LE
+ else

diff --git a/sys-apps/keyutils/keyutils-1.5.11.ebuild 
b/sys-apps/keyutils/keyutils-1.5.11.ebuild
new file mode 100644
index 000..4d30cfbe2eb
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.5.11.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib toolchain-funcs linux-info multilib-minimal
+
+DESCRIPTION="Linux Key Management Utilities"
+HOMEPAGE="https://people.redhat.com/dhowells/keyutils/;
+SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2;
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static static-libs test"
+
+RDEPEND=""
+DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.5.10-endian-check-1.patch
+   "${FILESDIR}"/${PN}-1.5.10-makefile-fixup.patch
+   "${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
+   "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
+)
+
+pkg_setup() {
+   CONFIG_CHECK="~KEYS"
+   ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
+
+   if use test && kernel_is lt 4 0 0; then
+   CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
+   ERROR_KEYS_DEBUG_PROC_KEYS="You must have 
CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+   fi
+   linux-info_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   # The lsb check is useless, so avoid spurious command not found 
messages.
+   sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
+   # All the test files are bash, but try to execute via `sh`.
+   sed -i -r \
+   -e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
+   tests/{Makefile*,*.sh} || die
+   find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
+   # Some tests call the kernel which calls userspace, but that will
+   # run the install keyutils rather than the locally compiled one,
+   # so disable round trip tests.
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/keyutils/, sys-apps/keyutils/files/

2017-05-24 Thread Lars Wendler 
commit: 303e55e589bd914b48bfbc3e29880cfb2bac0c91
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May 24 16:29:06 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May 24 16:30:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303e55e5

sys-apps/keyutils: Bump to version 1.5.10

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/keyutils/Manifest |  1 +
 .../files/keyutils-1.5.10-disable-tests.patch  | 51 
 .../files/keyutils-1.5.10-makefile-fixup.patch | 25 ++
 sys-apps/keyutils/keyutils-1.5.10.ebuild   | 96 ++
 4 files changed, 173 insertions(+)

diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 08c5655aca8..c1a203fc277 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1 +1,2 @@
+DIST keyutils-1.5.10.tar.bz2 74190 SHA256 
115c3deae7f181778fd0e0ffaa2dad1bf1fe2f5677cf2e0e348cdb7a1c93afb6 SHA512 
7f6f956c7e76cdc2aeb52e74fe670b20a5f9a5d9b543fd2ce971d80c48745f37d05235a42f0a8f152b1128a109c7d8bf07e751282a20d2d3f433a99a5308ae8d
 WHIRLPOOL 
09d4c420d26e4089c5d1c460faf5c6a40912dc2f2d4abb3b1aaedfacb3919e7deab8e29c7a4f8306d5b8539c7ab0f3df659cc1cb804e5d43030bb0c331eead9f
 DIST keyutils-1.5.9.tar.bz2 74683 SHA256 
4da2c5552c688b65ab14d4fd40fbdf720c8b396d8ece643e040cf6e707e083ae SHA512 
d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
 WHIRLPOOL 
0509cce076a32d2f319f596506d4aaeb83e1853ee6337e6a3041e6957e9098f4482ae56a9c6455605b72b3f34701a890e9be666b6fdd752ff14a3d3564dcba19

diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-disable-tests.patch 
b/sys-apps/keyutils/files/keyutils-1.5.10-disable-tests.patch
new file mode 100644
index 000..fa82792cddb
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.5.10-disable-tests.patch
@@ -0,0 +1,51 @@
+disable tests that mess with system wide settings
+
+https://bugs.gentoo.org/519062
+
+--- keyutils-1.5.10/tests/bugzillas/bz1031154/runtest.sh
 keyutils-1.5.10/tests/bugzillas/bz1031154/runtest.sh
+@@ -27,6 +27,8 @@
+ 
+ echo " BEGINNING TEST" >$OUTPUTFILE
+ 
++if false ; then
++
+ # we need a reference time to scan the audit log from so as not to pick up old
+ # results from this test.
+ base_date=`date +"%x@%X"`
+@@ -97,6 +99,10 @@
+   fi
+ fi
+ 
++else
++marker "Gentoo: skipping test due to system wide modifications"
++fi
++
+ echo " FINISHED TEST: $result" >>$OUTPUTFILE
+ 
+ # --- then report the results in the database ---
+
+https://bugs.gentoo.org/522050
+
+--- keyutils-1.5.10/tests/keyctl/padd/useradd/runtest.sh
 keyutils-1.5.10/tests/keyctl/padd/useradd/runtest.sh
+@@ -40,6 +40,8 @@
+ marker "UNLINK KEY"
+ unlink_key $keyid @s
+ 
++if false ; then
++
+ if [ $skip_root_required = 0 ] && {
+ [ $OSDIST = RHEL ] && ! version_less_than $OSRELEASE 6.6 ||
+ keyutils_at_or_later_than 1.5.6 ;
+@@ -85,6 +87,10 @@
+ fi
+ fi
+ 
++else
++marker "Gentoo: skipping test due to system wide modifications"
++fi
++
+ echo " FINISHED TEST: $result" >>$OUTPUTFILE
+ 
+ # --- then report the results in the database ---

diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-makefile-fixup.patch 
b/sys-apps/keyutils/files/keyutils-1.5.10-makefile-fixup.patch
new file mode 100644
index 000..c37cca0dbfd
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.5.10-makefile-fixup.patch
@@ -0,0 +1,25 @@
+From 19b92eb56ca53cb4967e7bd27e3bc5e3b0e29736 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Thu, 16 Mar 2017 09:55:42 +0100
+Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 824bbbf..8ce3a13 100644
+--- a/Makefile
 b/Makefile
+@@ -167,7 +167,7 @@ ifeq ($(NO_SOLIB),0)
+   $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+   $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
+   mkdir -p $(DESTDIR)$(USRLIBDIR)
+-  $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
++  $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
+ endif
+   $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
+   $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
+-- 
+2.12.0
+

diff --git a/sys-apps/keyutils/keyutils-1.5.10.ebuild 
b/sys-apps/keyutils/keyutils-1.5.10.ebuild
new file mode 100644
index 000..658882242f2
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.5.10.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib eutils toolchain-funcs linux-info multilib-minimal
+
+DESCRIPTION="Linux Key Management Utilities"
+HOMEPAGE="https://people.redhat.com/dhowells/keyutils/;
+SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2;
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/keyutils/, sys-apps/keyutils/files/

2017-01-25 Thread Mike Frysinger 
commit: 3b68244ddce256fa9637d75cab0e001a711dfb46
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Jan 26 00:44:07 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Jan 26 00:47:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b68244d

sys-apps/keyutils: fix extern C markings in keyutils.h

 .../files/keyutils-1.5.9-header-extern-c.patch | 43 ++
 sys-apps/keyutils/keyutils-1.5.9-r3.ebuild | 93 ++
 2 files changed, 136 insertions(+)

diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-header-extern-c.patch 
b/sys-apps/keyutils/files/keyutils-1.5.9-header-extern-c.patch
new file mode 100644
index ..c7a4c10
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.5.9-header-extern-c.patch
@@ -0,0 +1,43 @@
+sent upstream
+
+From 1f15000ad21c301a51f7746eb561659348060f45 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Wed, 25 Jan 2017 14:06:55 -1000
+Subject: [PATCH keyutils] add extern C markings to header file for C++ users
+
+If people try to use keyutils from C++ code, the header doesn't work
+properly because the compiler mangles the keyutils symbols.  Add the
+right extern markings so it works out of the box.
+
+Signed-off-by: Mike Frysinger 
+---
+ keyutils.h | 8 
+ 1 file changed, 8 insertions(+)
+
+diff --git a/keyutils.h b/keyutils.h
+index a69fa7aaa11d..d50d19d3e929 100644
+--- a/keyutils.h
 b/keyutils.h
+@@ -15,6 +15,10 @@
+ #include 
+ #include 
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern const char keyutils_version_string[];
+ extern const char keyutils_build_string[];
+ 
+@@ -180,4 +184,8 @@ extern int 
recursive_session_key_scan(recursive_key_scanner_t func, void *data);
+ extern key_serial_t find_key_by_type_and_desc(const char *type, const char 
*desc,
+ key_serial_t destringid);
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* KEYUTILS_H */
+-- 
+2.11.0
+

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r3.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r3.ebuild
new file mode 100644
index ..54b7d6e
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.5.9-r3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit multilib eutils toolchain-funcs linux-info multilib-minimal
+
+DESCRIPTION="Linux Key Management Utilities"
+HOMEPAGE="https://people.redhat.com/dhowells/keyutils/;
+SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2;
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+IUSE="static static-libs test"
+
+RDEPEND=""
+DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+pkg_setup() {
+   CONFIG_CHECK="~KEYS"
+   use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
+   ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
+   ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS 
to run the package testsuite!"
+   linux-info_pkg_setup
+}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch
+   epatch "${FILESDIR}"/${PN}-1.5.9-endian-check-{1,2}.patch #426424
+   epatch "${FILESDIR}"/${PN}-1.5.9-disable-tests.patch #519062 #522050
+   epatch "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
+
+   # The lsb check is useless, so avoid spurious command not found 
messages.
+   sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
+   # All the test files are bash, but try to execute via `sh`.
+   sed -i -r \
+   -e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
+   tests/{Makefile*,*.sh} || die
+   find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
+   # Some tests call the kernel which calls userspace, but that will
+   # run the install keyutils rather than the locally compiled one,
+   # so disable round trip tests.
+   rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
+
+   multilib_copy_sources
+}
+
+multilib_src_compile() {
+   tc-export AR CC
+   sed -i \
+   -e "1iRPATH = $(usex static -static '')" \
+   -e '/^C.*FLAGS/s|:=|+=|' \
+   -e 's:-Werror::' \
+   -e '/^BUILDFOR/s:=.*:=:' \
+   -e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
+   -e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
+   -e "s: /: ${EPREFIX}/:g" \
+   -e '/^NO_ARLIB/d' \
+   Makefile || die
+
+   # We need the static lib in order to statically link programs.
+   if use static ; then
+   export NO_ARLIB=0
+   # Hack the progs to depend on the static lib instead.
+   sed -i \
+   -e

[gentoo-commits] repo/gentoo:master commit in: sys-apps/keyutils/, sys-apps/keyutils/files/

2017-01-19 Thread Mike Frysinger 
commit: 41318c00bfbdba74249f88cde3e64ddfdc240cce
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Jan 19 16:54:46 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Jan 19 16:54:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41318c00

sys-apps/keyutils: disable tests that modify global system settings #519062 
#522050

 .../files/keyutils-1.5.9-disable-tests.patch   | 51 ++
 sys-apps/keyutils/keyutils-1.5.9-r2.ebuild |  1 +
 2 files changed, 52 insertions(+)

diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch 
b/sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch
new file mode 100644
index ..0a5a02b
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch
@@ -0,0 +1,51 @@
+disable tests that mess with system wide settings
+
+https://bugs.gentoo.org/519062
+
+--- a/tests/bugzillas/bz1031154/runtest.sh
 b/tests/bugzillas/bz1031154/runtest.sh
+@@ -11,6 +11,8 @@
+ result=PASS
+ echo " BEGINNING TEST" >$OUTPUTFILE
+ 
++if false; then
++
+ # we need a reference time to scan the audit log from so as not to pick up old
+ # results from this test.
+ base_date=`date +"%x@%X"`
+@@ -81,6 +83,10 @@
+   fi
+ fi
+ 
++else
++marker "Gentoo: skipping test due to system wide modifications"
++fi
++
+ echo " FINISHED TEST: $result" >>$OUTPUTFILE
+ 
+ # --- then report the results in the database ---
+
+https://bugs.gentoo.org/522050
+
+--- a/tests/keyctl/padd/useradd/runtest.sh
 b/tests/keyctl/padd/useradd/runtest.sh
+@@ -40,6 +40,8 @@
+ marker "UNLINK KEY"
+ unlink_key $keyid @s
+ 
++if false; then
++
+ # add keys with huge payloads
+ old_root_quota=`cat /proc/sys/kernel/keys/root_maxbytes`
+ if [ $old_root_quota -lt 65536 ]
+@@ -76,6 +78,10 @@
+ sleep 1
+ fi
+ 
++else
++marker "Gentoo: skipping test due to system wide modifications"
++fi
++
+ echo " FINISHED TEST: $result" >>$OUTPUTFILE
+ 
+ # --- then report the results in the database ---

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
index 572489e..0c96c79 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
@@ -28,6 +28,7 @@ pkg_setup() {
 src_prepare() {
epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch
epatch "${FILESDIR}"/${PN}-1.5.9-endian-check-{1,2}.patch #426424
+   epatch "${FILESDIR}"/${PN}-1.5.9-disable-tests.patch #519062 #522050
 
# The lsb check is useless, so avoid spurious command not found 
messages.
sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die

[gentoo-commits] repo/gentoo:master commit in: sys-apps/keyutils/, sys-apps/keyutils/files/

2017-01-19 Thread Mike Frysinger 
commit: 547bf7fbf276a24d17cfa2a21248cf7670e939f9
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Jan 19 16:48:31 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Jan 19 16:51:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547bf7fb

sys-apps/keyutils: add upstream fix for tests endian checking #426424

 .../files/keyutils-1.5.9-endian-check-1.patch  | 43 ++
 .../files/keyutils-1.5.9-endian-check-2.patch  | 38 +++
 sys-apps/keyutils/keyutils-1.5.9-r2.ebuild |  1 +
 3 files changed, 82 insertions(+)

diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-1.patch 
b/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-1.patch
new file mode 100644
index ..18344b9
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-1.patch
@@ -0,0 +1,43 @@
+patch from upstream
+
+https://bugs.gentoo.org/426424
+
+From f0d9a8c15f1525d0404077f32fddccb606a61bac Mon Sep 17 00:00:00 2001
+From: Tyler Hicks 
+Date: Mon, 24 Feb 2014 18:52:41 -0600
+Subject: [PATCH] TEST: Make endianness detection work with file 5.14
+
+The 5.14 release of file outputs an extra space after [LM]SB:
+
+$ ./src/file -m magic/magic.mgc -L /proc/$$/exe
+/proc/12755/exe: ELF 64-bit LSB  executable, ...
+
+This was due to the elf magic file containing some trailing spaces in
+the 5.14 release.
+
+Signed-off-by: Tyler Hicks 
+Signed-off-by: David Howells 
+---
+ tests/toolbox.inc.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh
+index cbc49e0fce23..fe3c7f71299a 100644
+--- a/tests/toolbox.inc.sh
 b/tests/toolbox.inc.sh
+@@ -17,10 +17,10 @@ includes=${includes%/*}/
+ echo === $OUTPUTFILE ===
+ 
+ endian=`file -L /proc/$$/exe`
+-if expr "$endian" : '.* MSB executable.*' >&/dev/null
++if expr "$endian" : '.* MSB \+executable.*' >&/dev/null
+ then
+ endian=BE
+-elif expr "$endian" : '.* LSB executable.*' >&/dev/null
++elif expr "$endian" : '.* LSB \+executable.*' >&/dev/null
+ then
+ endian=LE
+ else
+-- 
+2.11.0
+

diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch 
b/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch
new file mode 100644
index ..a4558d8
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch
@@ -0,0 +1,38 @@
+patch from upstream
+
+https://bugs.gentoo.org/426424
+
+From ce92e974b8ecff19cf430b7b58a09b8190645b5c Mon Sep 17 00:00:00 2001
+From: David Howells 
+Date: Fri, 26 Feb 2016 10:07:00 +
+Subject: [PATCH] TEST: Fix endianness determination
+
+Endianness determination was broken sometime after Fedora 20 when
+executables switched to being DYN objects rather than EXEC objects.  This
+caused the output of file to change.
+
+Signed-off-by: David Howells 
+---
+ tests/toolbox.inc.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh
+index f2463c57b40e..5ac23ffc04fb 100644
+--- a/tests/toolbox.inc.sh
 b/tests/toolbox.inc.sh
+@@ -13,10 +13,10 @@
+ echo === $OUTPUTFILE ===
+ 
+ endian=`file -L /proc/$$/exe`
+-if expr "$endian" : '.* MSB \+executable.*' >&/dev/null
++if expr "$endian" : '.* MSB \+\(executable\|shared object).*' >&/dev/null
+ then
+ endian=BE
+-elif expr "$endian" : '.* LSB \+executable.*' >&/dev/null
++elif expr "$endian" : '.* LSB \+\(executable\|shared object\).*' >&/dev/null
+ then
+ endian=LE
+ else
+-- 
+2.11.0
+

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
index 0a46055..572489e 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
@@ -27,6 +27,7 @@ pkg_setup() {
 
 src_prepare() {
epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch
+   epatch "${FILESDIR}"/${PN}-1.5.9-endian-check-{1,2}.patch #426424
 
# The lsb check is useless, so avoid spurious command not found 
messages.
sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die