diff --git a/VERSION b/VERSION index 4006d25f2..66a583007 100644 --- a/VERSION +++ b/VERSION @@ -7,7 +7,7 @@ FWB_MICRO_VERSION=1 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3572" +BUILD_NUM="3573" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index dbc003576..5a0b9292f 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "5.0.1.3572" +#define VERSION "5.0.1.3573" #define GENERATION "5.0" diff --git a/doc/ChangeLog b/doc/ChangeLog index 2476d5291..4dcde3155 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,10 @@ +2011-08-08 Vadim Kurland + + * configlets/freebsd/rc_conf_carp_interface: see #2636 "carp : + Incorrect output in rc.conf.local format". Should use + create_args_carp0 instead of ifconfig_carp0 to set up CARP + interface vhid, pass and adskew parameters. + 2011-08-05 Vadim Kurland * RuleElement.cpp (RuleElementItf::validateChild): see #2635 diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index 0c8713359..e62242b26 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 5.0.1.3572 +%define version 5.0.1.3573 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index 32af6ded5..0d474dc19 100644 --- a/packaging/fwbuilder.control +++ b/packaging/fwbuilder.control @@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu Priority: extra Section: checkinstall Maintainer: vadim@fwbuilder.org -Version: 5.0.1.3572-1 +Version: 5.0.1.3573-1 Depends: libqt4-gui (>= 4.4.0), libqt4-network (>= 4.4.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Description: Firewall Builder GUI and policy compilers diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec index 77957f1b1..1f92d07cd 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 5.0.1.3572 +%define version 5.0.1.3573 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/res/configlets/freebsd/rc_conf_carp_interface b/src/res/configlets/freebsd/rc_conf_carp_interface index c17f76cc9..0f5815b46 100644 --- a/src/res/configlets/freebsd/rc_conf_carp_interface +++ b/src/res/configlets/freebsd/rc_conf_carp_interface @@ -18,7 +18,7 @@ ## ## Unlike in OpenBSD, in FreeBSD ifconfig does not understand carpdev parameter -ifconfig_{{$carp_interface}}="vhid {{$vhid}} pass {{$carp_password}} {{if have_advbase}} advbase {{$advbase}}{{endif}} {{if have_advskew}} advskew {{$advskew}}{{endif}}" +create_args_{{$carp_interface}}="vhid {{$vhid}} pass {{$carp_password}} {{if have_advbase}} advbase {{$advbase}}{{endif}} {{if have_advskew}} advskew {{$advskew}}{{endif}}" diff --git a/test/pf/cluster-tests.fwb b/test/pf/cluster-tests.fwb index 4562ba0a6..a4f332300 100644 --- a/test/pf/cluster-tests.fwb +++ b/test/pf/cluster-tests.fwb @@ -1,6 +1,6 @@ - + @@ -1693,6 +1693,455 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2145,7 +2594,7 @@ - + @@ -3009,7 +3458,7 @@ - + @@ -3124,7 +3573,7 @@ - + @@ -3749,6 +4198,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/pf/firewall-base-rulesets.fw.orig b/test/pf/firewall-base-rulesets.fw.orig index e5aa5fe3d..e1ebc61a9 100755 --- a/test/pf/firewall-base-rulesets.fw.orig +++ b/test/pf/firewall-base-rulesets.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:23 2011 PDT by vadim +# Generated Mon Aug 8 15:27:06 2011 PDT by vadim # # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw # files: firewall-base-rulesets.conf /etc/fw/firewall-base-rulesets.conf @@ -169,7 +169,7 @@ configure_interfaces() { update_addresses_of_interface "en2 192.168.100.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:23 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-1.fw.orig b/test/pf/firewall-ipv6-1.fw.orig index 5370f7ba1..609986719 100755 --- a/test/pf/firewall-ipv6-1.fw.orig +++ b/test/pf/firewall-ipv6-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:23 2011 PDT by vadim +# Generated Mon Aug 8 15:27:06 2011 PDT by vadim # # files: * firewall-ipv6-1.fw pf-ipv6.fw # files: firewall-ipv6-1.conf /etc/fw/pf-ipv6.conf @@ -181,7 +181,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Jul 21 14:14:23 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-2.conf.orig b/test/pf/firewall-ipv6-2.conf.orig index f2da72b09..b1db3ca87 100644 --- a/test/pf/firewall-ipv6-2.conf.orig +++ b/test/pf/firewall-ipv6-2.conf.orig @@ -5,7 +5,7 @@ # Tables: (5) table { 222.222.222.22 , 222.222.222.23 } table { 2001:5c0:0:2::24 , 3ffe:1200:2000::/36 , 3ffe:1200:2001:1:8000::1 } -table { 61.150.47.112 , 74.125.224.80 , 74.125.224.81 , 74.125.224.82 , 74.125.224.83 , 74.125.224.84 , 192.168.1.0 } +table { 61.150.47.112 , 74.125.224.112 , 74.125.224.113 , 74.125.224.114 , 74.125.224.115 , 74.125.224.116 , 192.168.1.0 } table { 2001:5c0:0:2::24 , 3ffe:1200:2001:1:8000::1 } table { 61.150.47.112 , 192.168.1.0 } diff --git a/test/pf/firewall-ipv6-2.fw.orig b/test/pf/firewall-ipv6-2.fw.orig index f80f3676a..6ebd5de8d 100755 --- a/test/pf/firewall-ipv6-2.fw.orig +++ b/test/pf/firewall-ipv6-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:24 2011 PDT by vadim +# Generated Mon Aug 8 15:27:06 2011 PDT by vadim # # files: * firewall-ipv6-2.fw pf.fw # files: firewall-ipv6-2.conf pf.conf @@ -185,7 +185,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Jul 21 14:14:24 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-3.fw.orig b/test/pf/firewall-ipv6-3.fw.orig index f7f330e66..97feb56f0 100755 --- a/test/pf/firewall-ipv6-3.fw.orig +++ b/test/pf/firewall-ipv6-3.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:24 2011 PDT by vadim +# Generated Mon Aug 8 15:27:06 2011 PDT by vadim # # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw # files: firewall-ipv6-3.conf /etc/firewall-ipv6-3.conf diff --git a/test/pf/firewall.fw.orig b/test/pf/firewall.fw.orig index e688c6189..44422aaec 100755 --- a/test/pf/firewall.fw.orig +++ b/test/pf/firewall.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:51 2011 PDT by vadim +# Generated Mon Aug 8 15:26:35 2011 PDT by vadim # # files: * firewall.fw /etc/pf.fw # files: firewall.conf /etc/pf.conf @@ -173,7 +173,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Jul 21 14:13:51 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:35 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall1.fw.orig b/test/pf/firewall1.fw.orig index 43a47eb0f..4777f6007 100755 --- a/test/pf/firewall1.fw.orig +++ b/test/pf/firewall1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:52 2011 PDT by vadim +# Generated Mon Aug 8 15:26:35 2011 PDT by vadim # # files: * firewall1.fw /etc/fw/firewall1.fw # files: firewall1.conf /etc/fw/firewall1.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:13:52 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:35 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-1.fw.orig b/test/pf/firewall10-1.fw.orig index f83cc561e..180ab87d1 100755 --- a/test/pf/firewall10-1.fw.orig +++ b/test/pf/firewall10-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:53 2011 PDT by vadim +# Generated Mon Aug 8 15:26:37 2011 PDT by vadim # # files: * firewall10-1.fw /etc/fw/firewall10-1.fw # files: firewall10-1.conf /etc/fw/firewall10-1.conf @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:13:53 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:37 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-2.fw.orig b/test/pf/firewall10-2.fw.orig index 1b2703432..3682b4fbd 100755 --- a/test/pf/firewall10-2.fw.orig +++ b/test/pf/firewall10-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:54 2011 PDT by vadim +# Generated Mon Aug 8 15:26:37 2011 PDT by vadim # # files: * firewall10-2.fw /etc/fw/firewall10-2.fw # files: firewall10-2.conf /etc/fw/firewall10-2.conf @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:13:54 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:37 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-3.fw.orig b/test/pf/firewall10-3.fw.orig index cdc935338..302d9b401 100755 --- a/test/pf/firewall10-3.fw.orig +++ b/test/pf/firewall10-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:55 2011 PDT by vadim +# Generated Mon Aug 8 15:26:40 2011 PDT by vadim # # files: * firewall10-3.fw /etc/fw/firewall10-3.fw # files: firewall10-3.conf /etc/fw/firewall10-3.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:13:55 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:40 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-4.fw.orig b/test/pf/firewall10-4.fw.orig index fd3e0df15..f758dbb3a 100755 --- a/test/pf/firewall10-4.fw.orig +++ b/test/pf/firewall10-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:58 2011 PDT by vadim +# Generated Mon Aug 8 15:26:42 2011 PDT by vadim # # files: * firewall10-4.fw /etc/fw/firewall10-4.fw # files: firewall10-4.conf /etc/fw/firewall10-4.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:13:58 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:42 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-5.fw.orig b/test/pf/firewall10-5.fw.orig index 6ab40b7aa..df70f6beb 100755 --- a/test/pf/firewall10-5.fw.orig +++ b/test/pf/firewall10-5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:00 2011 PDT by vadim +# Generated Mon Aug 8 15:26:42 2011 PDT by vadim # # files: * firewall10-5.fw /etc/fw/firewall10-5.fw # files: firewall10-5.conf /etc/fw/firewall10-5.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:00 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:42 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-6.fw.orig b/test/pf/firewall10-6.fw.orig index e96064b9e..73a15bde9 100755 --- a/test/pf/firewall10-6.fw.orig +++ b/test/pf/firewall10-6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:01 2011 PDT by vadim +# Generated Mon Aug 8 15:26:44 2011 PDT by vadim # # files: * firewall10-6.fw /etc/fw/firewall10-6.fw # files: firewall10-6.conf /etc/fw/firewall10-6.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:01 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:44 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall100.fw.orig b/test/pf/firewall100.fw.orig index 293040bb8..638b7072c 100755 --- a/test/pf/firewall100.fw.orig +++ b/test/pf/firewall100.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:52 2011 PDT by vadim +# Generated Mon Aug 8 15:26:35 2011 PDT by vadim # # files: * firewall100.fw /etc/fw/pf.fw # files: firewall100.conf /etc/fw/path\ with\ space/pf.conf @@ -167,7 +167,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:13:52 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:35 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall101.fw.orig b/test/pf/firewall101.fw.orig index 0aaaba196..89d71a7d7 100755 --- a/test/pf/firewall101.fw.orig +++ b/test/pf/firewall101.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:53 2011 PDT by vadim +# Generated Mon Aug 8 15:26:37 2011 PDT by vadim # # files: * firewall101.fw /etc/fw/pf.fw # files: firewall101.conf /etc/fw/path\ with\ space/pf.conf @@ -170,7 +170,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:13:53 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:37 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall102.fw.orig b/test/pf/firewall102.fw.orig index 77c2d1956..64d327c91 100755 --- a/test/pf/firewall102.fw.orig +++ b/test/pf/firewall102.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:54 2011 PDT by vadim +# Generated Mon Aug 8 15:26:37 2011 PDT by vadim # # files: * firewall102.fw /etc/fw/pf.fw # files: firewall102.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall103-1.fw.orig b/test/pf/firewall103-1.fw.orig index 1d5b32758..924d2d345 100755 --- a/test/pf/firewall103-1.fw.orig +++ b/test/pf/firewall103-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:56 2011 PDT by vadim +# Generated Mon Aug 8 15:26:40 2011 PDT by vadim # # files: * firewall103-1.fw /etc/fw/pf.fw # files: firewall103-1.conf /etc/fw/path\ with\ space/pf.conf @@ -394,7 +394,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:13:56 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:40 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall103-2.fw.orig b/test/pf/firewall103-2.fw.orig index dff178bf5..8e71b4ceb 100755 --- a/test/pf/firewall103-2.fw.orig +++ b/test/pf/firewall103-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:57 2011 PDT by vadim +# Generated Mon Aug 8 15:26:40 2011 PDT by vadim # # files: * firewall103-2.fw /etc/fw/pf.fw # files: firewall103-2.conf /etc/fw/path\ with\ space/pf.conf @@ -394,7 +394,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:13:57 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:40 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall103.fw.orig b/test/pf/firewall103.fw.orig index 57ac0d218..f58140661 100755 --- a/test/pf/firewall103.fw.orig +++ b/test/pf/firewall103.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:55 2011 PDT by vadim +# Generated Mon Aug 8 15:26:39 2011 PDT by vadim # # files: * firewall103.fw /etc/fw/pf.fw # files: firewall103.conf /etc/fw/path\ with\ space/pf.conf @@ -397,7 +397,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:13:55 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:39 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall104-1.fw.orig b/test/pf/firewall104-1.fw.orig index 380ca8a1a..9361dc3d0 100755 --- a/test/pf/firewall104-1.fw.orig +++ b/test/pf/firewall104-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:58 2011 PDT by vadim +# Generated Mon Aug 8 15:26:42 2011 PDT by vadim # # files: * firewall104-1.fw /etc/fw/pf.fw # files: firewall104-1.conf /etc/fw/path\ with\ space/pf.conf @@ -393,7 +393,7 @@ configure_interfaces() { $IFCONFIG bridge0 -stp em3 } -log "Activating firewall script generated Thu Jul 21 14:13:58 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:42 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall104.fw.orig b/test/pf/firewall104.fw.orig index 0641078f5..ea2779e15 100755 --- a/test/pf/firewall104.fw.orig +++ b/test/pf/firewall104.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:57 2011 PDT by vadim +# Generated Mon Aug 8 15:26:41 2011 PDT by vadim # # files: * firewall104.fw /etc/fw/pf.fw # files: firewall104.conf /etc/fw/path\ with\ space/pf.conf @@ -396,7 +396,7 @@ configure_interfaces() { $IFCONFIG bridge0 stp em3 } -log "Activating firewall script generated Thu Jul 21 14:13:57 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:41 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall105.fw.orig b/test/pf/firewall105.fw.orig index 0bf7a54ec..9a081b96e 100755 --- a/test/pf/firewall105.fw.orig +++ b/test/pf/firewall105.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:13:59 2011 PDT by vadim +# Generated Mon Aug 8 15:26:42 2011 PDT by vadim # # files: * firewall105.fw /etc/fw/pf.fw # files: firewall105.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall106.fw.orig b/test/pf/firewall106.fw.orig index 19aa95356..9723f3636 100755 --- a/test/pf/firewall106.fw.orig +++ b/test/pf/firewall106.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:00 2011 PDT by vadim +# Generated Mon Aug 8 15:26:44 2011 PDT by vadim # # files: * firewall106.fw /etc/fw/pf.fw # files: firewall106.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall107.fw.orig b/test/pf/firewall107.fw.orig index 871e8b13d..876fa62cd 100755 --- a/test/pf/firewall107.fw.orig +++ b/test/pf/firewall107.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:01 2011 PDT by vadim +# Generated Mon Aug 8 15:26:44 2011 PDT by vadim # # files: * firewall107.fw /etc/fw/pf.fw # files: firewall107.conf /etc/fw/path\ with\ space/pf.conf @@ -395,7 +395,7 @@ configure_interfaces() { update_addresses_of_interface "vlan102 192.168.102.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:01 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:44 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall108.fw.orig b/test/pf/firewall108.fw.orig index fc76e93ad..23497736c 100755 --- a/test/pf/firewall108.fw.orig +++ b/test/pf/firewall108.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:02 2011 PDT by vadim +# Generated Mon Aug 8 15:26:44 2011 PDT by vadim # # files: * firewall108.fw /etc/fw/pf.fw # files: firewall108.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall109-1.fw.orig b/test/pf/firewall109-1.fw.orig index e208bc37a..e2c562937 100755 --- a/test/pf/firewall109-1.fw.orig +++ b/test/pf/firewall109-1.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:03 2011 PDT by vadim +# Generated Mon Aug 8 15:26:46 2011 PDT by vadim # # files: * firewall109-1.fw /etc/fw/pf.fw # files: firewall109-1.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall109-2.fw.orig b/test/pf/firewall109-2.fw.orig index eaa082727..d08088ace 100755 --- a/test/pf/firewall109-2.fw.orig +++ b/test/pf/firewall109-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:03 2011 PDT by vadim +# Generated Mon Aug 8 15:26:46 2011 PDT by vadim # # files: * firewall109-2.fw /etc/fw/pf.fw # files: firewall109-2.conf /etc/fw/path\ with\ space/pf.conf @@ -400,7 +400,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:03 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall109-3.fw.orig b/test/pf/firewall109-3.fw.orig index f9c31c026..085181b02 100755 --- a/test/pf/firewall109-3.fw.orig +++ b/test/pf/firewall109-3.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:04 2011 PDT by vadim +# Generated Mon Aug 8 15:26:46 2011 PDT by vadim # # files: * firewall109-3.fw /etc/fw/pf.fw # files: firewall109-3.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall109.fw.orig b/test/pf/firewall109.fw.orig index 1101cefc4..60da08a06 100755 --- a/test/pf/firewall109.fw.orig +++ b/test/pf/firewall109.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:02 2011 PDT by vadim +# Generated Mon Aug 8 15:26:46 2011 PDT by vadim # # files: * firewall109.fw /etc/fw/pf.fw # files: firewall109.conf /etc/fw/path\ with\ space/pf.conf @@ -401,7 +401,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:02 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall11.fw.orig b/test/pf/firewall11.fw.orig index d65725ded..6b8c22102 100755 --- a/test/pf/firewall11.fw.orig +++ b/test/pf/firewall11.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:04 2011 PDT by vadim +# Generated Mon Aug 8 15:26:48 2011 PDT by vadim # # files: * firewall11.fw /etc/firewall11.fw # files: firewall11.conf /etc/firewall11.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:04 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall110.fw.orig b/test/pf/firewall110.fw.orig index 549f77266..c0917446d 100755 --- a/test/pf/firewall110.fw.orig +++ b/test/pf/firewall110.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:05 2011 PDT by vadim +# Generated Mon Aug 8 15:26:48 2011 PDT by vadim # # files: * firewall110.fw /etc/fw/firewall110.fw # files: firewall110.conf /etc/fw/firewall110.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:05 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall111.fw.orig b/test/pf/firewall111.fw.orig index b12e2f22f..98362cc96 100755 --- a/test/pf/firewall111.fw.orig +++ b/test/pf/firewall111.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:05 2011 PDT by vadim +# Generated Mon Aug 8 15:26:48 2011 PDT by vadim # # files: * firewall111.fw /etc/fw/firewall111.fw # files: firewall111.conf /etc/fw/firewall111.conf @@ -86,7 +86,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:05 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall12.fw.orig b/test/pf/firewall12.fw.orig index 900ec1f05..d790bb593 100755 --- a/test/pf/firewall12.fw.orig +++ b/test/pf/firewall12.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:06 2011 PDT by vadim +# Generated Mon Aug 8 15:26:48 2011 PDT by vadim # # files: * firewall12.fw /etc/fw/firewall12.fw # files: firewall12.conf /etc/fw/firewall12.conf @@ -165,7 +165,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Jul 21 14:14:06 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall13.fw.orig b/test/pf/firewall13.fw.orig index 1684a1713..c5534f693 100755 --- a/test/pf/firewall13.fw.orig +++ b/test/pf/firewall13.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:06 2011 PDT by vadim +# Generated Mon Aug 8 15:26:49 2011 PDT by vadim # # files: * firewall13.fw /etc/fw/firewall13.fw # files: firewall13.conf /etc/fw/firewall13.conf @@ -88,7 +88,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:06 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:49 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14-1.fw.orig b/test/pf/firewall14-1.fw.orig index cc0306b89..f0cd10224 100755 --- a/test/pf/firewall14-1.fw.orig +++ b/test/pf/firewall14-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:07 2011 PDT by vadim +# Generated Mon Aug 8 15:26:51 2011 PDT by vadim # # files: * firewall14-1.fw /etc/firewall14-1.fw # files: firewall14-1.conf /etc/firewall14-1.conf @@ -248,7 +248,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:07 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:51 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14.fw.orig b/test/pf/firewall14.fw.orig index 219c6d039..241185c97 100755 --- a/test/pf/firewall14.fw.orig +++ b/test/pf/firewall14.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:07 2011 PDT by vadim +# Generated Mon Aug 8 15:26:50 2011 PDT by vadim # # files: * firewall14.fw /etc/firewall14.fw # files: firewall14.conf /etc/firewall14.conf @@ -248,7 +248,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:07 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:50 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2-1.fw.orig b/test/pf/firewall2-1.fw.orig index c8d8ac955..fe97e9100 100755 --- a/test/pf/firewall2-1.fw.orig +++ b/test/pf/firewall2-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:09 2011 PDT by vadim +# Generated Mon Aug 8 15:26:53 2011 PDT by vadim # # files: * firewall2-1.fw /etc/fw/firewall2-1.fw # files: firewall2-1.conf /etc/fw/firewall2-1.conf @@ -88,7 +88,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:09 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:53 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2-6.fw.orig b/test/pf/firewall2-6.fw.orig index d4999ef46..c123bb06e 100755 --- a/test/pf/firewall2-6.fw.orig +++ b/test/pf/firewall2-6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:10 2011 PDT by vadim +# Generated Mon Aug 8 15:26:53 2011 PDT by vadim # # files: * firewall2-6.fw /etc/firewall2-6.fw # files: firewall2-6.conf /etc/firewall2-6.conf @@ -170,7 +170,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Jul 21 14:14:10 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:53 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2.fw.orig b/test/pf/firewall2.fw.orig index 5179a55d8..b3506eeb0 100755 --- a/test/pf/firewall2.fw.orig +++ b/test/pf/firewall2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:08 2011 PDT by vadim +# Generated Mon Aug 8 15:26:51 2011 PDT by vadim # # files: * firewall2.fw /etc/fw/firewall2.fw # files: firewall2.conf /etc/fw/firewall2.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:08 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:51 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall20.fw.orig b/test/pf/firewall20.fw.orig index 9ab32e6da..d845c8a82 100755 --- a/test/pf/firewall20.fw.orig +++ b/test/pf/firewall20.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:08 2011 PDT by vadim +# Generated Mon Aug 8 15:26:51 2011 PDT by vadim # # files: * firewall20.fw /etc/fw/firewall20.fw # files: firewall20.conf /etc/fw/firewall20.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:08 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:51 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall21.fw.orig b/test/pf/firewall21.fw.orig index c21685a5e..34d31fd43 100755 --- a/test/pf/firewall21.fw.orig +++ b/test/pf/firewall21.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:09 2011 PDT by vadim +# Generated Mon Aug 8 15:26:52 2011 PDT by vadim # # files: * firewall21.fw /etc/fw/firewall21.fw # files: firewall21.conf /etc/fw/firewall21.conf @@ -81,7 +81,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:09 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:52 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall22.fw.orig b/test/pf/firewall22.fw.orig index 3827a866a..0429ead75 100755 --- a/test/pf/firewall22.fw.orig +++ b/test/pf/firewall22.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:10 2011 PDT by vadim +# Generated Mon Aug 8 15:26:53 2011 PDT by vadim # # files: * firewall22.fw /etc/fw/firewall22.fw # files: firewall22.conf /etc/fw/firewall22.conf @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:10 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:53 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall3.fw.orig b/test/pf/firewall3.fw.orig index c8b31ece2..e1464a714 100755 --- a/test/pf/firewall3.fw.orig +++ b/test/pf/firewall3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:11 2011 PDT by vadim +# Generated Mon Aug 8 15:26:54 2011 PDT by vadim # # files: * firewall3.fw /etc/firewall3.fw # files: firewall3.conf /etc/firewall3.conf @@ -165,7 +165,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Jul 21 14:14:11 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:54 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall33.conf.orig b/test/pf/firewall33.conf.orig index 5c8597e2c..f1bb54960 100644 --- a/test/pf/firewall33.conf.orig +++ b/test/pf/firewall33.conf.orig @@ -6,7 +6,7 @@ table { 157.166.224.25 , 157.166.224.26 , 157.166.226.25 , 157.166.226.26 , 157.166.255.18 , 157.166.255.19 } table { www.google.com , 157.166.224.25 , 157.166.224.26 , 157.166.226.25 , 157.166.226.26 , 157.166.255.18 , 157.166.255.19 } table { www.google.com , www.cnn.com } -table { 74.125.224.80 , 74.125.224.81 , 74.125.224.82 , 74.125.224.83 , 74.125.224.84 , 157.166.224.25 , 157.166.224.26 , 157.166.226.25 , 157.166.226.26 , 157.166.255.18 , 157.166.255.19 } +table { 74.125.224.112 , 74.125.224.113 , 74.125.224.114 , 74.125.224.115 , 74.125.224.116 , 157.166.224.25 , 157.166.224.26 , 157.166.226.25 , 157.166.226.26 , 157.166.255.18 , 157.166.255.19 } # # Rule 0 (NAT) diff --git a/test/pf/firewall33.fw.orig b/test/pf/firewall33.fw.orig index e282b0511..1b6348494 100755 --- a/test/pf/firewall33.fw.orig +++ b/test/pf/firewall33.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:11 2011 PDT by vadim +# Generated Mon Aug 8 15:26:55 2011 PDT by vadim # # files: * firewall33.fw /etc/fw/firewall33.fw # files: firewall33.conf /etc/fw/firewall33.conf @@ -168,7 +168,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Jul 21 14:14:11 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall34.fw.orig b/test/pf/firewall34.fw.orig index 52a6b15c2..c5a51896d 100755 --- a/test/pf/firewall34.fw.orig +++ b/test/pf/firewall34.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:21:46 2011 PDT by vadim +# Generated Mon Aug 8 15:26:55 2011 PDT by vadim # # files: * firewall34.fw /etc/fw/firewall34.fw # files: firewall34.conf /etc/fw/firewall34.conf @@ -164,7 +164,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Jul 21 14:21:46 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall38.fw.orig b/test/pf/firewall38.fw.orig index 347504dbf..16c0d26e4 100755 --- a/test/pf/firewall38.fw.orig +++ b/test/pf/firewall38.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:12 2011 PDT by vadim +# Generated Mon Aug 8 15:26:55 2011 PDT by vadim # # files: * firewall38.fw /etc/fw/firewall38.fw # files: firewall38.conf /etc/fw/firewall38.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:12 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall39.fw.orig b/test/pf/firewall39.fw.orig index eced6c13a..0cc037cbb 100755 --- a/test/pf/firewall39.fw.orig +++ b/test/pf/firewall39.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:13 2011 PDT by vadim +# Generated Mon Aug 8 15:26:55 2011 PDT by vadim # # files: * firewall39.fw pf.fw # files: firewall39.conf pf.conf @@ -79,7 +79,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:13 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall4.fw.orig b/test/pf/firewall4.fw.orig index 7ef5d3172..8c7743d36 100755 --- a/test/pf/firewall4.fw.orig +++ b/test/pf/firewall4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:14 2011 PDT by vadim +# Generated Mon Aug 8 15:26:57 2011 PDT by vadim # # files: * firewall4.fw pf.fw # files: firewall4.conf /etc/fw/pf.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:14 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:57 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40-1.fw.orig b/test/pf/firewall40-1.fw.orig index c35cc65e0..dcf583663 100755 --- a/test/pf/firewall40-1.fw.orig +++ b/test/pf/firewall40-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:15 2011 PDT by vadim +# Generated Mon Aug 8 15:26:57 2011 PDT by vadim # # files: * firewall40-1.fw /etc/firewall40-1.fw # files: firewall40-1.conf /etc/firewall40-1.conf @@ -182,7 +182,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Jul 21 14:14:15 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:57 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40-2.fw.orig b/test/pf/firewall40-2.fw.orig index 0fa248c5c..39cc21fc3 100755 --- a/test/pf/firewall40-2.fw.orig +++ b/test/pf/firewall40-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:15 2011 PDT by vadim +# Generated Mon Aug 8 15:26:57 2011 PDT by vadim # # files: * firewall40-2.fw /etc/firewall40-2.fw # files: firewall40-2.conf /etc/firewall40-2.conf @@ -166,7 +166,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Jul 21 14:14:15 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:57 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40.fw.orig b/test/pf/firewall40.fw.orig index f4cb43bd9..3140e9a47 100755 --- a/test/pf/firewall40.fw.orig +++ b/test/pf/firewall40.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:14 2011 PDT by vadim +# Generated Mon Aug 8 15:26:57 2011 PDT by vadim # # files: * firewall40.fw /etc/firewall40.fw # files: firewall40.conf /etc/firewall40.conf @@ -166,7 +166,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Jul 21 14:14:14 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:57 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall41.fw.orig b/test/pf/firewall41.fw.orig index b634ff53f..3943941e6 100755 --- a/test/pf/firewall41.fw.orig +++ b/test/pf/firewall41.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:16 2011 PDT by vadim +# Generated Mon Aug 8 15:26:58 2011 PDT by vadim # # files: * firewall41.fw /etc/firewall41.fw # files: firewall41.conf /etc/firewall41.conf @@ -169,7 +169,7 @@ configure_interfaces() { update_addresses_of_interface "eth1 2.2.2.2/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:16 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:58 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall5.fw.orig b/test/pf/firewall5.fw.orig index d795fd970..aeb7a35f2 100755 --- a/test/pf/firewall5.fw.orig +++ b/test/pf/firewall5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:16 2011 PDT by vadim +# Generated Mon Aug 8 15:26:59 2011 PDT by vadim # # files: * firewall5.fw /etc/fw/firewall5.fw # files: firewall5.conf /etc/fw/firewall5.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:16 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:26:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall51.fw.orig b/test/pf/firewall51.fw.orig index 35ab875a9..c217d5248 100755 --- a/test/pf/firewall51.fw.orig +++ b/test/pf/firewall51.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:17 2011 PDT by vadim +# Generated Mon Aug 8 15:27:00 2011 PDT by vadim # # files: * firewall51.fw /etc/fw/firewall51.fw # files: firewall51.conf /etc/fw/firewall51.conf @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:17 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall6.fw.orig b/test/pf/firewall6.fw.orig index 4b613b012..3a69fb132 100755 --- a/test/pf/firewall6.fw.orig +++ b/test/pf/firewall6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:17 2011 PDT by vadim +# Generated Mon Aug 8 15:27:00 2011 PDT by vadim # # files: * firewall6.fw /etc/fw/firewall6.fw # files: firewall6.conf /etc/fw/firewall6.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:17 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall62.fw.orig b/test/pf/firewall62.fw.orig index 4dbcc42f5..cb7b68af8 100755 --- a/test/pf/firewall62.fw.orig +++ b/test/pf/firewall62.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:18 2011 PDT by vadim +# Generated Mon Aug 8 15:27:00 2011 PDT by vadim # # files: * firewall62.fw /etc/firewall62.fw # files: firewall62.conf /etc/firewall62.conf @@ -191,7 +191,7 @@ configure_interfaces() { update_addresses_of_interface "en1 222.222.222.222/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:18 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall63.fw.orig b/test/pf/firewall63.fw.orig index ee83b22e5..35c351b59 100755 --- a/test/pf/firewall63.fw.orig +++ b/test/pf/firewall63.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:18 2011 PDT by vadim +# Generated Mon Aug 8 15:27:01 2011 PDT by vadim # # files: * firewall63.fw /etc/fw/firewall63.fw # files: firewall63.conf /etc/fw/firewall63.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:18 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:01 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall7.fw.orig b/test/pf/firewall7.fw.orig index 55cb0aaa7..1bfbd45c7 100755 --- a/test/pf/firewall7.fw.orig +++ b/test/pf/firewall7.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:19 2011 PDT by vadim +# Generated Mon Aug 8 15:27:02 2011 PDT by vadim # # files: * firewall7.fw /etc/fw/firewall7.fw # files: firewall7.conf /etc/fw/firewall7.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:19 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:02 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall70.fw.orig b/test/pf/firewall70.fw.orig index 19d40e5b4..a6889a620 100755 --- a/test/pf/firewall70.fw.orig +++ b/test/pf/firewall70.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:19 2011 PDT by vadim +# Generated Mon Aug 8 15:27:02 2011 PDT by vadim # # files: * firewall70.fw /etc/fw/firewall70.fw # files: firewall70.conf /etc/fw/firewall70.conf @@ -82,7 +82,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:19 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:02 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall8.fw.orig b/test/pf/firewall8.fw.orig index 52d9434fb..1ae09b78b 100755 --- a/test/pf/firewall8.fw.orig +++ b/test/pf/firewall8.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:20 2011 PDT by vadim +# Generated Mon Aug 8 15:27:02 2011 PDT by vadim # # files: * firewall8.fw /etc/firewall8.fw # files: firewall8.conf /etc/firewall8.conf @@ -72,7 +72,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:20 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:02 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80-4.5.fw.orig b/test/pf/firewall80-4.5.fw.orig index 1879d42e8..a7cb44dcb 100755 --- a/test/pf/firewall80-4.5.fw.orig +++ b/test/pf/firewall80-4.5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:21 2011 PDT by vadim +# Generated Mon Aug 8 15:27:04 2011 PDT by vadim # # files: * firewall80-4.5.fw /etc/firewall80-4.5.fw # files: firewall80-4.5.conf /etc/firewall80-4.5.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:21 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:04 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80.fw.orig b/test/pf/firewall80.fw.orig index ede22f67f..93c7bcdd9 100755 --- a/test/pf/firewall80.fw.orig +++ b/test/pf/firewall80.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:20 2011 PDT by vadim +# Generated Mon Aug 8 15:27:03 2011 PDT by vadim # # files: * firewall80.fw /etc/firewall80.fw # files: firewall80.conf /etc/firewall80.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:20 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall9.fw.orig b/test/pf/firewall9.fw.orig index 142211698..114740cc4 100755 --- a/test/pf/firewall9.fw.orig +++ b/test/pf/firewall9.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:21 2011 PDT by vadim +# Generated Mon Aug 8 15:27:04 2011 PDT by vadim # # files: * firewall9.fw /etc/fw/firewall9.fw # files: firewall9.conf /etc/fw/firewall9.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Jul 21 14:14:21 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:04 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall91.fw.orig b/test/pf/firewall91.fw.orig index d191c6984..46afb612b 100755 --- a/test/pf/firewall91.fw.orig +++ b/test/pf/firewall91.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:22 2011 PDT by vadim +# Generated Mon Aug 8 15:27:04 2011 PDT by vadim # # files: * firewall91.fw /etc/fw/pf.fw # files: firewall91.conf /etc/fw/pf.conf @@ -247,7 +247,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:22 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:04 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall92.fw.orig b/test/pf/firewall92.fw.orig index 4e5e16cb5..fc2b7a891 100755 --- a/test/pf/firewall92.fw.orig +++ b/test/pf/firewall92.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:22 2011 PDT by vadim +# Generated Mon Aug 8 15:27:05 2011 PDT by vadim # # files: * firewall92.fw /etc/fw/pf.fw # files: firewall92.conf /etc/fw/path\ with\ space/pf.conf @@ -166,7 +166,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:22 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:05 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_1_openbsd-1.fw.orig b/test/pf/pf_cluster_1_openbsd-1.fw.orig index 18c8b8b89..16d9e036c 100755 --- a/test/pf/pf_cluster_1_openbsd-1.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:24 2011 PDT by vadim +# Generated Mon Aug 8 15:27:06 2011 PDT by vadim # # files: * pf_cluster_1_openbsd-1.fw /etc/pf_cluster_1_openbsd-1.fw # files: pf_cluster_1_openbsd-1.conf /etc/pf_cluster_1_openbsd-1.conf @@ -299,7 +299,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:24 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_1_openbsd-2.fw.orig b/test/pf/pf_cluster_1_openbsd-2.fw.orig index 64360c130..7ccd496c4 100755 --- a/test/pf/pf_cluster_1_openbsd-2.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:24 2011 PDT by vadim +# Generated Mon Aug 8 15:27:06 2011 PDT by vadim # # files: * pf_cluster_1_openbsd-2.fw /etc/pf_cluster_1_openbsd-2.fw # files: pf_cluster_1_openbsd-2.conf /etc/pf_cluster_1_openbsd-2.conf @@ -195,7 +195,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:24 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_2_freebsd-1.fw.orig b/test/pf/pf_cluster_2_freebsd-1.fw.orig index d955d9f90..69005fa3c 100755 --- a/test/pf/pf_cluster_2_freebsd-1.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-1.fw.orig @@ -2,14 +2,14 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:24 2011 PDT by vadim +# Generated Mon Aug 8 15:27:06 2011 PDT by vadim # # files: * pf_cluster_2_freebsd-1.fw /etc/pf_cluster_2_freebsd-1.fw # files: pf_cluster_2_freebsd-1.conf /etc/pf_cluster_2_freebsd-1.conf # -# Compiled for pf 4.x +# Compiled for pf 4.0 # @@ -301,7 +301,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:24 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_2_freebsd-2.fw.orig b/test/pf/pf_cluster_2_freebsd-2.fw.orig index d94dabb09..145d5c338 100755 --- a/test/pf/pf_cluster_2_freebsd-2.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-2.fw.orig @@ -2,14 +2,14 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:24 2011 PDT by vadim +# Generated Mon Aug 8 15:27:06 2011 PDT by vadim # # files: * pf_cluster_2_freebsd-2.fw /etc/pf_cluster_2_freebsd-2.fw # files: pf_cluster_2_freebsd-2.conf /etc/pf_cluster_2_freebsd-2.conf # -# Compiled for pf 4.x +# Compiled for pf 4.0 # @@ -197,7 +197,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:24 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_3_openbsd-3.fw.orig b/test/pf/pf_cluster_3_openbsd-3.fw.orig index ea0ab7016..d73bf24f9 100755 --- a/test/pf/pf_cluster_3_openbsd-3.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:24 2011 PDT by vadim +# Generated Mon Aug 8 15:27:06 2011 PDT by vadim # # files: * pf_cluster_3_openbsd-3.fw /etc/pf_cluster_3_openbsd-3.fw # files: pf_cluster_3_openbsd-3.conf /etc/pf_cluster_3_openbsd-3.conf @@ -302,7 +302,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:24 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_3_openbsd-4.fw.orig b/test/pf/pf_cluster_3_openbsd-4.fw.orig index 65d903834..e7494e3f0 100755 --- a/test/pf/pf_cluster_3_openbsd-4.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:24 2011 PDT by vadim +# Generated Mon Aug 8 15:27:07 2011 PDT by vadim # # files: * pf_cluster_3_openbsd-4.fw /etc/pf_cluster_3_openbsd-4.fw # files: pf_cluster_3_openbsd-4.conf /etc/pf_cluster_3_openbsd-4.conf @@ -199,7 +199,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:24 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:07 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_4_rc.conf.local b/test/pf/pf_cluster_4_rc.conf.local.orig similarity index 75% rename from test/pf/pf_cluster_4_rc.conf.local rename to test/pf/pf_cluster_4_rc.conf.local.orig index 0ff8fd890..ce6bcb06b 100755 --- a/test/pf/pf_cluster_4_rc.conf.local +++ b/test/pf/pf_cluster_4_rc.conf.local.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3561 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Mon Jul 11 18:37:15 2011 PDT by vadim +# Generated Mon Aug 8 15:27:07 2011 PDT by vadim # # files: * pf_cluster_4_rc.conf.local /etc/pf_cluster_4_rc.conf.local # files: pf_cluster_4_pf.conf /etc/pf_cluster_4_pf.conf @@ -23,9 +23,9 @@ pfsync_syncdev="en0" pfsync_syncpeer="172.24.0.2" ifconfig_en0="172.24.0.3 netmask 0xffffff00" ifconfig_en1="192.168.1.3 netmask 0xffffff00" -ifconfig_carp0="vhid 101 pass secret advskew 10" +create_args_carp0="vhid 101 pass secret advskew 10" ifconfig_carp0="172.24.0.1 netmask 0xffffff00" -ifconfig_carp1="vhid 100 pass secret advskew 10" +create_args_carp1="vhid 100 pass secret advskew 10" ifconfig_carp1="192.168.1.1 netmask 0xffffff00" pfsync_enable="YES" diff --git a/test/pf/pf_cluster_5_openbsd-3.fw.orig b/test/pf/pf_cluster_5_openbsd-3.fw.orig index eb127600c..c2d899cb5 100755 --- a/test/pf/pf_cluster_5_openbsd-3.fw.orig +++ b/test/pf/pf_cluster_5_openbsd-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:25 2011 PDT by vadim +# Generated Mon Aug 8 15:27:07 2011 PDT by vadim # # files: * pf_cluster_5_openbsd-3.fw /etc/pf_cluster_5_openbsd-3.fw # files: pf_cluster_5_openbsd-3.conf /etc/pf_cluster_5_openbsd-3.conf @@ -302,7 +302,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:25 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:07 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_5_openbsd-4.fw.orig b/test/pf/pf_cluster_5_openbsd-4.fw.orig index 70245e568..e29850310 100755 --- a/test/pf/pf_cluster_5_openbsd-4.fw.orig +++ b/test/pf/pf_cluster_5_openbsd-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3566 +# Firewall Builder fwb_pf v5.0.1.3572 # -# Generated Thu Jul 21 14:14:25 2011 PDT by vadim +# Generated Mon Aug 8 15:27:07 2011 PDT by vadim # # files: * pf_cluster_5_openbsd-4.fw /etc/pf_cluster_5_openbsd-4.fw # files: pf_cluster_5_openbsd-4.conf /etc/pf_cluster_5_openbsd-4.conf @@ -199,7 +199,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Thu Jul 21 14:14:25 2011 by vadim" +log "Activating firewall script generated Mon Aug 8 15:27:07 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/quick-cmp.sh b/test/pf/quick-cmp.sh index 5fa4221ac..ca4c241b6 100755 --- a/test/pf/quick-cmp.sh +++ b/test/pf/quick-cmp.sh @@ -3,7 +3,7 @@ DIFFCMD="diff -C 5 -c -b -B -w -I \"# Generated\" -I 'Activating ' -I '# Firewall Builder fwb_pf v' -I 'Can not find file' -I '====' -I 'log '" -for f in $(ls *.fw.orig *.conf.orig) +for f in $(ls *.fw.orig *rc.conf*.orig *.conf.orig) do V="$f <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" echo "echo \"$V\" | cut -c1-72" diff --git a/test/pf/recycle b/test/pf/recycle index 5f94b137d..b65e615ec 100755 --- a/test/pf/recycle +++ b/test/pf/recycle @@ -1,6 +1,6 @@ #!/bin/sh -for f in *.fw; do +for f in *.fw *rc.conf*; do j=${f}.orig mv $f $j done