Grab upstream patches to build ipfilter, #124257

Package-Manager: portage-2.1.3.3

4 files changed, 140 insertions, 10 deletions

diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index 1c64f394909d..5f4064f0211d 100644
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.41 2007/08/06 09:46:15 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.42 2007/08/06 15:46:05 uberlord Exp $
+
+  06 Aug 2007; Roy Marples <uberlord@gentoo.org>
+  +files/freebsd-sbin-6.2-ipfilter.patch, freebsd-sbin-6.2-r2.ebuild:
+  Grab upstream patches to build ipfilter, #124257
 
 *freebsd-sbin-6.2-r2 (06 Aug 2007)
 
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index 670fc9838285..f07f8051b4fa 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -18,6 +18,10 @@ AUX freebsd-sbin-6.1-pr102701.patch 548 RMD160 ccaac521cdbb9b5449329cf98fc77be34
 MD5 c8be557a8710553350290da3e53f3e13 files/freebsd-sbin-6.1-pr102701.patch 548
 RMD160 ccaac521cdbb9b5449329cf98fc77be340c59cd1 files/freebsd-sbin-6.1-pr102701.patch 548
 SHA256 dccf32386359a2cfd80272c86085467d612c8f4d7924a6a223cd1259a8b7a176 files/freebsd-sbin-6.1-pr102701.patch 548
+AUX freebsd-sbin-6.2-ipfilter.patch 3766 RMD160 28e4ac9bf318290c925b77bcb26769c1a1522c00 SHA1 e24af0b269ff4f4b6fed20f0008733bd4a0b4e38 SHA256 3f6d8d9fa58bbb5814e2e15556d63af2b292c277db854fbdb661c106e36c50e2
+MD5 a50bbada05b569d01b3b6841fdd483dc files/freebsd-sbin-6.2-ipfilter.patch 3766
+RMD160 28e4ac9bf318290c925b77bcb26769c1a1522c00 files/freebsd-sbin-6.2-ipfilter.patch 3766
+SHA256 3f6d8d9fa58bbb5814e2e15556d63af2b292c277db854fbdb661c106e36c50e2 files/freebsd-sbin-6.2-ipfilter.patch 3766
 AUX freebsd-sbin-6.2-ldconfig.patch 389 RMD160 856f6d3479ee927850f84380de6ee4109b41d236 SHA1 8af511190f4005b4a3de5159f86d9c23d8dc52f1 SHA256 b3fd47a733d39dea3400bee180d156ed09ff4c19dd47fbf5df52af33bdc5dc2b
 MD5 fe9236f65baef9d006ebfa26c80b0031 files/freebsd-sbin-6.2-ldconfig.patch 389
 RMD160 856f6d3479ee927850f84380de6ee4109b41d236 files/freebsd-sbin-6.2-ldconfig.patch 389
@@ -53,18 +57,18 @@ EBUILD freebsd-sbin-6.2-r1.ebuild 2858 RMD160 9cfe06129cdee90c9cbd2bdb2bf7281c3c
 MD5 7860c6fe461736d6dba297480310937c freebsd-sbin-6.2-r1.ebuild 2858
 RMD160 9cfe06129cdee90c9cbd2bdb2bf7281c3cf5d99f freebsd-sbin-6.2-r1.ebuild 2858
 SHA256 30925d04692e679663e7f6c6e85751c9cfd8eb50ab0b8fbe3fbd03f987fdb501 freebsd-sbin-6.2-r1.ebuild 2858
-EBUILD freebsd-sbin-6.2-r2.ebuild 2896 RMD160 44b7a36aa4642634e44491232b065c5125d469f0 SHA1 394c06e648514beb5d067a97eef5244058039448 SHA256 b10efe783882ff688e05e95f5cbd3f7c555aad7a5d078ff9f21faff8863483d5
-MD5 c80fb014302653e740744baa19202085 freebsd-sbin-6.2-r2.ebuild 2896
-RMD160 44b7a36aa4642634e44491232b065c5125d469f0 freebsd-sbin-6.2-r2.ebuild 2896
-SHA256 b10efe783882ff688e05e95f5cbd3f7c555aad7a5d078ff9f21faff8863483d5 freebsd-sbin-6.2-r2.ebuild 2896
+EBUILD freebsd-sbin-6.2-r2.ebuild 2934 RMD160 8a01f8c1f14e1f1ca1f98964ffe76622db847781 SHA1 3866266701bae60bc2c65a1f31132e6cb1d75d89 SHA256 b350da5a7eb0ebf186aa9a05e1c4b5a67b15700fb094b0a0d3677889acb38a95
+MD5 184bcc7657490721bd8fb33d30bc3d8a freebsd-sbin-6.2-r2.ebuild 2934
+RMD160 8a01f8c1f14e1f1ca1f98964ffe76622db847781 freebsd-sbin-6.2-r2.ebuild 2934
+SHA256 b350da5a7eb0ebf186aa9a05e1c4b5a67b15700fb094b0a0d3677889acb38a95 freebsd-sbin-6.2-r2.ebuild 2934
 EBUILD freebsd-sbin-6.2.ebuild 2756 RMD160 248395564ee560c18166c075e95b25bd48308159 SHA1 a3e099442d7e7757c70e3556875a93b5aebe6c2f SHA256 bed2cca5e89e0210e5d41f1f731d17fe6ef234cc32e9557d04c108bcb9c2d560
 MD5 896bd762d6714ae266a8af3dd16fc929 freebsd-sbin-6.2.ebuild 2756
 RMD160 248395564ee560c18166c075e95b25bd48308159 freebsd-sbin-6.2.ebuild 2756
 SHA256 bed2cca5e89e0210e5d41f1f731d17fe6ef234cc32e9557d04c108bcb9c2d560 freebsd-sbin-6.2.ebuild 2756
-MISC ChangeLog 9541 RMD160 7a85516074be0b2f5cc2da5db05c306fcdbf4588 SHA1 3a65c1982b6851a99e04b468249967c0823d8747 SHA256 98e2ac78688bd7f6b3d92420858abb0a4297467b1b9ef8596e856fdad79c4ee5
-MD5 ba1d14de36e3e624255195a87bbe3835 ChangeLog 9541
-RMD160 7a85516074be0b2f5cc2da5db05c306fcdbf4588 ChangeLog 9541
-SHA256 98e2ac78688bd7f6b3d92420858abb0a4297467b1b9ef8596e856fdad79c4ee5 ChangeLog 9541
+MISC ChangeLog 9712 RMD160 4959a596990894253e293dae48ccc21bb08fb17b SHA1 f7940bd0d100302c2a2e9a06c3a312c9b9ab7780 SHA256 fb13b3908de424b3ac5a1ee7f80981961db868a360e0703fe1d4cb98d76f8755
+MD5 323e13c05a2a6898ab508ee0cdc97f08 ChangeLog 9712
+RMD160 4959a596990894253e293dae48ccc21bb08fb17b ChangeLog 9712
+SHA256 fb13b3908de424b3ac5a1ee7f80981961db868a360e0703fe1d4cb98d76f8755 ChangeLog 9712
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ipfilter.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ipfilter.patch
new file mode 100644
index 000000000000..83681b70f28f
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ipfilter.patch
@@ -0,0 +1,121 @@
+--- sbin.orig/ipf/ipf/Makefile	2007-08-06 15:57:49 +0100
++++ sbin/ipf/ipf/Makefile	2007-08-06 16:02:33 +0100
+@@ -1,15 +1,15 @@
+ # $FreeBSD: src/sbin/ipf/ipf/Makefile,v 1.3.2.1 2006/08/24 07:37:10 guido Exp $
+ 
+ PROG=		ipf
+-SRCS=		ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c
++SRCS=		${GENHDRS} ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c
+ MAN=		ipf.8 ipf.4 ipf.5 ipl.4
+ MLINKS=		ipl.4 ipfilter.4 ipf.5 ipf.conf.5 ipf.5 ipf6.conf.5
+ CFLAGS+=	-I. -DIPFILTER_BPF
+ 
+-DPSRCS+=	ipf_l.h ipf_y.h
++GENHDRS=	ipf_l.h ipf_y.h
++DPSRCS+=	${GENHDRS}
+ 
+-CLEANFILES+=	ipf_y.c ipf_y.h
+-CLEANFILES+=	ipf_l.c ipf_l.h
++CLEANFILES+=	${GENHDRS} ipf_y.c ipf_l.c
+ 
+ ipf_y.c: ipf_y.y
+ 	${YACC} -d ${.ALLSRC}
+--- sbin.orig/ipf/ipftest/Makefile	2007-08-06 16:07:39 +0100
++++ sbin/ipf/ipftest/Makefile	2007-08-06 16:13:23 +0100
+@@ -1,7 +1,7 @@
+ #	$FreeBSD: src/sbin/ipf/ipftest/Makefile,v 1.3 2005/04/28 16:26:34 darrenr Exp $
+ 
+ PROG=		ipftest
+-SRCS=		ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
++SRCS=		${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
+ 		ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \
+ 		ip_pool.c ip_scan.c ip_sync.c ip_rules.c \
+ 		ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \
+@@ -13,16 +13,15 @@
+ 
+ .PATH:		${.CURDIR}/../../../sys/contrib/ipfilter/netinet
+ 
+-DPSRCS+=	ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h
++GENHDRS=	ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h
++DPSRCS+=	${GENHDRS}
+ 
+-CLEANFILES+=	ipf_y.c ipf_y.h
+-CLEANFILES+=	ipf_l.c ipf_l.h
++CLEANFILES+=	${GENHDRS} 
++CLEANFILES+=	ipf_y.c ipf_l.c
+ CLEANFILES+=	ipf.tab.c ipf.tab.h
+-CLEANFILES+=	ipnat_y.c ipnat_y.h
+-CLEANFILES+=	ipnat_l.c ipnat_l.h
++CLEANFILES+=	ipnat_y.c ipnat_l.c
+ CLEANFILES+=	ipnat.tab.c ipnat.tab.h
+-CLEANFILES+=	ippool_y.c ippool_y.h
+-CLEANFILES+=	ippool_l.c ippool_l.h
++CLEANFILES+=	ippool_y.c ippool_l.c
+ CLEANFILES+=	ippool.tab.c ippool.tab.h
+ 
+ ipnat_y.c: ipnat_y.y
+--- sbin.orig/ipf/ipmon/Makefile	2007-08-06 16:19:32 +0100
++++ sbin/ipf/ipmon/Makefile	2007-08-06 16:21:44 +0100
+@@ -1,15 +1,15 @@
+ #	$FreeBSD: src/sbin/ipf/ipmon/Makefile,v 1.2 2005/04/28 16:26:34 darrenr Exp $
+ 
+ PROG=		ipmon
+-SRCS=		ipmon.c ipmon_y.c ipmon_l.c
++SRCS=		${GENHDRS} ipmon.c ipmon_y.c ipmon_l.c
+ MAN=		ipmon.8
+ 
+ CFLAGS+=	-DLOGFAC=LOG_LOCAL0 -I.
+ 
+-DPSRCS+=	ipmon_l.h ipmon_y.h
++GENHDRS+=	ipmon_l.h ipmon_y.h
++DPSRCS+=	${GENHDRS}
+ 
+-CLEANFILES+=	ipmon_y.c ipmon_y.h
+-CLEANFILES+=	ipmon_l.c ipmon_l.h
++CLEANFILES+=	${GENHDRS} ipmon_y.c ipmon_l.c
+ 
+ ipmon_y.c: ipmon_y.y
+ 	${YACC} -d ${.ALLSRC}
+--- sbin.orig/ipf/ipnat/Makefile	2005-04-28 17:26:34 +0100
++++ sbin/ipf/ipnat/Makefile	2007-08-06 16:24:42 +0100
+@@ -1,15 +1,15 @@
+ #	$FreeBSD: src/sbin/ipf/ipnat/Makefile,v 1.2 2005/04/28 16:26:34 darrenr Exp $
+ 
+ PROG=		ipnat
+-SRCS=		ipnat.c ipnat_y.c ipnat_l.c
++SRCS=		${GENHDRS} ipnat.c ipnat_y.c ipnat_l.c
+ MAN=		ipnat.8 ipnat.4 ipnat.5
+ MLINKS=		ipnat.5 ipnat.conf.5
+ CFLAGS+=	-I.
+ 
+-DPSRCS+=	ipnat_l.h ipnat_y.h
++GENHDRS=	ipnat_l.h ipnat_y.h
++DPSRCS+=	${GENHDRS}
+ 
+-CLEANFILES+=	ipnat_y.c ipnat_y.h
+-CLEANFILES+=	ipnat_l.c ipnat_l.h
++CLEANFILES+=	${GENHDRS} ipnat_y.c ipnat_l.c
+ 
+ ipnat_y.c: ipnat_y.y
+ 	${YACC} -d ${.ALLSRC}
+--- sbin.orig/ipf/ippool/Makefile	2005-04-28 17:26:34 +0100
++++ sbin/ipf/ippool/Makefile	2007-08-06 16:25:20 +0100
+@@ -1,14 +1,14 @@
+ #	$FreeBSD: src/sbin/ipf/ippool/Makefile,v 1.2 2005/04/28 16:26:34 darrenr Exp $
+ 
+ PROG=		ippool
+-SRCS=		ippool_y.c ippool_l.c kmem.c ippool.c
++SRCS=		${GENHDRS} ippool_y.c ippool_l.c kmem.c ippool.c
+ MAN=		ippool.5 ippool.8
+ CFLAGS+=	-I.
+ 
+-DPSRCS+=	ippool_l.h ippool_y.h
++GENHDRS=	ippool_l.h ippool_y.h
++DPSRCS+=	${GENHDRS}
+ 
+-CLEANFILES+=	ippool_y.c ippool_y.h
+-CLEANFILES+=	ippool_l.c ippool_l.h
++CLEANFILES+=	${GENHDRS} ippool_y.c ippool_l.c
+ 
+ ippool_y.c: ippool_y.y
+ 	${YACC} -d ${.ALLSRC}
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2-r2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2-r2.ebuild
index d6e84140ce65..0382dd1cb235 100644
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2-r2.ebuild
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2-r2.ebuild,v 1.1 2007/08/06 09:46:15 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2-r2.ebuild,v 1.2 2007/08/06 15:46:05 uberlord Exp $
 
 inherit flag-o-matic bsdmk freebsd
 
@@ -46,6 +46,7 @@ pkg_setup() {
 REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder"
 
 PATCHES="${FILESDIR}/${PN}-6.2-ldconfig.patch
+	${FILESDIR}/${PN}-6.2-ipfilter.patch
 	${FILESDIR}/${PN}-setXid.patch
 	${FILESDIR}/${PN}-zlib.patch
 	${FILESDIR}/${PN}-6.1-pr102701.patch"