commit: 056186b5dd17e2f1c3082234e1acae1170492c38 Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz> AuthorDate: Thu Apr 23 05:52:31 2020 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Thu Apr 23 14:56:07 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=056186b5
keyutils: Fixed upstream in commit ab818a7, refactored in 0d71523. In-tree version builds fine: >>> Completed installing sys-apps/keyutils-1.6.1 into >>> /var/tmp/portage/sys-apps/keyutils-1.6.1/image >>> sys-apps/keyutils-1.6.1 merged. Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz> Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> sys-apps/keyutils/Manifest | 2 - .../files/keyutils-1.5.10-disable-tests.patch | 51 ------------ .../files/keyutils-1.5.10-makefile-fixup.patch | 25 ------ .../files/keyutils-1.5.5-makefile-fixup.patch | 27 ------ .../keyutils/files/keyutils-1.5.9-UINT_MAX.patch | 12 --- .../files/keyutils-1.5.9-header-extern-c.patch | 43 ---------- sys-apps/keyutils/keyutils-1.5.10.ebuild | 97 ---------------------- sys-apps/keyutils/keyutils-1.5.9-r1.ebuild | 79 ------------------ sys-apps/keyutils/metadata.xml | 11 --- 9 files changed, 347 deletions(-) diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest deleted file mode 100644 index 93b26a3..0000000 --- a/sys-apps/keyutils/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST keyutils-1.5.10.tar.bz2 74190 SHA256 115c3deae7f181778fd0e0ffaa2dad1bf1fe2f5677cf2e0e348cdb7a1c93afb6 SHA512 7f6f956c7e76cdc2aeb52e74fe670b20a5f9a5d9b543fd2ce971d80c48745f37d05235a42f0a8f152b1128a109c7d8bf07e751282a20d2d3f433a99a5308ae8d WHIRLPOOL 09d4c420d26e4089c5d1c460faf5c6a40912dc2f2d4abb3b1aaedfacb3919e7deab8e29c7a4f8306d5b8539c7ab0f3df659cc1cb804e5d43030bb0c331eead9f -DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2 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 deleted file mode 100644 index fa82792..0000000 --- a/sys-apps/keyutils/files/keyutils-1.5.10-disable-tests.patch +++ /dev/null @@ -1,51 +0,0 @@ -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 deleted file mode 100644 index c37cca0..0000000 --- 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 <[email protected]> -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.5-makefile-fixup.patch b/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch deleted file mode 100644 index ff4bcfa..0000000 --- a/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch +++ /dev/null @@ -1,27 +0,0 @@ -Raw patch edit based on: - -From af14e945bd617bb82ebc4c6c8d4fb948d715f16a Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Fri, 2 Sep 2011 13:30:30 -0400 -Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils - ---- - Makefile | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 9e3fa9b..46695d1 100644 ---- a/Makefile -+++ b/Makefile -@@ -91,7 +91,7 @@ - $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) - $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) - mkdir -p $(DESTDIR)$(USRLIBDIR) -- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) -+ $(LNS) $(SONAME) $(DESTDIR)$(LIBDIR)/$(DEVELLIB) - $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl - $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key - $(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh --- -1.7.6 - diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-UINT_MAX.patch b/sys-apps/keyutils/files/keyutils-1.5.9-UINT_MAX.patch deleted file mode 100644 index 65a50b0..0000000 --- a/sys-apps/keyutils/files/keyutils-1.5.9-UINT_MAX.patch +++ /dev/null @@ -1,12 +0,0 @@ -Patch sent to [email protected] - ---- a/keyutils-1.5.9/key.dns_resolver.c 2014-02-21 17:18:24.000000000 -0200 -+++ b/keyutils-1.5.9/key.dns_resolver.c 2015-04-03 17:29:22.517832174 -0200 -@@ -42,6 +42,7 @@ - #include <netinet/in.h> - #include <arpa/nameser.h> - #include <arpa/inet.h> -+#include <limits.h> - #include <resolv.h> - #include <getopt.h> - #include <sys/types.h> 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 deleted file mode 100644 index c7a4c10..0000000 --- a/sys-apps/keyutils/files/keyutils-1.5.9-header-extern-c.patch +++ /dev/null @@ -1,43 +0,0 @@ -sent upstream - -From 1f15000ad21c301a51f7746eb561659348060f45 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -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 <[email protected]> ---- - 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 <sys/types.h> - #include <stdint.h> - -+#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.10.ebuild b/sys-apps/keyutils/keyutils-1.5.10.ebuild deleted file mode 100644 index 8fdde80..0000000 --- a/sys-apps/keyutils/keyutils-1.5.10.ebuild +++ /dev/null @@ -1,97 +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 usr-ldscript - -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="amd64 arm arm64 ~mips ppc x86" -IUSE="static static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )" - -PATCHES=( - "${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" - 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 "${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 `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) $(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 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-r1.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild deleted file mode 100644 index 275d19d..0000000 --- a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild +++ /dev/null @@ -1,79 +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 usr-ldscript - -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="amd64 arm arm64 ~mips ppc x86" -IUSE="test" -RESTRICT="!test? ( 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-UINT_MAX.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 -} diff --git a/sys-apps/keyutils/metadata.xml b/sys-apps/keyutils/metadata.xml deleted file mode 100644 index 9590fe1..0000000 --- a/sys-apps/keyutils/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="person"> - <email>[email protected]</email> -</maintainer> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Base System</name> -</maintainer> -</pkgmetadata>
