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

update libfwbuilder/fwbuilder to 4.1.2, from maintainer Vadim Zhukov with

Browse Source 
a small tweak from me to tighten the lib dependency on libfwbuilder.
This commit is contained in:
sthen 2010-10-11 20:19:11 +00:00
parent 24c46c77f1
commit ffe3bb5efe
7 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
security/fwbuilder/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.19 2010/07/24 09:15:55 steven Exp $
# $OpenBSD: Makefile,v 1.20 2010/10/11 20:19:11 sthen Exp $
# Consumes more than 512MB on at least i386 when building qrc_MainRes.o
VMEM_WARNING = Yes
V = 4.1.2
COMMENT = firewall GUI
DISTNAME = fwbuilder-4.0.1
DISTNAME = fwbuilder-$V
CATEGORIES = net security
HOMEPAGE = http://www.fwbuilder.org/
@ -19,7 +20,7 @@ PERMIT_DISTFILES_CDROM =Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
AUTOMAKE_VERSION = 1.9 # XXX should be 1.10
AUTOMAKE_VERSION = 1.10
AUTOCONF_VERSION = 2.63
CONFIGURE_STYLE = gnu
@ -31,14 +32,15 @@ BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
CONFIGURE_ARGS += --with-docdir=${TRUEPREFIX}/share/doc/fwbuilder \
--with-templatedir=${TRUEPREFIX}/share/fwbuilder \
--with-qtdir=${MODQT_QTDIR} \
--with-qmake=qmake4
--with-qmake=qmake4 \
--without-distcc
MAKE_ENV += QMAKE=${MODQT_QTDIR}/bin/qmake \
CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}"
MODULES = x11/qt4 converters/libiconv
DESTDIRNAME = INSTALL_ROOT
LIB_DEPENDS = ::security/libfwbuilder \
LIB_DEPENDS = :libfwbuilder-$V:security/libfwbuilder \
::x11/qt4
REGRESS_TARGET =tests

10
security/fwbuilder/distinfo
View File

@ -1,5 +1,5 @@
MD5 (fwbuilder-4.0.1.tar.gz) = NkDA0gCyoOISXQyZHox8LA==
RMD160 (fwbuilder-4.0.1.tar.gz) = p91UCsRszfDun8dfp4ajz6trhIQ=
SHA1 (fwbuilder-4.0.1.tar.gz) = a0zt0iVjfajr2mzbn+UBEbbdL2E=
SHA256 (fwbuilder-4.0.1.tar.gz) = 2Lt4Z99wOzCl10coqEl6L6GxCJGEvW0B6XRwXlqtdmw=
SIZE (fwbuilder-4.0.1.tar.gz) = 5532239
MD5 (fwbuilder-4.1.2.tar.gz) = m6daUVdFMEJH31vhiFteDw==
RMD160 (fwbuilder-4.1.2.tar.gz) = R5GJBeNvWHGU0M/uJ8XX/Q4cMCM=
SHA1 (fwbuilder-4.1.2.tar.gz) = gjweewlH23vXE+B2u0fdnPgWylg=
SHA256 (fwbuilder-4.1.2.tar.gz) = Pq5gewa8R/hSQdlSw8m85CJiWq/37B1jLKD64cl3sVw=
SIZE (fwbuilder-4.1.2.tar.gz) = 5872728

10
security/fwbuilder/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2010/07/14 08:46:35 sthen Exp $
@comment $OpenBSD: PLIST,v 1.10 2010/10/11 20:19:11 sthen Exp $
@bin bin/fwb_iosacl
@bin bin/fwb_ipf
@bin bin/fwb_ipfw
@ -52,11 +52,13 @@ 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/routing_functions
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/routing_functions
share/fwbuilder/configlets/dd-wrt-nvram/script_skeleton
share/fwbuilder/configlets/dd-wrt-nvram/top_comment
share/fwbuilder/configlets/freebsd/
@ -91,6 +93,7 @@ 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/block_action
share/fwbuilder/configlets/linux24/check_utilities
share/fwbuilder/configlets/linux24/conntrack
share/fwbuilder/configlets/linux24/constants
@ -102,6 +105,7 @@ 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_address_tables
share/fwbuilder/configlets/linux24/run_time_wrappers
share/fwbuilder/configlets/linux24/script_body_iptables_restore
share/fwbuilder/configlets/linux24/script_body_single_rule
@ -205,6 +209,10 @@ 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/release_notes_4.0.1.html
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/state_sync_configuration.png
share/fwbuilder/help/en_US/summary.html
share/fwbuilder/help/en_US/tip01.html

17
security/libfwbuilder/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.15 2010/08/31 12:25:30 jasper Exp $
# $OpenBSD: Makefile,v 1.16 2010/10/11 20:19:11 sthen Exp $
COMMENT= libraries for fwbuilder
DISTNAME= libfwbuilder-4.0.1
DISTNAME= libfwbuilder-4.1.2
CATEGORIES= net security
SHARED_LIBS= fwbuilder 14.0 \
fwcompiler 14.0
SHARED_LIBS= fwbuilder 15.0 \
fwcompiler 15.0
HOMEPAGE= http://www.fwbuilder.org/
@ -25,12 +25,13 @@ LIB_DEPENDS+= ::textproc/libxslt \
::textproc/libxml \
::net/net-snmp
AUTOMAKE_VERSION = 1.9 # XXX should be 1.10
AUTOMAKE_VERSION = 1.10
AUTOCONF_VERSION = 2.63
USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
USE_LIBTOOL = gnu # wants libtoolize
BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
@ -38,9 +39,11 @@ BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
CONFIGURE_ARGS += --with-docdir=${TRUEPREFIX}/share/doc/libfwbuilder \
--with-templatedir=${TRUEPREFIX}/share/libfwbuilder \
--with-qtdir=${MODQT_QTDIR} \
--with-qmake=qmake4
--with-qmake=qmake4 \
--without-distcc
MAKE_ENV += QMAKE=${MODQT_QTDIR}/bin/qmake \
CXXFLAGS="${CXXFLAGS}"
CXXFLAGS="${CXXFLAGS}" \
CCACHE=/nonexistent
REGRESS_TARGET= tests

10
security/libfwbuilder/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libfwbuilder-4.0.1.tar.gz) = KWaiqfzxsumQJRcYaWFE9Q==
RMD160 (libfwbuilder-4.0.1.tar.gz) = 3wZtYkiR6L5WtN5x4rpfiD+PrL4=
SHA1 (libfwbuilder-4.0.1.tar.gz) = egoH61VzznaqLN2YUf9IPyq75VQ=
SHA256 (libfwbuilder-4.0.1.tar.gz) = B8eTs3gZpeMj8G5QEQW5yxx1LEaUN9lZzdgWQj7KHzg=
SIZE (libfwbuilder-4.0.1.tar.gz) = 376936
MD5 (libfwbuilder-4.1.2.tar.gz) = qi99d86o0pSjWULkeve5bg==
RMD160 (libfwbuilder-4.1.2.tar.gz) = Ijvp5IfBkhRl8BnfVrbet/ABw5Y=
SHA1 (libfwbuilder-4.1.2.tar.gz) = YuntnUmCicOombCdULfi0S1qZKc=
SHA256 (libfwbuilder-4.1.2.tar.gz) = E0Qt9gGVJhEKtWWjUxlpvwUUy8u1RAidAS84bnn4Azc=
SIZE (libfwbuilder-4.1.2.tar.gz) = 378748

10
security/libfwbuilder/patches/patch-src_fwbuilder_unit_tests_unit_tests_sh
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_fwbuilder_unit_tests_unit_tests_sh,v 1.1 2010/07/14 08:46:35 sthen Exp $
$OpenBSD: patch-src_fwbuilder_unit_tests_unit_tests_sh,v 1.2 2010/10/11 20:19:11 sthen Exp $
XXX handrolled; no trailing eol
--- src/fwbuilder/unit_tests/unit_tests.sh.orig Tue Jul 13 21:57:36 2010
+++ src/fwbuilder/unit_tests/unit_tests.sh Tue Jul 13 22:01:04 2010
@@ -1,10 +1,10 @@
--- src/fwbuilder/unit_tests/unit_tests.sh.orig Sun Feb 28 20:11:11 2010
+++ src/fwbuilder/unit_tests/unit_tests.sh Sun Oct 10 10:17:28 2010
@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/bin/sh
@ -18,3 +18,5 @@ XXX handrolled; no trailing eol
+ [ ! -e Makefile ] && ${QMAKE} -spec $QMAKESPEC
$commands || exit 1
cd -
done;
\ No newline at end of file

3
security/libfwbuilder/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2010/07/14 08:46:35 sthen Exp $
@comment $OpenBSD: PLIST,v 1.7 2010/10/11 20:19:11 sthen Exp $
%%SHARED%%
bin/libfwbuilder-config-4
include/fwb-4/
@ -125,6 +125,7 @@ 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_16.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