Old.

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

4 files changed, 9 insertions, 78 deletions

diff --git a/net-libs/libnet/ChangeLog b/net-libs/libnet/ChangeLog
index 990ccff9b301..9a07546b17e4 100644
--- a/net-libs/libnet/ChangeLog
+++ b/net-libs/libnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libnet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.73 2011/07/13 12:31:23 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.74 2011/07/13 13:37:19 jer Exp $
+
+  13 Jul 2011; Jeroen Roovers <jer@gentoo.org> -libnet-1.1.4-r1.ebuild,
+  -files/libnet-1.1.4-zero-pointers-after-free.patch:
+  ^
 
   13 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> libnet-1.1.5.ebuild:
   ppc/ppc64 stable wrt #359037
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index f9fcd0cd63be..52b73cc16f9e 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -2,23 +2,18 @@
 Hash: SHA1
 
 AUX 1.0.2a-slot.patch 7696 RMD160 9efca7d4e59ab46eaddb3932c39e86b7ad2bd9ce SHA1 4f4b0d316f8e61eb8d2daf25051036968d5d4594 SHA256 bd1d187bce4f5d618506d0149b469e4208eea0b45bbebec0aa190644be8d016e
-AUX libnet-1.1.4-zero-pointers-after-free.patch 870 RMD160 efbf34695710253105a792b1a65eaac187ed2b75 SHA1 30d5b10f10db27d923ae6d2d51795f9f68f71886 SHA256 d93e9401be39a278c6be60996cdd61240fb13571d8aba81326d5468b440bbd76
 AUX libnet-1.1.5-darwin.patch 595 RMD160 9e8113d58eddb0f456fe74e05a7c2b4dc89ed4e9 SHA1 5188141d86a217f87d0766185ddfc8cae5a6f03b SHA256 dcf3a67d375675544a104f8aedd318cb4ea5d907b3456d9330413ba784845eb8
 AUX libnet-gcc33-fix 563 RMD160 1d153e6ad09f447ab3ebc3568df9e595cc33f133 SHA1 5e29c42bfb18cd3bd55f8700bd0a2886d463c6e3 SHA256 b533c27f07bb27489b0a3941546788447cab6e767b489961ba7fc776ee49ed47
 DIST libnet-1.0.2a.tar.gz 140191 RMD160 43dd2edc31e56b42792727b88d81342dc26d3308 SHA1 804eaf43bb90f93e505d46a9668c914a112bf136 SHA256 7c7f2e8ccb47bb47072c5cd583fea5e90ab892c75889b625346b60d10464459a
-DIST libnet-1.1.4.tar.gz 1204502 RMD160 e9dd2026ac9191e62646ec97eb4896703b445685 SHA1 86a2f75b52c5b15dbd41c3e03356167de9c883e4 SHA256 de98229d9eca00b66c26cb368e582901cf768456321703bc38235e3b347b512d
 DIST libnet-1.1.5.tar.gz 1190258 RMD160 46c67e67760c636d7b41a30e13ee2ba97d1f866d SHA1 a2271762a7d6505c1ff6c4c048bf802e643b6790 SHA256 75588f8d1232e1df34eccf2dba5e66be197b345a07fae80d8275db994496a20d
 EBUILD libnet-1.0.2a-r3.ebuild 1619 RMD160 a605e55ae1f4e08efe1a5b492ade168b565eb598 SHA1 97b23d27dd7fc822876ff7f9e82b238536f54a39 SHA256 8388ff97f254654ce768ddc37c221e4fba1f7c4836baacfc94bdf45090a9af53
-EBUILD libnet-1.1.4-r1.ebuild 1073 RMD160 1223e90a20bd72ae8ab176a3c27e619e755b94a1 SHA1 94d11eac56a6cf8eae3fcfed342b839fe373128d SHA256 d0ec4826707bded1bf1bd68b9a7d62f852057d956ad9510bbd2eb8d962082ee4
 EBUILD libnet-1.1.5.ebuild 1044 RMD160 3412fb3966cf04ceaaddd0f21b701ce70be009fd SHA1 9ef3ba1c2c839f4fb1abe118436023b533b61ea6 SHA256 78142c2ad526c8d34d25a9dd2141cc7ce4174bd6ab7bc4a373bec4443f83aa9b
-MISC ChangeLog 9575 RMD160 134dbd0858c037496a5c1692ffa55eaf6ff57590 SHA1 77e77fb25b0bdc57f7006de8df1df291008995f1 SHA256 7a6e83d3c6087f9c59eed8247b1c9f61e0f36534c960825da17c56056a541641
+MISC ChangeLog 9699 RMD160 3ef0c19e8c8a4cb3a1ac39c6b2ac4f084d64b9dd SHA1 a17efe124813b07880d8b23145741bab3f6826bc SHA256 5eb70f41fdcebc44c8b75d9cdb18d8220e410b7381e635c06733d4f91640fb0b
 MISC metadata.xml 1021 RMD160 1e9e28f0dfd9ec6ffff940be53303d9b88b25b9f SHA1 6a1e29dba034a48b8dc54af7fb5bc3cfc1f6f364 SHA256 dde6801b0f8a66cc775c3cb6cadacf0a5c0f024d3535b22b2c787057b5b3e889
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4dkCkACgkQIiMqcbOVdxTwpQP/SfIYaaZXthrTE0o8/siaV6FX
-2oKKZS48K24VXFhefFt3UXwU2ajkY3vsc9CZv3YTKk1gvcuJYM5NpgFwmMXeH0Ih
-kUt4LxOlycKHuSZlnzH80Ve9OP9ARkelY6vihkTgLQ3vgx/05lMeGuL0H65oTjbc
-vA8nj8ItnVHpBb1pMMg=
-=JAJw
+iEYEARECAAYFAk4dn6kACgkQVWmRsqeSphMz3wCfdWht7gIuKrhOzx7SFwu4EhWd
+6cQAnjbFNGFawVuKg/abnoy6QxPy9MJW
+=9QKl
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libnet/files/libnet-1.1.4-zero-pointers-after-free.patch b/net-libs/libnet/files/libnet-1.1.4-zero-pointers-after-free.patch
deleted file mode 100644
index 0fd81d7377f4..000000000000
--- a/net-libs/libnet/files/libnet-1.1.4-zero-pointers-after-free.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-http://ftp.de.debian.org/debian/pool/main/libn/libnet/libnet_1.1.4-2.diff.gz
-
-
-NULLify pointers after free()ing them to avoid double free()s.
-Index: libnet-1.1.4/src/libnet_if_addr.c
-===================================================================
---- libnet-1.1.4.orig/src/libnet_if_addr.c	2009-06-27 14:48:56.084093427 +0300
-+++ libnet-1.1.4/src/libnet_if_addr.c	2009-06-27 14:49:30.081249393 +0300
-@@ -240,6 +240,7 @@
-         {
-             /* fix memory leak */
-             free(al->device);
-+	    al->device = NULL;
-         }
-         if ((al->device = strdup(device)) == NULL)
-         {
-@@ -406,6 +407,7 @@
-     for (i = 0; i < c; i++)
-     {
-         free(al[i].device);
-+	al[i].device = NULL;
-     }
-     return (1);
- 
-@@ -413,6 +415,7 @@
-     for (i = 0; i < c; i++)
-     {
-         free(al[i].device);
-+	al[i].device = NULL;
-     }
-     return (-1);
- }
diff --git a/net-libs/libnet/libnet-1.1.4-r1.ebuild b/net-libs/libnet/libnet-1.1.4-r1.ebuild
deleted file mode 100644
index 1768759a05eb..000000000000
--- a/net-libs/libnet/libnet-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.1.4-r1.ebuild,v 1.11 2010/11/10 05:55:28 jer Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
-HOMEPAGE="http://libnet-dev.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}-dev/${PN}-dev/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="1.1"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="sys-devel/autoconf"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-zero-pointers-after-free.patch
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die "Failed to install"
-
-	dodoc README \
-		doc/{BUGS,CHANGELOG,CONTRIB,DESIGN_NOTES,MIGRATION} \
-		doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO}
-	if use doc ; then
-		dohtml -r doc/html/*
-		docinto sample
-		dodoc sample/*.[ch]
-	fi
-}