Stub out des_crypt for now #370713 by Nicolas Schlumberger, fix building with glibc-2.14 #370663 by Diego Elio Pettenò, restore static lib support, and start installing into / for glibc replacement.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 109 insertions, 6 deletions

diff --git a/net-libs/libtirpc/ChangeLog b/net-libs/libtirpc/ChangeLog
index 66cd05a9d27f..fd057ad00b73 100644
--- a/net-libs/libtirpc/ChangeLog
+++ b/net-libs/libtirpc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libtirpc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/ChangeLog,v 1.19 2011/06/07 19:35:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/ChangeLog,v 1.20 2011/06/11 19:52:16 vapier Exp $
+
+*libtirpc-0.2.2-r1 (11 Jun 2011)
+
+  11 Jun 2011; Mike Frysinger <vapier@gentoo.org> +libtirpc-0.2.2-r1.ebuild,
+  +files/libtirpc-0.2.2-rpc-des-prot.patch:
+  Stub out des_crypt for now #370713 by Nicolas Schlumberger, fix building with
+  glibc-2.14 #370663 by Diego Elio Pettenò, restore static lib support, and
+  start installing into / for glibc replacement.
 
 *libtirpc-0.2.2 (07 Jun 2011)
 
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 31f02fbe593a..67a595ba294e 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libtirpc-0.2.1-fortify.patch 704 RMD160 4030f5f8a583d36affa19536c83aa63c21ecdedb SHA1 c14fcb21e0dfa37fce5b5e23d5a04ddf0090da35 SHA256 e3436a6de8182e51c577000917feffc6428b6907d8bf1b56318acd999d34b056
+AUX libtirpc-0.2.2-rpc-des-prot.patch 979 RMD160 b60af12a2d9a27fb7e855c053ea8698b8a374d4f SHA1 29cdbb22e478bf2bc28c84a378ddb64327a8e378 SHA256 f09e866816973c6aac5c6e19d3007440b85ff42fe3c36ad0c3ee02dd657eb90c
 DIST libtirpc-0.1.10.tar.bz2 416468 RMD160 494ae5beb892e47a551cba974b6586cf35af89b2 SHA1 42702d6f40acdf040c421554f36621e68920e702 SHA256 8441ee7b583b964c961e4e2b502063b668bb0b59c405526176e71d071caf0b0a
 DIST libtirpc-0.2.1.tar.bz2 413031 RMD160 4443d83dea6b24d4fb5581ee13284865e6839f2f SHA1 ab0188be0eee162ad42cb941257e1615db5387c9 SHA256 ea77cadd63941fc4edbee7863d2c7094e6a18263d2a2c8922319aee91352ff41
 DIST libtirpc-0.2.2.tar.bz2 464094 RMD160 b244a9fefa6cf2c2bc84300c9a51339ad87e229b SHA1 576c8826a91110580b60c973c672836559d2805a SHA256 f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705
+DIST libtirpc-glibc-nfs.tar.xz 8948 RMD160 0f1254307780d5fc2004b5fc006a770d9626d935 SHA1 35496dd459ec014756be6816ca888271feb8e03d SHA256 2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83
 EBUILD libtirpc-0.1.10.ebuild 684 RMD160 0a61e18c6162f1e50f24974c96b540d245e7dda0 SHA1 c1cae64f22c0f0ebdc690d2fe18b90af8a21a8af SHA256 b3f164c22c5472b130f60d084fc245a92879014700f1176f564af3841988bfd2
 EBUILD libtirpc-0.2.1-r1.ebuild 1071 RMD160 7b9121b46a899517ce2b23cb8b94bc73ab77c8f3 SHA1 c27a50be0a5834303a03a680032a9f55afaedc93 SHA256 66aeea982bbf63cbc6a02b1413e10b9103dc520063a90ba6707a528f70c6d081
+EBUILD libtirpc-0.2.2-r1.ebuild 1511 RMD160 bc88114e9bc331e13b30f8899795c721db056c6a SHA1 64acaef6219f0012f47254377ea83d337d19bd17 SHA256 dbb9d5046c12dc7a61452c751eb513aa2e2e371fee5b897688f3dbbdcac95573
 EBUILD libtirpc-0.2.2.ebuild 1085 RMD160 c4c7dc9f84f4956d4bd315dbd52f2c82d045194d SHA1 aa090c1b16b672a4033a9c2b9f487d5c642b0ea9 SHA256 c7c6afda56ec58245e62794f57a692a5a148229587def15124ad689341dbc02d
-MISC ChangeLog 3232 RMD160 8df6142643e1138559dc8af73bddb881d241904a SHA1 ffd118569bbd923f337daa8c2b1bbfc13a0f81c2 SHA256 2df713dd4979bbea7f9e41e6c869b12912f18adaf99f9d666d30b2ea413c7fc8
+MISC ChangeLog 3591 RMD160 e9be2a61c58b3f2a2d17b7b8f17b948c5b7ae740 SHA1 8f114f73de275a2750c800b0729a3a1ed61aefaa SHA256 ab955a12e6f1f50c32981baa159ae05cecc02496d962e20343f7b4c191e12dc7
 MISC metadata.xml 159 RMD160 8e0977b9abd90afe9e1d5c1326823a5726f6e2a4 SHA1 33f35324ce730e28838be228d9ee4e4dd1bab1e5 SHA256 562c59615c028ffa088de789b3a792fd4cbbbfe71628ddd6a55d3b176becbc6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3ufY0ACgkQAiZjviIA2XhTtgCfV83Y6E5kuDCA8lBhckwaT7yt
-QvcAoMHM9GusKqhdaXIbozr7LvBZqxzr
-=iCHa
+iF4EAREIAAYFAk3zx3cACgkQaC/OocHi7JadnwD/VuZo/Rs1JcBJAHzq0gSDYEWU
+qURc5BhOyT1CiThX66IBAJDKMIFFJMAIp7giHiDWEtrZOnC3aM//hc6SbK5QHjgA
+=bKMa
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libtirpc/files/libtirpc-0.2.2-rpc-des-prot.patch b/net-libs/libtirpc/files/libtirpc-0.2.2-rpc-des-prot.patch
new file mode 100644
index 000000000000..c5de6da40640
--- /dev/null
+++ b/net-libs/libtirpc/files/libtirpc-0.2.2-rpc-des-prot.patch
@@ -0,0 +1,36 @@
+From f2f43212b33dea42635061c82645287454a70107 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 11 Jun 2011 15:21:55 -0400
+Subject: [PATCH] add multiple inclusion protection to rpc/des.h
+
+If you try to include this file multiple times, you get a build failure
+due to redefinitions of enums and such.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ tirpc/rpc/des.h |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h
+index e3d6897..d2881ad 100644
+--- a/tirpc/rpc/des.h
++++ b/tirpc/rpc/des.h
+@@ -33,6 +33,9 @@
+  * Copyright (c) 1986 by Sun Microsystems, Inc.
+  */
+ 
++#ifndef _RPC_DES_H_
++#define _RPC_DES_H_
++
+ #define DES_MAXLEN 	65536	/* maximum # of bytes to encrypt  */
+ #define DES_QUICKLEN	16	/* maximum # of bytes to encrypt quickly */
+ 
+@@ -80,3 +83,5 @@ struct desparams {
+  * Software DES.
+  */
+ extern int _des_crypt( char *, int, struct desparams * );
++
++#endif
+-- 
+1.7.5.3
+
diff --git a/net-libs/libtirpc/libtirpc-0.2.2-r1.ebuild b/net-libs/libtirpc/libtirpc-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..34ba34e96c9e
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-0.2.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/libtirpc-0.2.2-r1.ebuild,v 1.1 2011/06/11 19:52:16 vapier Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="http://libtirpc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="kerberos static-libs"
+
+RDEPEND="kerberos? ( net-libs/libgssglue )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cp -r tirpc "${S}"/ || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.1-fortify.patch
+	epatch "${FILESDIR}"/${PN}-0.2.2-rpc-des-prot.patch
+	> src/des_crypt.c #370713
+}
+
+src_configure() {
+	econf \
+		$(use_enable kerberos gss) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	insinto /etc
+	newins doc/etc_netconfig netconfig || die
+
+	insinto /usr/include/tirpc
+	doins -r "${WORKDIR}"/tirpc/* || die
+
+	# libtirpc replaces rpc support in glibc, so we need it in /
+	gen_usr_ldscript -a tirpc
+
+	# makes sure that the linking order for nfs-utils is proper, as
+	# libtool would inject a libgssglue dependency in the list.
+	use static-libs || find "${D}" -name '*.la' -delete
+}