Add patch to allow building using portage's libpcap, see bug #124759.

Package-Manager: portage-2.1_pre7-r3

4 files changed, 35 insertions, 11 deletions

diff --git a/sys-freebsd/freebsd-pf/ChangeLog b/sys-freebsd/freebsd-pf/ChangeLog
index 12b9b14913b9..34d049f1ea60 100644
--- a/sys-freebsd/freebsd-pf/ChangeLog
+++ b/sys-freebsd/freebsd-pf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-pf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.2 2006/04/04 07:11:20 flameeyes Exp $
+
+  04 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/freebsd-pf-6.0-pcap.patch, freebsd-pf-6.0.ebuild:
+  Add patch to allow building using portage's libpcap, see bug #124759.
 
 *freebsd-pf-6.0 (01 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index 65ad3d8fdbf9..4d753d04275f 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1eca8f2894356e6e726ef117b606a41e ChangeLog 634
-RMD160 11530f7ae353d87b2401ef2fd85c6d61d7286c06 ChangeLog 634
-SHA256 0bbcba8d00b1bd83fdf9cf2d2579eef17f3302f8c9c0e5e30755752017d62a79 ChangeLog 634
+MD5 f1b3c55ab52a4db10d89a90e2293a746 ChangeLog 819
+RMD160 247060c87a2ac1f7c7bca35e8283945ddff39653 ChangeLog 819
+SHA256 39985b9868918e8917b286c3c7e72dfe38cf48330384770a305e53d6378c346c ChangeLog 819
 MD5 85901762b1b5797d4c97aa0cdd7be3e1 files/digest-freebsd-pf-6.0 1295
 RMD160 dfaa6acbcc3a5282d41b3204342dda0e0c906fa8 files/digest-freebsd-pf-6.0 1295
 SHA256 24290e8449f22ded1c68fe86e421e332e96d5dc384d37a79b93aa68cbb8d2b60 files/digest-freebsd-pf-6.0 1295
-MD5 5de8d9a23654ba023bc2c3f313f589df freebsd-pf-6.0.ebuild 1249
-RMD160 8a054b7eb5f53c7d0775229f2e7c997e51198be8 freebsd-pf-6.0.ebuild 1249
-SHA256 3e924a8b4b9a7062d77760c4267b6bd7705ac3ec0c4efaf7eda5e31c81860d82 freebsd-pf-6.0.ebuild 1249
+MD5 2d3b83d198f4bde2c2f5c838be5ed0f1 files/freebsd-pf-6.0-pcap.patch 556
+RMD160 ddb0733e487a7ba4eecedc82bc95695cb397f072 files/freebsd-pf-6.0-pcap.patch 556
+SHA256 1bef4f28c77386d50712dd8d5579d0dfcd4ef24b2a730597bdcfc4218fe70017 files/freebsd-pf-6.0-pcap.patch 556
+MD5 6c90ac96781f3234837132391e2f2daa freebsd-pf-6.0.ebuild 1295
+RMD160 46df430a0554fdc84520cc9895367b8e8d1ca16b freebsd-pf-6.0.ebuild 1295
+SHA256 f0e34cede6ae3ca3bfa444a8e33d9ed7c22e453eaaf16d9c0aa2dfa04e7d1d40 freebsd-pf-6.0.ebuild 1295
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEMEgXAiZjviIA2XgRArHjAKDQ4pmexBGS2VUcK24m6ne3nV4QWQCg0B0w
-+aNs/eXwn+mtiqsH8v3kBKY=
-=HA4f
+iD8DBQFEMhxCAiZjviIA2XgRAlNmAKDymGL7W0nayiWIfJwXf9lNHwxxnACdGHj2
+WWVqc81b3M3jT2/6sZ9wtKc=
+=de8j
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-6.0-pcap.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-6.0-pcap.patch
new file mode 100644
index 000000000000..32f0605de985
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-6.0-pcap.patch
@@ -0,0 +1,15 @@
+This patch includes net/bpf.h so that libpcap will use that instead of its own
+stripped down version, that doesnt't allow for pflogd to work correctly.
+
+Index: fbsd-6/contrib/pf/pflogd/pflogd.c
+===================================================================
+--- fbsd-6.orig/contrib/pf/pflogd/pflogd.c
++++ fbsd-6/contrib/pf/pflogd/pflogd.c
+@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD: src/contrib/pf/pflog
+ #include <sys/ioctl.h>
+ #include <sys/file.h>
+ #include <sys/stat.h>
++#include <net/bpf.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-6.0.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-6.0.ebuild
index dc75616ab15b..5b08d7917b69 100644
--- a/sys-freebsd/freebsd-pf/freebsd-pf-6.0.ebuild
+++ b/sys-freebsd/freebsd-pf/freebsd-pf-6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-6.0.ebuild,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-6.0.ebuild,v 1.2 2006/04/04 07:11:20 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
@@ -27,6 +27,8 @@ S="${WORKDIR}"
 
 SUBDIRS="libexec/ftp-proxy usr.sbin/authpf sbin/pfctl sbin/pflogd"
 
+PATCHES="${FILESDIR}/${PN}-${RV}-pcap.patch"
+
 src_unpack() {
 	freebsd_src_unpack