Add patch to fix a possible overflow (reported by _FORTIFY_SOURCE=2); thanks to Joshua Kinard (Kumba) for reporting. Cleanup old versions and patches.

Package-Manager: portage-2.2_rc80/cvs/Linux x86_64

7 files changed, 39 insertions, 75 deletions

diff --git a/net-libs/libtirpc/ChangeLog b/net-libs/libtirpc/ChangeLog
index 8dd9277b9862..ccf4becb771d 100644
--- a/net-libs/libtirpc/ChangeLog
+++ b/net-libs/libtirpc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-libs/libtirpc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/ChangeLog,v 1.9 2010/07/23 01:53:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/ChangeLog,v 1.10 2010/09/12 21:41:47 flameeyes Exp $
+
+*libtirpc-0.2.1-r1 (12 Sep 2010)
+
+  12 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -libtirpc-0.2.0.ebuild, -files/libtirpc-0.2.0-hppa-float.patch,
+  -files/libtirpc-0.2.0-no-gss.patch, -libtirpc-0.2.1.ebuild,
+  +libtirpc-0.2.1-r1.ebuild, +files/libtirpc-0.2.1-fortify.patch:
+  Add patch to fix a possible overflow (reported by _FORTIFY_SOURCE=2);
+  thanks to Joshua Kinard (Kumba) for reporting. Cleanup old versions and
+  patches.
 
 *libtirpc-0.2.1 (23 Jul 2010)
 
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index b7f78541d4b8..a7471fb6dc7b 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX libtirpc-0.2.0-hppa-float.patch 415 RMD160 db300367907dc4280bac4389cd722554e0e5909d SHA1 387c749d12dc2cea5f00f5ba8db8755de52774e3 SHA256 29205d017d6cbd97c7c392b014e677f07868521f0a02bf36a6c8f4557788d78b
-AUX libtirpc-0.2.0-no-gss.patch 385 RMD160 5fc38f8daccec8d47a72bcbf4a88600961880c21 SHA1 398b144b6cecd0aa742c24e46109971422db7dc0 SHA256 3212e53dafb9be8fa2899e89ca205b7213b50140d013e43dc1589e37e476a56f
+AUX libtirpc-0.2.1-fortify.patch 676 RMD160 20204bbc49d6a390e8739900659e713853d0ef4b SHA1 29bcfc491c38a0cbf12de185c83eb53cecba669d SHA256 d0fad24dceea9dcc7aa2e9236dd8c5d6adc1be61f0cc3a2c714cf73eeab475a7
 DIST libtirpc-0.1.10.tar.bz2 416468 RMD160 494ae5beb892e47a551cba974b6586cf35af89b2 SHA1 42702d6f40acdf040c421554f36621e68920e702 SHA256 8441ee7b583b964c961e4e2b502063b668bb0b59c405526176e71d071caf0b0a
-DIST libtirpc-0.2.0.tar.bz2 436321 RMD160 6a6583e3db021a581b4a6ef078980d186345d44e SHA1 fba25db14518daeaca3ede3e38ef6e18ba1c9a8f SHA256 084c0661773c489df910f24caf915f2cf96ed3e00dea5222e788b754fea4c0db
 DIST libtirpc-0.2.1.tar.bz2 413031 RMD160 4443d83dea6b24d4fb5581ee13284865e6839f2f SHA1 ab0188be0eee162ad42cb941257e1615db5387c9 SHA256 ea77cadd63941fc4edbee7863d2c7094e6a18263d2a2c8922319aee91352ff41
 EBUILD libtirpc-0.1.10.ebuild 684 RMD160 0a61e18c6162f1e50f24974c96b540d245e7dda0 SHA1 c1cae64f22c0f0ebdc690d2fe18b90af8a21a8af SHA256 b3f164c22c5472b130f60d084fc245a92879014700f1176f564af3841988bfd2
-EBUILD libtirpc-0.2.0.ebuild 949 RMD160 246e6567a2571fc16fb9b3bac14b4954b91b3fea SHA1 5fcebd29a31aaa42dc50541d3c5f32a09bf9222a SHA256 58c489a5086c34b042d2a52b8e4da17169d6ece9da72551e5c838813307d7cf4
-EBUILD libtirpc-0.2.1.ebuild 1015 RMD160 6837f1bd54a3c1b51e5b34509f969b904a870695 SHA1 d9e5a2ff16e2c212ff1e090b519d4f2f03f60e33 SHA256 fe4dd0c0bbb56629cfc3d1597aadd24af01fc16c6c08c693e949fc3a08135ddd
-MISC ChangeLog 1653 RMD160 f2732c141f23a2d23ad47e14043a0a8ff2dce52b SHA1 5468a7762ee9dbbb9ea9f8f26067118b389e809c SHA256 c7e3f759b8b796f7ef9a12df65e774c55a13740f80798487d40317bdbe356175
+EBUILD libtirpc-0.2.1-r1.ebuild 1081 RMD160 f75ab45c8351cf2d1fb0d85e416a22833d963b4e SHA1 7aa67588c25e7826d54ca5a1f0c76ecf2e3dd154 SHA256 a3cdd83096dded2aeb78b0414ba1266453ccf51dd98dff17c14f34d516024a98
+MISC ChangeLog 2096 RMD160 321a2f9f56a9746c9585f1124932604b3099f820 SHA1 da20f6cd9b11c7841dd7881e92bbf9f4d8d897d2 SHA256 030a8b836a5fe73be5b8404facb80f90f904f58fd1bdd3ee70df5857658731f3
 MISC metadata.xml 159 RMD160 8e0977b9abd90afe9e1d5c1326823a5726f6e2a4 SHA1 33f35324ce730e28838be228d9ee4e4dd1bab1e5 SHA256 562c59615c028ffa088de789b3a792fd4cbbbfe71628ddd6a55d3b176becbc6b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxJCsEACgkQTwhj9JtAlp5KagEAv1EM2vb8MHlCf1mTtLkVjIlL
-L9mgVqNGKUohHocS2uQBAMRhyh8xT8r8z49g113b7AZhDET4NeThbJ47eaoPvgc5
-=d3u/
+iEYEARECAAYFAkyNST8ACgkQAiZjviIA2XjL2ACcCH2mpVWp7CbtrjD16sCQ1aV9
+7jYAn1/rUKr3fV8cSGhhfSebwY5CdfFJ
+=DZ8R
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libtirpc/files/libtirpc-0.2.0-hppa-float.patch b/net-libs/libtirpc/files/libtirpc-0.2.0-hppa-float.patch
deleted file mode 100644
index 7ba1e38e5aad..000000000000
--- a/net-libs/libtirpc/files/libtirpc-0.2.0-hppa-float.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-fix build failure on hppa
-
---- src/xdr_float.c
-+++ src/xdr_float.c
-@@ -59,7 +59,7 @@
-     defined(__arm32__) || defined(__ppc__) || defined(__ia64__) || \
-     defined(__arm26__) || defined(__sparc64__) || defined(__amd64__) || \
-     defined(__powerpc__) || defined(__s390__) || defined(__arm__) || \
--    defined(__sh__)
-+    defined(__sh__) || defined(__hppa__)
- #include <bits/endian.h>
- #define IEEEFP
- #endif
diff --git a/net-libs/libtirpc/files/libtirpc-0.2.0-no-gss.patch b/net-libs/libtirpc/files/libtirpc-0.2.0-no-gss.patch
deleted file mode 100644
index 6ab54a0c1f75..000000000000
--- a/net-libs/libtirpc/files/libtirpc-0.2.0-no-gss.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-if gss is disabled, then svc_auth_gss_ops won't be available
-
---- src/svc.c
-+++ src/svc.c
-@@ -77,7 +77,7 @@
- 
- extern rwlock_t svc_lock;
- extern rwlock_t svc_fd_lock;
--extern struct svc_auth_ops svc_auth_gss_ops;
-+extern struct svc_auth_ops svc_auth_gss_ops __attribute__((weak));
- 
- static struct svc_callout *svc_find (rpcprog_t, rpcvers_t,
- 				     struct svc_callout **, char *);
diff --git a/net-libs/libtirpc/files/libtirpc-0.2.1-fortify.patch b/net-libs/libtirpc/files/libtirpc-0.2.1-fortify.patch
new file mode 100644
index 000000000000..39abfdd3c062
--- /dev/null
+++ b/net-libs/libtirpc/files/libtirpc-0.2.1-fortify.patch
@@ -0,0 +1,15 @@
+Index: libtirpc-0.2.1/src/getrpcport.c
+===================================================================
+--- libtirpc-0.2.1.orig/src/getrpcport.c
++++ libtirpc-0.2.1/src/getrpcport.c
+@@ -57,8 +57,8 @@ getrpcport(host, prognum, versnum, proto
+ 	memset(&addr, 0, sizeof(addr));
+ 	addr.sin_family = AF_INET;
+ 	addr.sin_port =  0;
+-	if (hp->h_length > sizeof(addr))
+-	  hp->h_length = sizeof(addr);
++	if (hp->h_length > sizeof(addr.sin_addr.s_addr))
++	  hp->h_length = sizeof(addr.sin_addr.s_addr);
+ 	memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length);
+ 	/* Inconsistent interfaces need casts! :-( */
+ 	return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum, 
diff --git a/net-libs/libtirpc/libtirpc-0.2.0.ebuild b/net-libs/libtirpc/libtirpc-0.2.0.ebuild
deleted file mode 100644
index ef2d019bbe4d..000000000000
--- a/net-libs/libtirpc/libtirpc-0.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/libtirpc-0.2.0.ebuild,v 1.4 2009/05/30 21:28:12 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
-HOMEPAGE="http://libtirpc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="kerberos"
-
-DEPEND="kerberos? ( net-libs/libgssglue )"
-RDEPEND=${DEPEND}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-hppa-float.patch
-	epatch "${FILESDIR}"/${P}-no-gss.patch
-}
-
-src_compile() {
-	econf $(use_enable kerberos gss) || die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	insinto /etc
-	newins doc/etc_netconfig netconfig || die
-}
diff --git a/net-libs/libtirpc/libtirpc-0.2.1.ebuild b/net-libs/libtirpc/libtirpc-0.2.1-r1.ebuild
index a6feabc2b868..ea9819bc9fbe 100644
--- a/net-libs/libtirpc/libtirpc-0.2.1.ebuild
+++ b/net-libs/libtirpc/libtirpc-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/libtirpc-0.2.1.ebuild,v 1.2 2010/07/23 03:21:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/libtirpc-0.2.1-r1.ebuild,v 1.1 2010/09/12 21:41:47 flameeyes Exp $
 
 EAPI="2"
 
@@ -19,6 +19,10 @@ RDEPEND="kerberos? ( net-libs/libgssglue )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fortify.patch
+}
+
 src_configure() {
 	econf $(use_enable kerberos gss) --disable-static
 }