diff options
| -rw-r--r-- | sys-apps/keyutils/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch | 42 | ||||
| -rw-r--r-- | sys-apps/keyutils/keyutils-1.5.3.ebuild | 40 |
3 files changed, 90 insertions, 1 deletions
diff --git a/sys-apps/keyutils/ChangeLog b/sys-apps/keyutils/ChangeLog index 6c8d98941425..ef019ea73d34 100644 --- a/sys-apps/keyutils/ChangeLog +++ b/sys-apps/keyutils/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/keyutils # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.25 2011/07/08 19:41:49 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.26 2011/09/02 17:41:30 vapier Exp $ + +*keyutils-1.5.3 (02 Sep 2011) + + 02 Sep 2011; Mike Frysinger <vapier@gentoo.org> +keyutils-1.5.3.ebuild, + +files/keyutils-1.5.3-makefile-fixup.patch: + Version bump #381467 by teidakankan. Fixes rpath issues #328467 by William + Throwe and multilib issues #339173 by Matt McAdoo. 08 Jul 2011; Matt Turner <mattst88@gentoo.org> keyutils-1.4-r1.ebuild: Added ~mips, bug 201744 diff --git a/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch b/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch new file mode 100644 index 000000000000..b0e8add18488 --- /dev/null +++ b/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch @@ -0,0 +1,42 @@ +From af14e945bd617bb82ebc4c6c8d4fb948d715f16a Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +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 +@@ -125,13 +125,13 @@ keyutils.os: keyutils.c keyutils.h Makefile + %.o: %.c keyutils.h Makefile + $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< + +-keyctl: keyctl.o -lkeyutils ++keyctl: keyctl.o $(DEVELLIB) + $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils + +-request-key: request-key.o -lkeyutils ++request-key: request-key.o $(DEVELLIB) + $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils + +-key.dns_resolver: key.dns_resolver.o -lkeyutils ++key.dns_resolver: key.dns_resolver.o $(DEVELLIB) + $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv + + ############################################################################### +@@ -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/keyutils-1.5.3.ebuild b/sys-apps/keyutils/keyutils-1.5.3.ebuild new file mode 100644 index 000000000000..98fa18ad5022 --- /dev/null +++ b/sys-apps/keyutils/keyutils-1.5.3.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.3.ebuild,v 1.1 2011/09/02 17:41:30 vapier Exp $ + +EAPI="3" + +inherit multilib eutils toolchain-funcs + +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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux" +IUSE="" + +DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.5.3-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 +} + +src_configure() { + tc-export CC +} + +src_install() { + emake DESTDIR="${ED}" install || die + dodoc README + gen_usr_ldscript -a keyutils +} |