commit: f136e1ad51364c29ad132e1602786eee12e3687f Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Fri Apr 3 15:41:53 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Fri Apr 3 19:46:07 2015 +0000 URL: https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=f136e1ad
sys-apps/keyutils: bump to version 1.5.9 .../keyutils-1.5.5-remove-key.dns_resolver.patch | 47 ------------------ .../keyutils/files/keyutils-1.5.9-UINT_MAX.patch | 12 +++++ ...-1.5.5-r99.ebuild => keyutils-1.5.9-r99.ebuild} | 55 +++++++++++++--------- 3 files changed, 46 insertions(+), 68 deletions(-) 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 deleted file mode 100644 index 26ff334..0000000 --- a/sys-apps/keyutils/files/keyutils-1.5.5-remove-key.dns_resolver.patch +++ /dev/null @@ -1,47 +0,0 @@ -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/files/keyutils-1.5.9-UINT_MAX.patch b/sys-apps/keyutils/files/keyutils-1.5.9-UINT_MAX.patch new file mode 100644 index 0000000..65a50b0 --- /dev/null +++ b/sys-apps/keyutils/files/keyutils-1.5.9-UINT_MAX.patch @@ -0,0 +1,12 @@ +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/keyutils-1.5.5-r99.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r99.ebuild similarity index 70% rename from sys-apps/keyutils/keyutils-1.5.5-r99.ebuild rename to sys-apps/keyutils/keyutils-1.5.9-r99.ebuild index 37d515d..d148784 100644 --- a/sys-apps/keyutils/keyutils-1.5.5-r99.ebuild +++ b/sys-apps/keyutils/keyutils-1.5.9-r99.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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 $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild,v 1.12 2015/01/05 13:45:19 jlec Exp $ -EAPI="3" +EAPI="5" -inherit multilib eutils toolchain-funcs linux-info +inherit multilib eutils toolchain-funcs linux-info multilib-minimal DESCRIPTION="Linux Key Management Utilities" HOMEPAGE="http://people.redhat.com/dhowells/keyutils/"; @@ -15,6 +15,11 @@ SLOT="0" KEYWORDS="amd64 arm ~mips ppc x86" IUSE="test" +RDEPEND=" + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )" pkg_setup() { @@ -27,15 +32,7 @@ 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 + 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 @@ -48,23 +45,39 @@ src_prepare() { # 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 } -src_configure() { +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 } -src_test() { +multilib_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 + LD_LIBRARY_PATH=${BUILD_DIR} \ + PATH="${BUILD_DIR}:${PATH}" \ + emake test +} + +multilib_src_install() { + default + multilib_is_native_abi && gen_usr_ldscript -a keyutils } -src_install() { - emake DESTDIR="${ED}" install || die +multilib_src_install_all() { dodoc README - gen_usr_ldscript -a keyutils }
