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

(Portage version: 2.2_rc80/cvs/Linux x86_64)

6 files changed, 31 insertions, 64 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/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
 }