subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sys\-apps\/keyutils\/"

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

2024-05-14 Thread Mike Gilbert

commit: 3cc0a9fd571f057ca3a2eae1c7f49f7048364e2c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed May 15 00:10:59 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed May 15 00:10:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cc0a9fd

sys-apps/keyutils: pass parameters to make

... instead of abusing sed.

Closes: https://bugs.gentoo.org/931839
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3-r1.ebuild | 57 +-
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
index c8d82212103a..6d09620c632a 100644
--- a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
@@ -70,30 +70,38 @@ src_prepare() {
multilib_copy_sources
 }
 
+mymake() {
+   local args=(
+   PREFIX="${EPREFIX}/usr"
+   ETCDIR="${EPREFIX}/etc"
+   BINDIR="${EPREFIX}/bin"
+   SBINDIR="${EPREFIX}/sbin"
+   SHAREDIR="${EPREFIX}/usr/share/keyutils"
+   MANDIR="${EPREFIX}/usr/share/man"
+   INCLUDEDIR="${EPREFIX}/usr/include"
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+   USRLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+   CFLAGS="${CFLAGS}"
+   CXXFLAGS="${CXXFLAGS}"
+   RPATH=$(usex static -static '')
+   BUILDFOR=
+   NO_ARLIB="${NO_ARLIB}"
+   )
+   if use static; then
+   args+=( LIB_DEPENDENCY='$(ARLIB)' )
+   fi
+   emake "${args[@]}" "$@"
+}
+
 multilib_src_compile() {
-   tc-export AR CC CXX
-   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 '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) 
$(SONAME):' \
-   Makefile || die
+   local NO_ARLIB
+   if use static; then
+   NO_ARLIB=0
else
-   export NO_ARLIB=$(usex static-libs 0 1)
+   NO_ARLIB=$(usex static-libs 0 1)
fi
-   emake
+   tc-export AR CC CXX
+   mymake
 }
 
 multilib_src_test() {
@@ -101,14 +109,13 @@ multilib_src_test() {
# older versions already installed in the system.
LD_LIBRARY_PATH=${BUILD_DIR} \
PATH="${BUILD_DIR}:${PATH}" \
-   emake test
+   mymake test
 }
 
 multilib_src_install() {
# Possibly undo the setting for USE=static (see src_compile).
-   export NO_ARLIB=$(usex static-libs 0 1)
-
-   default
+   local NO_ARLIB=$(usex static-libs 0 1)
+   mymake DESTDIR="${D}" install
 }
 
 multilib_src_install_all() {

[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/

2024-03-02 Thread Sam James

commit: 6b40ef2dd17e0da9dbced4cf29f788fc2537f6dc
Author: Eli Schwartz  gmail  com>
AuthorDate: Sun Mar  3 01:39:36 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  3 04:00:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b40ef2d

sys-apps/keyutils: drop 1.6.3

Old ebuild uses usr-ldscript

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 116 
 1 file changed, 116 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
deleted file mode 100644
index 05c7d9bde8b6..
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.6-makefile-fixup.patch
-   "${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
-)
-
-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!"
-   fi
-
-   if kernel_is -ge 4 7 ; then
-   CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
-   ERROR_KEY_DH_OPERATIONS="You must have 
CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
-   fi
-   else
-   CONFIG_CHECK="~KEYS"
-   ERROR_KEYS="You will be unable to use this package on this 
system because CONFIG_KEYS is not set!"
-
-   if kernel_is -ge 4 7 ; then
-   CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
-   ERROR_KEY_DH_OPERATIONS="You will be unable to use 
Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
-   fi
-   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
-   # 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 CXX
-   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 '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) 
$(SONAME):' \
-   Makefile || die
-   else
-   export NO_ARLIB=$(usex static-libs 0 1)
-   fi
-   emake
-}
-
-multilib_src_test() {
-   # Execute the locally compiled code rather than the
-   # older versions already installed in the system.
-   LD_LIBRARY_PATH=${BUILD_DIR} \
-   PATH="${BUILD_DIR}:${PATH}" \
-   emake test
-}
-
-multilib_src_install() {
-   # Possibly undo the setting for USE=static (see

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

2024-03-02 Thread Arthur Zamarin

commit: 4618a0cbe36c5f9791a8683a5bb955f5e067da65
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  2 12:12:14 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  2 12:12:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4618a0cb

sys-apps/keyutils: Stabilize 1.6.3-r1 amd64, #925636

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
index fa67273868d0..cc112d736dd9 100644
--- a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2024-03-02 Thread Arthur Zamarin

commit: d1bddb0fb4c380caa9dfe4de04e977f88c93c196
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  2 12:12:24 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  2 12:12:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1bddb0f

sys-apps/keyutils: Stabilize 1.6.3-r1 hppa, #925636

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
index bb1172b113b2..b0f539de7b97 100644
--- a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2024-03-02 Thread Arthur Zamarin

commit: 06311958daf43845763029c2a19c6994ecde3754
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  2 12:12:09 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  2 12:12:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06311958

sys-apps/keyutils: Stabilize 1.6.3-r1 arm64, #925636

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
index bc5a6f8d661b..8a167ee39969 100644
--- a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2024-03-02 Thread Arthur Zamarin

commit: c7f7a4ce6ec6b98cc49b42008a3b5aaad6f67197
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  2 12:12:06 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  2 12:12:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f7a4ce

sys-apps/keyutils: Stabilize 1.6.3-r1 arm, #925636

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
index 37ead31590a3..bc5a6f8d661b 100644
--- a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2024-03-02 Thread Arthur Zamarin

commit: b4fb729776fbe1c0a12502a010e3f16cafa91334
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  2 12:12:19 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  2 12:12:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4fb7297

sys-apps/keyutils: Stabilize 1.6.3-r1 ppc64, #925636

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
index cc112d736dd9..bb1172b113b2 100644
--- a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2024-03-02 Thread Arthur Zamarin

commit: 6104d1f4a1ac101f5347cf155814ffbc1fd37f75
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  2 12:12:11 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  2 12:12:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6104d1f4

sys-apps/keyutils: Stabilize 1.6.3-r1 x86, #925636

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
index 8a167ee39969..fa67273868d0 100644
--- a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2024-02-07 Thread Sam James

commit: 624363fd24ce66be030fc0270524a63a67458e02
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Feb  7 06:14:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  7 19:20:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624363fd

sys-apps/keyutils: remove usr-ldscript support

Per news item 2024-01-05-usr-initramfs, we no longer support this use
case. It is fragile and hacky and leads to bizarre forms of load errors.

The functionality is, despite being called "split-usr", not really about
split-usr at all.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3-r1.ebuild | 115 +
 1 file changed, 115 insertions(+)

diff --git a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
new file mode 100644
index ..37ead31590a3
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs linux-info multilib-minimal
+
+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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.6-makefile-fixup.patch
+   "${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
+)
+
+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!"
+   fi
+
+   if kernel_is -ge 4 7 ; then
+   CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
+   ERROR_KEY_DH_OPERATIONS="You must have 
CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
+   fi
+   else
+   CONFIG_CHECK="~KEYS"
+   ERROR_KEYS="You will be unable to use this package on this 
system because CONFIG_KEYS is not set!"
+
+   if kernel_is -ge 4 7 ; then
+   CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
+   ERROR_KEY_DH_OPERATIONS="You will be unable to use 
Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
+   fi
+   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
+   # 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 CXX
+   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 '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) 
$(SONAME):' \
+   Makefile || die
+   else
+   export NO_ARLIB=$(usex static-libs 0 1)
+   fi
+   emake
+}
+
+multilib_src_test() {
+   # Execute the locally compiled code rather than the
+   # older

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

2024-01-05 Thread Sam James

commit: 9dd872f591e8f6ae9f214dc853d3b853e69b9511
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 13:55:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 14:02:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dd872f5

Revert "sys-apps/keyutils: unkeyword 1.6.3 for ~ppc, ~sparc"

This reverts commit 0e8a5923082f98666cd145742fd7aad69435f196.

Needed by nfs-utils.

Signed-off-by: Sam James  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index 6a49f4993dc8..05c7d9bde8b6 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc64 ~riscv 
~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2024-01-05 Thread Sam James

commit: 908f1c9dc7d11498b5ae5e1585af675e34462f31
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr  6 04:49:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 14:02:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=908f1c9d

sys-apps/keyutils: unkeyword 1.6.3 for ~ppc, ~sparc

Bug: https://bugs.gentoo.org/636252
Signed-off-by: Sam James  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index 05c7d9bde8b6..6a49f4993dc8 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc64 ~riscv 
~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2023-10-09 Thread Sam James

commit: a424a8291ce5ad3bfe3adb46e4ab644a01c43094
Author: Eli Schwartz  gmail  com>
AuthorDate: Tue Oct 10 04:03:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 10 04:33:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a424a829

sys-apps/keyutils: drop unused seds

QA checks warned that the first sed was not used. Turns out neither is
the second sed.

This was fixed in upstream version v1.5.9-2-g80d4848 (commit
80d484853742639b9a83c17ee99188e56206eaa4 dated 2014 (so before
gentoo.git conversion) and has survived all this time.

Signed-off-by: Eli Schwartz  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33273
Signed-off-by: Sam James  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index 9e79ba6b0e87..05c7d9bde8b6 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,11 +61,6 @@ src_prepare() {
 
# 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:' {} + || die
# 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/

2023-04-05 Thread Sam James

commit: 3203deb98638e984a40a00b780cb451741d13266
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr  6 05:17:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  6 05:18:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3203deb9

Revert "sys-apps/keyutils: unkeyword 1.6.3 for ~ppc, ~sparc"

This reverts commit 989234ec76d43cf109bf6a29580de82f0e803779.

Signed-off-by: Sam James  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index b66626556bad..9e79ba6b0e87 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc64 ~riscv 
~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2023-04-05 Thread Sam James

commit: 989234ec76d43cf109bf6a29580de82f0e803779
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr  6 04:49:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  6 04:49:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=989234ec

sys-apps/keyutils: unkeyword 1.6.3 for ~ppc, ~sparc

Bug: https://bugs.gentoo.org/636252
Signed-off-by: Sam James  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index 9e79ba6b0e87..b66626556bad 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc64 ~riscv 
~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2023-01-01 Thread Conrad Kostecki

commit: 8432d9eb9a7a6521ccc92d33b830a942452607ce
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Jan  1 13:40:18 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Jan  1 18:16:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8432d9eb

sys-apps/keyutils: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28920
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/keyutils-1.6-endian-check-1.patch| 32 --
 .../files/keyutils-1.6.1-silence-rpm-check.patch   | 20 --
 2 files changed, 52 deletions(-)

diff --git a/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch 
b/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch
deleted file mode 100644
index e783ec699c34..
--- a/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0a99778774df85448aeda0a37b85c43bc8868a9e Mon Sep 17 00:00:00 2001
-From: Lars Wendler 
-Date: Fri, 16 Nov 2018 12:37:29 +0100
-Subject: [PATCH] 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.

- 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 0ce6db0..712c5bd 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\|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
--- 
-2.19.1
-

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
deleted file mode 100644
index f68d7d111a0c..
--- a/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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))

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

2022-12-26 Thread Sam James

commit: f791b902166c6846c7fc863c7aaa6dc483e24787
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 26 08:24:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 26 08:33:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f791b902

sys-apps/keyutils: drop 1.6.1

Signed-off-by: Sam James  gentoo.org>

 sys-apps/keyutils/Manifest  |   1 -
 sys-apps/keyutils/keyutils-1.6.1.ebuild | 122 
 2 files changed, 123 deletions(-)

diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 20f06fe2a31f..a4690bb30144 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,2 +1 @@
-DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B 
b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9
 SHA512 
a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
 DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B 
b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b
 SHA512 
f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
deleted file mode 100644
index b99c47b63c99..
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static static-libs test"
-RESTRICT="!test? ( 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!"
-   fi
-
-   if kernel_is -ge 4 7 ; then
-   CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
-   ERROR_KEY_DH_OPERATIONS="You must have 
CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
-   fi
-   else
-   CONFIG_CHECK="~KEYS"
-   ERROR_KEYS="You will be unable to use this package on this 
system because CONFIG_KEYS is not set!"
-
-   if kernel_is -ge 4 7 ; then
-   CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
-   ERROR_KEY_DH_OPERATIONS="You will be unable to use 
Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
-   fi
-   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:' {} + || die
-   # 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 '')" \
-

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

2022-11-22 Thread Arthur Zamarin

commit: a85b260f1db5533fecc8d9261b5654e0bab7c373
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Nov 22 08:04:27 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Nov 22 08:04:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a85b260f

sys-apps/keyutils: Stabilize 1.6.3 arm, #789837

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index fe79df96fe7d..9e79ba6b0e87 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2022-10-29 Thread Sam James

commit: 5c6e6f56bcc47801243967be57210db2eee0d7cd
Author: kochera  google  com>
AuthorDate: Fri Oct 28 21:40:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 29 14:44:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c6e6f56

sys-apps/keyutils: Add cpe_uri for keyutils package.

Signed-off-by: Michael Kochera  google.com>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/keyutils/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-apps/keyutils/metadata.xml b/sys-apps/keyutils/metadata.xml
index 0b1a8dcd2f89..f16b3424c619 100644
--- a/sys-apps/keyutils/metadata.xml
+++ b/sys-apps/keyutils/metadata.xml
@@ -8,6 +8,9 @@
base-sys...@gentoo.org
Gentoo Base System

+   
+   cpe:/a:keyutils_project:keyutils
+   

Reflect ABI compatibility for 
libkeyutils.so.

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

2022-05-10 Thread Sam James

commit: 59a3d3369a55f48c4ec3ceba101c1aab499d447f
Author: Sam James  gentoo  org>
AuthorDate: Tue May 10 17:01:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 11 00:49:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59a3d336

sys-apps/keyutils: drop to ~sparc

Too many test failures. Unclear if it truly works at runtime.

Bug: https://bugs.gentoo.org/789837
Bug: https://bugs.gentoo.org/636252
Signed-off-by: Sam James  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 96aead1e2727..7b40e4596402 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2022-05-10 Thread Sam James

commit: ad328cf93cda113885b8b21135e29c5909a71350
Author: Sam James  gentoo  org>
AuthorDate: Tue May 10 17:01:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 11 00:49:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad328cf9

sys-apps/keyutils: drop to ~ppc

Too many test failures. Unclear if it truly works at runtime.

Bug: https://bugs.gentoo.org/789837
Bug: https://bugs.gentoo.org/636252
Signed-off-by: Sam James  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
 sys-apps/keyutils/keyutils-1.6.3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 7b40e4596402..b99c47b63c99 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index 6c64cb3ebe26..fe79df96fe7d 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2022-05-10 Thread Agostino Sarubbo

commit: 5c18582eecf1c756da3ee1396da6eabcda089076
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue May 10 14:34:29 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue May 10 14:34:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c18582e

Revert "sys-apps/keyutils: sparc stable wrt bug #789837"

This reverts commit f10ae6d4cd127a4fc33d2e953a55bfc217c07a93.

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index d36d94ee829b..6c64cb3ebe26 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2022-05-10 Thread Agostino Sarubbo

commit: f10ae6d4cd127a4fc33d2e953a55bfc217c07a93
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue May 10 13:47:56 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue May 10 13:47:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f10ae6d4

sys-apps/keyutils: sparc stable wrt bug #789837

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index 6c64cb3ebe26..d36d94ee829b 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2022-05-10 Thread Agostino Sarubbo

commit: f8111ed1e80b7cadc8c8388aa15e1ffedc96f8f4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue May 10 13:46:57 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue May 10 13:46:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8111ed1

sys-apps/keyutils: amd64 stable wrt bug #789837

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index 2e3787d7780e..6c64cb3ebe26 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2022-04-28 Thread Sam James

commit: 58a5861e534bf5ae62c70b66989629365a3e39bb
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 29 04:19:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 29 04:19:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58a5861e

sys-apps/keyutils: fix "command not found" error for rpmspec

Closes: https://bugs.gentoo.org/760633
Thanks-to: Adrian Ratiu  collabora.com>
Signed-off-by: Sam James  gentoo.org>

 .../files/keyutils-1.6.3-fix-rpmspec-check.patch   | 38 ++
 sys-apps/keyutils/keyutils-1.6.3.ebuild|  1 +
 2 files changed, 39 insertions(+)

diff --git a/sys-apps/keyutils/files/keyutils-1.6.3-fix-rpmspec-check.patch 
b/sys-apps/keyutils/files/keyutils-1.6.3-fix-rpmspec-check.patch
new file mode 100644
index ..3fb659712aed
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.6.3-fix-rpmspec-check.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/760633
+
+From 41077f8901b642d36b63f94b0fc62377a07fc0b2 Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu 
+Date: Tue, 4 Jan 2022 03:51:10 +0200
+Subject: [PATCH] Makefile: only run rpmspec if it exists
+
+keyutils is built on many distros which do not use rpm like
+Gentoo, ChromeOS or Arch. Older versions of bash silently
+ignored the fact that rpmspec was missing, but newer bash
+like v5.1 issue a new error:
+
+/bin/sh: line 1: rpmspec: command not found
+
+This happens every time the Makefile is parsed, including
+for a simple "make" invocation or "make install" even if
+a rpm package is not desired.
+
+Arch Linux simply ignores this new error but Gentoo and
+ChromeOS fail because portage actively monitors the build
+log for errors like this. See bug report [1].
+
+Fix this by calling rpmspec only if it exists.
+
+[1] https://bugs.gentoo.org/760633
+
+Signed-off-by: Adrian Ratiu 
+--- a/Makefile
 b/Makefile
+@@ -285,7 +285,7 @@ SRCBALL:= rpmbuild/SOURCES/$(TARBALL)
+ ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL)
+ 
+ BUILDID   := .local
+-rpmver0   := $(shell rpmspec -q ./keyutils.spec --define "buildid 
$(BUILDID)")
++rpmver0   := $(shell if which rpmspec >/dev/null 2>&1; then rpmspec -q 
./keyutils.spec --define "buildid $(BUILDID)"; fi)
+ rpmver1   := $(word 1,$(rpmver0))
+ rpmver2   := $(subst ., ,$(rpmver1))
+ rpmver3   := $(lastword $(rpmver2))

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index ec3bdc264953..e42968e1bd57 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -22,6 +22,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.6-makefile-fixup.patch
"${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
 )
 
 pkg_setup() {

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

2022-04-27 Thread Arthur Zamarin

commit: 85fdbcf2169c7ebe2c49c3c04cae55098099
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Apr 27 18:05:51 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Apr 27 18:05:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85fdbcf2

sys-apps/keyutils: Stabilize 1.6.3 ppc, #789837

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index e70d7c5d4311..ec3bdc264953 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2022-01-14 Thread Arthur Zamarin

commit: 9c0563ed5cf2dda1a6e5ca59ef4a13ea60430898
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 14 14:41:55 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 14 14:41:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c0563ed

sys-apps/keyutils: Stabilize 1.6.3 hppa, #789837

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index 99217d63b428..e70d7c5d4311 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2022-01-12 Thread Georgy Yakovlev

commit: b9cc983bd63988cf2b6c988196dd181e84a27ad5
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Jan 13 02:50:36 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Jan 13 02:50:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9cc983b

sys-apps/keyutils: Stabilize 1.6.3 ppc64, #789837

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index d32b3b91f411..99217d63b428 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2021-05-13 Thread Sam James

commit: d9c516e7c7240feb8acf0d452e1c8ab674c40d40
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 16:14:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 13 16:14:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c516e7

sys-apps/keyutils: Stabilize 1.6.3 x86, #789837

Signed-off-by: Sam James  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index d5d66680c04..013beb38f8c 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"

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

2021-05-13 Thread David Seifert

commit: 26b663dfcf3acde755dc937cff0bbd2b0d0af5e2
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 13:54:07 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu May 13 13:54:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b663df

sys-apps/keyutils: drop unused multilib inherit

Signed-off-by: David Seifert  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
 sys-apps/keyutils/keyutils-1.6.3.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 35de8f2bff1..96aead1e272 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib toolchain-funcs linux-info multilib-minimal usr-ldscript
+inherit 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;

diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index 127ba037b76..d5d66680c04 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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
+inherit 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;

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

2020-07-08 Thread Thomas Deutschmann

commit: 828c0e2d18787c72e3771cb5be987b747e708c27
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Jul  8 09:32:32 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Jul  8 11:34:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=828c0e2d

sys-apps/keyutils: bump to v1.6.3

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-apps/keyutils/Manifest | 2 +-
 sys-apps/keyutils/{keyutils-1.6.2.ebuild => keyutils-1.6.3.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index e57a41e9c31..20f06fe2a31 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,2 +1,2 @@
 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B 
b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9
 SHA512 
a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
-DIST keyutils-1.6.2.tar.gz 137099 BLAKE2B 
7f304631e46a7e3f3dd5d64ca55661e6f39518bbcab9cd27c2ef4a53656c9e51891f462829c63dd8ea14c51472d8e10032df692925d8f001faa3db64f842172a
 SHA512 
276eb8747a25f9519b1b244499b6ee47b12c54d20885a42f40f812bff4d8c774366e08dd8c6c9f87031fdd6fa91b22888625754b7d1152bdbf5b465120698a52
+DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B 
b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b
 SHA512 
f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9

diff --git a/sys-apps/keyutils/keyutils-1.6.2.ebuild 
b/sys-apps/keyutils/keyutils-1.6.3.ebuild
similarity index 100%
rename from sys-apps/keyutils/keyutils-1.6.2.ebuild
rename to sys-apps/keyutils/keyutils-1.6.3.ebuild

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

2020-07-07 Thread Thomas Deutschmann

commit: 1482b3fd3c37733a7b721526361c8a1586bcfaf5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jul  7 17:04:40 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jul  7 17:08:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1482b3fd

sys-apps/keyutils: bump to v1.6.2

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-apps/keyutils/Manifest  |   1 +
 sys-apps/keyutils/keyutils-1.6.2.ebuild | 120 
 2 files changed, 121 insertions(+)

diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 2d430658d3b..e57a41e9c31 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1 +1,2 @@
 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B 
b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9
 SHA512 
a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
+DIST keyutils-1.6.2.tar.gz 137099 BLAKE2B 
7f304631e46a7e3f3dd5d64ca55661e6f39518bbcab9cd27c2ef4a53656c9e51891f462829c63dd8ea14c51472d8e10032df692925d8f001faa3db64f842172a
 SHA512 
276eb8747a25f9519b1b244499b6ee47b12c54d20885a42f40f812bff4d8c774366e08dd8c6c9f87031fdd6fa91b22888625754b7d1152bdbf5b465120698a52

diff --git a/sys-apps/keyutils/keyutils-1.6.2.ebuild 
b/sys-apps/keyutils/keyutils-1.6.2.ebuild
new file mode 100644
index 000..127ba037b76
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.6.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.6-makefile-fixup.patch
+   "${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!"
+   fi
+
+   if kernel_is -ge 4 7 ; then
+   CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
+   ERROR_KEY_DH_OPERATIONS="You must have 
CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
+   fi
+   else
+   CONFIG_CHECK="~KEYS"
+   ERROR_KEYS="You will be unable to use this package on this 
system because CONFIG_KEYS is not set!"
+
+   if kernel_is -ge 4 7 ; then
+   CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
+   ERROR_KEY_DH_OPERATIONS="You will be unable to use 
Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
+   fi
+   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:' {} + || die
+   # 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 CXX
+   sed -i \
+   -e "1iRPATH = $(usex static -static '')" \
+   -e '/^C.*FLAGS/s|:=|+=|' \
+

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

2020-01-06 Thread Mike Frysinger

commit: b7999c662517a7c74142f691809115028f565671
Author: Mike Frysinger  gentoo  org>
AuthorDate: Mon Jan  6 11:51:36 2020 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Mon Jan  6 11:52:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7999c66

sys-apps/keyutils: mark 1.6.1 m68k/s390/sh stable

Signed-off-by: Mike Frysinger  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index b69a471cf39..007040d0897 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 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"
+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"
 RESTRICT="!test? ( test )"

[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/

2019-11-01 Thread Sergei Trofimovich

commit: 6f74661683df37c6777494142461f657974a81ba
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Nov  2 00:14:19 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Nov  2 00:22:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f746616

sys-apps/keyutils: stable 1.6.1 for hppa, bug #693240

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index d68746b5022..d6bea1f56a1 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 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"
+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=""

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

2019-09-22 Thread Agostino Sarubbo

commit: 6beb193b280b25aa4a8d8e756dcbf3a6e4aa643b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Sep 22 09:31:53 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Sep 22 09:31:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6beb193b

sys-apps/keyutils: ia64 stable wrt bug #693240

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ia64"

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index bc739bc0146..d68746b5022 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 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"
+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=""

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

2019-09-20 Thread Matt Turner

commit: e9cb2f1b87dde68cf5e2ec8d5d8b056f4e8a670e
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Sep 21 05:17:02 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Sep 21 05:19:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9cb2f1b

sys-apps/keyutils-1.6.1: alpha stable, bug 693240

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

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index edc06893811..bc739bc0146 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 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"
+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=""

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

2019-09-16 Thread Agostino Sarubbo

commit: ac7aeccd9ebbc4f3efcf5fc2b01256468144139c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Sep 16 07:54:47 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Sep 16 07:54:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7aeccd

sys-apps/keyutils: sparc stable wrt bug #693240

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index b2dfc1add1e..edc06893811 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 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"
+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=""

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

2019-09-13 Thread Mikle Kolyada

commit: bd40f0704085f3f23aa79dc2256a6dc77748dc6b
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Sep 13 18:01:01 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Sep 13 18:01:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd40f070

sys-apps/keyutils: arm stable wrt bug #693240

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 452097f3071..b2dfc1add1e 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 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"
+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=""

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

2019-09-11 Thread Agostino Sarubbo

commit: bd560b34a50fe4a164592e0ade25dd62d07adecb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep 11 08:43:20 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep 11 08:43:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd560b34

sys-apps/keyutils: x86 stable wrt bug #693240

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index a3d25b12d90..452097f3071 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 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"
+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=""

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

2019-09-11 Thread Agostino Sarubbo

commit: f7c6dfc8b7e1a8e6a0f1c2d402726e178c650370
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep 11 08:40:58 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep 11 08:40:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7c6dfc8

sys-apps/keyutils: ppc64 stable wrt bug #693240

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 985853e87be..a3d25b12d90 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 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"
+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=""

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

2019-09-11 Thread Agostino Sarubbo

commit: 0b24bd1e8526b657f55666348156adad465448e4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep 11 08:28:28 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep 11 08:28:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b24bd1e

sys-apps/keyutils: ppc stable wrt bug #693240

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index d0b1f461ee9..985853e87be 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 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"
+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=""

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

2019-09-11 Thread Agostino Sarubbo

commit: 3e2bea99100da259035acec74b99f7820a8af5ce
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep 11 08:20:11 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep 11 08:20:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2bea99

sys-apps/keyutils: amd64 stable wrt bug #693240

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index d509e673c21..d0b1f461ee9 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 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"
+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=""

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

2019-09-09 Thread Aaron Bauman

commit: 63a59a9f738f130dc077361d310f673eb14d49c3
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Sep  9 17:19:45 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Sep  9 17:20:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a59a9f

sys-apps/keyutils: arm64 stable (bug #693240)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.75, Repoman-2.3.17
RepoMan-Options: --include-arches="arm64"

 sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild 
b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 9bb0b02d677..d509e673c21 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 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"
+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=""

[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/

2019-05-05 Thread Mikle Kolyada

commit: 50df6421da7aae475eb97729a067b4fbe3094ef7
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  5 12:05:59 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  5 12:05:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50df6421

sys-apps/keyutils: Add ~riscv keyword

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 sys-apps/keyutils/keyutils-1.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.6.ebuild 
b/sys-apps/keyutils/keyutils-1.6.ebuild
index ab926f98b57..eeca7d4ac1f 100644
--- a/sys-apps/keyutils/keyutils-1.6.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ 
SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2;
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+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=""

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

2018-11-16 Thread Lars Wendler

commit: 62b9f85d32fe91d1d9f733828eab14d91a402d7e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Nov 16 12:53:24 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Nov 16 12:53:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62b9f85d

sys-apps/keyutils: Removed old.

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

 sys-apps/keyutils/Manifest  |   1 -
 sys-apps/keyutils/keyutils-1.5.10-r1.ebuild | 121 
 2 files changed, 122 deletions(-)

diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 2fbe7776b33..7354bfc3ddf 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,4 +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
 DIST keyutils-1.6.tar.bz2 93973 BLAKE2B 
250275852d13fb5f77786350e64175c9c0909d1a7e44750e44b09f79217acb9c40536bd61e15d1abdfe36b9e161832f4c59f11b73915d457356a273ad490
 SHA512 
ee50da165099ea26904066d24b27c5165cb1eb78df6768cba3a534aa318a5c8d926ec6e5322a38c8cedaa768cd79bdcb26ef918aa8447df2e5dfbbe7b8f200ff

diff --git a/sys-apps/keyutils/keyutils-1.5.10-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.5.10-r1.ebuild
deleted file mode 100644
index e76b88beb5d..000
--- a/sys-apps/keyutils/keyutils-1.5.10-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 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/1.6"
-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-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!"
-   fi
-
-   if kernel_is -ge 4 7 ; then
-   CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
-   ERROR_KEY_DH_OPERATIONS="You must have 
CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
-   fi
-   else
-   CONFIG_CHECK="~KEYS"
-   ERROR_KEYS="You will be unable to use this package on this 
system because CONFIG_KEYS is not set!"
-
-   if kernel_is -ge 4 7 ; then
-   CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
-   ERROR_KEY_DH_OPERATIONS="You will be unable to use 
Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
-   fi
-   fi
-
-   linux-info_pkg_setup
-}
-
-src_prepare() {
-   epatch "${PATCHES[@]}"
-
-   # 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

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

2018-11-16 Thread Lars Wendler

commit: cbb28eaa7d2cd7b18b874c51f7ab0f0efcbf66b4
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Nov 16 12:51:45 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Nov 16 12:51:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb28eaa

sys-apps/keyutils: Bump to version 1.6

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

 sys-apps/keyutils/Manifest |   1 +
 .../files/keyutils-1.6-endian-check-1.patch|  32 ++
 .../files/keyutils-1.6-makefile-fixup.patch|  25 +
 sys-apps/keyutils/keyutils-1.6.ebuild  | 121 +
 4 files changed, 179 insertions(+)

diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 3892769c71a..2fbe7776b33 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,3 +1,4 @@
 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
+DIST keyutils-1.6.tar.bz2 93973 BLAKE2B 
250275852d13fb5f77786350e64175c9c0909d1a7e44750e44b09f79217acb9c40536bd61e15d1abdfe36b9e161832f4c59f11b73915d457356a273ad490
 SHA512 
ee50da165099ea26904066d24b27c5165cb1eb78df6768cba3a534aa318a5c8d926ec6e5322a38c8cedaa768cd79bdcb26ef918aa8447df2e5dfbbe7b8f200ff

diff --git a/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch 
b/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch
new file mode 100644
index 000..e783ec699c3
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch
@@ -0,0 +1,32 @@
+From 0a99778774df85448aeda0a37b85c43bc8868a9e Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+Date: Fri, 16 Nov 2018 12:37:29 +0100
+Subject: [PATCH] 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.
+---
+ 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 0ce6db0..712c5bd 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\|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
+-- 
+2.19.1
+

diff --git a/sys-apps/keyutils/files/keyutils-1.6-makefile-fixup.patch 
b/sys-apps/keyutils/files/keyutils-1.6-makefile-fixup.patch
new file mode 100644
index 000..25dcdeb5fc3
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.6-makefile-fixup.patch
@@ -0,0 +1,25 @@
+From d1a02ed81c86fe7140f93b9a160fbb53be148446 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Fri, 16 Nov 2018 12:39:12 +0100
+Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 33a451e..845b8fe 100644
+--- a/Makefile
 b/Makefile
+@@ -184,7 +184,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)
+   sed \
+   -e 's,@VERSION\@,$(VERSION),g' \
+   -e 's,@prefix\@,$(PREFIX),g' \
+-- 
+2.19.1
+

diff --git a/sys-apps/keyutils/keyutils-1.6.ebuild 
b/sys-apps/keyutils/keyutils-1.6.ebuild
new file mode 100644
index 000..ab926f98b57
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.6.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General

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

2018-08-31 Thread Thomas Deutschmann

commit: 3c3ef606b855d35fb0e0fc9dcc0c005b28f5e6d3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Sep  1 01:20:01 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Sep  1 01:32:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c3ef606

sys-apps/keyutils: kernel config checks rewritten

- CONFIG_KEY_DH_OPERATIONS is only available in kernel >=4.7

- Package will now fail in setup phase when FEATURES=test is set
  and not all required kernel options are set to prevent false
  positive bug reports due to failures of test phase caused by
  missing options.

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

 sys-apps/keyutils/keyutils-1.5.10-r1.ebuild | 30 -
 sys-apps/keyutils/keyutils-1.5.11-r1.ebuild | 30 -
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.10-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.5.10-r1.ebuild
index 5a4a876d41c..e76b88beb5d 100644
--- a/sys-apps/keyutils/keyutils-1.5.10-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.10-r1.ebuild
@@ -26,13 +26,33 @@ PATCHES=(
 )
 
 pkg_setup() {
-   CONFIG_CHECK="~KEYS"
-   ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
+   # 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!"
+   fi
+
+   if kernel_is -ge 4 7 ; then
+   CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
+   ERROR_KEY_DH_OPERATIONS="You must have 
CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
+   fi
+   else
+   CONFIG_CHECK="~KEYS"
+   ERROR_KEYS="You will be unable to use this package on this 
system because CONFIG_KEYS is not set!"
 
-   if use test && kernel_is lt 4 0 0; then
-   CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS 
~KEY_DH_OPERATIONS"
-   ERROR_KEYS_DEBUG_PROC_KEYS="You must have 
CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+   if kernel_is -ge 4 7 ; then
+   CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
+   ERROR_KEY_DH_OPERATIONS="You will be unable to use 
Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
+   fi
fi
+
linux-info_pkg_setup
 }
 

diff --git a/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
index b47e4ff1d2d..23be07210ba 100644
--- a/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
@@ -27,13 +27,33 @@ PATCHES=(
 )
 
 pkg_setup() {
-   CONFIG_CHECK="~KEYS"
-   ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
+   # 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!"
+   fi
+
+   if kernel_is -ge 4 7 ; then
+   CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
+   ERROR_KEY_DH_OPERATIONS="You must have 
CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
+   fi
+   else
+   CONFIG_CHECK="~KEYS"
+   ERROR_KEYS="You will be unable to use this package on this 
system because CONFIG_KEYS is not set!"
 
-   if use test && kernel_is lt 4 0 0; then
-   CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS 
~KEY_DH_OPERATIONS"
-   ERROR_KEYS_DEBUG_PROC_KEYS="You must have 
CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+   if kernel_is -ge 4 7 ; then
+

[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/

2018-08-31 Thread Thomas Deutschmann

commit: fc830422e666e5cd1c98e68c72b6ba7b94b82e2e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug 31 14:39:28 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug 31 14:54:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc830422

sys-apps/keyutils: tests require a kernel with KEY_DH_OPERATIONS

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

 sys-apps/keyutils/keyutils-1.5.10.ebuild | 2 +-
 sys-apps/keyutils/keyutils-1.5.11.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.10.ebuild 
b/sys-apps/keyutils/keyutils-1.5.10.ebuild
index eb922e7c5c4..572f0923f73 100644
--- a/sys-apps/keyutils/keyutils-1.5.10.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.10.ebuild
@@ -30,7 +30,7 @@ pkg_setup() {
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"
+   CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS 
~KEY_DH_OPERATIONS"
ERROR_KEYS_DEBUG_PROC_KEYS="You must have 
CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
fi
linux-info_pkg_setup

diff --git a/sys-apps/keyutils/keyutils-1.5.11.ebuild 
b/sys-apps/keyutils/keyutils-1.5.11.ebuild
index dc870fbcc6f..462a6f46511 100644
--- a/sys-apps/keyutils/keyutils-1.5.11.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.11.ebuild
@@ -30,7 +30,7 @@ pkg_setup() {
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"
+   CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS 
~KEY_DH_OPERATIONS"
ERROR_KEYS_DEBUG_PROC_KEYS="You must have 
CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
fi
linux-info_pkg_setup

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

2018-08-31 Thread Thomas Deutschmann

commit: 727929e2098f7f73a0c9fb1b9de8758c8658d870
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug 31 14:46:05 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug 31 14:54:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=727929e2

sys-apps/keyutils: depend on app-crypt/mit-krb5 atom

Upstream added support for AFS SRV records [Link 1] which requires
"profile.h" from app-crypt/mit-krb5 package.

Link 1: 
https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/commit/?id=0d71523ab58493e1b40e1c80d569ff8ebc5ea27d
Closes: https://bugs.gentoo.org/664942
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 .../keyutils/{keyutils-1.5.11.ebuild => keyutils-1.5.11-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.11.ebuild 
b/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
similarity index 97%
rename from sys-apps/keyutils/keyutils-1.5.11.ebuild
rename to sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
index 462a6f46511..f4892d5ba5a 100644
--- a/sys-apps/keyutils/keyutils-1.5.11.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
@@ -15,7 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips 
~ppc ~ppc64 ~s390 ~s
 IUSE="static static-libs test"
 
 RDEPEND=""
-DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
+DEPEND="app-crypt/mit-krb5
+   !prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.5.10-endian-check-1.patch

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

2018-08-31 Thread Thomas Deutschmann

commit: 0c3043cb79744e7a2a66a1a8855aa34de0b07b84
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug 31 14:52:01 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug 31 14:54:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c3043cb

sys-apps/keyutils: define subslot

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 .../keyutils/{keyutils-1.5.10.ebuild => keyutils-1.5.10-r1.ebuild} | 2 +-
 sys-apps/keyutils/keyutils-1.5.11-r1.ebuild| 2 +-
 sys-apps/keyutils/metadata.xml | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.10.ebuild 
b/sys-apps/keyutils/keyutils-1.5.10-r1.ebuild
similarity index 99%
rename from sys-apps/keyutils/keyutils-1.5.10.ebuild
rename to sys-apps/keyutils/keyutils-1.5.10-r1.ebuild
index 572f0923f73..5a4a876d41c 100644
--- a/sys-apps/keyutils/keyutils-1.5.10.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.10-r1.ebuild
@@ -10,7 +10,7 @@ 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"
+SLOT="0/1.6"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 

diff --git a/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
index f4892d5ba5a..b47e4ff1d2d 100644
--- a/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
@@ -10,7 +10,7 @@ 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"
+SLOT="0/1.7"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 

diff --git a/sys-apps/keyutils/metadata.xml b/sys-apps/keyutils/metadata.xml
index 9590fe15fc0..4290110582e 100644
--- a/sys-apps/keyutils/metadata.xml
+++ b/sys-apps/keyutils/metadata.xml
@@ -8,4 +8,7 @@
base-sys...@gentoo.org
Gentoo Base System
 
+
+   Reflect ABI compatibility for libkeyutils.so.
+

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

2018-08-31 Thread Thomas Deutschmann

commit: 91f07ab8d3e56fbb78a4c84b58af21b2645a0c78
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug 31 14:53:19 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug 31 14:54:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f07ab8

sys-apps/keyutils: use tabs in metadata.xml

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 sys-apps/keyutils/metadata.xml | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys-apps/keyutils/metadata.xml b/sys-apps/keyutils/metadata.xml
index 4290110582e..58a06dbe335 100644
--- a/sys-apps/keyutils/metadata.xml
+++ b/sys-apps/keyutils/metadata.xml
@@ -1,14 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   robb...@gentoo.org
-
-
-   base-sys...@gentoo.org
-   Gentoo Base System
-
-
-   Reflect ABI compatibility for libkeyutils.so.
-
+   
+   robb...@gentoo.org
+   
+   
+   base-sys...@gentoo.org
+   Gentoo Base System
+   
+   
+   Reflect ABI compatibility for 
libkeyutils.so.
+

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

2018-08-30 Thread Thomas Deutschmann

commit: 3f7d93229885bf116a31741137500e36f6de040a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug 31 02:52:25 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug 31 02:54:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7d9322

sys-apps/keyutils: add patch to support pie executables

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 sys-apps/keyutils/keyutils-1.5.10.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-apps/keyutils/keyutils-1.5.10.ebuild 
b/sys-apps/keyutils/keyutils-1.5.10.ebuild
index 28cfcee53fc..f2610937efe 100644
--- a/sys-apps/keyutils/keyutils-1.5.10.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.10.ebuild
@@ -18,6 +18,7 @@ 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

[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/

2018-08-02 Thread Lars Wendler

commit: 01763e53175661b80fd777485b162d6c54a813fd
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Aug  2 15:49:43 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Aug  2 15:49:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01763e53

sys-apps/keyutils: Removed old.

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 sys-apps/keyutils/keyutils-1.5.9-r1.ebuild | 77 --
 1 file changed, 77 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
deleted file mode 100644
index 5dd6f75e4ce..000
--- a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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 ~x86-linux"
-IUSE="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
-
-   # 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 CC
-   tc-export AR
-   sed -i \
-   -e '1iRPATH=' \
-   -e '/^C.*FLAGS/s|:=|+=|' \
-   -e 's:-Werror::' \
-   -e '/^BUILDFOR/s:=.*:=:' \
-   -e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
-   -e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
-   -e "s: /: ${EPREFIX}/:g" \
-   Makefile || die
-
-   emake
-}
-
-multilib_src_test() {
-   # Execute the locally compiled code rather than the
-   # older versions already installed in the system.
-   LD_LIBRARY_PATH=${BUILD_DIR} \
-   PATH="${BUILD_DIR}:${PATH}" \
-   emake test
-}
-
-multilib_src_install() {
-   default
-   gen_usr_ldscript -a keyutils
-}
-
-multilib_src_install_all() {
-   dodoc README
-}

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

2018-03-10 Thread Matt Turner

commit: 5ba206c24738022e96693a5591fb3a6227f51a6a
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 11 06:24:06 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 11 06:24:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ba206c2

sys-apps/keyutils: Don't check for KEYS_DEBUG_PROC_KEYS after Linux 4.0

Closes: https://bugs.gentoo.org/552512
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/keyutils/keyutils-1.5.10.ebuild   | 9 ++---
 sys-apps/keyutils/keyutils-1.5.9-r4.ebuild | 7 +--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.10.ebuild 
b/sys-apps/keyutils/keyutils-1.5.10.ebuild
index 658882242f2..298b6bed808 100644
--- a/sys-apps/keyutils/keyutils-1.5.10.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,9 +25,12 @@ PATCHES=(
 
 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!"
+
+   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
 }
 

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index d032a53dabd..2526784ea7b 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -19,9 +19,12 @@ 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!"
+
+   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
 }

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

2018-03-10 Thread Matt Turner

commit: 7bf3f32927bb4de0d3467708147cfd0602b23e6e
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 11 01:12:35 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 11 01:12:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf3f329

sys-apps/keyutils-1.5.9-r4: hppa stable, bug 643406

 sys-apps/keyutils/keyutils-1.5.9-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index 4b42896f732..d032a53dabd 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -11,7 +11,7 @@ 
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 ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static static-libs test"
 
 RDEPEND=""

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

2018-02-18 Thread Tobias Klausmann

commit: c4c3810b405466e71c276f06a4826c5fee9dc252
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sun Feb 18 12:28:26 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sun Feb 18 12:28:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4c3810b

sys-apps/keyutils-1.5.9-r4: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/643406

 sys-apps/keyutils/keyutils-1.5.9-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index 3ca355e6df9..4b42896f732 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -11,7 +11,7 @@ 
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 ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static static-libs test"
 
 RDEPEND=""

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

2018-01-24 Thread Sergei Trofimovich

commit: 5c6d3d5c98e9c0b449afecbf06ffecb76a6ddc2a
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Jan 24 20:02:16 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jan 24 21:25:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c6d3d5c

sys-apps/keyutils: stable 1.5.9-r4 for sparc, bug #643406

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 sys-apps/keyutils/keyutils-1.5.9-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index 9a2e98de587..3ca355e6df9 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -11,7 +11,7 @@ 
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 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static static-libs test"
 
 RDEPEND=""

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

2018-01-11 Thread Mike Frysinger

commit: 4afefbc65b5ef08c4b5c6a0657e69f921de67d38
Author: Mike Frysinger  gentoo  org>
AuthorDate: Fri Jan 12 03:31:14 2018 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri Jan 12 04:07:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4afefbc6

sys-apps/keyutils: mark 1.5.9-r4 arm/arm64/ia64/m68k/s390/sh stable

 sys-apps/keyutils/keyutils-1.5.9-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index c5a160fb145..9a2e98de587 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -11,7 +11,7 @@ 
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 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh 
~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static static-libs test"
 
 RDEPEND=""

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

2018-01-09 Thread Sergei Trofimovich

commit: 78e099047d49e5961c244c0dd71200b011f5b04e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Jan  9 08:09:11 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jan  9 08:09:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78e09904

sys-apps/keyutils: stable 1.5.9-r4 for ppc/ppc64, bug #643406

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc ppc64"

 sys-apps/keyutils/keyutils-1.5.9-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index c5aed8c4240..c5a160fb145 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -11,7 +11,7 @@ 
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 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static static-libs test"
 
 RDEPEND=""

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

2018-01-06 Thread Sergei Trofimovich

commit: 00d57eb00bc359140fa3b2e9bfddab9c89d401a8
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan  6 22:20:36 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan  6 22:20:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00d57eb0

sys-apps/keyutils: tweak endianness check on BE systems, bug #643406

Seen on powerpc and sparc to fail as:
+++ Can't Determine Endianness

It's caused by missing trailing escape of closing ')' for MSB case.

Reported-by: Rolf Eike Beer
Bug: https://bugs.gentoo.org/643406
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index a4558d8edfc..bc96dae464b 100644
--- 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
@@ -25,7 +25,7 @@ index f2463c57b40e..5ac23ffc04fb 100644
  
  endian=`file -L /proc/$$/exe`
 -if expr "$endian" : '.* MSB \+executable.*' >&/dev/null
-+if expr "$endian" : '.* MSB \+\(executable\|shared object).*' >&/dev/null
++if expr "$endian" : '.* MSB \+\(executable\|shared object\).*' >&/dev/null
  then
  endian=BE
 -elif expr "$endian" : '.* LSB \+executable.*' >&/dev/null

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

2018-01-04 Thread Lars Wendler

commit: 7c0e16a86b1c66c927a46f80a1c2e87a64a96e80
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Jan  4 15:42:30 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Jan  4 15:42:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c0e16a8

sys-apps/keyutils: Version 1.5.9-r4 stable for x86.

Bug: https://bugs.gentoo.org/643406
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/keyutils/keyutils-1.5.9-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index ebad2f517d1..c5aed8c4240 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -11,7 +11,7 @@ 
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 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static static-libs test"
 
 RDEPEND=""

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

2018-01-04 Thread Lars Wendler

commit: e5cb9461345dfc34a1035e7db25822ed9a241e75
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Jan  4 15:24:41 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Jan  4 15:25:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5cb9461

sys-apps/keyutils: Version 1.5.9-r4 stable for amd64.

Bug: https://bugs.gentoo.org/643406
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/keyutils/keyutils-1.5.9-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index 473847a77c1..ebad2f517d1 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ 
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 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static static-libs test"
 
 RDEPEND=""

[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/

2017-05-24 Thread Lars Wendler

commit: ce3843183473f710d4a19d790b57f74598196f55
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May 24 16:29:57 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May 24 16:30:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce384318

sys-apps/keyutils: Removed old.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/keyutils/keyutils-1.5.9-r2.ebuild | 92 -
 sys-apps/keyutils/keyutils-1.5.9-r3.ebuild | 93 --
 2 files changed, 185 deletions(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
deleted file mode 100644
index 9f0a92e3693..000
--- a/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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 ~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
-
-   # 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 '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB):' \
-   Makefile || die
-   else
-   export NO_ARLIB=$(usex static-libs 0 1)
-   fi
-   emake
-}
-
-multilib_src_test() {
-   # Execute the locally compiled code rather than the
-   # older versions already installed in the system.
-   LD_LIBRARY_PATH=${BUILD_DIR} \
-   PATH="${BUILD_DIR}:${PATH}" \
-   emake test
-}
-
-multilib_src_install() {
-   # Possibly undo the setting for USE=static (see src_compile).
-   export NO_ARLIB=$(usex static-libs 0 1)
-
-   default
-   use static || gen_usr_ldscript -a keyutils
-}
-
-multilib_src_install_all() {
-   dodoc README
-}

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r3.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r3.ebuild
deleted file mode 100644
index 0fef96cfb73..000
--- a/sys-apps/keyutils/keyutils-1.5.9-r3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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 ~x86-linux"
-IUSE="static static-libs test"
-
-RDEPEND=""
-DEPEND="!prefix? (

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

2017-03-14 Thread Mike Frysinger

commit: ddd55bf142b67a784b9cb08e23b99e60c5a6bf83
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Mar 14 21:01:28 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Mar 14 21:02:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd55bf1

sys-apps/keyutils: drop man pages installed by common package now #612640

 sys-apps/keyutils/keyutils-1.5.9-r4.ebuild | 96 ++
 1 file changed, 96 insertions(+)

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
new file mode 100644
index 000..473847a77c1
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~arm-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}
+
+   # Delete man pages that are included in the common package now. #612640
+   rm man/*-keyring.7 man/keyrings.7 || die
+
+   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 '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB):' \
+   Makefile || die
+   else
+   export NO_ARLIB=$(usex static-libs 0 1)
+   fi
+   emake
+}
+
+multilib_src_test() {
+   # Execute the locally compiled code rather than the
+   # older versions already installed in the system.
+   LD_LIBRARY_PATH=${BUILD_DIR} \
+   PATH="${BUILD_DIR}:${PATH}" \
+   emake test
+}
+
+multilib_src_install() {
+   # Possibly undo the setting for USE=static (see src_compile).
+   export NO_ARLIB=$(usex static-libs 0 1)
+
+   default
+   use static || gen_usr_ldscript -a keyutils
+}
+
+multilib_src_install_all() {
+   dodoc README
+}

[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

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

2016-04-18 Thread Mike Frysinger

commit: 26117ba0b8fb9867c06b49e2ed9840733ed638d3
Author: Mike Frysinger  gentoo  org>
AuthorDate: Mon Apr 18 19:09:32 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Mon Apr 18 19:10:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26117ba0

sys-apps/keyutils: add USE=static & USE=static-libs support #542540

 sys-apps/keyutils/keyutils-1.5.9-r2.ebuild | 90 ++
 1 file changed, 90 insertions(+)

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
new file mode 100644
index 000..0a46055
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 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
+
+   # 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 '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB):' \
+   Makefile || die
+   else
+   export NO_ARLIB=$(usex static-libs 0 1)
+   fi
+   emake
+}
+
+multilib_src_test() {
+   # Execute the locally compiled code rather than the
+   # older versions already installed in the system.
+   LD_LIBRARY_PATH=${BUILD_DIR} \
+   PATH="${BUILD_DIR}:${PATH}" \
+   emake test
+}
+
+multilib_src_install() {
+   # Possibly undo the setting for USE=static (see src_compile).
+   export NO_ARLIB=$(usex static-libs 0 1)
+
+   default
+   use static || gen_usr_ldscript -a keyutils
+}
+
+multilib_src_install_all() {
+   dodoc README
+}

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

2016-03-30 Thread Mike Frysinger

commit: 4d6b7d9a0b6af944a91d125862d6f90401eddb91
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Mar 30 23:10:07 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Mar 30 23:47:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6b7d9a

sys-apps/keyutils: drop old <1.5.9-r1 versions

 sys-apps/keyutils/Manifest  |  2 -
 sys-apps/keyutils/keyutils-1.5.5.ebuild | 69 -
 sys-apps/keyutils/keyutils-1.5.8.ebuild | 69 -
 sys-apps/keyutils/keyutils-1.5.9.ebuild | 69 -
 4 files changed, 209 deletions(-)

diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index f984f80..08c5655 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,3 +1 @@
-DIST keyutils-1.5.5.tar.bz2 63397 SHA256 
8fab781fb2d1450b2112a7fbfe6629522ae5a6b901f875a74a201012025a3fc5 SHA512 
372a4881ca5cd679de0e6baa4e0e8c61ec8163b9259b018e1eb4db51fca68c0326d82a745abce96d22de367e88c88fa13b8afe438acfb38af799893630d3ba75
 WHIRLPOOL 
15c03983e18471b97e10f378d97c6e7e9ac7045c1f4721382f500cd8796f4a55575420b515b870ef94714bfb3dc62cb954e66efb2835fcb671c98d2f9ab33ae9
-DIST keyutils-1.5.8.tar.bz2 64880 SHA256 
6c7da37272eb39abc2ebafc9ba4a580d7cf8725b61e1db21e508de7ab24b819c SHA512 
f69b1acd3bff2a821ce31c6a772eea68dfbe57bb1d6128fa344ab9688c9110733b1432176e42b67648ff3a01200f4adbb92e4577132539b4c4af817027ed8f19
 WHIRLPOOL 
e4c8d18c8ea48346a759f0e379a2bb3e6faf30f9c4a4b794485a612e25bbe86a81833e68e28b2def668faa4ff41d476ed5a6cbf105ef76bb31a02169b879f9b6
 DIST keyutils-1.5.9.tar.bz2 74683 SHA256 
4da2c5552c688b65ab14d4fd40fbdf720c8b396d8ece643e040cf6e707e083ae SHA512 
d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
 WHIRLPOOL 
0509cce076a32d2f319f596506d4aaeb83e1853ee6337e6a3041e6957e9098f4482ae56a9c6455605b72b3f34701a890e9be666b6fdd752ff14a3d3564dcba19

diff --git a/sys-apps/keyutils/keyutils-1.5.5.ebuild 
b/sys-apps/keyutils/keyutils-1.5.5.ebuild
deleted file mode 100644
index 29ab4b9..000
--- a/sys-apps/keyutils/keyutils-1.5.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit multilib eutils toolchain-funcs linux-info
-
-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="test"
-
-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
-   sed -i \
-   -e '1iRPATH=' \
-   -e '/^C.*FLAGS/s|:=|+=|' \
-   -e 's:-Werror::' \
-   -e '/^BUILDFOR/s:=.*:=:' \
-   -e "/^LIBDIR/s:=.*:=/usr/$(get_libdir):" \
-   -e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
-   Makefile || die
-
-   # 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}
-}
-
-src_configure() {
-   tc-export CC
-   tc-export AR
-}
-
-src_test() {
-   # Execute the locally compiled code rather than the
-   # older versions already installed in the system.
-   LD_LIBRARY_PATH=${S} \
-   PATH="${S}:${PATH}" \
-   emake test || die
-}
-
-src_install() {
-   emake DESTDIR="${ED}" install || die
-   dodoc README
-   gen_usr_ldscript -a keyutils
-}

diff --git a/sys-apps/keyutils/keyutils-1.5.8.ebuild 
b/sys-apps/keyutils/keyutils-1.5.8.ebuild
deleted file mode 100644
index 5ac75dc..000
--- a/sys-apps/keyutils/keyutils-1.5.8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit multilib

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

2016-03-30 Thread Mike Frysinger

commit: d0454aedbc7ef7d31e46ef6ea592bb8282b062d5
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Mar 30 23:09:18 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Mar 30 23:47:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0454aed

sys-apps/keyutils: mark 1.5.9-r1 m68k/s390/sh stable

 sys-apps/keyutils/keyutils-1.5.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild 
b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
index e6250c4..7b8ddbf 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
@@ -12,7 +12,7 @@ 
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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="

75 matches

Mail list logo