Removed uncalled for #include <net/bpf.h>

5 files changed, 33 insertions, 17 deletions

diff --git a/net-analyzer/p0f/ChangeLog b/net-analyzer/p0f/ChangeLog
index 82e6bc687e10..c7aa26f12541 100644
--- a/net-analyzer/p0f/ChangeLog
+++ b/net-analyzer/p0f/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/p0f
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/ChangeLog,v 1.16 2004/08/06 13:56:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/ChangeLog,v 1.17 2004/10/15 10:01:30 eldad Exp $
+
+  15 Oct 2004; Eldad Zack <eldad@gentoo.org> p0f-1.8.2.ebuild,
+  p0f-2.0.2.ebuild, p0f-2.0.3.ebuild:
+  Removed uncalled for #include <net/bpf.h> in 1.8.2 and 2.0.2. Removed patch in
+  2.0.3 in favor of sed. Closes #50094.
 
   06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> p0f-2.0.3.ebuild:
   Stable on sparc
diff --git a/net-analyzer/p0f/Manifest b/net-analyzer/p0f/Manifest
index 48e6513d110b..7f2bade7eebb 100644
--- a/net-analyzer/p0f/Manifest
+++ b/net-analyzer/p0f/Manifest
@@ -1,11 +1,21 @@
-MD5 e22c6d2a32c3e9c741872f5b8cddfe6a ChangeLog 1659
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0c94bf7428ff57035132a1be189b820f p0f-2.0.3.ebuild 838
+MD5 a1ea6c567384353d10d03791960b87f5 p0f-1.8.2.ebuild 881
+MD5 d7754be65f973d0c7f7c3e667b601cb2 ChangeLog 1879
 MD5 a6504b2ab3f5f778d46643a087162f71 metadata.xml 250
-MD5 967869af1236cb136aee13501027324b p0f-1.8.2.ebuild 836
-MD5 83e42da2750b3dca9a40901c97da1096 p0f-2.0.2.ebuild 1044
-MD5 0637fb96dd4af1a58753d4db1852ec94 p0f-2.0.3.ebuild 885
+MD5 8be0f907669c375e52f9e1161ce27bfd p0f-2.0.2.ebuild 1090
+MD5 c701078bca6f0b08f687b66cffe6f1a6 files/p0f-2.0.3-libpcap-include.patch 234
+MD5 f184953061e4a88dad985e15eb2b4f22 files/p0f-1.8.2-makefile.patch 377
+MD5 aec7b9a8cf64ab5785008f4f5fc64095 files/p0f-1.8.2.rc 1274
 MD5 f6ee2143700cca09dfededeef39ed216 files/digest-p0f-1.8.2 57
 MD5 5bf1dc20124f41cadbc7560bddfe875c files/digest-p0f-2.0.2 57
 MD5 d68117a6108bcd2769ac8128cec37896 files/digest-p0f-2.0.3 58
-MD5 f184953061e4a88dad985e15eb2b4f22 files/p0f-1.8.2-makefile.patch 377
-MD5 aec7b9a8cf64ab5785008f4f5fc64095 files/p0f-1.8.2.rc 1274
-MD5 c701078bca6f0b08f687b66cffe6f1a6 files/p0f-2.0.3-libpcap-include.patch 234
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBb5+zT+MN7JbqCpMRAjwCAJ9DgOzFv/gi4q/2vjpiOg2qhaoydwCeOGAg
++L5Q2ZRuPaaNUtZeH1WODXg=
+=g1pq
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/p0f/p0f-1.8.2.ebuild b/net-analyzer/p0f/p0f-1.8.2.ebuild
index 6189549a5461..4ad97a6af586 100644
--- a/net-analyzer/p0f/p0f-1.8.2.ebuild
+++ b/net-analyzer/p0f/p0f-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-1.8.2.ebuild,v 1.14 2004/07/11 10:33:31 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-1.8.2.ebuild,v 1.15 2004/10/15 10:01:30 eldad Exp $
 
 inherit eutils
 
@@ -17,6 +17,8 @@ DEPEND="net-libs/libpcap"
 
 src_compile() {
 	epatch ${FILESDIR}/${P}-makefile.patch
+	sed -e 's;#include <net/bpf.h>;;' -i p0f.c
+
 	cp ${FILESDIR}/${P}.rc p0f.rc
 	make || die
 }
diff --git a/net-analyzer/p0f/p0f-2.0.2.ebuild b/net-analyzer/p0f/p0f-2.0.2.ebuild
index 2d19a6f84311..fcf79c041e15 100644
--- a/net-analyzer/p0f/p0f-2.0.2.ebuild
+++ b/net-analyzer/p0f/p0f-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.2.ebuild,v 1.6 2004/07/11 10:33:31 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.2.ebuild,v 1.7 2004/10/15 10:01:30 eldad Exp $
 
 DESCRIPTION="p0f performs passive OS detection based on SYN packets."
 # the p0f.tgz always resembles the latest version, trashing the digest md5sum then, discovered and fixed by gustavoz
@@ -18,6 +18,9 @@ src_compile () {
 	sed -i "s: /usr/sbin/: ../../image/usr/sbin/:g" ${WORKDIR}/p0f/mk/Linux
 	sed -i "s: /etc/p0f: ../../image/etc/p0f:g" ${WORKDIR}/p0f/mk/Linux
 	sed -i "s: /usr/man/man1/: ../../image/usr/man/man1/:g" ${WORKDIR}/p0f/mk/Linux
+
+	sed -e 's;#include <net/bpf.h>;;' -i p0f.c
+
 	make || die
 }
 
diff --git a/net-analyzer/p0f/p0f-2.0.3.ebuild b/net-analyzer/p0f/p0f-2.0.3.ebuild
index c7101c47be3d..f6b68b481904 100644
--- a/net-analyzer/p0f/p0f-2.0.3.ebuild
+++ b/net-analyzer/p0f/p0f-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.3.ebuild,v 1.8 2004/09/16 02:11:18 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.3.ebuild,v 1.9 2004/10/15 10:01:30 eldad Exp $
 
 inherit eutils
 
@@ -17,13 +17,9 @@ S=${WORKDIR}/${PN}
 
 DEPEND="net-libs/libpcap"
 
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-libpcap-include.patch
-}
-
 src_compile() {
+	sed -e 's;#include <net/bpf.h>;;' -i p0f.c
+
 	make || die
 }