cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update fwbuilder to 5.0.1

Browse Source 
libfwbuilder got merged into fwbuilder.

Besides still not fully supporting all new features of recent OpenBSD pf,
it generally works well.

feedback and OK sthen@
This commit is contained in:
sebastia 2012-01-04 08:57:50 +00:00
parent d1968f6594
commit baaa2ca0d4
4 changed files with 146 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
security/fwbuilder/Makefile
View File

@ -1,19 +1,17 @@
# $OpenBSD: Makefile,v 1.26 2011/12/05 10:41:44 espie Exp $
# $OpenBSD: Makefile,v 1.27 2012/01/04 08:57:50 sebastia Exp $
# Consumes more than 512MB on at least i386 when building qrc_MainRes.o
VMEM_WARNING = Yes
V = 4.1.3
COMMENT = firewall GUI
DISTNAME = fwbuilder-$V
REVISION = 0
DISTNAME = fwbuilder-5.0.1.3592
CATEGORIES = net security
HOMEPAGE = http://www.fwbuilder.org/
MAINTAINER = Vadim Zhukov <persgray@gmail.com>
# GPLv2+
# GPLv2+ mostly, some code under BSD-like
PERMIT_PACKAGE_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
@ -21,6 +19,9 @@ PERMIT_DISTFILES_CDROM =Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
# .orig produces too much spam in tests directories
PATCHORIG = .ports.orig
AUTOMAKE_VERSION = 1.10
AUTOCONF_VERSION = 2.63
@ -28,8 +29,8 @@ CONFIGURE_STYLE = gnu
BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/cppunit \
devel/libtool # for libtoolize, required by autogen.sh
devel/cppunit
COPTS = ${DEBUG}
CONFIGURE_ARGS += --with-docdir=${TRUEPREFIX}/share/doc/fwbuilder \
--with-templatedir=${TRUEPREFIX}/share/fwbuilder \
@ -38,24 +39,28 @@ CONFIGURE_ARGS += --with-docdir=${TRUEPREFIX}/share/doc/fwbuilder \
--without-distcc
MAKE_ENV += QMAKE=${MODQT_QTDIR}/bin/qmake \
CXXFLAGS="${CXXFLAGS}" \
COPTS="${COPTS}" \
LDFLAGS="${LDFLAGS}"
USE_LIBTOOL = gnu
MODULES = x11/qt4 converters/libiconv
DESTDIRNAME = INSTALL_ROOT
LIB_DEPENDS = libfwbuilder-$V:security/libfwbuilder \
LIB_DEPENDS = net/net-snmp \
textproc/libxml \
textproc/libxslt \
x11/qt4
REGRESS_TARGET =tests
USE_GROFF = Yes
REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
REGRESS_TARGET = tests
REGRESS_ENV += COPTS="${COPTS}"
REGRESS_IS_INTERACTIVE = X11
WANTLIB += c crypto m netsnmp
WANTLIB += c crypto m netsnmp QtGui QtNetwork
WANTLIB += pthread stdc++ util xml2 xslt z
WANTLIB += QtDBus QtGui QtNetwork QtXml
WANTLIB += fwcompiler>=14 fwbuilder>=14
WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
FAKE_FLAGS = INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
INSTALL_FILE="${INSTALL_DATA}"
post-patch:
cd ${WRKSRC}; \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \

10
security/fwbuilder/distinfo
View File

@ -1,5 +1,5 @@
MD5 (fwbuilder-4.1.3.tar.gz) = fLbVDObwK0hVJUBb0A2MMw==
RMD160 (fwbuilder-4.1.3.tar.gz) = mjP9FFtFsdEmou9MGYx5f0ZhtAE=
SHA1 (fwbuilder-4.1.3.tar.gz) = YS2/181mnC74iJFXrj+PANKFN/4=
SHA256 (fwbuilder-4.1.3.tar.gz) = +K9JC8OgkSTrWsbOEVc2ZTDLUWz4VqOYtuzoGbbmZD4=
SIZE (fwbuilder-4.1.3.tar.gz) = 5683404
MD5 (fwbuilder-5.0.1.3592.tar.gz) = ULVnqXUundT0zQ2YjXTYeQ==
RMD160 (fwbuilder-5.0.1.3592.tar.gz) = qL72bfaDgiJhWX5DEYAe14L64ms=
SHA1 (fwbuilder-5.0.1.3592.tar.gz) = 2fpkq06ES2+M+qiUlSTjRkqsLvc=
SHA256 (fwbuilder-5.0.1.3592.tar.gz) = IhIN5xKES12Jo/KSSWTBbMhvlvIVas58P1Ub0NcTyUs=
SIZE (fwbuilder-5.0.1.3592.tar.gz) = 6733502

12
security/fwbuilder/patches/patch-qmake_inc_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-qmake_inc_in,v 1.6 2011/12/12 09:11:10 jasper Exp $
--- qmake.inc.in.orig Mon Dec 6 01:29:02 2010
+++ qmake.inc.in Mon Dec 12 10:02:38 2011
@@ -62,7 +62,7 @@ unix {
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

127
security/fwbuilder/pkg/PLIST
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.11 2011/04/12 12:38:08 sthen Exp $
@comment $OpenBSD: PLIST,v 1.12 2012/01/04 08:57:50 sebastia Exp $
@conflict libfwbuilder-*
@pkgpath security/libfwbuilder
@bin bin/fwb_iosacl
@bin bin/fwb_ipf
@bin bin/fwb_ipfw
@ -8,7 +10,6 @@
@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
@ -39,12 +40,16 @@ share/doc/fwbuilder/README.routing
share/fwbuilder/
share/fwbuilder/configlets/
share/fwbuilder/configlets/bsd/
share/fwbuilder/configlets/bsd/bridge_interface
share/fwbuilder/configlets/bsd/bridge_port
share/fwbuilder/configlets/bsd/carp_interface
share/fwbuilder/configlets/bsd/ifconfig_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_bridge
share/fwbuilder/configlets/bsd/update_carp
share/fwbuilder/configlets/bsd/update_pfsync
share/fwbuilder/configlets/bsd/update_vlans
@ -63,10 +68,35 @@ share/fwbuilder/configlets/dd-wrt-nvram/routing_functions
share/fwbuilder/configlets/dd-wrt-nvram/script_skeleton
share/fwbuilder/configlets/dd-wrt-nvram/top_comment
share/fwbuilder/configlets/freebsd/
share/fwbuilder/configlets/freebsd/carp_interface
share/fwbuilder/configlets/freebsd/ifconfig_interface
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/rc_conf_bridge_port
share/fwbuilder/configlets/freebsd/rc_conf_carp_interface
share/fwbuilder/configlets/freebsd/rc_conf_ifconfig_interface
share/fwbuilder/configlets/freebsd/rc_conf_kernel_vars
share/fwbuilder/configlets/freebsd/rc_conf_pfsync_interface
share/fwbuilder/configlets/freebsd/routing_functions
share/fwbuilder/configlets/freebsd/tools
share/fwbuilder/configlets/fwsm_os/
share/fwbuilder/configlets/fwsm_os/failover_commands_2
share/fwbuilder/configlets/fwsm_os/failover_commands_3_2
share/fwbuilder/configlets/fwsm_os/failover_interface_2
share/fwbuilder/configlets/fwsm_os/failover_interface_3_2
share/fwbuilder/configlets/fwsm_os/installer_commands_post_config
share/fwbuilder/configlets/fwsm_os/installer_commands_pre_config
share/fwbuilder/configlets/fwsm_os/installer_commands_reg_user
share/fwbuilder/configlets/fwsm_os/ntp
share/fwbuilder/configlets/fwsm_os/regular_interface_2
share/fwbuilder/configlets/fwsm_os/regular_interface_3_2
share/fwbuilder/configlets/fwsm_os/snmp
share/fwbuilder/configlets/fwsm_os/ssh
share/fwbuilder/configlets/fwsm_os/vlan_parent_interface_2
share/fwbuilder/configlets/fwsm_os/vlan_parent_interface_3_2
share/fwbuilder/configlets/fwsm_os/vlan_subinterface_2
share/fwbuilder/configlets/fwsm_os/vlan_subinterface_3_2
share/fwbuilder/configlets/ios/
share/fwbuilder/configlets/ios/installer_commands_post_config
share/fwbuilder/configlets/ios/installer_commands_pre_config
@ -109,6 +139,7 @@ share/fwbuilder/configlets/linux24/routing_functions
share/fwbuilder/configlets/linux24/run_time_address_tables
share/fwbuilder/configlets/linux24/run_time_wrappers
share/fwbuilder/configlets/linux24/script_body_iptables_restore
share/fwbuilder/configlets/linux24/script_body_iptables_shell
share/fwbuilder/configlets/linux24/script_body_single_rule
share/fwbuilder/configlets/linux24/script_skeleton
share/fwbuilder/configlets/linux24/shell_functions
@ -129,6 +160,7 @@ 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/routing_functions
share/fwbuilder/configlets/openbsd/tools
share/fwbuilder/configlets/openwrt/
share/fwbuilder/configlets/openwrt/check_utilities
@ -139,6 +171,9 @@ 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/rc_conf_activation
share/fwbuilder/configlets/pf/rc_conf_skeleton
share/fwbuilder/configlets/pf/rc_conf_top_comment
share/fwbuilder/configlets/pf/script_skeleton
share/fwbuilder/configlets/pf/top_comment
share/fwbuilder/configlets/pix_os/
@ -183,6 +218,7 @@ 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/fwbuilder.dtd
share/fwbuilder/help/
share/fwbuilder/help/en_US/
share/fwbuilder/help/en_US/cluster_interfaces.png
@ -215,6 +251,11 @@ share/fwbuilder/help/en_US/release_notes_4.1.0.html
share/fwbuilder/help/en_US/release_notes_4.1.1.html
share/fwbuilder/help/en_US/release_notes_4.1.2.html
share/fwbuilder/help/en_US/release_notes_4.1.3.html
share/fwbuilder/help/en_US/release_notes_4.2.0.html
share/fwbuilder/help/en_US/release_notes_4.2.1.html
share/fwbuilder/help/en_US/release_notes_4.2.2.html
share/fwbuilder/help/en_US/release_notes_5.0.0.html
share/fwbuilder/help/en_US/release_notes_5.0.1.html
share/fwbuilder/help/en_US/state_sync_configuration.png
share/fwbuilder/help/en_US/tip01.html
share/fwbuilder/help/en_US/tip02.html
@ -227,9 +268,85 @@ 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/migration/
share/fwbuilder/migration/FWObjectDatabase_0.10.0.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.1.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.10.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.11.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.12.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.13.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.14.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.2.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.3.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.4.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.5.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.6.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.7.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.8.xslt
share/fwbuilder/migration/FWObjectDatabase_0.10.9.xslt
share/fwbuilder/migration/FWObjectDatabase_0.9.0.xslt
share/fwbuilder/migration/FWObjectDatabase_0.9.1.xslt
share/fwbuilder/migration/FWObjectDatabase_0.9.2.xslt
share/fwbuilder/migration/FWObjectDatabase_0.9.3.xslt
share/fwbuilder/migration/FWObjectDatabase_0.9.4.xslt
share/fwbuilder/migration/FWObjectDatabase_0.9.5.xslt
share/fwbuilder/migration/FWObjectDatabase_1.0.0.xslt
share/fwbuilder/migration/FWObjectDatabase_1.0.1.xslt
share/fwbuilder/migration/FWObjectDatabase_1.0.2.xslt
share/fwbuilder/migration/FWObjectDatabase_10.xslt
share/fwbuilder/migration/FWObjectDatabase_11.xslt
share/fwbuilder/migration/FWObjectDatabase_12.xslt
share/fwbuilder/migration/FWObjectDatabase_13.xslt
share/fwbuilder/migration/FWObjectDatabase_14.xslt
share/fwbuilder/migration/FWObjectDatabase_15.xslt
share/fwbuilder/migration/FWObjectDatabase_16.xslt
share/fwbuilder/migration/FWObjectDatabase_17.xslt
share/fwbuilder/migration/FWObjectDatabase_18.xslt
share/fwbuilder/migration/FWObjectDatabase_19.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.0.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.1.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.10.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.11.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.12.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.2.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.3.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.4.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.5.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.6.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.7.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.8.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.9.xslt
share/fwbuilder/migration/FWObjectDatabase_2.0.99.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.0.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.1.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.10.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.11.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.12.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.13.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.14.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.15.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.16.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.17.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.18.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.19.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.2.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.3.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.4.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.5.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.6.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.7.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.8.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.9.xslt
share/fwbuilder/migration/FWObjectDatabase_2.1.99.xslt
share/fwbuilder/migration/FWObjectDatabase_20.xslt
share/fwbuilder/migration/FWObjectDatabase_21.xslt
share/fwbuilder/migration/FWObjectDatabase_3.xslt
share/fwbuilder/migration/FWObjectDatabase_4.xslt
share/fwbuilder/migration/FWObjectDatabase_5.xslt
share/fwbuilder/migration/FWObjectDatabase_6.xslt
share/fwbuilder/migration/FWObjectDatabase_7.xslt
share/fwbuilder/migration/FWObjectDatabase_8.xslt
share/fwbuilder/migration/FWObjectDatabase_9.xslt
share/fwbuilder/objects_init.xml
share/fwbuilder/os/
share/fwbuilder/os/dd-wrt-jffs.xml