Update 4.0.1 --> 4.1.1

7 files changed, 18 insertions, 10 deletions

diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 47a7af66ade5..de3a9a6ecf2b 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-DISTVERSION=	4.0.1
+DISTVERSION=	4.1.1
 PORTVERSION=	${DISTVERSION}
 CATEGORIES=	security
 .if defined(BUILD)
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 931a934eba1b..41e4a7beab15 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,3 +1,3 @@
-MD5 (fwbuilder-4.0.1.tar.gz) = 684f00944ee1bc9da9a8fd4a774c5eb0
-SHA256 (fwbuilder-4.0.1.tar.gz) = 208cce7e304b66efe5b6c7c8fa100b573f66180b006ee84ce8c83a0781dc2904
-SIZE (fwbuilder-4.0.1.tar.gz) = 5528377
+MD5 (fwbuilder-4.1.1.tar.gz) = efa0b687089dc88ed3d55e7da68f9198
+SHA256 (fwbuilder-4.1.1.tar.gz) = 7b2d817665fefd9979ac07a468b98449733d8648aa3605b24e288364a26a0290
+SIZE (fwbuilder-4.1.1.tar.gz) = 5757379
diff --git a/security/fwbuilder/files/patch-aa b/security/fwbuilder/files/patch-aa
index 27e7557251e4..08ae9b5ede34 100644
--- a/security/fwbuilder/files/patch-aa
+++ b/security/fwbuilder/files/patch-aa
@@ -1,6 +1,6 @@
 --- qmake.inc.in.orig	2010-01-26 15:58:20.000000000 -0800
 +++ qmake.inc.in	2010-05-02 23:23:06.953322354 -0700
-@@ -68,10 +68,6 @@
+@@ -68,11 +68,7 @@
          LIBS += $$LIBS_FWBUILDER @LIBS@
  
          CONFIG += warn_on debug
@@ -8,6 +8,7 @@
 -        QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
 -        QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
 -        QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
+
      }
  }
  
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
index bb94673a24f2..9b5a832b1e9c 100644
--- a/security/fwbuilder/pkg-plist
+++ b/security/fwbuilder/pkg-plist
@@ -20,10 +20,12 @@ share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/update_pfsync
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/update_vlans
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs/installer_commands_reg_user
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs/installer_commands_root
+share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs/routing_functions
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs/script_skeleton
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs/top_comment
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/installer_commands_reg_user
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/installer_commands_root
+share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/routing_functions
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/script_skeleton
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/top_comment
 share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/installer_commands_reg_user
@@ -52,6 +54,7 @@ share/fwbuilder-%%BUILD_VERSION%%/configlets/ipf/top_comment
 share/fwbuilder-%%BUILD_VERSION%%/configlets/ipfw/script_skeleton
 share/fwbuilder-%%BUILD_VERSION%%/configlets/ipfw/top_comment
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/automatic_rules
+share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/block_action
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/check_utilities
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/conntrack
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/constants
@@ -63,6 +66,7 @@ share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/load_modules
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/prolog_epilog_functions
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/reset_iptables
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/routing_functions
+share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/run_time_address_tables
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/run_time_wrappers
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/script_body_iptables_restore
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/script_body_single_rule
@@ -155,6 +159,9 @@ share/fwbuilder-%%BUILD_VERSION%%/help/en_US/pix-failover-groups-mapping.png
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/pix-statesync-group-1.png
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/pix-statesync-group-mapping.png
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.0.0.html
+share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.0.1.html
+share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.1.0.html
+share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.1.1.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/state_sync_configuration.png
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/summary.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/tip01.html
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 26b7f4481401..3370040f3472 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -5,9 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-DISTVERSION=	4.0.1
+DISTVERSION=	4.1.1
 PORTVERSION=	${DISTVERSION}
-PORTREVISION=	1
 CATEGORIES=	security
 .if defined(BUILD)
 MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-4.0/build-${BUILD}/ \
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index 9e7ba0326ea8..ab54ed8fa665 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,3 +1,3 @@
-MD5 (libfwbuilder-4.0.1.tar.gz) = 434f2c222a9b1656c1adc14315cd578e
-SHA256 (libfwbuilder-4.0.1.tar.gz) = 877723f464f08fab25ed72941a02ccff1b618a6f1d9d7fb63ebb20e136e090a6
-SIZE (libfwbuilder-4.0.1.tar.gz) = 376739
+MD5 (libfwbuilder-4.1.1.tar.gz) = f1a989c69bc65ccfef623eec391a513e
+SHA256 (libfwbuilder-4.1.1.tar.gz) = 506820ce7f3254f5c1cad3c52e9cb27dec174430946e4b90d327556aab7fefff
+SIZE (libfwbuilder-4.1.1.tar.gz) = 378640
diff --git a/security/libfwbuilder/pkg-plist b/security/libfwbuilder/pkg-plist
index c90a0cad1a44..a34a44e75c21 100644
--- a/security/libfwbuilder/pkg-plist
+++ b/security/libfwbuilder/pkg-plist
@@ -158,6 +158,7 @@ share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_12.xslt
 share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_13.xslt
 share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_14.xslt
 share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_15.xslt
+share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_16.xslt
 share/libfwbuilder-%%BUILD_VERSION%%/fwbuilder.dtd
 @dirrm share/libfwbuilder-%%BUILD_VERSION%%/migration
 @dirrm share/libfwbuilder-%%BUILD_VERSION%%