Grab upstream patches to build ipfilter, #124257

(Portage version: 2.1.3.3)

3 files changed, 128 insertions, 2 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/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"