hi, here is an update to fwbuilder 3.0.0. please comment/give it a try.
Index: libfwbuilder/Makefile =================================================================== RCS file: /cvs/ports/security/libfwbuilder/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- libfwbuilder/Makefile 4 Jan 2008 17:48:37 -0000 1.8 +++ libfwbuilder/Makefile 8 Sep 2008 21:10:11 -0000 @@ -1,14 +1,13 @@ -# $OpenBSD: Makefile,v 1.7 2007/09/15 23:29:58 merdely Exp $ +# $OpenBSD: Makefile,v 1.8 2008/01/04 17:48:37 espie Exp $ COMMENT= libraries for fwbuilder -DISTNAME= libfwbuilder-2.1.8 -PKGNAME= $(DISTNAME) +DISTNAME= libfwbuilder-3.0.0 CATEGORIES= net security -SHARED_LIBS= fwbuilder 9.0 \ - fwcompiler 9.0 +SHARED_LIBS= fwbuilder 10.0 \ + fwcompiler 10.0 -INCLUDE= include/fwb-2.1 -SHARE= share/libfwbuilder21 +INCLUDE= include/fwb-3 +SHARE= share/libfwbuilder SUBST_VARS= INCLUDE SHARE HOMEPAGE= http://www.fwbuilder.org/ @@ -19,16 +18,20 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes -WANTLIB= m ssl crypto z xml2 iconv +WANTLIB= m z iconv MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/} -MODULES= x11/qt3 +MODULES= x11/qt4 LIB_DEPENDS+= xslt::textproc/libxslt \ + xml2::textproc/libxml \ netsnmp::net/net-snmp CONFIGURE_STYLE=gnu -CONFIGURE_ARGS+= --with-docdir=${TRUEPREFIX}/share/doc/libfwbuilder +CONFIGURE_ARGS+=--with-docdir=${TRUEPREFIX}/share/doc/libfwbuilder \ + --with-templatedir=${TRUEPREFIX}/share/libfwbuilder \ + --with-qtdir=${MODQT_QTDIR} \ + QMAKE=${MODQT_QTDIR}/bin/qmake NO_REGRESS= Yes Index: libfwbuilder/distinfo =================================================================== RCS file: /cvs/ports/security/libfwbuilder/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- libfwbuilder/distinfo 5 Apr 2007 17:26:07 -0000 1.4 +++ libfwbuilder/distinfo 8 Sep 2008 18:42:02 -0000 @@ -1,5 +1,5 @@ -MD5 (libfwbuilder-2.1.8.tar.gz) = J3tRhZoj4+dZ4WnQh2RvNA== -RMD160 (libfwbuilder-2.1.8.tar.gz) = 4rTJyJ91N+td/bFAOtn7O+PDnwY= -SHA1 (libfwbuilder-2.1.8.tar.gz) = EA/WKInpUFKA5mXi/wT6AdTsjGo= -SHA256 (libfwbuilder-2.1.8.tar.gz) = WRwPZ/Z6jlPVySvea9v//FfkPvdyFwTKztSsvKXQJ98= -SIZE (libfwbuilder-2.1.8.tar.gz) = 318784 +MD5 (libfwbuilder-3.0.0.tar.gz) = mTqo0IOL9/kVrT2/zAPRYQ== +RMD160 (libfwbuilder-3.0.0.tar.gz) = mMMcSmfxA/oK/2oeEoh4RSHUpfk= +SHA1 (libfwbuilder-3.0.0.tar.gz) = uTcdiRVAUMBNqE6GHqkkMhEXT2I= +SHA256 (libfwbuilder-3.0.0.tar.gz) = lJmCxq87fQdcp5VR8ruFWctZGlJNPgqfJbFla2XHdAI= +SIZE (libfwbuilder-3.0.0.tar.gz) = 537382 Index: libfwbuilder/patches/patch-qmake_inc_in =================================================================== RCS file: /cvs/ports/security/libfwbuilder/patches/patch-qmake_inc_in,v retrieving revision 1.2 diff -u -r1.2 patch-qmake_inc_in --- libfwbuilder/patches/patch-qmake_inc_in 29 Jan 2007 11:56:13 -0000 1.2 +++ libfwbuilder/patches/patch-qmake_inc_in 8 Sep 2008 18:43:15 -0000 @@ -1,9 +1,9 @@ -$OpenBSD: patch-qmake_inc_in,v 1.1.1.1 2005/05/21 09:35:19 espie Exp $ ---- qmake.inc.in.orig Thu Jun 22 06:50:45 2006 -+++ qmake.inc.in Mon Jan 29 11:05:38 2007 +$OpenBSD: patch-qmake_inc_in,v 1.2 2007/01/29 11:56:13 espie Exp $ +--- qmake.inc.in.orig Mon Sep 1 09:45:37 2008 ++++ qmake.inc.in Mon Sep 8 20:43:12 2008 @@ -27,7 +27,7 @@ unix { - migration.path =$(DDIR)@TEMPLATE_DIR@/migration - doc.path =$(DDIR)@DOCDIR@ + migration.path = @TEMPLATE_DIR@/migration + doc.path = @DOCDIR@ - CONFIG += warn_on debug + CONFIG += warn_on release Index: libfwbuilder/pkg/PLIST =================================================================== RCS file: /cvs/ports/security/libfwbuilder/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- libfwbuilder/pkg/PLIST 29 Jan 2007 11:56:13 -0000 1.3 +++ libfwbuilder/pkg/PLIST 8 Sep 2008 18:56:56 -0000 @@ -1,6 +1,6 @@ [EMAIL PROTECTED] $OpenBSD: PLIST,v 1.2 2006/04/17 14:46:09 espie Exp $ [EMAIL PROTECTED] $OpenBSD: PLIST,v 1.3 2007/01/29 11:56:13 espie Exp $ %%SHARED%% -bin/libfwbuilder-config-2.1 +bin/libfwbuilder-config-3 ${INCLUDE}/ ${INCLUDE}/fwbuilder/ ${INCLUDE}/fwbuilder/Address.h @@ -22,11 +22,17 @@ ${INCLUDE}/fwbuilder/Group.h ${INCLUDE}/fwbuilder/Host.h ${INCLUDE}/fwbuilder/HostsFile.h +${INCLUDE}/fwbuilder/ICMP6Service.h ${INCLUDE}/fwbuilder/ICMPService.h -${INCLUDE}/fwbuilder/IPAddress.h +${INCLUDE}/fwbuilder/IPRoute.h ${INCLUDE}/fwbuilder/IPService.h ${INCLUDE}/fwbuilder/IPv4.h +${INCLUDE}/fwbuilder/IPv6.h +${INCLUDE}/fwbuilder/Inet6AddrMask.h +${INCLUDE}/fwbuilder/InetAddr.h +${INCLUDE}/fwbuilder/InetAddrMask.h ${INCLUDE}/fwbuilder/Interface.h +${INCLUDE}/fwbuilder/InterfaceData.h ${INCLUDE}/fwbuilder/InterfacePolicy.h ${INCLUDE}/fwbuilder/Interval.h ${INCLUDE}/fwbuilder/IntervalGroup.h @@ -36,6 +42,7 @@ ${INCLUDE}/fwbuilder/MultiAddress.h ${INCLUDE}/fwbuilder/NAT.h ${INCLUDE}/fwbuilder/Network.h +${INCLUDE}/fwbuilder/NetworkIPv6.h ${INCLUDE}/fwbuilder/ObjectGroup.h ${INCLUDE}/fwbuilder/Policy.h ${INCLUDE}/fwbuilder/Pool.h @@ -48,13 +55,15 @@ ${INCLUDE}/fwbuilder/ServiceGroup.h ${INCLUDE}/fwbuilder/SyncQueue.h ${INCLUDE}/fwbuilder/TCPService.h +${INCLUDE}/fwbuilder/TCPUDPService.h ${INCLUDE}/fwbuilder/TagService.h ${INCLUDE}/fwbuilder/ThreadTools.h ${INCLUDE}/fwbuilder/Tools.h ${INCLUDE}/fwbuilder/UDPService.h +${INCLUDE}/fwbuilder/UserService.h ${INCLUDE}/fwbuilder/XMLTools.h -${INCLUDE}/fwbuilder/crypto.h ${INCLUDE}/fwbuilder/dns.h +${INCLUDE}/fwbuilder/inet_net.h ${INCLUDE}/fwbuilder/libfwbuilder-config.h ${INCLUDE}/fwbuilder/libfwbuilder-version.h ${INCLUDE}/fwbuilder/physAddress.h @@ -118,9 +127,29 @@ ${SHARE}/migration/FWObjectDatabase_2.0.99.xslt ${SHARE}/migration/FWObjectDatabase_2.1.0.xslt ${SHARE}/migration/FWObjectDatabase_2.1.1.xslt +${SHARE}/migration/FWObjectDatabase_2.1.10.xslt +${SHARE}/migration/FWObjectDatabase_2.1.11.xslt +${SHARE}/migration/FWObjectDatabase_2.1.12.xslt +${SHARE}/migration/FWObjectDatabase_2.1.13.xslt +${SHARE}/migration/FWObjectDatabase_2.1.14.xslt +${SHARE}/migration/FWObjectDatabase_2.1.15.xslt +${SHARE}/migration/FWObjectDatabase_2.1.16.xslt +${SHARE}/migration/FWObjectDatabase_2.1.17.xslt +${SHARE}/migration/FWObjectDatabase_2.1.18.xslt +${SHARE}/migration/FWObjectDatabase_2.1.19.xslt ${SHARE}/migration/FWObjectDatabase_2.1.2.xslt ${SHARE}/migration/FWObjectDatabase_2.1.3.xslt ${SHARE}/migration/FWObjectDatabase_2.1.4.xslt ${SHARE}/migration/FWObjectDatabase_2.1.5.xslt ${SHARE}/migration/FWObjectDatabase_2.1.6.xslt ${SHARE}/migration/FWObjectDatabase_2.1.7.xslt +${SHARE}/migration/FWObjectDatabase_2.1.8.xslt +${SHARE}/migration/FWObjectDatabase_2.1.9.xslt +${SHARE}/migration/FWObjectDatabase_2.1.99.xslt +${SHARE}/migration/FWObjectDatabase_3.xslt +${SHARE}/migration/FWObjectDatabase_4.xslt +${SHARE}/migration/FWObjectDatabase_5.xslt +${SHARE}/migration/FWObjectDatabase_6.xslt +${SHARE}/migration/FWObjectDatabase_7.xslt +${SHARE}/migration/FWObjectDatabase_8.xslt +${SHARE}/migration/FWObjectDatabase_9.xslt Index: fwbuilder/Makefile =================================================================== RCS file: /cvs/ports/security/fwbuilder/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- fwbuilder/Makefile 4 Jan 2008 17:48:37 -0000 1.9 +++ fwbuilder/Makefile 8 Sep 2008 19:45:28 -0000 @@ -1,33 +1,38 @@ -# $OpenBSD: Makefile,v 1.8 2007/09/15 23:29:58 merdely Exp $ +# $OpenBSD: Makefile,v 1.9 2008/01/04 17:48:37 espie Exp $ -COMMENT=firewall gui -CATEGORIES=net security +COMMENT= firewall GUI +DISTNAME= fwbuilder-3.0.0 +CATEGORIES= net security # GPL PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes + HOMEPAGE= http://www.fwbuilder.org/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/} -SHARE= share/fwbuilder21 +SHARE= share/fwbuilder SUBST_VARS= SHARE -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/} -DISTNAME= fwbuilder-2.1.8 -PKGNAME= ${DISTNAME} -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --with-docdir=${TRUEPREFIX}/share/doc/fwbuilder +CONFIGURE_STYLE=gnu +CONFIGURE_ARGS+=--with-docdir=${TRUEPREFIX}/share/doc/fwbuilder \ + --with-templatedir=${TRUEPREFIX}/share/fwbuilder \ + --with-qtdir=${MODQT_QTDIR} \ + QMAKE=${MODQT_QTDIR}/bin/qmake -MODULES= x11/qt3 +MODULES= x11/qt4 DESTDIRNAME= INSTALL_ROOT -LIB_DEPENDS= fwcompiler.>=9,fwbuilder.>=9::security/libfwbuilder +LIB_DEPENDS= fwcompiler.>=10,fwbuilder.>=10::security/libfwbuilder \ + QtGui,QtNetwork::x11/qt4 + NO_REGRESS= Yes USE_X11= Yes -WANTLIB= stdc++ c util m X11 ssl z crypto Xext pthread iconv xslt xml2 netsnmp - -# before qt 4, there is no distinction between INSTALL_FILE and INSTALL_PROGRAM +WANTLIB= ICE SM X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender \ + c crypto fontconfig freetype glib-2.0 gthread-2.0 iconv intl \ + m netsnmp png pthread ssl stdc++ util xml2 xslt z post-install: chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/* Index: fwbuilder/distinfo =================================================================== RCS file: /cvs/ports/security/fwbuilder/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- fwbuilder/distinfo 5 Apr 2007 17:26:06 -0000 1.4 +++ fwbuilder/distinfo 8 Sep 2008 17:03:25 -0000 @@ -1,5 +1,5 @@ -MD5 (fwbuilder-2.1.8.tar.gz) = +YcGocvkxHDjogoapxWNWA== -RMD160 (fwbuilder-2.1.8.tar.gz) = AL6+vE8OSVV76BzEmLcx2P/lL9A= -SHA1 (fwbuilder-2.1.8.tar.gz) = Lv+lgwzIuGaA22VG6aAIs2Dbtuw= -SHA256 (fwbuilder-2.1.8.tar.gz) = wZLGgrtn818l800ChOE5pMJ/3rPuOWfFfmvqAxClRd0= -SIZE (fwbuilder-2.1.8.tar.gz) = 1521885 +MD5 (fwbuilder-3.0.0.tar.gz) = 8QMvTryCYyJNfoKaIE6NXg== +RMD160 (fwbuilder-3.0.0.tar.gz) = jrJvDBlLNvJYnLXaQXvJMAHBZ9U= +SHA1 (fwbuilder-3.0.0.tar.gz) = IuCy7mb2VNcNNCpFRU4CXtJQdKs= +SHA256 (fwbuilder-3.0.0.tar.gz) = AwNtila7cpWJ/+n8SACkkeE9Vbjxd/7njn7kMwWpMYU= +SIZE (fwbuilder-3.0.0.tar.gz) = 2130909 Index: fwbuilder/patches/patch-qmake_inc_in =================================================================== RCS file: /cvs/ports/security/fwbuilder/patches/patch-qmake_inc_in,v retrieving revision 1.2 diff -u -r1.2 patch-qmake_inc_in --- fwbuilder/patches/patch-qmake_inc_in 17 Apr 2006 14:46:09 -0000 1.2 +++ fwbuilder/patches/patch-qmake_inc_in 8 Sep 2008 19:04:02 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-qmake_inc_in,v 1.1.1.1 2005/05/21 09:37:35 espie Exp $ ---- qmake.inc.in.orig Tue Oct 25 08:11:26 2005 -+++ qmake.inc.in Mon Apr 17 14:40:39 2006 -@@ -27,7 +27,7 @@ unix { - res_os.path = $(DDIR)@RES_DIR@/os - res_platform.path = $(DDIR)@RES_DIR@/platform +$OpenBSD$ +--- qmake.inc.in.orig Mon Sep 8 21:03:47 2008 ++++ qmake.inc.in Mon Sep 8 21:03:53 2008 +@@ -65,7 +65,7 @@ unix { -- CONFIG += qt thread rtti stl warn_on debug -+ CONFIG += qt thread rtti stl warn_on release - INCLUDEPATH += @LIBFWBUILDER_INCLUDEPATH@ + PKGLOCALEDIR = $$res.path/locale - LIBS += $$LIBS_FWBUILDER @LIBS@ +- CONFIG += warn_on debug ++ CONFIG += warn_on release + QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter + QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter + QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@ Index: fwbuilder/pkg/PLIST =================================================================== RCS file: /cvs/ports/security/fwbuilder/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- fwbuilder/pkg/PLIST 29 Jan 2007 11:56:13 -0000 1.3 +++ fwbuilder/pkg/PLIST 8 Sep 2008 19:38:48 -0000 @@ -1,18 +1,22 @@ [EMAIL PROTECTED] $OpenBSD: PLIST,v 1.2 2006/04/17 14:46:09 espie Exp $ -bin/fwb_ipf -bin/fwb_ipfw -bin/fwb_ipt -bin/fwb_pf -bin/fwbedit -bin/fwblookup -bin/fwbuilder [EMAIL PROTECTED] $OpenBSD: PLIST,v 1.3 2007/01/29 11:56:13 espie Exp $ [EMAIL PROTECTED] bin/fwb_iosacl [EMAIL PROTECTED] bin/fwb_ipf [EMAIL PROTECTED] bin/fwb_ipfw [EMAIL PROTECTED] bin/fwb_ipt [EMAIL PROTECTED] bin/fwb_pf [EMAIL PROTECTED] bin/fwb_pix [EMAIL PROTECTED] bin/fwbedit [EMAIL PROTECTED] bin/fwbuilder [EMAIL PROTECTED] man/man1/fwb_iosacl.1 @man man/man1/fwb_ipf.1 @man man/man1/fwb_ipfw.1 @man man/man1/fwb_ipt.1 @man man/man1/fwb_pf.1 [EMAIL PROTECTED] man/man1/fwb_pix.1 @man man/man1/fwbedit.1 [EMAIL PROTECTED] man/man1/fwblookup.1 @man man/man1/fwbuilder.1 +share/applications/ +share/applications/fwbuilder.desktop share/doc/fwbuilder/ share/doc/fwbuilder/AUTHORS share/doc/fwbuilder/COPYING @@ -21,27 +25,25 @@ share/doc/fwbuilder/FWBuilder-Routing-LICENSE.txt share/doc/fwbuilder/PatchAcceptancePolicy.txt share/doc/fwbuilder/README.floppyfw +share/doc/fwbuilder/README.iosacl share/doc/fwbuilder/README.ipf share/doc/fwbuilder/README.ipfw share/doc/fwbuilder/README.ipt share/doc/fwbuilder/README.pf +share/doc/fwbuilder/README.pix +share/doc/fwbuilder/README.policy_import share/doc/fwbuilder/README.routing -share/doc/fwbuilder/ReleaseNotes_2.1.7.html -share/doc/fwbuilder/ReleaseNotes_2.1.7.txt -share/doc/fwbuilder/ReleaseNotes_2.1.8.html -share/doc/fwbuilder/ReleaseNotes_2.1.8.txt ${SHARE}/ +${SHARE}/help/ +${SHARE}/help/iptAdvancedDialog_en_US.html +${SHARE}/help/linux24AdvancedDialog_en_US.html +${SHARE}/help/pfAdvancedDialog_en_US.html ${SHARE}/locale/ -${SHARE}/locale/fwbuilder_de.qm -${SHARE}/locale/fwbuilder_es.qm -${SHARE}/locale/fwbuilder_fr.qm -${SHARE}/locale/fwbuilder_ja.qm -${SHARE}/locale/fwbuilder_ru.qm -${SHARE}/locale/fwbuilder_sv.qm ${SHARE}/objects_init.xml ${SHARE}/os/ ${SHARE}/os/freebsd.xml ${SHARE}/os/fwsm_os.xml +${SHARE}/os/ios.xml ${SHARE}/os/linksys.xml ${SHARE}/os/linux24.xml ${SHARE}/os/macosx.xml @@ -51,6 +53,7 @@ ${SHARE}/os/unknown_os.xml ${SHARE}/platform/ ${SHARE}/platform/fwsm.xml +${SHARE}/platform/iosacl.xml ${SHARE}/platform/ipf.xml ${SHARE}/platform/ipfw.xml ${SHARE}/platform/iptables.xml @@ -59,3 +62,5 @@ ${SHARE}/platform/unknown.xml ${SHARE}/resources.xml ${SHARE}/templates.xml [EMAIL PROTECTED] %D/bin/update-desktop-database [EMAIL PROTECTED] %D/bin/update-desktop-database
