Hello all.
sthen@ kindly reminded me that new fwbuilder version, supporting PF from
4.7, just come out. So here is an update to corresponding ports.
Ports were reworked and now look uglier than before. That's because I
gave up making it compile using gnu.port.mk :( and run autocrap manually
(or, more precisely, via "autogen.sh" provided in distfiles). Also note
that new fwbuilder port has VMEM_WARNING set. See comments in port for
details.
Also I removed SUBST_VARS because do not see the point in them anymore.
All patches except qmake.inc.in ones, were sent upstream.
Tested on i386. Dumped core once in a weird case related with repainting,
still investigating. Otherwise works for me.
--
Best wishes,
Vadim Zhukov
Index: libfwbuilder/Makefile
===================================================================
RCS file: /cvs/ports/security/libfwbuilder/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- libfwbuilder/Makefile 12 Oct 2009 11:16:51 -0000 1.12
+++ libfwbuilder/Makefile 23 May 2010 22:52:35 -0000
@@ -1,14 +1,10 @@
# $OpenBSD: Makefile,v 1.12 2009/10/12 11:16:51 steven Exp $
COMMENT= libraries for fwbuilder
-DISTNAME= libfwbuilder-3.0.7
+DISTNAME= libfwbuilder-4.0.1
CATEGORIES= net security
-SHARED_LIBS= fwbuilder 13.0 \
- fwcompiler 13.0
-
-INCLUDE= include/fwb-3
-SHARE= share/libfwbuilder
-SUBST_VARS= INCLUDE SHARE
+SHARED_LIBS= fwbuilder 14.0 \
+ fwcompiler 14.0
HOMEPAGE= http://www.fwbuilder.org/
@@ -29,16 +25,36 @@
xml2::textproc/libxml \
netsnmp::net/net-snmp
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=--with-docdir=${TRUEPREFIX}/share/doc/libfwbuilder \
- --with-templatedir=${TRUEPREFIX}/share/libfwbuilder \
- --with-qtdir=${MODQT_QTDIR} \
- QMAKE=${MODQT_QTDIR}/bin/qmake
+USE_LIBTOOL = gnu
+AUTOMAKE_VERSION = 1.9
+AUTOCONF_VERSION = 2.63
+
+# XXX: Weird thins go here: plain acinclude+automake+autoconf+configure
+# works, and CONFIGURE_STYLE=gnu doesn't.
+# CONFIGURE_STYLE = gnu automake autoconf
+
+# XXX: Actually automake 1.10 should be used, as distfiles say.
+BUILD_DEPENDS +=::devel/metaauto \
+
:autoconf-${AUTOCONF_VERSION}:devel/autoconf/${AUTOCONF_VERSION} \
+
:automake->=${AUTOMAKE_VERSION},<1.11:devel/automake/${AUTOMAKE_VERSION}
+MAKE_ENV += AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
+CXXFLAGS = -pthread
+
+CONFIGURE_ARGS += --with-docdir=${TRUEPREFIX}/share/doc/libfwbuilder \
+ --with-templatedir=${TRUEPREFIX}/share/libfwbuilder \
+ --with-qtdir=${MODQT_QTDIR} \
+ --with-qmake=qmake4
+MAKE_ENV += QMAKE=${MODQT_QTDIR}/bin/qmake \
+ CXXFLAGS="${CXXFLAGS}"
NO_REGRESS= Yes
MAKE_FLAGS= LIBfwbuilder_VERSION=${LIBfwbuilder_VERSION} \
LIBfwcompiler_VERSION=${LIBfwcompiler_VERSION}
DESTDIRNAME= INSTALL_ROOT
+
+do-configure:
+ cd ${WRKSRC} && ${MAKE_ENV} exec sh autogen.sh ${CONFIGURE_ARGS}
.include <bsd.port.mk>
Index: libfwbuilder/distinfo
===================================================================
RCS file: /cvs/ports/security/libfwbuilder/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- libfwbuilder/distinfo 12 Oct 2009 11:16:51 -0000 1.8
+++ libfwbuilder/distinfo 23 May 2010 22:52:35 -0000
@@ -1,5 +1,5 @@
-MD5 (libfwbuilder-3.0.7.tar.gz) = cGMq+58nasJIsTsI8G24Wg==
-RMD160 (libfwbuilder-3.0.7.tar.gz) = kbeY81LXtCSQ8vZFg+1oF7qeQcc=
-SHA1 (libfwbuilder-3.0.7.tar.gz) = 2SNUHlLRkZ6qVldb3qarAegas2o=
-SHA256 (libfwbuilder-3.0.7.tar.gz) =
tt7dpa955FlNWhP6JMhh2jat8zY2wOlYatV0Sictb94=
-SIZE (libfwbuilder-3.0.7.tar.gz) = 540834
+MD5 (libfwbuilder-4.0.1.tar.gz) = iq94jCIpVnkTq6kBH65/dA==
+RMD160 (libfwbuilder-4.0.1.tar.gz) = casMC/+zObZYM/EHjoU796FXlrk=
+SHA1 (libfwbuilder-4.0.1.tar.gz) = ksPq2q2Rh5Ip3J/M2oY5Mu3HKeM=
+SHA256 (libfwbuilder-4.0.1.tar.gz) =
NeGcfOtYvTcfYOI/ITaFE/HaA7lhfHxmjEWH7aGMRac=
+SIZE (libfwbuilder-4.0.1.tar.gz) = 376065
Index: libfwbuilder/patches/patch-qmake_inc_in
===================================================================
RCS file: /cvs/ports/security/libfwbuilder/patches/patch-qmake_inc_in,v
retrieving revision 1.4
diff -u -r1.4 patch-qmake_inc_in
--- libfwbuilder/patches/patch-qmake_inc_in 12 Oct 2009 11:16:51 -0000
1.4
+++ libfwbuilder/patches/patch-qmake_inc_in 23 May 2010 22:52:35 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-qmake_inc_in,v 1.4 2009/10/12 11:16:51 steven Exp $
---- qmake.inc.in.orig Fri Sep 18 21:28:03 2009
-+++ qmake.inc.in Mon Oct 12 11:14:50 2009
-@@ -29,7 +29,7 @@ unix {
+--- qmake.inc.in.orig Sun Feb 28 05:23:02 2010
++++ qmake.inc.in Sun May 23 00:40:33 2010
+@@ -35,7 +35,7 @@ unix {
migration.path = @TEMPLATE_DIR@/migration
doc.path = @DOCDIR@
Index: libfwbuilder/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/libfwbuilder/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- libfwbuilder/pkg/PLIST 13 Apr 2009 14:11:23 -0000 1.5
+++ libfwbuilder/pkg/PLIST 23 May 2010 22:52:35 -0000
@@ -1,81 +1,89 @@
@comment $OpenBSD: PLIST,v 1.5 2009/04/13 14:11:23 steven Exp $
%%SHARED%%
-bin/libfwbuilder-config-3
-${INCLUDE}/
-${INCLUDE}/fwbuilder/
-${INCLUDE}/fwbuilder/Address.h
-${INCLUDE}/fwbuilder/AddressRange.h
-${INCLUDE}/fwbuilder/AddressTable.h
-${INCLUDE}/fwbuilder/BackgroundOp.h
-${INCLUDE}/fwbuilder/Constants.h
-${INCLUDE}/fwbuilder/CustomService.h
-${INCLUDE}/fwbuilder/DNSName.h
-${INCLUDE}/fwbuilder/FWException.h
-${INCLUDE}/fwbuilder/FWIntervalReference.h
-${INCLUDE}/fwbuilder/FWObject.h
-${INCLUDE}/fwbuilder/FWObjectDatabase.h
-${INCLUDE}/fwbuilder/FWObjectReference.h
-${INCLUDE}/fwbuilder/FWOptions.h
-${INCLUDE}/fwbuilder/FWReference.h
-${INCLUDE}/fwbuilder/FWServiceReference.h
-${INCLUDE}/fwbuilder/Firewall.h
-${INCLUDE}/fwbuilder/Group.h
-${INCLUDE}/fwbuilder/Host.h
-${INCLUDE}/fwbuilder/HostsFile.h
-${INCLUDE}/fwbuilder/ICMP6Service.h
-${INCLUDE}/fwbuilder/ICMPService.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/Interval.h
-${INCLUDE}/fwbuilder/IntervalGroup.h
-${INCLUDE}/fwbuilder/Library.h
-${INCLUDE}/fwbuilder/Logger.h
-${INCLUDE}/fwbuilder/Management.h
-${INCLUDE}/fwbuilder/MultiAddress.h
-${INCLUDE}/fwbuilder/NAT.h
-${INCLUDE}/fwbuilder/Network.h
-${INCLUDE}/fwbuilder/NetworkIPv6.h
-${INCLUDE}/fwbuilder/ObjectGroup.h
-${INCLUDE}/fwbuilder/ObjectMatcher.h
-${INCLUDE}/fwbuilder/Policy.h
-${INCLUDE}/fwbuilder/Pool.h
-${INCLUDE}/fwbuilder/Resources.h
-${INCLUDE}/fwbuilder/Routing.h
-${INCLUDE}/fwbuilder/Rule.h
-${INCLUDE}/fwbuilder/RuleElement.h
-${INCLUDE}/fwbuilder/RuleSet.h
-${INCLUDE}/fwbuilder/Service.h
-${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/dns.h
-${INCLUDE}/fwbuilder/inet_net.h
-${INCLUDE}/fwbuilder/libfwbuilder-config.h
-${INCLUDE}/fwbuilder/libfwbuilder-version.h
-${INCLUDE}/fwbuilder/physAddress.h
-${INCLUDE}/fwbuilder/snmp.h
-${INCLUDE}/fwcompiler/
-${INCLUDE}/fwcompiler/Compiler.h
-${INCLUDE}/fwcompiler/NATCompiler.h
-${INCLUDE}/fwcompiler/OSConfigurator.h
-${INCLUDE}/fwcompiler/PolicyCompiler.h
-${INCLUDE}/fwcompiler/Preprocessor.h
-${INCLUDE}/fwcompiler/RoutingCompiler.h
-${INCLUDE}/fwcompiler/RuleProcessor.h
+bin/libfwbuilder-config-4
+include/fwb-4/
+include/fwb-4/fwbuilder/
+include/fwb-4/fwbuilder/Address.h
+include/fwb-4/fwbuilder/AddressRange.h
+include/fwb-4/fwbuilder/AddressTable.h
+include/fwb-4/fwbuilder/BackgroundOp.h
+include/fwb-4/fwbuilder/Cluster.h
+include/fwb-4/fwbuilder/ClusterGroup.h
+include/fwb-4/fwbuilder/Constants.h
+include/fwb-4/fwbuilder/CustomService.h
+include/fwb-4/fwbuilder/DNSName.h
+include/fwb-4/fwbuilder/Dispatch.h
+include/fwb-4/fwbuilder/FWException.h
+include/fwb-4/fwbuilder/FWIntervalReference.h
+include/fwb-4/fwbuilder/FWObject.h
+include/fwb-4/fwbuilder/FWObjectDatabase.h
+include/fwb-4/fwbuilder/FWObjectReference.h
+include/fwb-4/fwbuilder/FWOptions.h
+include/fwb-4/fwbuilder/FWReference.h
+include/fwb-4/fwbuilder/FWServiceReference.h
+include/fwb-4/fwbuilder/FailoverClusterGroup.h
+include/fwb-4/fwbuilder/Firewall.h
+include/fwb-4/fwbuilder/Group.h
+include/fwb-4/fwbuilder/Host.h
+include/fwb-4/fwbuilder/HostsFile.h
+include/fwb-4/fwbuilder/ICMP6Service.h
+include/fwb-4/fwbuilder/ICMPService.h
+include/fwb-4/fwbuilder/IPRoute.h
+include/fwb-4/fwbuilder/IPService.h
+include/fwb-4/fwbuilder/IPv4.h
+include/fwb-4/fwbuilder/IPv6.h
+include/fwb-4/fwbuilder/Inet6AddrMask.h
+include/fwb-4/fwbuilder/InetAddr.h
+include/fwb-4/fwbuilder/InetAddrMask.h
+include/fwb-4/fwbuilder/Interface.h
+include/fwb-4/fwbuilder/InterfaceData.h
+include/fwb-4/fwbuilder/Interval.h
+include/fwb-4/fwbuilder/IntervalGroup.h
+include/fwb-4/fwbuilder/Library.h
+include/fwb-4/fwbuilder/Logger.h
+include/fwb-4/fwbuilder/Management.h
+include/fwb-4/fwbuilder/MultiAddress.h
+include/fwb-4/fwbuilder/NAT.h
+include/fwb-4/fwbuilder/Network.h
+include/fwb-4/fwbuilder/NetworkIPv6.h
+include/fwb-4/fwbuilder/ObjectGroup.h
+include/fwb-4/fwbuilder/ObjectMatcher.h
+include/fwb-4/fwbuilder/ObjectMirror.h
+include/fwb-4/fwbuilder/Policy.h
+include/fwb-4/fwbuilder/Pool.h
+include/fwb-4/fwbuilder/Resources.h
+include/fwb-4/fwbuilder/Routing.h
+include/fwb-4/fwbuilder/Rule.h
+include/fwb-4/fwbuilder/RuleElement.h
+include/fwb-4/fwbuilder/RuleSet.h
+include/fwb-4/fwbuilder/SecuwallMgmtFile.h
+include/fwb-4/fwbuilder/Service.h
+include/fwb-4/fwbuilder/ServiceGroup.h
+include/fwb-4/fwbuilder/StateSyncClusterGroup.h
+include/fwb-4/fwbuilder/SyncQueue.h
+include/fwb-4/fwbuilder/TCPService.h
+include/fwb-4/fwbuilder/TCPUDPService.h
+include/fwb-4/fwbuilder/TagService.h
+include/fwb-4/fwbuilder/ThreadTools.h
+include/fwb-4/fwbuilder/Tools.h
+include/fwb-4/fwbuilder/UDPService.h
+include/fwb-4/fwbuilder/UserService.h
+include/fwb-4/fwbuilder/XMLTools.h
+include/fwb-4/fwbuilder/dns.h
+include/fwb-4/fwbuilder/inet_net.h
+include/fwb-4/fwbuilder/libfwbuilder-config.h
+include/fwb-4/fwbuilder/libfwbuilder-version.h
+include/fwb-4/fwbuilder/physAddress.h
+include/fwb-4/fwbuilder/snmp.h
+include/fwb-4/fwcompiler/
+include/fwb-4/fwcompiler/BaseCompiler.h
+include/fwb-4/fwcompiler/Compiler.h
+include/fwb-4/fwcompiler/NATCompiler.h
+include/fwb-4/fwcompiler/OSConfigurator.h
+include/fwb-4/fwcompiler/PolicyCompiler.h
+include/fwb-4/fwcompiler/Preprocessor.h
+include/fwb-4/fwcompiler/RoutingCompiler.h
+include/fwb-4/fwcompiler/RuleProcessor.h
share/doc/libfwbuilder/
share/doc/libfwbuilder/AUTHORS
share/doc/libfwbuilder/COPYING
@@ -83,73 +91,79 @@
share/doc/libfwbuilder/Credits
share/doc/libfwbuilder/INSTALL
share/doc/libfwbuilder/PatchAcceptancePolicy.txt
-${SHARE}/
-${SHARE}/fwbuilder.dtd
-${SHARE}/migration/
-${SHARE}/migration/FWObjectDatabase_0.10.0.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.1.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.10.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.11.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.12.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.13.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.14.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.2.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.3.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.4.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.5.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.6.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.7.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.8.xslt
-${SHARE}/migration/FWObjectDatabase_0.10.9.xslt
-${SHARE}/migration/FWObjectDatabase_0.8.7.xslt
-${SHARE}/migration/FWObjectDatabase_0.9.0.xslt
-${SHARE}/migration/FWObjectDatabase_0.9.1.xslt
-${SHARE}/migration/FWObjectDatabase_0.9.2.xslt
-${SHARE}/migration/FWObjectDatabase_0.9.3.xslt
-${SHARE}/migration/FWObjectDatabase_0.9.4.xslt
-${SHARE}/migration/FWObjectDatabase_0.9.5.xslt
-${SHARE}/migration/FWObjectDatabase_1.0.0.xslt
-${SHARE}/migration/FWObjectDatabase_1.0.1.xslt
-${SHARE}/migration/FWObjectDatabase_1.0.2.xslt
-${SHARE}/migration/FWObjectDatabase_2.0.0.xslt
-${SHARE}/migration/FWObjectDatabase_2.0.1.xslt
-${SHARE}/migration/FWObjectDatabase_2.0.10.xslt
-${SHARE}/migration/FWObjectDatabase_2.0.11.xslt
-${SHARE}/migration/FWObjectDatabase_2.0.12.xslt
-${SHARE}/migration/FWObjectDatabase_2.0.2.xslt
-${SHARE}/migration/FWObjectDatabase_2.0.3.xslt
-${SHARE}/migration/FWObjectDatabase_2.0.4.xslt
-${SHARE}/migration/FWObjectDatabase_2.0.5.xslt
-${SHARE}/migration/FWObjectDatabase_2.0.6.xslt
-${SHARE}/migration/FWObjectDatabase_2.0.7.xslt
-${SHARE}/migration/FWObjectDatabase_2.0.8.xslt
-${SHARE}/migration/FWObjectDatabase_2.0.9.xslt
-${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
+share/libfwbuilder/
+share/libfwbuilder/fwbuilder.dtd
+share/libfwbuilder/migration/
+share/libfwbuilder/migration/FWObjectDatabase_0.10.0.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.1.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.10.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.11.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.12.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.13.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.14.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.2.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.3.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.4.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.5.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.6.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.7.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.8.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.10.9.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.8.7.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.9.0.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.9.1.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.9.2.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.9.3.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.9.4.xslt
+share/libfwbuilder/migration/FWObjectDatabase_0.9.5.xslt
+share/libfwbuilder/migration/FWObjectDatabase_1.0.0.xslt
+share/libfwbuilder/migration/FWObjectDatabase_1.0.1.xslt
+share/libfwbuilder/migration/FWObjectDatabase_1.0.2.xslt
+share/libfwbuilder/migration/FWObjectDatabase_10.xslt
+share/libfwbuilder/migration/FWObjectDatabase_11.xslt
+share/libfwbuilder/migration/FWObjectDatabase_12.xslt
+share/libfwbuilder/migration/FWObjectDatabase_13.xslt
+share/libfwbuilder/migration/FWObjectDatabase_14.xslt
+share/libfwbuilder/migration/FWObjectDatabase_15.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.0.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.1.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.10.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.11.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.12.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.2.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.3.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.4.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.5.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.6.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.7.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.8.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.9.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.99.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.0.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.1.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.10.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.11.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.12.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.13.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.14.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.15.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.16.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.17.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.18.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.19.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.2.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.3.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.4.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.5.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.6.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.7.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.8.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.9.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.1.99.xslt
+share/libfwbuilder/migration/FWObjectDatabase_3.xslt
+share/libfwbuilder/migration/FWObjectDatabase_4.xslt
+share/libfwbuilder/migration/FWObjectDatabase_5.xslt
+share/libfwbuilder/migration/FWObjectDatabase_6.xslt
+share/libfwbuilder/migration/FWObjectDatabase_7.xslt
+share/libfwbuilder/migration/FWObjectDatabase_8.xslt
+share/libfwbuilder/migration/FWObjectDatabase_9.xslt
Index: fwbuilder/Makefile
===================================================================
RCS file: /cvs/ports/security/fwbuilder/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- fwbuilder/Makefile 22 Dec 2009 12:51:52 -0000 1.17
+++ fwbuilder/Makefile 23 May 2010 22:52:35 -0000
@@ -1,42 +1,62 @@
# $OpenBSD: Makefile,v 1.17 2009/12/22 12:51:52 sthen Exp $
-COMMENT= firewall GUI
-DISTNAME= fwbuilder-3.0.7
-PKGNAME= ${DISTNAME}p0
-CATEGORIES= net security
+COMMENT = firewall GUI
+DISTNAME = fwbuilder-4.0.1
+CATEGORIES = net security
-HOMEPAGE= http://www.fwbuilder.org/
+HOMEPAGE = http://www.fwbuilder.org/
-MAINTAINER= Vadim Zhukov <persg...@gmail.com>
+MAINTAINER = Vadim Zhukov <persg...@gmail.com>
# GPL v2
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
-
-SHARE= share/fwbuilder
-SUBST_VARS= SHARE
-
-FLAVORS= debug
-FLAVOR?=
-
-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
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
+
+FLAVORS = debug
+FLAVOR ?=
+
+# Consumes more than 512MB on at least i386 when building qrc_MainRes.o
+VMEM_WARNING = Yes
+
+USE_LIBTOOL = gnu
+AUTOMAKE_VERSION = 1.9
+AUTOCONF_VERSION = 2.63
+
+# XXX: Weird thins go here: plain acinclude+automake+autoconf+configure
+# works, and CONFIGURE_STYLE=gnu doesn't.
+# CONFIGURE_STYLE = gnu automake autoconf
+
+# XXX: Actually automake 1.10 should be used, as distfiles say.
+BUILD_DEPENDS +=::devel/metaauto \
+
:autoconf-${AUTOCONF_VERSION}:devel/autoconf/${AUTOCONF_VERSION} \
+
:automake->=${AUTOMAKE_VERSION},<1.11:devel/automake/${AUTOMAKE_VERSION}
+MAKE_ENV += AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
+# XXX: Stupid qmake converts "-pthread" given to it in "-I-pthread", so we add
+# another one.
+CXXFLAGS = -pthread
+
+CONFIGURE_ARGS += --with-docdir=${TRUEPREFIX}/share/doc/fwbuilder \
+ --with-templatedir=${TRUEPREFIX}/share/fwbuilder \
+ --with-qtdir=${MODQT_QTDIR} \
+ --with-qmake=qmake4
+MAKE_ENV += QMAKE=${MODQT_QTDIR}/bin/qmake \
+ CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
.if ${FLAVOR:L:Mdebug}
-CONFIGURE_ARGS+=--enable-debug
-COPTS= -g
+CXXFLAGS += -O0 -g
+.else
+LDFLAGS += -s
.endif
-MODULES= x11/qt4
-DESTDIRNAME= INSTALL_ROOT
-LIB_DEPENDS= fwcompiler.>=11,fwbuilder.>=11::security/libfwbuilder \
+MODULES = x11/qt4
+DESTDIRNAME = INSTALL_ROOT
+LIB_DEPENDS = fwcompiler.>=14,fwbuilder.>=14::security/libfwbuilder \
QtGui,QtNetwork::x11/qt4
NO_REGRESS= Yes
@@ -46,6 +66,9 @@
WANTLIB += freetype glib-2.0 gthread-2.0 iconv intl m netsnmp
WANTLIB += png pthread stdc++ util xml2 xslt z expat gobject-2.0
WANTLIB += pthread-stubs xcb
+
+do-configure:
+ cd ${WRKSRC} && ${MAKE_ENV} exec sh autogen.sh ${CONFIGURE_ARGS}
post-install:
chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/*
Index: fwbuilder/distinfo
===================================================================
RCS file: /cvs/ports/security/fwbuilder/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- fwbuilder/distinfo 12 Oct 2009 11:17:59 -0000 1.8
+++ fwbuilder/distinfo 23 May 2010 22:52:35 -0000
@@ -1,5 +1,5 @@
-MD5 (fwbuilder-3.0.7.tar.gz) = A64FXaGuocigm4zlH7+NfQ==
-RMD160 (fwbuilder-3.0.7.tar.gz) = xXFQo94Tat0opI+8O3mqEAa0aWM=
-SHA1 (fwbuilder-3.0.7.tar.gz) = wIQRvPW2hu+G4dpvCVTYaFv0nWE=
-SHA256 (fwbuilder-3.0.7.tar.gz) = u4J/VKd8D4qbRxIA7aOAHJ/z8qV2ZHympXblRuIKwlQ=
-SIZE (fwbuilder-3.0.7.tar.gz) = 2486382
+MD5 (fwbuilder-4.0.1.tar.gz) = k8+vLohIjbIUOWdr8qCarQ==
+RMD160 (fwbuilder-4.0.1.tar.gz) = BMnXMYCF54CERE3cZEDjlNo/rgE=
+SHA1 (fwbuilder-4.0.1.tar.gz) = Rs0v6QJOQExA59G3dJcwUpIZIs8=
+SHA256 (fwbuilder-4.0.1.tar.gz) = 9mLun/aENcPhnejWRAThmVuVVkXQmA5+zizXwHrq5aI=
+SIZE (fwbuilder-4.0.1.tar.gz) = 5527326
Index: fwbuilder/patches/patch-config_h_in
===================================================================
RCS file: fwbuilder/patches/patch-config_h_in
diff -N fwbuilder/patches/patch-config_h_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ fwbuilder/patches/patch-config_h_in 23 May 2010 22:52:35 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- config.h.in.orig Sun May 23 22:45:41 2010
++++ config.h.in Sun May 23 22:46:14 2010
+@@ -61,6 +61,7 @@
+ #undef HAVE_PTY_H
+ #undef HAVE_LIBUTIL_H
+ #undef HAVE_UTIL_H
++#undef HAVE_UNISTD_H
+
+ #ifdef HAVE_GETOPT_H
+ # define HAVE_DECL_GETOPT HAVE_GETOPT_H
Index: fwbuilder/patches/patch-qmake_inc_in
===================================================================
RCS file: /cvs/ports/security/fwbuilder/patches/patch-qmake_inc_in,v
retrieving revision 1.4
diff -u -r1.4 patch-qmake_inc_in
--- fwbuilder/patches/patch-qmake_inc_in 12 Oct 2009 11:17:59 -0000
1.4
+++ fwbuilder/patches/patch-qmake_inc_in 23 May 2010 22:52:35 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-qmake_inc_in,v 1.4 2009/10/12 11:17:59 steven Exp $
---- qmake.inc.in.orig Fri Sep 18 23:28:40 2009
-+++ qmake.inc.in Sat Sep 19 17:55:30 2009
-@@ -58,7 +58,7 @@ unix {
+--- qmake.inc.in.orig Wed Jan 27 02:58:20 2010
++++ qmake.inc.in Sun May 23 16:32:24 2010
+@@ -67,7 +67,7 @@ unix {
- 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@
+ QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
Index: fwbuilder/patches/patch-src_fwtransfer_TransferDevice_cpp
===================================================================
RCS file: fwbuilder/patches/patch-src_fwtransfer_TransferDevice_cpp
diff -N fwbuilder/patches/patch-src_fwtransfer_TransferDevice_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ fwbuilder/patches/patch-src_fwtransfer_TransferDevice_cpp 23 May 2010
22:52:35 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/fwtransfer/TransferDevice.cpp.orig Sun May 23 16:37:18 2010
++++ src/fwtransfer/TransferDevice.cpp Sun May 23 16:37:40 2010
+@@ -19,6 +19,7 @@
+ #include <string>
+
+ #include <sys/types.h>
++#include <unistd.h>
+
+ #include <QDebug>
+ #include <QString>
Index: fwbuilder/patches/patch-src_gui_FWBSettings_h
===================================================================
RCS file: /cvs/ports/security/fwbuilder/patches/patch-src_gui_FWBSettings_h,v
retrieving revision 1.2
diff -u -r1.2 patch-src_gui_FWBSettings_h
--- fwbuilder/patches/patch-src_gui_FWBSettings_h 13 Apr 2009 14:12:02
-0000 1.2
+++ fwbuilder/patches/patch-src_gui_FWBSettings_h 23 May 2010 22:52:35
-0000
@@ -1,12 +1,22 @@
$OpenBSD: patch-src_gui_FWBSettings_h,v 1.2 2009/04/13 14:12:02 steven Exp $
---- src/gui/FWBSettings.h.orig Sun Mar 29 22:08:37 2009
-+++ src/gui/FWBSettings.h Tue Mar 31 12:16:28 2009
-@@ -36,6 +36,8 @@
+--- src/gui/FWBSettings.h.orig Sun Mar 7 09:28:49 2010
++++ src/gui/FWBSettings.h Sun May 23 18:46:26 2010
+@@ -26,9 +26,7 @@
+ #ifndef __FWBSETTINGS_H_
+ #define __FWBSETTINGS_H_
+-#include "fwbuilder/FWObject.h"
+
+-
+ #include <qsettings.h>
+ #include <qrect.h>
+ #include <qprinter.h>
+@@ -37,6 +35,8 @@
#include <set>
-+#include <fwbuilder/FWObject.h>
+ #define SETTINGS_PATH_PREFIX "/4.0"
+
++#include <fwbuilder/FWObject.h>
+
class QWidget;
- /*
Index: fwbuilder/patches/patch-src_gui_HttpGet_cpp
===================================================================
RCS file: fwbuilder/patches/patch-src_gui_HttpGet_cpp
diff -N fwbuilder/patches/patch-src_gui_HttpGet_cpp
--- fwbuilder/patches/patch-src_gui_HttpGet_cpp 13 Apr 2009 14:12:02 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_gui_HttpGet_cpp,v 1.2 2009/04/13 14:12:02 steven Exp $
---- src/gui/HttpGet.cpp.orig Sun Mar 29 22:08:37 2009
-+++ src/gui/HttpGet.cpp Tue Mar 31 12:16:28 2009
-@@ -31,6 +31,8 @@
- #include <QHttpResponseHeader>
- #include <QLocale>
-
-+#include <fwbuilder/FWObject.h>
-+
- #include "HttpGet.h"
- #include "FWBSettings.h"
-
Index: fwbuilder/patches/patch-src_gui_ObjectManipulator_cpp
===================================================================
RCS file: fwbuilder/patches/patch-src_gui_ObjectManipulator_cpp
diff -N fwbuilder/patches/patch-src_gui_ObjectManipulator_cpp
--- fwbuilder/patches/patch-src_gui_ObjectManipulator_cpp 12 Oct 2009
11:17:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_gui_ObjectManipulator_cpp,v 1.1 2009/10/12 11:17:59 steven
Exp $
---- src/gui/ObjectManipulator.cpp.orig Fri Sep 18 23:28:37 2009
-+++ src/gui/ObjectManipulator.cpp Sat Sep 19 19:08:47 2009
-@@ -3423,7 +3423,7 @@ void ObjectManipulator::reopenCurrentItemParent()
- QTreeWidgetItem *itm = current_tree_view->currentItem();
- if (itm)
- itm = itm->parent();
-- if (!itm)
-+ if (!itm || !itm->parent())
- return;
- itm->parent()->setExpanded(false);
- itm->parent()->setExpanded(true);
Index: fwbuilder/patches/patch-src_gui_ssh_wrappers_cpp
===================================================================
RCS file: fwbuilder/patches/patch-src_gui_ssh_wrappers_cpp
diff -N fwbuilder/patches/patch-src_gui_ssh_wrappers_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ fwbuilder/patches/patch-src_gui_ssh_wrappers_cpp 23 May 2010 22:52:35
-0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/gui/ssh_wrappers.cpp.orig Sun May 23 18:23:27 2010
++++ src/gui/ssh_wrappers.cpp Sun May 23 18:23:35 2010
+@@ -39,7 +39,6 @@
+ #include <termios.h>
+ #include <time.h>
+ #include <sys/select.h>
+-#include <utmpx.h>
+
+ #ifdef HAVE_SIGNAL_H
+ #include <signal.h>
Index:
fwbuilder/patches/patch-src_transfer_agents_secuwall_transfer_secuwall_cpp
===================================================================
RCS file:
fwbuilder/patches/patch-src_transfer_agents_secuwall_transfer_secuwall_cpp
diff -N
fwbuilder/patches/patch-src_transfer_agents_secuwall_transfer_secuwall_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ fwbuilder/patches/patch-src_transfer_agents_secuwall_transfer_secuwall_cpp
23 May 2010 22:52:35 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+--- src/transfer_agents/secuwall/transfer_secuwall.cpp.orig Sun May 23
22:39:06 2010
++++ src/transfer_agents/secuwall/transfer_secuwall.cpp Sun May 23 22:42:17 2010
+@@ -14,10 +14,17 @@
+ * o The terms of NetCitadel End User License Agreement
+ */
+
++#include "../../../config.h"
++#include "../../../build_num"
++
+ #include <iostream>
+ #include <fstream>
+ #include <sys/stat.h>
+
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <direct.h>
+@@ -34,9 +41,6 @@
+ #include <stdlib.h>
+ #endif
+ #endif
+-
+-#include "../../../config.h"
+-#include "../../../build_num"
+
+ #include "fwbuilder/FWException.h"
+
Index: fwbuilder/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/fwbuilder/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- fwbuilder/pkg/PLIST 22 Dec 2009 12:51:52 -0000 1.8
+++ fwbuilder/pkg/PLIST 23 May 2010 22:52:35 -0000
@@ -5,8 +5,10 @@
@bin bin/fwb_ipt
@bin bin/fwb_pf
@bin bin/fwb_pix
+...@bin bin/fwb_procurve_acl
@bin bin/fwbedit
@bin bin/fwbuilder
+...@bin bin/transfer_secuwall
@man man/man1/fwb_iosacl.1
@man man/man1/fwb_ipf.1
@man man/man1/fwb_ipfw.1
@@ -34,59 +36,223 @@
share/doc/fwbuilder/README.pix_routing
share/doc/fwbuilder/README.policy_import
share/doc/fwbuilder/README.routing
-${SHARE}/
-${SHARE}/help/
-${SHARE}/help/ipfw_Classify_en_US.html
-${SHARE}/help/iptAdvancedDialog_en_US.html
-${SHARE}/help/iptables_Branch_en_US.html
-${SHARE}/help/iptables_Classify_en_US.html
-${SHARE}/help/iptables_Route_en_US.html
-${SHARE}/help/iptables_Tag_en_US.html
-${SHARE}/help/iptables_rule_options_en_US.html
-${SHARE}/help/linux24AdvancedDialog_en_US.html
-${SHARE}/help/main_en_US.html
-${SHARE}/help/pfAdvancedDialog_en_US.html
-${SHARE}/help/pf_Branch_en_US.html
-${SHARE}/help/pf_Classify_en_US.html
-${SHARE}/help/pf_Route_en_US.html
-${SHARE}/help/pf_Tag_en_US.html
-${SHARE}/help/pf_rule_options_en_US.html
-${SHARE}/help/tip01_en_US.html
-${SHARE}/help/tip02_en_US.html
-${SHARE}/help/tip03_en_US.html
-${SHARE}/help/tip04_en_US.html
-${SHARE}/help/tip05_en_US.html
-${SHARE}/help/tip06_en_US.html
-${SHARE}/help/tip07_en_US.html
-${SHARE}/help/tip08_en_US.html
-${SHARE}/help/tip09_en_US.html
-${SHARE}/help/tip10_en_US.html
-${SHARE}/locale/
-${SHARE}/locale/fwbuilder_ja.qm
-${SHARE}/locale/fwbuilder_ru.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
-${SHARE}/os/openbsd.xml
-${SHARE}/os/pix_os.xml
-${SHARE}/os/solaris.xml
-${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
-${SHARE}/platform/pf.xml
-${SHARE}/platform/pix.xml
-${SHARE}/platform/unknown.xml
-${SHARE}/resources.xml
-${SHARE}/templates.xml
+share/fwbuilder/
+share/fwbuilder/configlets/
+share/fwbuilder/configlets/bsd/
+share/fwbuilder/configlets/bsd/carp_interface
+share/fwbuilder/configlets/bsd/kernel_vars
+share/fwbuilder/configlets/bsd/pfsync_interface
+share/fwbuilder/configlets/bsd/shell_functions
+share/fwbuilder/configlets/bsd/tools
+share/fwbuilder/configlets/bsd/update_addresses
+share/fwbuilder/configlets/bsd/update_carp
+share/fwbuilder/configlets/bsd/update_pfsync
+share/fwbuilder/configlets/bsd/update_vlans
+share/fwbuilder/configlets/cisco/
+share/fwbuilder/configlets/dd-wrt-jffs/
+share/fwbuilder/configlets/dd-wrt-jffs/installer_commands_reg_user
+share/fwbuilder/configlets/dd-wrt-jffs/installer_commands_root
+share/fwbuilder/configlets/dd-wrt-jffs/script_skeleton
+share/fwbuilder/configlets/dd-wrt-jffs/top_comment
+share/fwbuilder/configlets/dd-wrt-nvram/
+share/fwbuilder/configlets/dd-wrt-nvram/installer_commands_reg_user
+share/fwbuilder/configlets/dd-wrt-nvram/installer_commands_root
+share/fwbuilder/configlets/dd-wrt-nvram/script_skeleton
+share/fwbuilder/configlets/dd-wrt-nvram/top_comment
+share/fwbuilder/configlets/freebsd/
+share/fwbuilder/configlets/freebsd/installer_commands_reg_user
+share/fwbuilder/configlets/freebsd/installer_commands_root
+share/fwbuilder/configlets/freebsd/kernel_vars
+share/fwbuilder/configlets/freebsd/tools
+share/fwbuilder/configlets/ios/
+share/fwbuilder/configlets/ios/installer_commands_post_config
+share/fwbuilder/configlets/ios/installer_commands_pre_config
+share/fwbuilder/configlets/ios/installer_commands_reg_user
+share/fwbuilder/configlets/ios/safety_net_acl
+share/fwbuilder/configlets/ios/script_skeleton
+share/fwbuilder/configlets/ios/top_comment
+share/fwbuilder/configlets/ipcop/
+share/fwbuilder/configlets/ipcop/automatic_rules
+share/fwbuilder/configlets/ipcop/installer_commands_reg_user
+share/fwbuilder/configlets/ipcop/installer_commands_root
+share/fwbuilder/configlets/ipcop/kernel_vars
+share/fwbuilder/configlets/ipcop/script_skeleton
+share/fwbuilder/configlets/ipcop/shell_functions
+share/fwbuilder/configlets/ipcop/update_addresses
+share/fwbuilder/configlets/ipcop/update_bonding
+share/fwbuilder/configlets/ipcop/update_bridge
+share/fwbuilder/configlets/ipcop/update_vlans
+share/fwbuilder/configlets/ipf/
+share/fwbuilder/configlets/ipf/activation
+share/fwbuilder/configlets/ipf/script_skeleton
+share/fwbuilder/configlets/ipf/top_comment
+share/fwbuilder/configlets/ipfw/
+share/fwbuilder/configlets/ipfw/script_skeleton
+share/fwbuilder/configlets/ipfw/top_comment
+share/fwbuilder/configlets/linux24/
+share/fwbuilder/configlets/linux24/automatic_rules
+share/fwbuilder/configlets/linux24/check_utilities
+share/fwbuilder/configlets/linux24/conntrack
+share/fwbuilder/configlets/linux24/constants
+share/fwbuilder/configlets/linux24/installer_commands_reg_user
+share/fwbuilder/configlets/linux24/installer_commands_root
+share/fwbuilder/configlets/linux24/ip_forwarding
+share/fwbuilder/configlets/linux24/kernel_vars
+share/fwbuilder/configlets/linux24/load_modules
+share/fwbuilder/configlets/linux24/prolog_epilog_functions
+share/fwbuilder/configlets/linux24/reset_iptables
+share/fwbuilder/configlets/linux24/routing_functions
+share/fwbuilder/configlets/linux24/run_time_wrappers
+share/fwbuilder/configlets/linux24/script_body_iptables_restore
+share/fwbuilder/configlets/linux24/script_body_single_rule
+share/fwbuilder/configlets/linux24/script_skeleton
+share/fwbuilder/configlets/linux24/shell_functions
+share/fwbuilder/configlets/linux24/status_action
+share/fwbuilder/configlets/linux24/stop_action
+share/fwbuilder/configlets/linux24/top_comment
+share/fwbuilder/configlets/linux24/update_addresses
+share/fwbuilder/configlets/linux24/update_bonding
+share/fwbuilder/configlets/linux24/update_bridge
+share/fwbuilder/configlets/linux24/update_vlans
+share/fwbuilder/configlets/linux24/verify_interfaces
+share/fwbuilder/configlets/macosx/
+share/fwbuilder/configlets/macosx/installer_commands_reg_user
+share/fwbuilder/configlets/macosx/installer_commands_root
+share/fwbuilder/configlets/macosx/kernel_vars
+share/fwbuilder/configlets/macosx/tools
+share/fwbuilder/configlets/openbsd/
+share/fwbuilder/configlets/openbsd/installer_commands_reg_user
+share/fwbuilder/configlets/openbsd/installer_commands_root
+share/fwbuilder/configlets/openbsd/kernel_vars
+share/fwbuilder/configlets/openbsd/tools
+share/fwbuilder/configlets/openwrt/
+share/fwbuilder/configlets/openwrt/check_utilities
+share/fwbuilder/configlets/openwrt/installer_commands_reg_user
+share/fwbuilder/configlets/openwrt/installer_commands_root
+share/fwbuilder/configlets/openwrt/load_modules
+share/fwbuilder/configlets/openwrt/script_skeleton
+share/fwbuilder/configlets/openwrt/top_comment
+share/fwbuilder/configlets/pf/
+share/fwbuilder/configlets/pf/activation
+share/fwbuilder/configlets/pf/script_skeleton
+share/fwbuilder/configlets/pf/top_comment
+share/fwbuilder/configlets/pix_os/
+share/fwbuilder/configlets/pix_os/failover_commands_6
+share/fwbuilder/configlets/pix_os/failover_commands_7
+share/fwbuilder/configlets/pix_os/failover_interface_6
+share/fwbuilder/configlets/pix_os/failover_interface_7
+share/fwbuilder/configlets/pix_os/installer_commands_post_config
+share/fwbuilder/configlets/pix_os/installer_commands_pre_config
+share/fwbuilder/configlets/pix_os/installer_commands_reg_user
+share/fwbuilder/configlets/pix_os/ntp
+share/fwbuilder/configlets/pix_os/regular_interface_6
+share/fwbuilder/configlets/pix_os/regular_interface_7
+share/fwbuilder/configlets/pix_os/script_skeleton
+share/fwbuilder/configlets/pix_os/snmp
+share/fwbuilder/configlets/pix_os/ssh
+share/fwbuilder/configlets/pix_os/top_comment
+share/fwbuilder/configlets/pix_os/vlan_parent_interface_6
+share/fwbuilder/configlets/pix_os/vlan_parent_interface_7
+share/fwbuilder/configlets/pix_os/vlan_subinterface_6
+share/fwbuilder/configlets/pix_os/vlan_subinterface_7
+share/fwbuilder/configlets/procurve/
+share/fwbuilder/configlets/procurve/installer_commands_post_config
+share/fwbuilder/configlets/procurve/installer_commands_pre_config
+share/fwbuilder/configlets/procurve/installer_commands_reg_user
+share/fwbuilder/configlets/procurve/safety_net_acl
+share/fwbuilder/configlets/procurve/script_skeleton
+share/fwbuilder/configlets/procurve/top_comment
+share/fwbuilder/configlets/secuwall/
+share/fwbuilder/configlets/secuwall/installer_commands_reg_user
+share/fwbuilder/configlets/secuwall/installer_commands_root
+share/fwbuilder/configlets/secuwall/management_rules
+share/fwbuilder/configlets/secuwall/script_skeleton
+share/fwbuilder/configlets/solaris/
+share/fwbuilder/configlets/solaris/installer_commands_reg_user
+share/fwbuilder/configlets/solaris/installer_commands_root
+share/fwbuilder/configlets/solaris/kernel_vars
+share/fwbuilder/configlets/solaris/tools
+share/fwbuilder/configlets/sveasoft/
+share/fwbuilder/configlets/sveasoft/installer_commands_reg_user
+share/fwbuilder/configlets/sveasoft/installer_commands_root
+share/fwbuilder/configlets/sveasoft/script_skeleton
+share/fwbuilder/configlets/sveasoft/shell_functions
+share/fwbuilder/configlets/sveasoft/top_comment
+share/fwbuilder/help/
+share/fwbuilder/help/en_US/
+share/fwbuilder/help/en_US/cluster_interfaces.png
+share/fwbuilder/help/en_US/create_and_add_to_group.png
+share/fwbuilder/help/en_US/ipcopAdvancedDialog.html
+share/fwbuilder/help/en_US/ipcoposAdvancedDialog.html
+share/fwbuilder/help/en_US/ipfw_Classify.html
+share/fwbuilder/help/en_US/iptAdvancedDialog.html
+share/fwbuilder/help/en_US/iptables_Branch.html
+share/fwbuilder/help/en_US/iptables_Classify.html
+share/fwbuilder/help/en_US/iptables_Route.html
+share/fwbuilder/help/en_US/iptables_Tag.html
+share/fwbuilder/help/en_US/iptables_rule_options.html
+share/fwbuilder/help/en_US/linux24AdvancedDialog.html
+share/fwbuilder/help/en_US/main.html
+share/fwbuilder/help/en_US/new_bridge_interfaces.png
+share/fwbuilder/help/en_US/pfAdvancedDialog.html
+share/fwbuilder/help/en_US/pf_Branch.html
+share/fwbuilder/help/en_US/pf_Classify.html
+share/fwbuilder/help/en_US/pf_Route.html
+share/fwbuilder/help/en_US/pf_Tag.html
+share/fwbuilder/help/en_US/pf_rule_options.html
+share/fwbuilder/help/en_US/pix-failover-group-1.png
+share/fwbuilder/help/en_US/pix-failover-groups-mapping.png
+share/fwbuilder/help/en_US/pix-statesync-group-1.png
+share/fwbuilder/help/en_US/pix-statesync-group-mapping.png
+share/fwbuilder/help/en_US/release_notes_4.0.0.html
+share/fwbuilder/help/en_US/state_sync_configuration.png
+share/fwbuilder/help/en_US/summary.html
+share/fwbuilder/help/en_US/tip01.html
+share/fwbuilder/help/en_US/tip02.html
+share/fwbuilder/help/en_US/tip03.html
+share/fwbuilder/help/en_US/tip04.html
+share/fwbuilder/help/en_US/tip05.html
+share/fwbuilder/help/en_US/tip06.html
+share/fwbuilder/help/en_US/tip07.html
+share/fwbuilder/help/en_US/tip08.html
+share/fwbuilder/help/en_US/tip09.html
+share/fwbuilder/help/en_US/tip10.html
+share/fwbuilder/help/en_US/vlan_interfaces.png
+share/fwbuilder/locale/
+share/fwbuilder/locale/fwbuilder_ja.qm
+share/fwbuilder/locale/fwbuilder_ru.qm
+share/fwbuilder/objects_init.xml
+share/fwbuilder/os/
+share/fwbuilder/os/dd-wrt-jffs.xml
+share/fwbuilder/os/dd-wrt-nvram.xml
+share/fwbuilder/os/endian.xml
+share/fwbuilder/os/freebsd.xml
+share/fwbuilder/os/fwsm_os.xml
+share/fwbuilder/os/ios.xml
+share/fwbuilder/os/ipcop.xml
+share/fwbuilder/os/linux24.xml
+share/fwbuilder/os/macosx.xml
+share/fwbuilder/os/oneshield.xml
+share/fwbuilder/os/openbsd.xml
+share/fwbuilder/os/openwrt.xml
+share/fwbuilder/os/pix_os.xml
+share/fwbuilder/os/procurve.xml
+share/fwbuilder/os/secuwall.xml
+share/fwbuilder/os/solaris.xml
+share/fwbuilder/os/sveasoft.xml
+share/fwbuilder/os/unknown_os.xml
+share/fwbuilder/platform/
+share/fwbuilder/platform/fwsm.xml
+share/fwbuilder/platform/iosacl.xml
+share/fwbuilder/platform/ipf.xml
+share/fwbuilder/platform/ipfw.xml
+share/fwbuilder/platform/iptables.xml
+share/fwbuilder/platform/pf.xml
+share/fwbuilder/platform/pix.xml
+share/fwbuilder/platform/procurve_acl.xml
+share/fwbuilder/platform/unknown.xml
+share/fwbuilder/resources.xml
+share/fwbuilder/templates.xml
share/icons/
share/icons/hicolor/
share/icons/hicolor/16x16/
