From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 099B4138EFD for ; Sat, 22 Feb 2014 15:52:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C06CE09C4; Sat, 22 Feb 2014 15:52:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE274E09C4 for ; Sat, 22 Feb 2014 15:52:26 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D80F333F9C4 for ; Sat, 22 Feb 2014 15:52:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 11D87188E8 for ; Sat, 22 Feb 2014 15:52:24 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1393022003.4ef60849f56ef3c845614cb877620b45e441ae8f.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:musl commit in: sys-apps/keyutils/, sys-apps/keyutils/files/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch sys-apps/keyutils/files/keyutils-1.5.5-remove-key.dns_resolver.patch sys-apps/keyutils/keyutils-1.5.5-r99.ebuild sys-apps/keyutils/metadata.xml X-VCS-Directories: sys-apps/keyutils/ sys-apps/keyutils/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 4ef60849f56ef3c845614cb877620b45e441ae8f X-VCS-Branch: musl Date: Sat, 22 Feb 2014 15:52:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6e327390-efe6-4507-93a4-abb96dfc73a1 X-Archives-Hash: 08e285171ff654d4207a274f2b7dd904 commit: 4ef60849f56ef3c845614cb877620b45e441ae8f Author: Anthony G. Basile gentoo org> AuthorDate: Fri Feb 21 22:33:23 2014 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Feb 21 22:33:23 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=4ef60849 sys-apps/keyutils: remove key.dns_resolver Package-Manager: portage-2.2.7 RepoMan-Options: --force --- .../files/keyutils-1.5.5-makefile-fixup.patch | 27 +++++++++ .../keyutils-1.5.5-remove-key.dns_resolver.patch | 47 +++++++++++++++ sys-apps/keyutils/keyutils-1.5.5-r99.ebuild | 70 ++++++++++++++++++++++ sys-apps/keyutils/metadata.xml | 8 +++ 4 files changed, 152 insertions(+) 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 new file mode 100644 index 0000000..ff4bcfa --- /dev/null +++ b/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch @@ -0,0 +1,27 @@ +Raw patch edit based on: + +From af14e945bd617bb82ebc4c6c8d4fb948d715f16a Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +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.5-remove-key.dns_resolver.patch b/sys-apps/keyutils/files/keyutils-1.5.5-remove-key.dns_resolver.patch new file mode 100644 index 0000000..26ff334 --- /dev/null +++ b/sys-apps/keyutils/files/keyutils-1.5.5-remove-key.dns_resolver.patch @@ -0,0 +1,47 @@ +diff -Naur keyutils-1.5.5.orig/Makefile keyutils-1.5.5/Makefile +--- keyutils-1.5.5.orig/Makefile 2011-11-30 15:27:43.000000000 +0000 ++++ keyutils-1.5.5/Makefile 2014-02-21 22:31:47.224588695 +0000 +@@ -86,7 +86,7 @@ + # Normal build rule + # + ############################################################################### +-all: $(DEVELLIB) keyctl request-key key.dns_resolver ++all: $(DEVELLIB) keyctl request-key + + ############################################################################### + # +@@ -137,9 +137,6 @@ + request-key: request-key.o $(DEVELLIB) + $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils + +-key.dns_resolver: key.dns_resolver.o $(DEVELLIB) +- $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv +- + ############################################################################### + # + # Install everything +@@ -156,7 +153,6 @@ + $(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 +- $(INSTALL) -D key.dns_resolver $(DESTDIR)$(SBINDIR)/key.dns_resolver + $(INSTALL) -D -m 0644 request-key.conf $(DESTDIR)$(ETCDIR)/request-key.conf + mkdir -p $(DESTDIR)$(ETCDIR)/request-key.d + $(INSTALL) -D -m 0644 keyctl.1 $(DESTDIR)$(MAN1)/keyctl.1 +@@ -187,7 +183,6 @@ + $(LNS) recursive_key_scan.3 $(DESTDIR)$(MAN3)/recursive_session_key_scan.3 + $(INSTALL) -D -m 0644 request-key.conf.5 $(DESTDIR)$(MAN5)/request-key.conf.5 + $(INSTALL) -D -m 0644 request-key.8 $(DESTDIR)$(MAN8)/request-key.8 +- $(INSTALL) -D -m 0644 key.dns_resolver.8 $(DESTDIR)$(MAN8)/key.dns_resolver.8 + $(INSTALL) -D -m 0644 keyutils.h $(DESTDIR)$(INCLUDEDIR)/keyutils.h + + ############################################################################### +@@ -206,7 +201,7 @@ + clean: + $(MAKE) -C tests clean + $(RM) libkeyutils* +- $(RM) keyctl request-key key.dns_resolver ++ $(RM) keyctl request-key + $(RM) *.o *.os *~ + $(RM) debugfiles.list debugsources.list + diff --git a/sys-apps/keyutils/keyutils-1.5.5-r99.ebuild b/sys-apps/keyutils/keyutils-1.5.5-r99.ebuild new file mode 100644 index 0000000..b0991c1 --- /dev/null +++ b/sys-apps/keyutils/keyutils-1.5.5-r99.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.5.ebuild,v 1.11 2014/01/18 04:49:23 vapier Exp $ + +EAPI="3" + +inherit multilib eutils toolchain-funcs linux-info + +DESCRIPTION="Linux Key Management Utilities" +HOMEPAGE="http://people.redhat.com/dhowells/keyutils/" +SRC_URI="http://people.redhat.com/dhowells/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 arm x86" +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 + epatch "${FILESDIR}"/${PN}-1.5.5-remove-key.dns_resolver.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/metadata.xml b/sys-apps/keyutils/metadata.xml new file mode 100644 index 0000000..035bc6b --- /dev/null +++ b/sys-apps/keyutils/metadata.xml @@ -0,0 +1,8 @@ + + + +base-system + + robbat2@gentoo.org + +