Do not call autoconf directly in 1.0.2a-r2, but call eautoconf (bug #226599). Apply cq_end_loop patch to new 1.1.2.1 revision to build net-analyzer/dhcp_probe against.

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

5 files changed, 92 insertions, 18 deletions

diff --git a/net-libs/libnet/ChangeLog b/net-libs/libnet/ChangeLog
index e4c7ca409c0b..50b543cb3af6 100644
--- a/net-libs/libnet/ChangeLog
+++ b/net-libs/libnet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libnet
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.44 2007/05/08 22:53:37 genone Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.45 2009/05/25 23:41:56 jer Exp $
+
+*libnet-1.1.2.1-r2 (25 May 2009)
+
+  25 May 2009; Jeroen Roovers <jer@gentoo.org> libnet-1.0.2a-r3.ebuild,
+  +libnet-1.1.2.1-r2.ebuild, +files/libnet-1.1.2.1-cq_end_loop.patch:
+  Do not call autoconf directly in 1.0.2a-r2, but call eautoconf (bug
+  #226599). Apply cq_end_loop patch to new 1.1.2.1 revision to build
+  net-analyzer/dhcp_probe against.
 
   08 May 2007; Marius Mauch <genone@gentoo.org> libnet-1.0.2a-r3.ebuild:
   Replacing einfo with elog
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 5045a5aeedba..28729cf57614 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.2a-slot.patch 7696 RMD160 9efca7d4e59ab46eaddb3932c39e86b7ad2bd9ce SHA1 4f4b0d316f8e61eb8d2daf25051036968d5d4594 SHA256 bd1d187bce4f5d618506d0149b469e4208eea0b45bbebec0aa190644be8d016e
 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-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
-EBUILD libnet-1.0.2a-r3.ebuild 1607 RMD160 0ebdbc1690007a1e162af46571428b03bc2e55a9 SHA1 5029a99c817e834b26438a15a87a3ba6f04f24b0 SHA256 0ab0b47b5d1a6b3a1931b13676ab108ad760b3af75015d33017066c2cb31cc63
+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
-MISC ChangeLog 5810 RMD160 e98cf79f6eef32a2417acc44137ba0e9787efc1b SHA1 db01f0e5ac83560a5c5882671fd2b35ffe8e6499 SHA256 2ace91e97e1ac9a863c64201ffec94ead1d9ba3405ea42a876d764c4a23f8230
+EBUILD libnet-1.1.2.1-r2.ebuild 1114 RMD160 ec7231ec6d168ab5ca85b6ef2ffb39bb4c432172 SHA1 e2c3267ad199ff6a81d38a74fa193e5a4c91d198 SHA256 e038b81ca473d8598ab5dcced24269a787210e9be5028ad5f19a49102cbb473a
+MISC ChangeLog 6158 RMD160 d8b37338a2e91ad7801e80e6d5ad29115632fc35 SHA1 c6e32dd233a20087484332aacdbdbdf618e72edc SHA256 91d3856281aca17710f91a214729807184d03ca12c67c0bd39fb8d7a2f33c527
 MISC metadata.xml 1021 RMD160 1e9e28f0dfd9ec6ffff940be53303d9b88b25b9f SHA1 6a1e29dba034a48b8dc54af7fb5bc3cfc1f6f364 SHA256 dde6801b0f8a66cc775c3cb6cadacf0a5c0f024d3535b22b2c787057b5b3e889
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFIQNrpj9hvisErhMIRAgpFAJ9yAOgGJVijinOIWHCJuL4BdGKipgCghrBV
-fCyXXNj+1CU656yOuoSO4WU=
-=selS
------END PGP SIGNATURE-----
diff --git a/net-libs/libnet/files/libnet-1.1.2.1-cq_end_loop.patch b/net-libs/libnet/files/libnet-1.1.2.1-cq_end_loop.patch
new file mode 100644
index 000000000000..6da82c0b83a6
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.1.2.1-cq_end_loop.patch
@@ -0,0 +1,32 @@
+Patch needed for net-analyzer/dhcp_probe -JeR (see [1])
+
+[1] http://www.net.princeton.edu/software/dhcp_probe/INSTALL.dhcp_probe.txt
+
+--- libnet/src/libnet_cq.c.orig	2004-01-28 20:45:00.000000000 +0100
++++ libnet/src/libnet_cq.c	2008-10-27 22:51:10.000000000 +0100
+@@ -393,3 +393,15 @@
+ {
+     return (l_cqd.node);
+ }
++
++u_int32_t
++libnet_cq_end_loop()
++{
++
++    if (! clear_cq_lock(CQ_LOCK_WRITE)) 
++    { 
++    	return (0); 
++    } 
++    l_cqd.current = l_cq;
++    return (1); 
++}
+--- libnet/include/libnet/libnet-functions.h.orig	2004-03-25 19:50:48.000000000 +0100
++++ libnet/include/libnet/libnet-functions.h	2008-10-27 22:52:14.000000000 +0100
+@@ -2148,4 +2148,7 @@
+ #endif
+ #endif  /* __LIBNET_FUNCTIONS_H */
+ 
++u_int32_t 
++libnet_cq_end_loop();
++
+ /* EOF */
diff --git a/net-libs/libnet/libnet-1.0.2a-r3.ebuild b/net-libs/libnet/libnet-1.0.2a-r3.ebuild
index 89ba81d1623e..3c4a43486d20 100644
--- a/net-libs/libnet/libnet-1.0.2a-r3.ebuild
+++ b/net-libs/libnet/libnet-1.0.2a-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.0.2a-r3.ebuild,v 1.17 2007/05/08 22:53:37 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.0.2a-r3.ebuild,v 1.18 2009/05/25 23:41:56 jer Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
 HOMEPAGE="http://www.packetfactory.net/libnet/"
@@ -30,7 +30,7 @@ src_unpack() {
 	cd "${S}"/doc
 	ln -s libnet.3 libnet-${SLOT}.3 || die "linking manpage"
 	cd "${S}"
-	autoconf || die
+	eautoconf || die
 }
 
 src_compile() {
diff --git a/net-libs/libnet/libnet-1.1.2.1-r2.ebuild b/net-libs/libnet/libnet-1.1.2.1-r2.ebuild
new file mode 100644
index 000000000000..c65c4af693b3
--- /dev/null
+++ b/net-libs/libnet/libnet-1.1.2.1-r2.ebuild
@@ -0,0 +1,42 @@
+# 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.2.1-r2.ebuild,v 1.1 2009/05/25 23:41:56 jer Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit eutils autotools
+
+DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
+HOMEPAGE="http://www.packetfactory.net/libnet/"
+SRC_URI="http://www.packetfactory.net/libnet/dist/${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"
+IUSE="doc"
+
+DEPEND="sys-devel/autoconf"
+RDEPEND=""
+
+S=${WORKDIR}/libnet
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-fix-chksum.patch
+	epatch "${FILESDIR}"/${P}-cq_end_loop.patch
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	eautoreconf
+}
+
+src_install(){
+	emake DESTDIR="${D}" install || die "Failed to install"
+
+	doman doc/man/man3/*.3
+	dodoc VERSION README doc/*
+	if use doc ; then
+		dohtml -r doc/html/*
+		docinto sample
+		dodoc sample/*.[ch]
+	fi
+}