Apply Debian patch (bug #296417).

Package-Manager: portage-2.2_rc57/cvs/Linux i686

4 files changed, 49 insertions, 4 deletions

diff --git a/net-libs/libnet/ChangeLog b/net-libs/libnet/ChangeLog
index 7226423d875f..3a3c2622ea1e 100644
--- a/net-libs/libnet/ChangeLog
+++ b/net-libs/libnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libnet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.51 2009/12/09 19:29:18 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.52 2009/12/10 16:22:57 jer Exp $
+
+  10 Dec 2009; Jeroen Roovers <jer@gentoo.org> libnet-1.1.4.ebuild,
+  +files/libnet-1.1.4-zero-pointers-after-free.patch:
+  Apply Debian patch (bug #296417).
 
   09 Dec 2009; nixnut <nixnut@gentoo.org> libnet-1.1.4.ebuild:
   ppc stable #289857
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 20b425716563..cf571bca30f1 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -2,6 +2,7 @@ AUX 1.0.2a-slot.patch 7696 RMD160 9efca7d4e59ab46eaddb3932c39e86b7ad2bd9ce SHA1
 AUX libnet-1.1.2.1-autotools.patch 2180 RMD160 005a05cc2b44e76c4eb2058d641c4475eef5a9bd SHA1 ce8e043fba6cea7b625efacad1a99954c5dff27c SHA256 1e2913b2c9323bc15e82c6e56060137bfafc1be07279c49f1d80f228c2003925
 AUX libnet-1.1.2.1-cq_end_loop.patch 766 RMD160 79257281ea029b5b243a3e8230f67cb3fab9c4c1 SHA1 38a81b0db7e9c515f4f9d33e43a2d35f80b982ce SHA256 2b3edf62528ce0b6bcdaf7b27710a182cf5722bea4f208dafa373460fcacde57
 AUX libnet-1.1.2.1-fix-chksum.patch 564 RMD160 bce53058c481e552494dee88e193157b151a31b1 SHA1 5a2fc6f2a540016edb82743a73cb30fef5fb9f62 SHA256 65e751e0957a6b7b73499513ad4260050f4627c3f9b46d73afeed3f7bd281682
+AUX libnet-1.1.4-zero-pointers-after-free.patch 870 RMD160 efbf34695710253105a792b1a65eaac187ed2b75 SHA1 30d5b10f10db27d923ae6d2d51795f9f68f71886 SHA256 d93e9401be39a278c6be60996cdd61240fb13571d8aba81326d5468b440bbd76
 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.2.1.tar.gz 1021236 RMD160 2d8d87930d09a74ab369bd7c240af4b5426ae380 SHA1 760783a2adbd845b731e2000aafa3cd9c3b028d5 SHA256 ab01882a3d0556176018c09342cd0731f7cbc8e687795009894c3326942c76ff
@@ -9,6 +10,6 @@ DIST libnet-1.1.4.tar.gz 1204502 RMD160 e9dd2026ac9191e62646ec97eb4896703b445685
 EBUILD libnet-1.0.2a-r3.ebuild 1615 RMD160 650515d40446fb101e3d19913ed6e39f4c8d5913 SHA1 37f8e23942945448d555676256f5b18881bd1c93 SHA256 fcafb176db7433026dcc0fe8aa4a6e11898b43062469b50c63ac469200dbc257
 EBUILD libnet-1.1.2.1-r1.ebuild 1060 RMD160 7362399e879f7b76a8692774e82f9c4aef263dd2 SHA1 97f8074383acadd8d0b6a4109df8b977c16792f7 SHA256 2315d9f2d18e412671113551fac55ea42d840aeca8ef6ebb15a8d3da1e71b912
 EBUILD libnet-1.1.2.1-r2.ebuild 1114 RMD160 ec7231ec6d168ab5ca85b6ef2ffb39bb4c432172 SHA1 e2c3267ad199ff6a81d38a74fa193e5a4c91d198 SHA256 e038b81ca473d8598ab5dcced24269a787210e9be5028ad5f19a49102cbb473a
-EBUILD libnet-1.1.4.ebuild 917 RMD160 cc0f8be2a6e9d4529ab65a071d3f6c55d672368e SHA1 e6fa821ed2a13c37665ac6a78b692b39b74eb36d SHA256 65d39d3d0dc3c87bdffbcda6111f7d0238cd78425b6706a7bc03c4375c27e469
-MISC ChangeLog 6795 RMD160 c203631de908d47fcba524245df9724d4f9b611f SHA1 3ec0142aebe8d5939039e53aec11ed6618dd220b SHA256 7b1749264b26172ad2a0614a19cd7e07d463dd32a7ad97b2d55ce0a295a77cea
+EBUILD libnet-1.1.4.ebuild 1017 RMD160 a10951adb622b39ce21d257764268c42acbec3e3 SHA1 09561a098f44d4c7842c78257c2d8682e78078ea SHA256 254696818e87eb62bdaeb2ff942e47a2dc5869cf572935536723922209751fe4
+MISC ChangeLog 6951 RMD160 c20c5f6b96f1d028f7511ecbcad687deda844065 SHA1 46220ff2efdd221a3d9ae56b5d82555f9825be47 SHA256 2a71e58b66d31f397d091347471d1e3fe10613a50e737c334df652be70e344f7
 MISC metadata.xml 1021 RMD160 1e9e28f0dfd9ec6ffff940be53303d9b88b25b9f SHA1 6a1e29dba034a48b8dc54af7fb5bc3cfc1f6f364 SHA256 dde6801b0f8a66cc775c3cb6cadacf0a5c0f024d3535b22b2c787057b5b3e889
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
new file mode 100644
index 000000000000..0fd81d7377f4
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.1.4-zero-pointers-after-free.patch
@@ -0,0 +1,32 @@
+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.ebuild b/net-libs/libnet/libnet-1.1.4.ebuild
index 830f93db8d64..041bf6f66ca4 100644
--- a/net-libs/libnet/libnet-1.1.4.ebuild
+++ b/net-libs/libnet/libnet-1.1.4.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2009 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.ebuild,v 1.6 2009/12/09 19:29:18 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.1.4.ebuild,v 1.7 2009/12/10 16:22:57 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/"
@@ -14,6 +18,10 @@ 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"