Date: Thu, 19 Aug 2004 22:27:38 +1200 (NZST) From: Andrew Thompson <andy@fud.org.nz> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70654: [maintainer-update] Fix pfflowd with pf in current (from OpenBSD 3.5) Message-ID: <20040819102738.CF1BE2842E@spoon.fud.org.nz> Resent-Message-ID: <200408191030.i7JAUVXZ082909@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70654
>Category: ports
>Synopsis: [maintainer-update] Fix pfflowd with pf in current (from OpenBSD 3.5)
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 19 10:30:31 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Andrew Thompson
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD spoon.fud.org.nz 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Mon Aug 16 20:06:31 NZST 2004 thompsa@spoon.fud.org.nz:/usr/obj/usr/src/sys/SPOON i386
>Description:
The latest pf in current has a different pfsync interface, imported 16 June
from OpenBSD 3.5. Make build aware of this by making -DOLD_PFSYNC conditional.
>How-To-Repeat:
>Fix:
diff -urN net/pfflowd.orig/Makefile net/pfflowd/Makefile
--- net/pfflowd.orig/Makefile Thu Aug 19 22:02:42 2004
+++ net/pfflowd/Makefile Thu Aug 19 22:19:01 2004
@@ -24,6 +24,10 @@
IGNORE= "Only for 5.0 and above"
.endif
+.if ${OSVERSION} < 502119
+EXTRA_PATCHES+= ${FILESDIR}/pf34-Makefile
+.endif
+
.if ${OSVERSION} < 502106
BUILD_DEPENDS= ${LOCALBASE}/include/pf/net/pfvar.h:${PORTSDIR}/security/pf
RUN_DEPENDS= ${LOCALBASE}/modules/pf.ko:${PORTSDIR}/security/pf
diff -urN net/pfflowd.orig/files/patch-Makefile net/pfflowd/files/patch-Makefile
--- net/pfflowd.orig/files/patch-Makefile Thu Aug 19 22:02:42 2004
+++ net/pfflowd/files/patch-Makefile Thu Aug 19 22:09:29 2004
@@ -1,6 +1,6 @@
--- Makefile Mon Feb 16 16:30:46 2004
-+++ Makefile Wed Feb 25 16:39:29 2004
-@@ -7,17 +7,17 @@
++++ Makefile Thu Aug 19 22:08:28 2004
+@@ -7,7 +7,7 @@
LIBS=-lpcap -lutil #-lefence
LDFLAGS=-g
@@ -8,10 +8,8 @@
+CFLAGS=-g -O -I /usr/local/include/pf
# Uncomment this if you are using pfflowd on OpenBSD <=3.4
--#CFLAGS+=-DOLD_PFSYNC
-+CFLAGS+=-DOLD_PFSYNC
-
- TARGETS=pfflowd
+ #CFLAGS+=-DOLD_PFSYNC
+@@ -16,8 +16,8 @@
all: $(TARGETS)
diff -urN net/pfflowd.orig/files/pf34-Makefile net/pfflowd/files/pf34-Makefile
--- net/pfflowd.orig/files/pf34-Makefile Thu Jan 1 12:00:00 1970
+++ net/pfflowd/files/pf34-Makefile Thu Aug 19 22:11:09 2004
@@ -0,0 +1,11 @@
+--- Makefile.orig Thu Aug 19 22:10:22 2004
++++ Makefile Thu Aug 19 22:10:29 2004
+@@ -10,7 +10,7 @@
+ CFLAGS=-g -O -I /usr/local/include/pf
+
+ # Uncomment this if you are using pfflowd on OpenBSD <=3.4
+-#CFLAGS+=-DOLD_PFSYNC
++CFLAGS+=-DOLD_PFSYNC
+
+ TARGETS=pfflowd
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040819102738.CF1BE2842E>