fwbuilder-commits Mailing List for Firewall Builder

Brought to you by: mikehorn

fwbuilder-commits — CVS commits

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (127)	Nov (180)	Dec (287)
2002	Jan (350)	Feb (258)	Mar (286)	Apr (225)	May (175)	Jun (160)	Jul (284)	Aug (315)	Sep (379)	Oct (184)	Nov (167)	Dec (198)
2003	Jan (244)	Feb (111)	Mar (239)	Apr (211)	May (56)	Jun (120)	Jul (70)	Aug (160)	Sep (68)	Oct (93)	Nov (77)	Dec (232)
2004	Jan (91)	Feb (68)	Mar (415)	Apr (192)	May (317)	Jun (276)	Jul (113)	Aug (122)	Sep (156)	Oct (74)	Nov (72)	Dec (124)
2005	Jan (80)	Feb (56)	Mar (39)	Apr (56)	May (60)	Jun (19)	Jul (63)	Aug (21)	Sep (110)	Oct (63)	Nov (73)	Dec (62)
2006	Jan (80)	Feb (74)	Mar (115)	Apr (68)	May (130)	Jun (98)	Jul (49)	Aug (59)	Sep (100)	Oct (86)	Nov (57)	Dec (28)
2007	Jan (56)	Feb (40)	Mar (28)	Apr (30)	May (189)	Jun (46)	Jul (55)	Aug (31)	Sep (11)	Oct (29)	Nov (12)	Dec (49)
2008	Jan (5)	Feb (29)	Mar (36)	Apr (10)	May (50)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2009	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (78)	Sep (171)	Oct (158)	Nov (350)	Dec (335)
2010	Jan (191)	Feb (209)	Mar (174)	Apr (85)	May (79)	Jun (112)	Jul (132)	Aug (78)	Sep (49)	Oct (61)	Nov (86)	Dec (40)
2011	Jan (186)	Feb (209)	Mar (227)	Apr (159)	May (122)	Jun (121)	Jul (103)	Aug (37)	Sep (17)	Oct (10)	Nov (28)	Dec (10)
2012	Jan (4)	Feb (11)	Mar (9)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

1 2 3 .. 531 > >> (Page 1 of 531)

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, builds, updated. v5.0.1-22-g4f9883f

From: <gi...@ir...> - 2012-03-20 00:43:52

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, builds has been updated
       via  4f9883fe28e1c40dca5906109a56dfa6eedfc028 (commit)
      from  a576ebac58a7999861d400c064a47cba3840a3e1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                   |    1 -
 qmake.inc.in => qmake.inc                    |   38 +++++++++++++-------------
 src/libfwbuilder/{qmake.inc.in => qmake.inc} |   24 ++++++++--------
 3 files changed, 31 insertions(+), 32 deletions(-)
 copy qmake.inc.in => qmake.inc (55%)
 copy src/libfwbuilder/{qmake.inc.in => qmake.inc} (54%)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-22-g4f9883f

From: <gi...@ir...> - 2012-03-20 00:43:44

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  4f9883fe28e1c40dca5906109a56dfa6eedfc028 (commit)
      from  a576ebac58a7999861d400c064a47cba3840a3e1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f9883fe28e1c40dca5906109a56dfa6eedfc028
Author: Vadim Kurland <va...@ne...>
Date:   Mon Mar 19 17:12:16 2012 -0700

    adding qmake.inc files needed for the build on windows

diff --git a/.gitignore b/.gitignore
index 7ae5cf1..fc74d31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,6 @@ fwb_procurve_acl
 transfer_secuwall
 .configure_marker
 .build_marker
-qmake.inc
 src/unit_tests/*/*Test
 src/unit_tests/*/*Tests
 src/unit_tests/*/*.output
diff --git a/qmake.inc b/qmake.inc
new file mode 100644
index 0000000..5b07c31
--- /dev/null
+++ b/qmake.inc
@@ -0,0 +1,89 @@
+#-*- mode: makefile; tab-width: 4; -*-
+#
+########## fwbuilder/qmake.inc.in
+#
+QTDIR = $$(QTDIR)
+TEMPLATE = app
+DEFINES += $$(DEFINES)
+LANGUAGE = C++
+UI_DIR = ui
+MANDIR = /usr/local/share/man/
+DOCDIR = /usr/local/share/doc/fwbuilder-5.1.0.3598
+
+HAVE_QTDBUS = @HAVE_QTDBUS@
+HAVE_CPPUNIT = 1
+CPPUNIT_CFLAGS = 
+CPPUNIT_LIBS = -lcppunit -ldl
+
+# CONFIG -= nostrip
+# CONFIG += release
+CONFIG += debug
+
+unix {
+    PREFIX = /usr/local
+
+    ANTLR_INCLUDEPATH =  /home/vadim/src/v4/build/source/fwbuilder/src/
+    ANTLR_LIBS =  /home/vadim/src/v4/build/source/fwbuilder/src/antlr/libantlr.a
+
+    QMAKE_CXX = /usr/bin/ccache  $$QMAKE_CXX
+
+    INCLUDEPATH += .. ../..
+    INCLUDEPATH += /usr/include/libxml2 
+    LIBS += -pthread -lxml2  -L/usr/lib -lxslt -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp  -lz -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp -lutil 
+
+    UI_DIR = .ui
+    MOC_DIR = .moc
+    OBJECTS_DIR = .obj
+
+    QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+    QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+    QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
+    QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
+
+    !macx {
+
+        exec_prefix = @EXEC_PREFIX@
+        DESTDIR =
+        ICONSDIR = /usr/local/share//icons/hicolor/
+
+        target.path = $$PREFIX/bin
+        dtd.path = /usr/local/share/fwbuilder-5.1.0.3598/
+        migration.path = /usr/local/share/fwbuilder-5.1.0.3598/migration
+        doc.path = /usr/local/share/doc/fwbuilder-5.1.0.3598
+        datadir.path   = /usr/local/share/
+
+        res.path = /usr/local/share/fwbuilder-5.1.0.3598
+        res_os.path = $$res.path/os/
+        res_platform.path = $$res.path/platform/
+        res_help_C.path = $$res.path/help/C
+        res_help_en_US.path = $$res.path/help/en_US
+        res_desktop.path = /usr/local/share//applications/
+        res_configlets.path = $$res.path/configlets
+
+        # INSTALLS += icns
+        # LIBS += -lz -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp -lutil 
+
+        PKGLOCALEDIR = $$res.path/locale
+
+        CONFIG += warn_on
+
+#		DEFINES += __STDC_FORMAT_MACROS
+    }
+}
+
+win32 {
+    CONFIG -= debug
+}
+
+FWB_SIG = $$(FWB_SIG)
+if (isEmpty(FWB_SIG)) { FWB_SIG=26932 }
+DEFINES += FWB_SIG=$$FWB_SIG
+
+QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
+QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
+
+exists(qmake2.inc) {
+  include(qmake2.inc)
+}
+
+INSTALLS += target
diff --git a/src/libfwbuilder/qmake.inc b/src/libfwbuilder/qmake.inc
new file mode 100644
index 0000000..712e552
--- /dev/null
+++ b/src/libfwbuilder/qmake.inc
@@ -0,0 +1,55 @@
+#-*- mode: makefile; tab-width: 4; -*-
+#
+######### libfwbuilder/qmake.inc.in
+#
+QTDIR = $$(QTDIR)
+TEMPLATE = lib
+DEFINES += $$(DEFINES)
+INCLUDEPATH += .. ../.. $$(INCLUDEPATH)
+DEPENDPATH  += .. ../..
+LANGUAGE = C++
+
+HAVE_CPPUNIT = 1
+CPPUNIT_CFLAGS = 
+CPPUNIT_LIBS = -lcppunit -ldl
+
+unix {
+    CONFIG += warn_on debug
+
+    UI_DIR = .ui
+    MOC_DIR = .moc
+    OBJECTS_DIR = .obj
+
+    prefix = /usr/local
+
+    QMAKE_CXX = /usr/bin/ccache  $$QMAKE_CXX
+
+	# We put /usr/include into INCLUDEPATH to fix a problem compiling
+	# fwbuilder/snmp.cpp on freebsd.
+    INCLUDEPATH += /usr/include /usr/include/libxml2 
+    LIBS += -pthread -lxml2  -L/usr/lib -lxslt -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp  -lz -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp -lutil 
+
+    QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+    QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+    QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter -g -O2
+    QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter -g -O2
+
+    exec_prefix = @EXEC_PREFIX@
+    DESTDIR =
+
+    target.path = @LIBDIR@
+    dtd.path = /usr/local/share/fwbuilder-5.1.0.3598/
+    migration.path = /usr/local/share/fwbuilder-5.1.0.3598/migration
+    doc.path = /usr/local/share/doc/fwbuilder-5.1.0.3598
+}
+
+QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
+QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
+
+exists(qmake2.inc) {
+  include( qmake2.inc)
+}
+
+CONFIG -= qt
+
+INSTALLS += target

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                   |    1 -
 qmake.inc.in => qmake.inc                    |   38 +++++++++++++-------------
 src/libfwbuilder/{qmake.inc.in => qmake.inc} |   24 ++++++++--------
 3 files changed, 31 insertions(+), 32 deletions(-)
 copy qmake.inc.in => qmake.inc (55%)
 copy src/libfwbuilder/{qmake.inc.in => qmake.inc} (54%)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, builds, updated. v5.0.1-21-ga576eba

From: <gi...@ir...> - 2012-03-19 21:48:50

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, builds has been updated
       via  a576ebac58a7999861d400c064a47cba3840a3e1 (commit)
       via  bf72cebcf6eed83eac684f324c68ade522b3120c (commit)
       via  882c620bd2908f296f48f1aec59e9e5c92ccaaa6 (commit)
       via  7015b23d1b4eb5a0919da86b6cbe2c1f8bda77c2 (commit)
      from  49ae170756789b7a7a9014ed1d5bb4196aed56b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                         |    4 -
 VERSION                                            |    6 +-
 VERSION.h                                          |    4 +-
 config.h.in                                        |    5 +
 config.win32.h                                     |  186 +++++
 configure.in                                       |    6 +-
 doc/ChangeLog                                      |    5 +
 packaging/SLA.r                                    |  712 ++++++++++++++++++++
 packaging/fwbuilder-160x60.bmp                     |  Bin 0 -> 28854 bytes
 packaging/fwbuilder-164x314.bmp                    |  Bin 0 -> 154542 bytes
 packaging/fwbuilder-static-qt.spec                 |    2 +-
 packaging/fwbuilder.control                        |    2 +-
 packaging/fwbuilder.nsi                            |  407 +++++++++++
 packaging/fwbuilder.nsi.in                         |  407 +++++++++++
 packaging/fwbuilder.spec                           |    2 +-
 qmake2.inc                                         |  126 ++++
 src/common/common.pro                              |    2 +-
 src/common/init2.cpp                               |  123 ++++
 src/gui/FwbuilderInfo.plist                        |   61 ++
 src/gui/fwbuilder-macosx.icns                      |  Bin 0 -> 236220 bytes
 src/gui/fwbuilder-windows-app.ico                  |  Bin 0 -> 175140 bytes
 src/gui/fwbuilder-windows.ico                      |  Bin 0 -> 175140 bytes
 src/gui/fwbuilder-windows.rc                       |    1 +
 src/gui/gui.pro                                    |   13 +
 src/gui/main_mac.cpp                               |  132 ++++
 src/libfwbuilder/.gitignore                        |    1 -
 src/libfwbuilder/qmake2.inc                        |   58 ++
 .../src/fwbuilder/libfwbuilder-config.h            |  114 ++++
 .../src/fwbuilder/libfwbuilder-config.h.in         |   62 ++-
 src/libgui/libgui.pro                              |    7 +
 ...e_notes_5.0.2.html => release_notes_5.1.0.html} |    0
 31 files changed, 2423 insertions(+), 25 deletions(-)
 create mode 100644 config.win32.h
 create mode 100644 packaging/SLA.r
 create mode 100644 packaging/fwbuilder-160x60.bmp
 create mode 100644 packaging/fwbuilder-164x314.bmp
 create mode 100644 packaging/fwbuilder.nsi
 create mode 100755 packaging/fwbuilder.nsi.in
 create mode 100644 qmake2.inc
 create mode 100644 src/common/init2.cpp
 create mode 100644 src/gui/FwbuilderInfo.plist
 create mode 100644 src/gui/fwbuilder-macosx.icns
 create mode 100644 src/gui/fwbuilder-windows-app.ico
 create mode 100644 src/gui/fwbuilder-windows.ico
 create mode 100644 src/gui/fwbuilder-windows.rc
 create mode 100644 src/gui/main_mac.cpp
 create mode 100644 src/libfwbuilder/qmake2.inc
 create mode 100644 src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h
 rename src/res/help/en_US/{release_notes_5.0.2.html => release_notes_5.1.0.html} (100%)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-21-ga576eba

From: <gi...@ir...> - 2012-03-19 21:48:37

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  a576ebac58a7999861d400c064a47cba3840a3e1 (commit)
      from  bf72cebcf6eed83eac684f324c68ade522b3120c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a576ebac58a7999861d400c064a47cba3840a3e1
Author: Vadim Kurland <va...@ne...>
Date:   Mon Mar 19 14:17:02 2012 -0700

    need to define variables GENERATION and GENERATION_SHORT for .nsi file

diff --git a/configure.in b/configure.in
index 739e8c5..a822f75 100644
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,7 @@ dnl
 . ./VERSION
 
 RELEASE_NUM=$BUILD_NUM
+GENERATION_SHORT=$(echo $GENERATION | sed 's/\.//')
 
 AC_DEFINE_UNQUOTED(BUILD_NUM, "$BUILD_NUM")
 AC_SUBST(BUILD_NUM)
@@ -28,6 +29,8 @@ AC_SUBST(FWB_MAJOR_VERSION)
 AC_SUBST(FWB_MINOR_VERSION)
 AC_SUBST(FWB_MICRO_VERSION)
 AC_SUBST(FWB_VERSION)
+AC_SUBST(GENERATION)
+AC_SUBST(GENERATION_SHORT)
 
 # libfwbuilder versions
 dnl AC_SUBST(LIBFWBUILDER_VERSION)
diff --git a/packaging/fwbuilder.nsi b/packaging/fwbuilder.nsi
index 66cfebf..2c9fe3c 100644
--- a/packaging/fwbuilder.nsi
+++ b/packaging/fwbuilder.nsi
@@ -11,8 +11,8 @@ Var STARTMENU_FOLDER
 ; GENERATION is used to build the path in the registry, it should be coordinated
 ; with the path defined in FWBSettings class
 ;
-!define GENERATION "@GENERATION@"
-!define GENERATION_SHORT "@GENERATION_SHORT@"
+!define GENERATION "5.1"
+!define GENERATION_SHORT "51"
 !define VERSION "5.1.0.3598"
 
 
diff --git a/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h b/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h
index 073499a..15bab9f 100644
--- a/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h
+++ b/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h
@@ -13,7 +13,7 @@
  * Template files directory dir
  * DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead!
  */
-#  define RES_DIR "/home/vadim/src/v4/build/install_root/share/fwbuilder-5.1.0.3598"
+#  define RES_DIR "/usr/local/share/fwbuilder-5.1.0.3598"
 
 /* #undef UCD_SNMP */
 #  define HAVE_LIBSNMP 1
@@ -59,7 +59,7 @@
  * Template files directory dir
  * DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead!
  */
-#define RES_DIR "/home/vadim/src/v4/build/install_root/share/fwbuilder-5.1.0.3598"
+#define RES_DIR "/usr/local/share/fwbuilder-5.1.0.3598"
 
 #define HAVE_LIBSNMP 1
 /* #undef UCD_SNMP */

-----------------------------------------------------------------------

Summary of changes:
 configure.in                                       |    3 +++
 packaging/fwbuilder.nsi                            |    4 ++--
 .../src/fwbuilder/libfwbuilder-config.h            |    4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-20-gbf72ceb

From: <gi...@ir...> - 2012-03-19 20:07:53

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  bf72cebcf6eed83eac684f324c68ade522b3120c (commit)
       via  882c620bd2908f296f48f1aec59e9e5c92ccaaa6 (commit)
       via  7015b23d1b4eb5a0919da86b6cbe2c1f8bda77c2 (commit)
      from  49ae170756789b7a7a9014ed1d5bb4196aed56b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bf72cebcf6eed83eac684f324c68ade522b3120c
Author: Vadim Kurland <va...@ne...>
Date:   Mon Mar 19 12:36:32 2012 -0700

    updated ChangeLoig

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 279643d..c28ceb3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,6 @@
 2012-03-19  Vadim Kurland  <va...@ne...>
 
+	* version 5.1.0
 	* switching to GPL for Mac OS X and Windows.
 
 2012-03-18  Vadim Kurland  <va...@ne...>

commit 882c620bd2908f296f48f1aec59e9e5c92ccaaa6
Author: Vadim Kurland <va...@ne...>
Date:   Mon Mar 19 12:35:53 2012 -0700

    version 5.1.0

diff --git a/VERSION.h b/VERSION.h
index e5ba23a..01cef63 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION      "5.0.2.3597"
-#define GENERATION   "5.0"
+#define VERSION      "5.1.0.3598"
+#define GENERATION   "5.1"
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index bfb6fdd..659ffb6 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
 
 
 %define name    fwbuilder
-%define version 5.0.2.3597
+%define version 5.1.0.3598
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index c67d05d..a663d82 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: va...@fw...
-Version: 5.0.2.3597-1
+Version: 5.1.0.3598-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.nsi b/packaging/fwbuilder.nsi
new file mode 100644
index 0000000..66cfebf
--- /dev/null
+++ b/packaging/fwbuilder.nsi
@@ -0,0 +1,407 @@
+; fwbuilder.nsi
+;
+;
+!verbose 1
+;--------------------------------
+;Variables
+
+Var MUI_TEMP
+Var STARTMENU_FOLDER
+
+; GENERATION is used to build the path in the registry, it should be coordinated
+; with the path defined in FWBSettings class
+;
+!define GENERATION "@GENERATION@"
+!define GENERATION_SHORT "@GENERATION_SHORT@"
+!define VERSION "5.1.0.3598"
+
+
+
+!define APPNAME "FirewallBuilder${GENERATION}"
+
+;------------------------------------------------------------------------------
+; GetWindowsVersion
+;
+; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/
+; Returns on top of stack
+;
+; Windows Version (95, 98, ME, NT x.x, 2000)
+; or
+; '' (Unknown Windows Version)
+;
+; Usage:
+;   Call GetWindowsVersion
+;   Pop $0
+;   ; at this point $0 is "NT 4.0" or whatnot
+
+Function GetWindowsVersion
+  Push $0
+  Push $9
+  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+  StrCmp $0 "" 0 lbl_winnt
+  ; we are not NT.
+  ReadRegStr $0 HKLM SOFTWARE\Microsoft\Windows\CurrentVersion VersionNumber
+ 
+  StrCpy $9 $0 1
+  StrCmp $9 '4' 0 lbl_error
+
+  StrCpy $9 $0 3
+
+  StrCmp $9 '4.0' lbl_win32_95
+  StrCmp $9 '4.9' lbl_win32_ME lbl_win32_98
+
+  lbl_win32_95:
+    StrCpy $0 '95'
+  Goto lbl_done
+
+  lbl_win32_98:
+    StrCpy $0 '98'
+  Goto lbl_done
+
+  lbl_win32_ME:
+    StrCpy $0 'ME'
+  Goto lbl_done
+
+  lbl_winnt: 
+
+    StrCpy $9 $0 1
+    StrCmp $9 '3' lbl_winnt_x
+    StrCmp $9 '4' lbl_winnt_x
+    StrCmp $9 '5' lbl_winnt_5
+    StrCmp $9 '6' lbl_winnt_6 lbl_error
+
+    lbl_winnt_x:
+      StrCpy $0 "NT $0" 6
+    Goto lbl_done
+
+    lbl_winnt_5:
+      Strcpy $0 '2000'
+    Goto lbl_done
+
+    lbl_winnt_6:
+      Strcpy $0 'Vista'
+    Goto lbl_done
+
+  lbl_error:
+    Strcpy $0 ''
+  lbl_done:
+  Pop $9
+  Exch $0
+FunctionEnd
+
+
+Function .onInit
+
+  Call GetWindowsVersion
+  Pop $0
+
+  StrCmp $0 "NT 4.0" lbl_done check_2000
+  check_2000:
+      StrCmp $0 "2000" lbl_done check_vista
+  check_vista:
+      StrCmp $0 "Vista" lbl_done lbl_error
+  lbl_error:
+      MessageBox MB_OK  "Firewall Builder supports only Windows 2000, Windows XP and Vista platform."
+      Abort
+
+lbl_done:
+
+FunctionEnd
+
+
+Function un.UninstallSurveyPageText
+
+  IfFileExists $PROFILE\fwb4*license* +4 0
+  IfFileExists $PROFILE\Documents\fwb4*license* +3 0
+
+  MessageBox MB_YESNO "Help us improve Firewall Builder!  If you are \
+uninstalling because you don't plan to use the software please fill out \
+a short survey to tell us why you are leaving and what we can do better.\
+$\n\
+$\n\
+Click Yes to open the survey in your web browser, click No to exit the \
+uninstaller." IDNO +2
+
+  ExecShell open "http://www.fwbuilder.org/uninstall_survey.html" 
+
+;  MessageBox MB_ICONSTOP "Continuing uninstaller"
+
+FunctionEnd
+
+
+;****************************************************************************
+;Include Modern UI
+
+  !include "MUI2.nsh"
+
+;****************************************************************************
+
+  setCompressor lzma
+
+  Name "Firewall Builder ${GENERATION}"
+  Caption "Firewall Builder installation"
+  OutFile "fwbuilder-${VERSION}.exe"
+
+;  Default installation folder
+  InstallDir "C:\FWBuilder${GENERATION_SHORT}"
+
+;****************************************************************************
+; We need to keep installation data and program settings in
+; registry folders with different names. QSettings always looks into
+; Current User registry first, so if the folders have the same names,
+; then we store evaluation key in Current User, while it is better
+; to put it in the Local Machine branch.
+;
+; So, installation data goes to HKLM Software\NetCitadel\FirewallBuilder\2.1
+; and settings to HKCU Software\NetCitadel\FirewallBuilder2_1
+;
+; fwbuilder-lm determines folder path for the license file by
+; reading key Install_Dir under HKLM Software\NetCitadel\FirewallBuilder\2.1
+;
+;****************************************************************************
+;
+;  Get installation folder from registry if available
+
+  InstallDirRegKey HKLM Software\NetCitadel\${APPNAME} "Install_Dir"
+
+;****************************************************************************
+;Interface Settings
+
+  !define MUI_ABORTWARNING
+
+  ;Start Menu Folder Page Configuration
+  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
+  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\NetCitadel\${APPNAME}" 
+  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+
+  LicenseText "GNU GENERAL PUBLIC LICENSE"
+  LicenseData "doc\COPYING"
+
+  !define MUI_HEADERIMAGE
+  !define MUI_HEADERIMAGE_BITMAP       packaging\fwbuilder-160x60.bmp
+  !define MUI_WELCOMEFINISHPAGE_BITMAP packaging\fwbuilder-164x314.bmp
+
+;****************************************************************************
+; The following macros add PageEx statements
+
+  !insertmacro MUI_PAGE_LICENSE  "doc\COPYING"
+;  !insertmacro MUI_PAGE_COMPONENTS
+  !insertmacro MUI_PAGE_DIRECTORY
+  !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+  !insertmacro MUI_PAGE_INSTFILES
+
+; Uninstaller starts with a custom page that asks the user to fill survey
+
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+  UninstPage custom un.UninstallSurveyPageText
+
+; Set language
+  !insertmacro MUI_LANGUAGE "English"
+
+;****************************************************************************
+; Request elevated priviliges
+
+  RequestExecutionLevel admin
+
+;****************************************************************************
+; The stuff to install
+Section "FWBuilder (required)"
+
+; Set output path to the installation directory.
+;  SetOutPath $INSTDIR
+
+  SetOutPath $INSTDIR\resources
+
+  File src\res\resources.xml
+  File src\res\templates.xml
+  File src\res\objects_init.xml
+  File src\libfwbuilder\etc\fwbuilder.dtd
+
+  File /r src\res\configlets
+  File /r src\res\help
+  File /r src\res\os
+  File /r src\res\platform
+  File /r src\libfwbuilder\migration
+
+  SetOutPath $INSTDIR\resources\locale
+
+; we have no working translations for v4 and v5
+;  File src\libgui\*.qm
+
+  SetOutPath $INSTDIR
+
+  File /oname=COPYING.doc doc\COPYING
+  File "doc\FWBuilder-Routing-LICENSE.txt"
+  File "doc\README.iosacl"
+  File "doc\README.ipt"
+  File "doc\README.ipf"
+  File "doc\README.ipfw"
+  File "doc\README.pf"
+  File "doc\README.pix"
+  File "doc\README.pix_routing"
+  File "doc\README.routing"
+
+  File /oname=fwbuilder.ico "src\gui\fwbuilder-windows.ico"
+
+  File /a "src\gui\release\fwbuilder.exe"
+  File /a "src\fwbedit\release\fwbedit.exe"
+  File /a "src\iosacl\release\fwb_iosacl.exe"
+  File /a "src\ipt\release\fwb_ipt.exe"
+  File /a "src\ipf\release\fwb_ipf.exe"
+  File /a "src\ipfw\release\fwb_ipfw.exe"
+  File /a "src\pf\release\fwb_pf.exe"
+  File /a "src\pix\release\fwb_pix.exe"
+  File /a "src\procurve_acl\release\fwb_procurve_acl.exe"
+
+  File "c:\MinGW\bin\libiconv-2.dll"
+  File "c:\MinGW\bin\libpthread-2.dll"
+  File "c:\MinGW\bin\libgcc_s_dw2-1.dll"
+  File "c:\MinGW\bin\libstdc++-6.dll"
+
+  File "c:\local\bin\libxml2-2.dll"
+  File "c:\local\bin\libxslt-1.dll"
+
+; Install RCS for these files
+;
+  File "c:\local\bin\ci.exe"
+  File "c:\local\bin\co.exe"
+  File "c:\local\bin\rcs.exe"
+  File "c:\local\bin\rcsdiff.exe"
+  File "c:\local\bin\rlog.exe"
+  File "c:\local\bin\diff.exe"
+  File "c:\local\bin\rcslib.dll"
+
+;  File "c:\local\bin\netsnmp.dll"
+
+  File "c:\local\qt-everywhere-commercial-src-4.7.3\bin\QtCore4.dll"
+  File "c:\local\qt-everywhere-commercial-src-4.7.3\bin\QtGui4.dll"
+  File "c:\local\qt-everywhere-commercial-src-4.7.3\bin\QtNetwork4.dll"
+  File "c:\local\qt-everywhere-commercial-src-4.7.3\bin\QtTest4.dll"
+
+  File /nonfatal /oname=resources\locale\qt_de.qm "c:\local\qt-everywhere-commercial-src-4.7.3\translations\qt_de.qm"
+  File /nonfatal /oname=resources\locale\qt_fr.qm "c:\local\qt-everywhere-commercial-src-4.7.3\translations\qt_fr.qm"
+  File /nonfatal /oname=resources\locale\qt_ru.qm "c:\local\qt-everywhere-commercial-src-4.7.3\translations\qt_ru.qm"
+
+
+;; Starting with 4.0.2, we now package putty tools with fwbuilder
+  File "c:\PuTTY\plink.exe"
+  File "c:\PuTTY\pscp.exe"
+
+
+; Write the installation path into the registry
+  WriteRegStr HKLM Software\NetCitadel\${APPNAME} "Install_Dir" "$INSTDIR"
+
+; Write the uninstall keys for Windows
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FWBuilder ${GENERATION}" "DisplayName"     "Firewall Builder ${GENERATION}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FWBuilder ${GENERATION}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FWBuilder ${GENERATION}" "Publisher"       "NetCitadel LLC"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FWBuilder ${GENERATION}" "DisplayVersion"  "${VERSION}"
+
+
+; Write file associations and icons
+
+  WriteRegStr HKLM "Software\Classes\.fwb" "" "fwbfile"
+  WriteRegStr HKLM "Software\Classes\fwbfile\shell\open\command" "" "$INSTDIR\fwbuilder.exe -noexec %1"
+  WriteRegStr HKLM "Software\Classes\fwbfile\DefaultIcon"        "" "$INSTDIR\fwbuilder.exe,0"
+
+  WriteRegStr HKLM "Software\Classes\.fwl" "" "fwlfile"
+  WriteRegStr HKLM "Software\Classes\fwlfile\shell\open\command" "" "$INSTDIR\fwbuilder.exe -noexec %1"
+  WriteRegStr HKLM "Software\Classes\fwlfile\DefaultIcon"        "" "$INSTDIR\fwbuilder.exe,0"
+
+
+; Create registry entry for putty session with ssh keepalive
+  WriteRegDWORD HKCU "Software\SimonTatham\PuTTY\Sessions\fwb_session_with_keepalive" "PingInterval" "0"
+  WriteRegDWORD HKCU "Software\SimonTatham\PuTTY\Sessions\fwb_session_with_keepalive" "PingIntervalSecs" "10"
+
+; ========================================================================
+; Configure installer to use our prepackaged plink.exe and pscp.exe but only if it was not configured before
+;
+; ******** THESE KEYS MUST MATCH THOSE USED BY the class FWBSettings 
+;
+  ReadRegStr $0 HKCU "Software\netcitadel.com\${APPNAME}\${GENERATION}\SSH" "SSHPath"
+  StrCmp $0 "" 0 +3
+    WriteRegStr HKCU "Software\netcitadel.com\${APPNAME}\${GENERATION}\SSH" "SSHPath" "$INSTDIR\plink.exe"
+    WriteRegStr HKCU "Software\netcitadel.com\${APPNAME}\${GENERATION}\SSH" "SCPPath" "$INSTDIR\pscp.exe"
+; ========================================================================
+
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+
+; Setting var context to "all" makes Start menu shortcuts appear for all
+; users
+
+;  SetShellVarContext all
+
+  CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\FWBuilder on the Web.lnk" "http://www.fwbuilder.org/" "" "$INSTDIR\fwbuilder.ico"
+  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\FWBuilder.lnk" "$INSTDIR\fwbuilder.exe" "" "$INSTDIR\fwbuilder.ico"
+  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+
+  !insertmacro MUI_STARTMENU_WRITE_END
+
+  WriteUninstaller "uninstall.exe"
+
+SectionEnd
+
+;=============================================================================
+; uninstall stuff
+
+UninstallText "This will uninstall FWBuilder. Hit next to continue."
+
+;=============================================================================
+
+Section "Uninstall"
+
+  ; remove registry keys
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FWBuilder ${GENERATION}"
+  DeleteRegKey HKLM "Software\NetCitadel\${APPNAME}"
+
+  ; delete obsolete registry folder, not used in v3.x but could be left over from older versions
+  DeleteRegKey HKCU "Software\NetCitadel LLC\Firewall Builder"
+
+  DeleteRegKey HKCU "Software\netcitadel.com\${APPNAME}"
+  DeleteRegKey /ifempty HKCU "Software\netcitadel.com\${APPNAME}"
+  DeleteRegKey /ifempty HKCU "Software\netcitadel.com"
+
+  DeleteRegKey HKCR ".fwb"
+  DeleteRegKey HKCR ".fwl"
+  DeleteRegKey HKCR "fwbfile"
+  DeleteRegKey HKCR "fwlfile"
+  DeleteRegKey HKCR "FirewallBuilder.AssocFile.FWB"
+  DeleteRegKey HKCR "FirewallBuilder.AssocFile.FWL"
+
+; remove files
+; MUST REMOVE UNINSTALLER, too
+  Delete  $INSTDIR\uninstall.exe
+  Delete "$INSTDIR\*.*"
+  Delete "$INSTDIR\migration\*.*"
+  Delete "$INSTDIR\resources\os\*.*"
+  Delete "$INSTDIR\resources\platform\*.*"
+  Delete "$INSTDIR\resources\help\*.*"
+  Delete "$INSTDIR\resources\configlets\*.*"
+  Delete  $INSTDIR\COPYING.doc
+
+  RMDir /r "$INSTDIR"
+
+;  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+;  Delete  "$SMPROGRAMS\$MUI_TEMP\*.*"
+;  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
+
+;  Remove Start menu shortcuts
+
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $STARTMENU_FOLDER
+
+;  SetShellVarContext all
+
+  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\FWBuilder on the Web.lnk"
+  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\FWBuilder.lnk"
+  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk"
+  RMDir  "$SMPROGRAMS\$STARTMENU_FOLDER"
+
+  ; delete only if empty because there could be registry folders
+  ; for our other products
+  DeleteRegKey /ifempty HKLM "Software\NetCitadel"
+
+SectionEnd
+
+; eof
diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec
index 79c2b2b..4e58c01 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 5.0.2.3597
+%define version 5.1.0.3598
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h b/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h
new file mode 100644
index 0000000..073499a
--- /dev/null
+++ b/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h
@@ -0,0 +1,114 @@
+/* src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h.  Generated from libfwbuilder-config.h.in by configure.  */
+
+#define FWBUILDER_XML_VERSION "22"
+
+#define FREEXMLBUFF(x) xmlFree((void*)(x))
+
+
+#ifdef _WIN32
+#  pragma warning(disable:4786)
+#  define _WIN32_WINNT 0x0501
+
+/*
+ * Template files directory dir
+ * DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead!
+ */
+#  define RES_DIR "/home/vadim/src/v4/build/install_root/share/fwbuilder-5.1.0.3598"
+
+/* #undef UCD_SNMP */
+#  define HAVE_LIBSNMP 1
+#  define NET_SNMP 1
+
+/*
+ * stdint.h must be installed on windows to satisfy uint128.h
+ */
+#  define HAVE_STDINT_H 1
+
+/* xmlSaveFile */
+#  define HAVE_XMLSAVEFORMATFILEENC 1
+
+/* #undef HAVE_LIBXSLT_XSLTCONFIG_H */
+
+/* strtok_s on windows */
+#  define HAVE_STRTOK_S  1
+
+/* net-snmp lib checks HAVE_STRTOK_R on windows. This function
+ * exists both on windows and mac
+ */
+#  define HAVE_STRTOK_R 1
+#  define WORDS_LITTLEENDIAN 1
+
+/*
+ * newer versions of UCD-SNMP use this function. This should be preferred way,
+ * but Mandrake 8.2 comes with ucd-snmp v.4.2.3 which does not have it.
+ */
+#  define HAVE_SNPRINT_OBJID 1
+
+/*
+ * always need this for openssl
+ */
+#  define OPENSSL_NO_KRB5
+
+#  define SNPRINTF  _snprintf
+#  define VSNPRINTF _vsnprintf
+#  define FS_SEPARATOR "\\"
+
+#else
+
+/* 
+ * Template files directory dir
+ * DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead!
+ */
+#define RES_DIR "/home/vadim/src/v4/build/install_root/share/fwbuilder-5.1.0.3598"
+
+#define HAVE_LIBSNMP 1
+/* #undef UCD_SNMP */
+#define NET_SNMP 1
+
+/* #undef HAVE_INET_NET_NTOP */
+
+/* #undef HAVE_GOODLIBRESOLV */
+
+/* #undef HAVE_LWRES */
+
+/* #undef HAVE_LWRES_GETIPNODE */
+
+#define HAVE_GETOPT_H 1
+
+/* gethostbyname_r */
+/* #undef HAVE_FUNC_GETHOSTBYNAME_R_6 */
+/* #undef HAVE_FUNC_GETHOSTBYNAME_R_5 */
+/* #undef HAVE_FUNC_GETHOSTBYNAME_R_3 */
+
+/* gethostbyaddr_r */
+/* #undef HAVE_GETHOSTBYADDR_R_5 */
+/* #undef HAVE_GETHOSTBYADDR_R_7 */
+/* #undef HAVE_GETHOSTBYADDR_R_8 */
+
+/* first argument of gethostbyaddr_r may be char* or void* */
+/* #undef GETHOSTBYADDR_FIRST_ARG_CHARPTR */
+/* #undef GETHOSTBYADDR_FIRST_ARG_VOIDPTR */
+
+/* xmlSaveFile */
+#define HAVE_XMLSAVEFORMATFILEENC 1
+
+#define HAVE_LIBXSLT_XSLTCONFIG_H 1
+
+/* strtok_r */
+#define HAVE_STRTOK_R 1
+
+#define WORDS_LITTLEENDIAN 1
+/* #undef WORDS_BIGENDIAN */
+
+/*
+ * newer versions of UCD-SNMP use this function. This should be preferred way,
+ * but Mandrake 8.2 comes with ucd-snmp v.4.2.3 which does not have it.
+ */
+#define HAVE_SNPRINT_OBJID 1
+
+#  define SNPRINTF  snprintf
+#  define VSNPRINTF vsnprintf
+#  define FS_SEPARATOR "/"
+
+#endif
+

commit 7015b23d1b4eb5a0919da86b6cbe2c1f8bda77c2
Author: Vadim Kurland <va...@ne...>
Date:   Mon Mar 19 12:45:32 2012 -0700

    switching to GPL for MacOSX and windows; merged build files for mac and win packages, updated license text

diff --git a/.gitignore b/.gitignore
index dbc6ecf..7ae5cf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,11 +11,7 @@ core
 *.fw
 *.conf
 *.app
-*.icns
-*.ico
-*.plist
 !src/gui/FwbuilderInfo.plist
-*.rc
 *.dylib
 *.spec
 *.control
diff --git a/VERSION b/VERSION
index 8590544..41205e3 100644
--- a/VERSION
+++ b/VERSION
@@ -1,13 +1,13 @@
 #-*- mode: shell-script; tab-width: 4; -*-
 
 FWB_MAJOR_VERSION=5
-FWB_MINOR_VERSION=0
-FWB_MICRO_VERSION=2
+FWB_MINOR_VERSION=1
+FWB_MICRO_VERSION=0
 
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3597"
+BUILD_NUM="3598"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 
diff --git a/config.h.in b/config.h.in
index 96d13e1..a90b6c8 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,6 +1,10 @@
 
 #include "VERSION.h"
 
+#if defined(_WIN32)
+#  include "config.win32.h"
+#else
+
 #undef BUILD_NUM
 
 #undef PACKAGE_LOCALE_DIR
@@ -117,4 +121,5 @@ using namespace std;
 #  define VSNPRINTF _vsnprintf
 #endif
 
+#endif
 
diff --git a/config.win32.h b/config.win32.h
new file mode 100644
index 0000000..7ce3ab3
--- /dev/null
+++ b/config.win32.h
@@ -0,0 +1,186 @@
+
+#include "VERSION.h"
+
+#ifdef _WIN32
+
+#ifndef __GNUC__
+/*****************  MSVC ****************/
+
+/* define constants for access that are missing on windows  */
+
+/* Values for the second argument to access.
+   These may be OR'd together.  */
+#define R_OK    4               /* Test for read permission.  */
+#define W_OK    2               /* Test for write permission.  */
+#define X_OK    1               /* Test for execute permission.  */
+#define F_OK    0               /* Test for existence.  */
+
+/****************************************/
+#endif
+
+#define _WIN32_WINNT 0x0501
+
+#undef PACKAGE_LOCALE_DIR
+#undef PACKAGE_DATA_DIR
+#undef PACKAGE_SOURCE_DIR
+
+#define RCS_FILE_NAME      "rcs.exe"
+#define RCSDIFF_FILE_NAME  "rcsdiff.exe"
+#define RLOG_FILE_NAME     "rlog.exe"
+#define CI_FILE_NAME       "ci.exe"
+#define CO_FILE_NAME       "co.exe"
+
+/*
+ * Normally this macro defines directory where system-wide QT
+ * translations are installed. We do not use it on win32 since
+ * we can't assume user has QT installed on their machine.
+ */
+#define QTTRANSLATIONSDIR "."
+
+/* Define if you have the <X11/SM/SMlib.h> header file.  */
+#undef HAVE_X11_SM_SMLIB_H
+
+/* Name of package */
+#define PACKAGE fwbuilder2
+
+/* init dir */
+#define RES_DIR "resources"
+
+/* OS */
+#undef OS
+
+/* OS */
+#define OS_WIN32 1
+
+/* distribution (for Linux) */
+#define DISTRO "Unknown"
+
+/* prefix dir */
+/* #define PREFIX Z: */
+
+#define MANIFEST_MARKER "# files: "
+
+#undef HAVE_LOCALE_H
+#undef HAVE_GETOPT_H
+#undef HAVE_SETLOCALE
+#undef HAVE_SETENV
+#undef HAVE_PUTENV
+
+#ifdef HAVE_GETOPT_H
+#  define HAVE_DECL_GETOPT  HAVE_GETOPT_H
+#endif
+
+#undef HAVE_STRUCT_TM_TM_ZONE
+#undef TM_IN_SYS_TIME
+
+/*
+ *  This is needed for Solaris
+ */
+#undef __PRAGMA_REDEFINE_EXTNAME
+
+
+
+#undef HAVE_CATGETS
+#undef HAVE_GETTEXT
+#undef HAVE_LC_MESSAGES
+#undef HAVE_STPCPY
+#undef HAVE_LIBSM
+#undef HAVE_MEMPCPY
+#undef HAVE_STRCHR
+
+#define HAVE_LIBSNMP 1
+#define HAVE_ANTLR_RUNTIME 1
+
+#define SNPRINTF  _snprintf
+#define VSNPRINTF _vsnprintf
+
+
+
+#endif     /* End of _WIN32 */
+
+/* **************************************************************** */
+#ifdef Q_OS_MACX
+
+#define RCS_FILE_NAME "/usr/bin/rcs"
+#define RCSDIFF_FILE_NAME "/usr/bin/rcsdiff"
+#define RLOG_FILE_NAME "/usr/bin/rlog"
+#define CI_FILE_NAME "/usr/bin/ci"
+#define CO_FILE_NAME "/usr/bin/co"
+
+/* Define if you have the <X11/SM/SMlib.h> header file.  */
+/* #undef HAVE_X11_SM_SMLIB_H */
+
+/* Name of package */
+#define PACKAGE "fwbuilder"
+
+/* OS */
+#define OS "MacOSX"
+
+/* OS */
+/* #undef OS_CYGWIN */
+/* #undef OS_MINGW */
+#define OS_MACOSX "1"
+/* #undef OS_SOLARIS */
+/* #undef OS_FREEBSD */
+/* #undef OS_OPENBSD */
+/* #undef OS_LINUX */
+/* #undef OS_UNKNOWN */
+
+#if defined(OS_SOLARIS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_LINUX) || defined(OS_MACOSX)
+#define OS_UNIX 1
+#endif
+
+/* distribution (for Linux) */
+#define DISTRO ""
+
+/* prefix dir    */
+/* #undef PREFIX */
+
+/* init dir */
+#define RES_DIR "../Resources"
+
+#define MANIFEST_MARKER "# files: "
+
+/* #undef HAVE_LOCALE_H */
+#define HAVE_GETOPT_H 1
+/* #undef HAVE_SETLOCALE */
+/* #undef HAVE_SETENV */
+/* #undef HAVE_PUTENV */
+#define HAVE_SIGNAL 1
+#define HAVE_SIGNAL_H 1
+
+/* #undef HAVE_PTY_H */
+/* #undef HAVE_LIBUTIL_H */
+#define HAVE_UTIL_H 1
+
+#ifdef HAVE_GETOPT_H
+#  define HAVE_DECL_GETOPT  HAVE_GETOPT_H
+#endif
+
+#define HAVE_STRUCT_TM_TM_ZONE 1
+/* #undef TM_IN_SYS_TIME */
+
+#define HAVE_FORKPTY 1
+#define HAVE_CFMAKERAW 1
+
+/* #undef HAVE_CATGETS */
+/* #undef HAVE_GETTEXT */
+/* #undef HAVE_LC_MESSAGES */
+/* #undef HAVE_STPCPY */
+/* #undef HAVE_LIBSM */
+/* #undef HAVE_MEMPCPY */
+#define HAVE_STRCHR 1
+
+
+/*
+ *  on some platforms (OpenBSD) the second parameter to dlopen is different
+ */
+/* #undef DLOPEN_MODE */
+
+#define SNPRINTF  snprintf
+#define VSNPRINTF vsnprintf
+
+#define HAVE_LIBSNMP 1
+#define HAVE_ANTLR_RUNTIME 1
+
+#endif
diff --git a/configure.in b/configure.in
index d709b19..739e8c5 100644
--- a/configure.in
+++ b/configure.in
@@ -669,7 +669,8 @@ AC_CONFIG_FILES([ qmake.inc
                   src/libfwbuilder/etc/fwbuilder.dtd
                   packaging/fwbuilder.control
                   packaging/fwbuilder.spec
-                  packaging/fwbuilder-static-qt.spec])
+                  packaging/fwbuilder-static-qt.spec
+                  packaging/fwbuilder.nsi])
 
 
 AC_OUTPUT
diff --git a/doc/ChangeLog b/doc/ChangeLog
index fd302e0..279643d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-19  Vadim Kurland  <va...@ne...>
+
+	* switching to GPL for Mac OS X and Windows.
+
 2012-03-18  Vadim Kurland  <va...@ne...>
 
 	* CompilerDriver.cpp (CompilerDriver::populateClusterElements):
diff --git a/packaging/SLA.r b/packaging/SLA.r
new file mode 100644
index 0000000..6f3d4fe
--- /dev/null
+++ b/packaging/SLA.r
@@ -0,0 +1,712 @@
+data 'LPic' (5000) {
+    $"0002 0011 0003 0001 0000 0000 0002 0000"
+    $"0008 0003 0000 0001 0004 0000 0004 0005"
+    $"0000 000E 0006 0001 0005 0007 0000 0007"
+    $"0008 0000 0047 0009 0000 0034 000A 0001"
+    $"0035 000B 0001 0020 000C 0000 0011 000D"
+    $"0000 005B 0004 0000 0033 000F 0001 000C"
+    $"0010 0000 000B 000E 0000"
+};
+
+
+data 'TEXT' (5002, "English") {
+"		    GNU GENERAL PUBLIC LICENSE\n"
+"		       Version 2, June 1991\n"
+"\n"
+" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
+"     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
+" Everyone is permitted to copy and distribute verbatim copies\n"
+" of this license document, but changing it is not allowed.\n"
+"\n"
+"			    Preamble\n"
+"\n"
+"  The licenses for most software are designed to take away your\n"
+"freedom to share and change it.  By contrast, the GNU General Public\n"
+"License is intended to guarantee your freedom to share and change free\n"
+"software--to make sure the software is free for all its users.  This\n"
+"General Public License applies to most of the Free Software\n"
+"Foundation\'s software and to any other program whose authors commit to\n"
+"using it.  (Some other Free Software Foundation software is covered by\n"
+"the GNU Library General Public License instead.)  You can apply it to\n"
+"your programs, too.\n"
+"\n"
+"  When we speak of free software, we are referring to freedom, not\n"
+"price.  Our General Public Licenses are designed to make sure that you\n"
+"have the freedom to distribute copies of free software (and charge for\n"
+"this service if you wish), that you receive source code or can get it\n"
+"if you want it, that you can change the software or use pieces of it\n"
+"in new free programs; and that you know you can do these things.\n"
+"\n"
+"  To protect your rights, we need to make restrictions that forbid\n"
+"anyone to deny you these rights or to ask you to surrender the rights.\n"
+"These restrictions translate to certain responsibilities for you if you\n"
+"distribute copies of the software, or if you modify it.\n"
+"\n"
+"  For example, if you distribute copies of such a program, whether\n"
+"gratis or for a fee, you must give the recipients all the rights that\n"
+"you have.  You must make sure that they, too, receive or can get the\n"
+"source code.  And you must show them these terms so they know their\n"
+"rights.\n"
+"\n"
+"  We protect your rights with two steps: (1) copyright the software, and\n"
+"(2) offer you this license which gives you legal permission to copy,\n"
+"distribute and/or modify the software.\n"
+"\n"
+"  Also, for each author\'s protection and ours, we want to make certain\n"
+"that everyone understands that there is no warranty for this free\n"
+"software.  If the software is modified by someone else and passed on, we\n"
+"want its recipients to know that what they have is not the original, so\n"
+"that any problems introduced by others will not reflect on the original\n"
+"authors\' reputations.\n"
+"\n"
+"  Finally, any free program is threatened constantly by software\n"
+"patents.  We wish to avoid the danger that redistributors of a free\n"
+"program will individually obtain patent licenses, in effect making the\n"
+"program proprietary.  To prevent this, we have made it clear that any\n"
+"patent must be licensed for everyone\'s free use or not licensed at all.\n"
+"\n"
+"  The precise terms and conditions for copying, distribution and\n"
+"modification follow.\n"
+"\n"
+"		    GNU GENERAL PUBLIC LICENSE\n"
+"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n"
+"\n"
+"  0. This License applies to any program or other work which contains\n"
+"a notice placed by the copyright holder saying it may be distributed\n"
+"under the terms of this General Public License.  The \"Program\", below,\n"
+"refers to any such program or work, and a \"work based on the Program\"\n"
+"means either the Program or any derivative work under copyright law:\n"
+"that is to say, a work containing the Program or a portion of it,\n"
+"either verbatim or with modifications and/or translated into another\n"
+"language.  (Hereinafter, translation is included without limitation in\n"
+"the term \"modification\".)  Each licensee is addressed as \"you\".\n"
+"\n"
+"Activities other than copying, distribution and modification are not\n"
+"covered by this License; they are outside its scope.  The act of\n"
+"running the Program is not restricted, and the output from the Program\n"
+"is covered only if its contents constitute a work based on the\n"
+"Program (independent of having been made by running the Program).\n"
+"Whether that is true depends on what the Program does.\n"
+"\n"
+"  1. You may copy and distribute verbatim copies of the Program\'s\n"
+"source code as you receive it, in any medium, provided that you\n"
+"conspicuously and appropriately publish on each copy an appropriate\n"
+"copyright notice and disclaimer of warranty; keep intact all the\n"
+"notices that refer to this License and to the absence of any warranty;\n"
+"and give any other recipients of the Program a copy of this License\n"
+"along with the Program.\n"
+"\n"
+"You may charge a fee for the physical act of transferring a copy, and\n"
+"you may at your option offer warranty protection in exchange for a fee.\n"
+"\n"
+"  2. You may modify your copy or copies of the Program or any portion\n"
+"of it, thus forming a work based on the Program, and copy and\n"
+"distribute such modifications or work under the terms of Section 1\n"
+"above, provided that you also meet all of these conditions:\n"
+"\n"
+"    a) You must cause the modified files to carry prominent notices\n"
+"    stating that you changed the files and the date of any change.\n"
+"\n"
+"    b) You must cause any work that you distribute or publish, that in\n"
+"    whole or in part contains or is derived from the Program or any\n"
+"    part thereof, to be licensed as a whole at no charge to all third\n"
+"    parties under the terms of this License.\n"
+"\n"
+"    c) If the modified program normally reads commands interactively\n"
+"    when run, you must cause it, when started running for such\n"
+"    interactive use in the most ordinary way, to print or display an\n"
+"    announcement including an appropriate copyright notice and a\n"
+"    notice that there is no warranty (or else, saying that you provide\n"
+"    a warranty) and that users may redistribute the program under\n"
+"    these conditions, and telling the user how to view a copy of this\n"
+"    License.  (Exception: if the Program itself is interactive but\n"
+"    does not normally print such an announcement, your work based on\n"
+"    the Program is not required to print an announcement.)\n"
+"\n"
+"These requirements apply to the modified work as a whole.  If\n"
+"identifiable sections of that work are not derived from the Program,\n"
+"and can be reasonably considered independent and separate works in\n"
+"themselves, then this License, and its terms, do not apply to those\n"
+"sections when you distribute them as separate works.  But when you\n"
+"distribute the same sections as part of a whole which is a work based\n"
+"on the Program, the distribution of the whole must be on the terms of\n"
+"this License, whose permissions for other licensees extend to the\n"
+"entire whole, and thus to each and every part regardless of who wrote it.\n"
+"\n"
+"Thus, it is not the intent of this section to claim rights or contest\n"
+"your rights to work written entirely by you; rather, the intent is to\n"
+"exercise the right to control the distribution of derivative or\n"
+"collective works based on the Program.\n"
+"\n"
+"In addition, mere aggregation of another work not based on the Program\n"
+"with the Program (or with a work based on the Program) on a volume of\n"
+"a storage or distribution medium does not bring the other work under\n"
+"the scope of this License.\n"
+"\n"
+"  3. You may copy and distribute the Program (or a work based on it,\n"
+"under Section 2) in object code or executable form under the terms of\n"
+"Sections 1 and 2 above provided that you also do one of the following:\n"
+"\n"
+"    a) Accompany it with the complete corresponding machine-readable\n"
+"    source code, which must be distributed under the terms of Sections\n"
+"    1 and 2 above on a medium customarily used for software interchange; or,\n"
+"\n"
+"    b) Accompany it with a written offer, valid for at least three\n"
+"    years, to give any third party, for a charge no more than your\n"
+"    cost of physically performing source distribution, a complete\n"
+"    machine-readable copy of the corresponding source code, to be\n"
+"    distributed under the terms of Sections 1 and 2 above on a medium\n"
+"    customarily used for software interchange; or,\n"
+"\n"
+"    c) Accompany it with the information you received as to the offer\n"
+"    to distribute corresponding source code.  (This alternative is\n"
+"    allowed only for noncommercial distribution and only if you\n"
+"    received the program in object code or executable form with such\n"
+"    an offer, in accord with Subsection b above.)\n"
+"\n"
+"The source code for a work means the preferred form of the work for\n"
+"making modifications to it.  For an executable work, complete source\n"
+"code means all the source code for all modules it contains, plus any\n"
+"associated interface definition files, plus the scripts used to\n"
+"control compilation and installation of the executable.  However, as a\n"
+"special exception, the source code distributed need not include\n"
+"anything that is normally distributed (in either source or binary\n"
+"form) with the major components (compiler, kernel, and so on) of the\n"
+"operating system on which the executable runs, unless that component\n"
+"itself accompanies the executable.\n"
+"\n"
+"If distribution of executable or object code is made by offering\n"
+"access to copy from a designated place, then offering equivalent\n"
+"access to copy the source code from the same place counts as\n"
+"distribution of the source code, even though third parties are not\n"
+"compelled to copy the source along with the object code.\n"
+"\n"
+"  4. You may not copy, modify, sublicense, or distribute the Program\n"
+"except as expressly provided under this License.  Any attempt\n"
+"otherwise to copy, modify, sublicense or distribute the Program is\n"
+"void, and will automatically terminate your rights under this License.\n"
+"However, parties who have received copies, or rights, from you under\n"
+"this License will not have their licenses terminated so long as such\n"
+"parties remain in full compliance.\n"
+"\n"
+"  5. You are not required to accept this License, since you have not\n"
+"signed it.  However, nothing else grants you permission to modify or\n"
+"distribute the Program or its derivative works.  These actions are\n"
+"prohibited by law if you do not accept this License.  Therefore, by\n"
+"modifying or distributing the Program (or any work based on the\n"
+"Program), you indicate your acceptance of this License to do so, and\n"
+"all its terms and conditions for copying, distributing or modifying\n"
+"the Program or works based on it.\n"
+"\n"
+"  6. Each time you redistribute the Program (or any work based on the\n"
+"Program), the recipient automatically receives a license from the\n"
+"original licensor to copy, distribute or modify the Program subject to\n"
+"these terms and conditions.  You may not impose any further\n"
+"restrictions on the recipients\' exercise of the rights granted herein.\n"
+"You are not responsible for enforcing compliance by third parties to\n"
+"this License.\n"
+"\n"
+"  7. If, as a consequence of a court judgment or allegation of patent\n"
+"infringement or for any other reason (not limited to patent issues),\n"
+"conditions are imposed on you (whether by court order, agreement or\n"
+"otherwise) that contradict the conditions of this License, they do not\n"
+"excuse you from the conditions of this License.  If you cannot\n"
+"distribute so as to satisfy simultaneously your obligations under this\n"
+"License and any other pertinent obligations, then as a consequence you\n"
+"may not distribute the Program at all.  For example, if a patent\n"
+"license would not permit royalty-free redistribution of the Program by\n"
+"all those who receive copies directly or indirectly through you, then\n"
+"the only way you could satisfy both it and this License would be to\n"
+"refrain entirely from distribution of the Program.\n"
+"\n"
+"If any portion of this section is held invalid or unenforceable under\n"
+"any particular circumstance, the balance of the section is intended to\n"
+"apply and the section as a whole is intended to apply in other\n"
+"circumstances.\n"
+"\n"
+"It is not the purpose of this section to induce you to infringe any\n"
+"patents or other property right claims or to contest validity of any\n"
+"such claims; this section has the sole purpose of protecting the\n"
+"integrity of the free software distribution system, which is\n"
+"implemented by public license practices.  Many people have made\n"
+"generous contributions to the wide range of software distributed\n"
+"through that system in reliance on consistent application of that\n"
+"system; it is up to the author/donor to decide if he or she is willing\n"
+"to distribute software through any other system and a licensee cannot\n"
+"impose that choice.\n"
+"\n"
+"This section is intended to make thoroughly clear what is believed to\n"
+"be a consequence of the rest of this License.\n"
+"\n"
+"  8. If the distribution and/or use of the Program is restricted in\n"
+"certain countries either by patents or by copyrighted interfaces, the\n"
+"original copyright holder who places the Program under this License\n"
+"may add an explicit geographical distribution limitation excluding\n"
+"those countries, so that distribution is permitted only in or among\n"
+"countries not thus excluded.  In such case, this License incorporates\n"
+"the limitation as if written in the body of this License.\n"
+"\n"
+"  9. The Free Software Foundation may publish revised and/or new versions\n"
+"of the General Public License from time to time.  Such new versions will\n"
+"be similar in spirit to the present version, but may differ in detail to\n"
+"address new problems or concerns.\n"
+"\n"
+"Each version is given a distinguishing version number.  If the Program\n"
+"specifies a version number of this License which applies to it and \"any\n"
+"later version\", you have the option of following the terms and conditions\n"
+"either of that version or of any later version published by the Free\n"
+"Software Foundation.  If the Program does not specify a version number of\n"
+"this License, you may choose any version ever published by the Free Software\n"
+"Foundation.\n"
+"\n"
+"  10. If you wish to incorporate parts of the Program into other free\n"
+"programs whose distribution conditions are different, write to the author\n"
+"to ask for permission.  For software which is copyrighted by the Free\n"
+"Software Foundation, write to the Free Software Foundation; we sometimes\n"
+"make exceptions for this.  Our decision will be guided by the two goals\n"
+"of preserving the free status of all derivatives of our free software and\n"
+"of promoting the sharing and reuse of software generally.\n"
+"\n"
+"			    NO WARRANTY\n"
+"\n"
+"  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
+"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
+"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
+"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\n"
+"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
+"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
+"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
+"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
+"REPAIR OR CORRECTION.\n"
+"\n"
+"  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
+"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
+"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
+"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
+"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
+"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
+"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
+"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
+"POSSIBILITY OF SUCH DAMAGES.\n"
+"\n"
+};
+
+
+resource 'STR#' (5001, "German") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Deutsch",
+        /* [2] */
+        "Akzeptieren",
+        /* [3] */
+        "Ablehnen",
+        /* [4] */
+        "Drucken",
+        /* [5] */
+        "Sichern...",
+        /* [6] */
+        "Klicken Sie auf kzeptieren wenn Sie mit den Bestimmungen des "
+        "Software-Lizenzvertrages einverstanden sind. Falls nicht, klicken "
+        "Sie bitte blehnenan. Sie knnen die Software nur installieren, "
+        "wenn Sie kzeptierenangeklickt haben.",
+        /* [7] */
+        "Software-Lizenzvertrag",
+        /* [8] */
+        "Dieser Text kann nicht gesichert werden. Diese Festplatte ist "
+        "mglicherweise voll oder geschtzt oder der Ordner ist geschtzt.",
+        /* [9] */
+        "Es kann nicht gedruckt werden. Bitte stellen Sie sicher, da ein "
+        "Drucker ausgewhlt ist."
+    }
+};
+
+resource 'STR#' (5002, "English") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "English",
+        /* [2] */
+        "Agree",
+        /* [3] */
+        "Disagree",
+        /* [4] */
+        "Print",
+        /* [5] */
+        "Save...",
+        /* [6] */
+        "IMPORTANT - Read this License Agreement carefully before clicking on "
+        "the \"Agree\" button.  By clicking on the \"Agree\" button, you agree "
+        "to be bound by the terms of the License Agreement.",
+        /* [7] */
+        "Software License Agreement",
+        /* [8] */
+        "This text cannot be saved. This disk may be full or locked, or the file "
+        "may be locked.",
+        /* [9] */
+        "Unable to print. Make sure youe selected a printer."
+    }
+};
+
+resource 'STR#' (5003, "Spanish") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Espaol",
+        /* [2] */
+        "Aceptar",
+        /* [3] */
+        "No aceptar",
+        /* [4] */
+        "Imprimir",
+        /* [5] */
+        "Guardar...",
+        /* [6] */
+        "Si est de acuerdo con los trminos de esta licencia, pulse \"Aceptar\" "
+        "para instalar el software. En el supuesto de que no est de acuerdo con "
+        "los trminos de esta licencia, pulse \"No aceptar.\"",
+        /* [7] */
+        "Licencia de Software",
+        /* [8] */
+        "Este texto no se puede guardar. El disco puede estar lleno o bloqueado, "
+        "o el archivo puede estar bloqueado.",
+        /* [9] */
+        "No se puede imprimir. Compruebe que ha seleccionado una impresora."
+    }
+};
+
+resource 'STR#' (5004, "French") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Franais",
+        /* [2] */
+        "Accepter",
+        /* [3] */
+        "Refuser",
+        /* [4] */
+        "Imprimer",
+        /* [5] */
+        "Enregistrer...",
+        /* [6] */
+        "Si vous acceptez les termes de la prsente licence, cliquez sur "
+        "\"Accepter\" afin d'installer le logiciel. Si vous n'tes pas d'accord "
+        "avec les termes de la licence, cliquez sur \"Refuser\".",
+        /* [7] */
+        "Contrat de licence de logiciel",
+        /* [8] */
+        "Ce texte ne peut tre sauvegard. Le disque est peut-tre satur ou "
+        "verrouill, ou bien le fichier est peut-tre verrouill.",
+        /* [9] */
+        "Impression impossible. Assurez-vous dvoir slectionn une imprimante."
+    }
+};
+
+resource 'STR#' (5005, "Italian") {
+    {    /* array StringArray: 9 elements */
+        /* [1] */
+        "Italiano",
+        /* [2] */
+        "Accetto",
+        /* [3] */
+        "Rifiuto",
+        /* [4] */
+        "Stampa",
+        /* [5] */
+        "Registra...",
+        /* [6] */
+        "Se accetti le condizioni di questa licenza, fai clic su \"Accetto\" per "
+        "installare il software. Altrimenti fai clic su \"Rifiuto\".",
+        /* [7] */
+        "Licenza Software",
+        /* [8] */
+        "Non posso registrare il testo. Il disco potrebbe essere pieno o protetto "
+        "oppure il documento potrebbe essere protetto.",
+        /* [9] */
+        "Non posso stampare. Assicurati di aver selezionato una stampante."
+    }
+};
+
+resource 'STR#' (5006, "Japanese") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Japanese",
+        /* [2] */
+        "ӂ܂",
+        /* [3] */
+        "ӂ܂+        /* [4] */
+        "
+        /* [5] */
+        "ۑ...",
+        /* [6] */
+        "{\\tgEGAgp̏ɓӂ"
+        "ꍇɂ́A\\tgEGAXg["
+        "邽߂Ɂuӂ܂vĂ"
+        "B@ӂꍇɂ́Auӂ܂        "vĂB",
+        /* [7] */
+        "\\tgEFAgp",
+        /* [8] */
+        "̃eLXǵAۑł܂̃fB"
+        "XNɋ󂫂bN\\"
+        "B܂́Ãt@CbN"
+        "\\B",
+        /* [9] */
+        "ł܂v^I+        "Ă邱ƂFĂB"
+    }
+};
+
+resource 'STR#' (5007, "Dutch") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Nederlands",
+        /* [2] */
+        "Ja",
+        /* [3] */
+        "Nee",
+        /* [4] */
+        "Print",
+        /* [5] */
+        "Bewaar...",
+        /* [6] */
+        "Indien u akkoord gaat met de voorwaarden van deze licentie, kunt u op 'Ja' "
+        "klikken om de programmatuur te installeren. Indien u niet akkoord gaat, "
+        "klikt u op 'Nee'.",
+        /* [7] */
+        "Softwarelicentie",
+        /* [8] */
+        "De tekst kan niet worden bewaard. Het kan zijn dat uw schijf vol of "
+        "beveiligd is of dat het bestand beveiligd is.",
+        /* [9] */
+        "Afdrukken niet mogelijk. Zorg dat er een printer is geselecteerd."
+    }
+};
+
+resource 'STR#' (5008, "Swedish") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Svensk",
+        /* [2] */
+        "Godknns",
+        /* [3] */
+        "Avbjs",
+        /* [4] */
+        "Skriv ut",
+        /* [5] */
+        "Spara...",
+        /* [6] */
+        "Om Du godknner licensvillkoren klicka p \"Godknns\" fr att installera "
+        "programprodukten. Om Du inte godknner licensvillkoren, klicka p \"Avbjs\".",
+        /* [7] */
+        "Licensavtal fr Programprodukt",
+        /* [8] */
+        "Den hr texten kan inte sparas eftersom antingen skivan r full eller skivan "
+        "och/eller dokumentet r lst.",
+        /* [9] */
+        "Kan inte skriva ut. Kontrollera att du har valt en skrivare. "
+    }
+};
+
+resource 'STR#' (5009, "Brazilian Portuguese") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Portugus, Brasil",
+        /* [2] */
+        "Concordar",
+        /* [3] */
+        "Discordar",
+        /* [4] */
+        "Imprimir",
+        /* [5] */
+        "Salvar...",
+        /* [6] */
+        "Se est de acordo com os termos desta licena, pressione \"Concordar\" para "
+        "instalar o software. Se no est de acordo, pressione \"Discordar\".",
+        /* [7] */
+        "Licena de Uso de Software",
+        /* [8] */
+        "Este texto no pode ser salvo. O disco pode estar cheio ou\nbloqueado, ou o "
+        "arquivo pode estar bloqueado.",
+        /* [9] */
+        "No  possvel imprimir. Comprove que voc selecionou uma impressora."
+    }
+};
+
+resource 'STR#' (5010, "Simplified Chinese") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Simplified Chinese",
+        /* [2] */
+        "ͬ",
+        /* [3] */
+        "ͬ",
+        /* [4] */
+        ",
+        /* [5] */
+        "洢",
+        /* [6] */
+        "ͬ"
+        "װͬͬ"
+        "",
+        /* [7] */
+        "",
+        /* [8] */
+        "洢ܱ̿+        "Ҳ",
+        /* [9] */
+        "ȷѡһ̨+    }
+};
+
+resource 'STR#' (5011, "Traditional Chinese") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Traditional Chinese",
+        /* [2] */
+        "PN",
+        /* [3] */
+        "PN",
+        /* [4] */
+        "CL",
+        /* [5] */
+        "sK",
+        /* [6] */
+        "pGzPN\\i̪ЫPN"
+        "Hw˳nCpGPNAЫPNC",
+        /* [7] */
+        "n\\i,
+        /* [8] */
+        "LksCoӺϺХiάOw"
+        "AɮפwgwC",
+        /* [9] */
+        "LkCLCнTwzwgFLC"
+    }
+};
+
+resource 'STR#' (5012, "Danish") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Dansk",
+        /* [2] */
+        "Enig",
+        /* [3] */
+        "Uenig",
+        /* [4] */
+        "Udskriv",
+        /* [5] */
+        "Arkiver...",
+        /* [6] */
+        "Hvis du accepterer betingelserne i licensaftalen, skal du klikke p nig"
+        "for at installere softwaren. Klik p enigfor at annullere installeringen.",
+        /* [7] */
+        "Licensaftale for software",
+        /* [8] */
+        "Teksten kan ikke arkiveres. Disken er evt. fuld eller lst, eller ogs er "
+        "arkivet lst.",
+        /* [9] */
+        "Kan ikke udskrive. Srg for, at der er valgt en printer."
+    }
+};
+
+resource 'STR#' (5013, "Finnish") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Suomi",
+        /* [2] */
+        "Hyvksyn",
+        /* [3] */
+        "En hyvksy",
+        /* [4] */
+        "Tulosta",
+        /* [5] */
+        "Tallenna,
+        /* [6] */
+        "Hyvksy lisenssisopimuksen ehdot osoittamalla yvksy Jos et hyvksy "
+        "sopimuksen ehtoja, osoita n hyvksy",
+        /* [7] */
+        "Lisenssisopimus",
+        /* [8] */
+        "Teksti ei voida tallentaa. Levy voi olla tynn tai lukittu.",
+        /* [9] */
+        "Teksti ei voida tulostaa. Varmista, ett kirjoitin on valittu."
+    }
+};
+
+resource 'STR#' (5014, "French Canadian") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Franais canadien",
+        /* [2] */
+        "Accepter",
+        /* [3] */
+        "Refuser",
+        /* [4] */
+        "Imprimer",
+        /* [5] */
+        "Enregistrer...",
+        /* [6] */
+        "Si vous acceptez les termes de la prsente licence, cliquez sur \"Accepter\" "
+        "afin d'installer le logiciel. Si vous n'tes pas d'accord avec les termes de "
+        "la licence, cliquez sur \"Refuser\".",
+        /* [7] */
+        "Contrat de licence de logiciel",
+        /* [8] */
+        "Ce texte ne peut tre sauvegard. Le disque est peut-tre satur ou verrouill, "
+        "ou bien le fichier est peut-tre verrouill.",
+        /* [9] */
+        "Impression impossible. Assurez-vous dvoir slectionn une imprimante."
+    }
+};
+
+resource 'STR#' (5015, "Korean") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Korean",
+        /* [2] */
+        "",
+        /* [3] */
+        " ,
+        /* [4] */
+        "Ʈ",
+        /* [5] */
+        "...",
+        /* [6] */
+        "  뿡 \"\" 
+        "   ġʽÿ 
+        "´ٸ\" " ߸ "
+        "ʽÿ",
+        /* [7] */
+        "  ",
+        /* [8] */
+        " Ʈ  ϴ  "
+        "áų ϴ Ǵ"
+        "  ϴ",
+        /* [9] */
+        "Ʈ ϴ  "
+        "ʽÿ"
+    }
+};
+
+resource 'STR#' (5016, "Norwegian") {
+    {   /* array StringArray: 9 elements */
+        /* [1] */
+        "Norsk",
+        /* [2] */
+        "Enig",
+        /* [3] */
+        "Ikke enig",
+        /* [4] */
+        "Skriv ut",
+        /* [5] */
+        "Arkiver...",
+        /* [6] */
+        "Hvis De er enig i bestemmelsene i denne lisensavtalen, klikker De p "
+        "\"Enig\"-knappen for  installere programvaren. Hvis De ikke er enig, "
+        "klikker De p \"Ikke enig\".",
+        /* [7] */
+        "Programvarelisensavtale",
+        /* [8] */
+        "Denne teksten kan ikke arkiveres. Disken kan vre full eller lst, "
+        "eller filen kan vre lst. ",
+        /* [9] */
+        "Kan ikke skrive ut. Forsikre deg om at du har valgt en skriver. "
+    }
+};
diff --git a/packaging/fwbuilder-160x60.bmp b/packaging/fwbuilder-160x60.bmp
new file mode 100644
index 0000000..8c22909
Binary files /dev/null and b/packaging/fwbuilder-160x60.bmp differ
diff --git a/packaging/fwbuilder-164x314.bmp b/packaging/fwbuilder-164x314.bmp
new file mode 100644
index 0000000..7cdde00
Binary files /dev/null and b/packaging/fwbuilder-164x314.bmp differ
diff --git a/packaging/fwbuilder.nsi.in b/packaging/fwbuilder.nsi.in
new file mode 100755
index 0000000..7bbd5fa
--- /dev/null
+++ b/packaging/fwbuilder.nsi.in
@@ -0,0 +1,407 @@
+; fwbuilder.nsi
+;
+;
+!verbose 1
+;--------------------------------
+;Variables
+
+Var MUI_TEMP
+Var STARTMENU_FOLDER
+
+; GENERATION is used to build the path in the registry, it should be coordinated
+; with the path defined in FWBSettings class
+;
+!define GENERATION "@GENERATION@"
+!define GENERATION_SHORT "@GENERATION_SHORT@"
+!define VERSION "@VERSION@"
+
+
+
+!define APPNAME "FirewallBuilder${GENERATION}"
+
+;------------------------------------------------------------------------------
+; GetWindowsVersion
+;
+; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/
+; Returns on top of stack
+;
+; Windows Version (95, 98, ME, NT x.x, 2000)
+; or
+; '' (Unknown Windows Version)
+;
+; Usage:
+;   Call GetWindowsVersion
+;   Pop $0
+;   ; at this point $0 is "NT 4.0" or whatnot
+
+Function GetWindowsVersion
+  Push $0
+  Push $9
+  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+  StrCmp $0 "" 0 lbl_winnt
+  ; we are not NT.
+  ReadRegStr $0 HKLM SOFTWARE\Microsoft\Windows\CurrentVersion VersionNumber
+ 
+  StrCpy $9 $0 1
+  StrCmp $9 '4' 0 lbl_error
+
+  StrCpy $9 $0 3
+
+  StrCmp $9 '4.0' lbl_win32_95
+  StrCmp $9 '4.9' lbl_win32_ME lbl_win32_98
+
+  lbl_win32_95:
+    StrCpy $0 '95'
+  Goto lbl_done
+
+  lbl_win32_98:
+    StrCpy $0 '98'
+  Goto lbl_done
+
+  lbl_win32_ME:
+    StrCpy $0 'ME'
+  Goto lbl_done
+
+  lbl_winnt: 
+
+    StrCpy $9 $0 1
+    StrCmp $9 '3' lbl_winnt_x
+    StrCmp $9 '4' lbl_winnt_x
+    StrCmp $9 '5' lbl_winnt_5
+    StrCmp $9 '6' lbl_winnt_6 lbl_error
+
+    lbl_winnt_x:
+      StrCpy $0 "NT $0" 6
+    Goto lbl_done
+
+    lbl_winnt_5:
+      Strcpy $0 '2000'
+    Goto lbl_done
+
+    lbl_winnt_6:
+      Strcpy $0 'Vista'
+    Goto lbl_done
+
+  lbl_error:
+    Strcpy $0 ''
+  lbl_done:
+  Pop $9
+  Exch $0
+FunctionEnd
+
+
+Function .onInit
+
+  Call GetWindowsVersion
+  Pop $0
+
+  StrCmp $0 "NT 4.0" lbl_done check_2000
+  check_2000:
+      StrCmp $0 "2000" lbl_done check_vista
+  check_vista:
+      StrCmp $0 "Vista" lbl_done lbl_error
+  lbl_error:
+      MessageBox MB_OK  "Firewall Builder supports only Windows 2000, Windows XP and Vista platform."
+      Abort
+
+lbl_done:
+
+FunctionEnd
+
+
+Function un.UninstallSurveyPageText
+
+  IfFileExists $PROFILE\fwb4*license* +4 0
+  IfFileExists $PROFILE\Documents\fwb4*license* +3 0
+
+  MessageBox MB_YESNO "Help us improve Firewall Builder!  If you are \
+uninstalling because you don't plan to use the software please fill out \
+a short survey to tell us why you are leaving and what we can do better.\
+$\n\
+$\n\
+Click Yes to open the survey in your web browser, click No to exit the \
+uninstaller." IDNO +2
+
+  ExecShell open "http://www.fwbuilder.org/uninstall_survey.html" 
+
+;  MessageBox MB_ICONSTOP "Continuing uninstaller"
+
+FunctionEnd
+
+
+;****************************************************************************
+;Include Modern UI
+
+  !include "MUI2.nsh"
+
+;****************************************************************************
+
+  setCompressor lzma
+
+  Name "Firewall Builder ${GENERATION}"
+  Caption "Firewall Builder installation"
+  OutFile "fwbuilder-${VERSION}.exe"
+
+;  Default installation folder
+  InstallDir "C:\FWBuilder${GENERATION_SHORT}"
+
+;****************************************************************************
+; We need to keep installation data and program settings in
+; registry folders with different names. QSettings always looks into
+; Current User registry first, so if the folders have the same names,
+; then we store evaluation key in Current User, while it is better
+; to put it in the Local Machine branch.
+;
+; So, installation data goes to HKLM Software\NetCitadel\FirewallBuilder\2.1
+; and settings to HKCU Software\NetCitadel\FirewallBuilder2_1
+;
+; fwbuilder-lm determines folder path for the license file by
+; reading key Install_Dir under HKLM Software\NetCitadel\FirewallBuilder\2.1
+;
+;****************************************************************************
+;
+;  Get installation folder from registry if available
+
+  InstallDirRegKey HKLM Software\NetCitadel\${APPNAME} "Install_Dir"
+
+;****************************************************************************
+;Interface Settings
+
+  !define MUI_ABORTWARNING
+
+  ;Start Menu Folder Page Configuration
+  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
+  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\NetCitadel\${APPNAME}" 
+  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+
+  LicenseText "GNU GENERAL PUBLIC LICENSE"
+  LicenseData "doc\COPYING"
+
+  !define MUI_HEADERIMAGE
+  !define MUI_HEADERIMAGE_BITMAP       packaging\fwbuilder-160x60.bmp
+  !define MUI_WELCOMEFINISHPAGE_BITMAP packaging\fwbuilder-164x314.bmp
+
+;****************************************************************************
+; The following macros add PageEx statements
+
+  !insertmacro MUI_PAGE_LICENSE  "doc\COPYING"
+;  !insertmacro MUI_PAGE_COMPONENTS
+  !insertmacro MUI_PAGE_DIRECTORY
+  !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+  !insertmacro MUI_PAGE_INSTFILES
+
+; Uninstaller starts with a custom page that asks the user to fill survey
+
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+  UninstPage custom un.UninstallSurveyPageText
+
+; Set language
+  !insertmacro MUI_LANGUAGE "English"
+
+;****************************************************************************
+; Request elevated priviliges
+
+  RequestExecutionLevel admin
+
+;****************************************************************************
+; The stuff to install
+Section "FWBuilder (required)"
+
+; Set output path to the installation directory.
+;  SetOutPath $INSTDIR
+
+  SetOutPath $INSTDIR\resources
+
+  File src\res\resources.xml
+  File src\res\templates.xml
+  File src\res\objects_init.xml
...
 
[truncated message content]

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, builds, updated. v5.0.1-17-g49ae170

From: <gi...@ir...> - 2012-03-19 03:56:13

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, builds has been updated
       via  49ae170756789b7a7a9014ed1d5bb4196aed56b5 (commit)
       via  24416b751a9990a3c11d55718e660acf72afb3da (commit)
       via  3520002f56a834639ef60c97a044951190eec70b (commit)
       via  0e9b904d1deb433ee4d9f682e5f0eafde5280b61 (commit)
      from  890d89506f2199ba4faefa6f581eeed5528ab4e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 VERSION                                            |    2 +-
 VERSION.h                                          |    2 +-
 doc/ChangeLog                                      |   12 +
 packaging/fwbuilder-static-qt.spec                 |    2 +-
 packaging/fwbuilder.control                        |    2 +-
 packaging/fwbuilder.spec                           |    2 +-
 src/compiler_lib/CompilerDriver.cpp                |    2 +-
 src/iptlib/AutomaticRules_ipt.cpp                  |    8 +-
 src/libgui/clusterMembersDialog.cpp                |    5 +-
 src/res/help/en_US/release_notes_5.0.2.html        |  118 +++
 test/ipt/cluster-tests.fwb                         | 1069 +++++---------------
 test/ipt/cluster1_secuwall-1.fw.orig               |  669 ------------
 test/ipt/firewall-base-rulesets.fw.orig            |    6 +-
 test/ipt/firewall-ipv6-1.fw.orig                   |   30 +-
 test/ipt/firewall-ipv6-2.fw.orig                   |   30 +-
 test/ipt/firewall-ipv6-3.fw.orig                   |   30 +-
 test/ipt/firewall-ipv6-4-1.fw.orig                 |   26 +-
 test/ipt/firewall-ipv6-4.fw.orig                   |   27 +-
 test/ipt/firewall-ipv6-5.fw.orig                   |    6 +-
 test/ipt/firewall-ipv6-6.fw.orig                   |    6 +-
 test/ipt/firewall-ipv6-7.fw.orig                   |    6 +-
 test/ipt/firewall-ipv6-8.fw.orig                   |    6 +-
 ...ewall-ipv6-ipt-reset-prolog-after-flush.fw.orig |    6 +-
 ...-ipv6-ipt-reset-prolog-after-interfaces.fw.orig |    6 +-
 .../ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig |    6 +-
 test/ipt/firewall-ipv6-nd-ns-1.fw.orig             |    6 +-
 test/ipt/firewall-ipv6-nd-ns-2.fw.orig             |    6 +-
 test/ipt/firewall-ipv6-prolog-after-flush.fw.orig  |    6 +-
 .../firewall-ipv6-prolog-after-interfaces.fw.orig  |    6 +-
 test/ipt/firewall-ipv6-prolog-top.fw.orig          |    6 +-
 test/ipt/firewall-server-1-s.fw.orig               |    6 +-
 test/ipt/firewall.fw.orig                          |    6 +-
 test/ipt/firewall1.fw.orig                         |    6 +-
 test/ipt/firewall10.fw.orig                        |    6 +-
 test/ipt/firewall11.fw.orig                        |    6 +-
 test/ipt/firewall12.fw.orig                        |    6 +-
 test/ipt/firewall13.fw.orig                        |    6 +-
 test/ipt/firewall14.fw.orig                        |    6 +-
 test/ipt/firewall15.fw.orig                        |    6 +-
 test/ipt/firewall16.fw.orig                        |    6 +-
 test/ipt/firewall17.fw.orig                        |    6 +-
 test/ipt/firewall18.fw.orig                        |    6 +-
 test/ipt/firewall19.fw.orig                        |    6 +-
 test/ipt/firewall2-1.fw.orig                       |    6 +-
 test/ipt/firewall2-2.fw.orig                       |    6 +-
 test/ipt/firewall2-3.fw.orig                       |    6 +-
 test/ipt/firewall2-4.fw.orig                       |    6 +-
 test/ipt/firewall2-5.fw.orig                       |    6 +-
 test/ipt/firewall2-6.fw.orig                       |    6 +-
 test/ipt/firewall2-7.fw.orig                       |    6 +-
 test/ipt/firewall2.fw.orig                         |    6 +-
 test/ipt/firewall20-ipv6.fw.orig                   |    6 +-
 test/ipt/firewall20.fw.orig                        |    6 +-
 test/ipt/firewall21-1.fw.orig                      |    6 +-
 test/ipt/firewall21.fw.orig                        |    6 +-
 test/ipt/firewall22.fw.orig                        |    6 +-
 test/ipt/firewall23-1.fw.orig                      |    6 +-
 test/ipt/firewall23-2.fw.orig                      |    6 +-
 test/ipt/firewall23-3.fw.orig                      |    6 +-
 test/ipt/firewall23.fw.orig                        |    6 +-
 test/ipt/firewall24.fw.orig                        |    6 +-
 test/ipt/firewall25.fw.orig                        |    6 +-
 test/ipt/firewall26.fw.orig                        |    6 +-
 test/ipt/firewall27.fw.orig                        |    6 +-
 test/ipt/firewall28.fw.orig                        |    6 +-
 test/ipt/firewall29.fw.orig                        |    6 +-
 test/ipt/firewall3.fw.orig                         |    6 +-
 test/ipt/firewall30.fw.orig                        |    6 +-
 test/ipt/firewall31.fw.orig                        |    6 +-
 test/ipt/firewall32.fw.orig                        |    6 +-
 test/ipt/firewall33-1.fw.orig                      |   22 +-
 test/ipt/firewall33.fw.orig                        |   24 +-
 test/ipt/firewall34.fw.orig                        |    6 +-
 test/ipt/firewall35.fw.orig                        |    6 +-
 test/ipt/firewall36-1.fw.orig                      |    6 +-
 test/ipt/firewall36-2.fw.orig                      |    6 +-
 test/ipt/firewall36.fw.orig                        |    6 +-
 test/ipt/firewall37-1.fw.orig                      |    6 +-
 test/ipt/firewall37-2.fw.orig                      |    6 +-
 test/ipt/firewall37.fw.orig                        |   19 +-
 test/ipt/firewall38.fw.orig                        |    6 +-
 test/ipt/firewall39.fw.orig                        |    6 +-
 test/ipt/firewall4.fw.orig                         |    6 +-
 test/ipt/firewall40-1.fw.orig                      |    6 +-
 test/ipt/firewall40-2.fw.orig                      |    6 +-
 test/ipt/firewall40.fw.orig                        |    6 +-
 test/ipt/firewall41-1.fw.orig                      |    6 +-
 test/ipt/firewall41.fw.orig                        |    6 +-
 test/ipt/firewall42.fw.orig                        |    6 +-
 test/ipt/firewall5.fw.orig                         |    6 +-
 test/ipt/firewall50.fw.orig                        |    6 +-
 test/ipt/firewall51.fw.orig                        |    6 +-
 test/ipt/firewall6.fw.orig                         |    6 +-
 test/ipt/firewall60.fw.orig                        |    6 +-
 test/ipt/firewall61-1.2.5.fw.orig                  |    6 +-
 test/ipt/firewall61-1.2.6.fw.orig                  |    6 +-
 test/ipt/firewall61-1.3.x.fw.orig                  |    6 +-
 test/ipt/firewall61-1.4.fw.orig                    |    6 +-
 test/ipt/firewall62.fw.orig                        |    6 +-
 test/ipt/firewall63.fw.orig                        |    6 +-
 test/ipt/firewall7.fw.orig                         |    6 +-
 test/ipt/firewall70.fw.orig                        |    6 +-
 test/ipt/firewall71.fw.orig                        |    6 +-
 test/ipt/firewall72-1.3.x.fw.orig                  |    6 +-
 test/ipt/firewall72-1.4.3.fw.orig                  |    6 +-
 test/ipt/firewall73.fw.orig                        |    6 +-
 test/ipt/firewall74.fw.orig                        |    6 +-
 test/ipt/firewall8.fw.orig                         |    6 +-
 test/ipt/firewall80.fw.orig                        |    6 +-
 test/ipt/firewall81.fw.orig                        |    6 +-
 test/ipt/firewall82.fw.orig                        |    6 +-
 test/ipt/firewall82_A.fw.orig                      |    6 +-
 test/ipt/firewall82_B.fw.orig                      |    6 +-
 test/ipt/firewall9.fw.orig                         |    6 +-
 test/ipt/firewall90.fw.orig                        |    6 +-
 test/ipt/firewall91.fw.orig                        |    6 +-
 test/ipt/firewall92.fw.orig                        |    6 +-
 test/ipt/firewall93.fw.orig                        |    6 +-
 test/ipt/firewall94.fw.orig                        |    6 +-
 test/ipt/firewall95.fw.orig                        |    6 +-
 test/ipt/fw-A.fw.orig                              |    6 +-
 test/ipt/fw1.fw.orig                               |    6 +-
 test/ipt/fwbuilder.fw.orig                         |    6 +-
 test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig   |    6 +-
 test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig   |    6 +-
 test/ipt/heartbeat_cluster_1_linux-1.fw.orig       |    6 +-
 test/ipt/heartbeat_cluster_1_linux-2.fw.orig       |    6 +-
 test/ipt/heartbeat_cluster_2_linux-1.fw.orig       |    6 +-
 test/ipt/heartbeat_cluster_2_linux-2.fw.orig       |    6 +-
 test/ipt/host.fw.orig                              |    6 +-
 test/ipt/openais_cluster_1_linux-1.fw.orig         |    6 +-
 test/ipt/openais_cluster_1_linux-2.fw.orig         |    6 +-
 test/ipt/rc.firewall.local                         |    4 +-
 test/ipt/rh90.fw.orig                              |    6 +-
 test/ipt/secuwall-1.fw.orig                        |  647 ------------
 test/ipt/secuwall_cluster_1_secuwall-1.fw.orig     |  486 ---------
 test/ipt/server-cluster-1_server-1.fw.orig         |    6 +-
 test/ipt/server-cluster-1_server-2.fw.orig         |    6 +-
 test/ipt/test-shadowing-1.fw.orig                  |    6 +-
 test/ipt/test-shadowing-2.fw.orig                  |    6 +-
 test/ipt/test-shadowing-3.fw.orig                  |    6 +-
 test/ipt/test_fw.fw.orig                           |    6 +-
 test/ipt/vrrp_cluster_1_linux-1.fw.orig            |    6 +-
 test/ipt/vrrp_cluster_1_linux-2.fw.orig            |    6 +-
 test/ipt/vrrp_cluster_2_linux-1.fw.orig            |    6 +-
 test/ipt/vrrp_cluster_2_linux-2.fw.orig            |    6 +-
 test/ipt/vrrp_cluster_2_linux-3.fw.orig            |    6 +-
 147 files changed, 815 insertions(+), 3167 deletions(-)
 create mode 100644 src/res/help/en_US/release_notes_5.0.2.html
 delete mode 100755 test/ipt/cluster1_secuwall-1.fw.orig
 delete mode 100755 test/ipt/secuwall-1.fw.orig
 delete mode 100755 test/ipt/secuwall_cluster_1_secuwall-1.fw.orig


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-17-g49ae170

From: <gi...@ir...> - 2012-03-19 03:55:51

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  49ae170756789b7a7a9014ed1d5bb4196aed56b5 (commit)
      from  24416b751a9990a3c11d55718e660acf72afb3da (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 49ae170756789b7a7a9014ed1d5bb4196aed56b5
Author: Vadim Kurland <va...@sl...>
Date:   Sun Mar 18 21:40:13 2012 -0700

    build 5.0.2.3597

diff --git a/VERSION b/VERSION
index 204c1f2..8590544 100644
--- a/VERSION
+++ b/VERSION
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=2
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3596"
+BUILD_NUM="3597"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 
diff --git a/VERSION.h b/VERSION.h
index 798cb35..e5ba23a 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION      "5.0.2.3596"
+#define VERSION      "5.0.2.3597"
 #define GENERATION   "5.0"
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index e567bda..bfb6fdd 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
 
 
 %define name    fwbuilder
-%define version 5.0.2.3596
+%define version 5.0.2.3597
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index a7ebaa5..c67d05d 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: va...@fw...
-Version: 5.0.2.3596-1
+Version: 5.0.2.3597-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 4ab71ad..79c2b2b 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 5.0.2.3596
+%define version 5.0.2.3597
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"

-----------------------------------------------------------------------

Summary of changes:
 VERSION                            |    2 +-
 VERSION.h                          |    2 +-
 packaging/fwbuilder-static-qt.spec |    2 +-
 packaging/fwbuilder.control        |    2 +-
 packaging/fwbuilder.spec           |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-16-g24416b7

From: <gi...@ir...> - 2012-03-19 03:48:08

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  24416b751a9990a3c11d55718e660acf72afb3da (commit)
      from  3520002f56a834639ef60c97a044951190eec70b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 24416b751a9990a3c11d55718e660acf72afb3da
Author: Vadim Kurland <va...@sl...>
Date:   Sun Mar 18 21:32:32 2012 -0700

    removed test objects for secuwall

diff --git a/src/res/help/en_US/release_notes_5.0.2.html b/src/res/help/en_US/release_notes_5.0.2.html
index 5d4c887..3594a01 100644
--- a/src/res/help/en_US/release_notes_5.0.2.html
+++ b/src/res/help/en_US/release_notes_5.0.2.html
@@ -35,21 +35,6 @@
 
 
 <!-- ######################################################################### -->
-<a name="import"></a>
-<h2>Changes in policy importer for all supported platforms</h2>
-
-<h3>Changes that affect import of PIX configurations</h3>
-<ul>
-
-  <li>
-    <p>
-    </p>
-  </li>
-
-</ul>
-
-
-<!-- ######################################################################### -->
 <a name="iptables"></a>
 <h2>Changes in support for iptables</h2>
 
diff --git a/test/ipt/cluster-tests.fwb b/test/ipt/cluster-tests.fwb
index 48b5a58..1b3afb6 100644
--- a/test/ipt/cluster-tests.fwb
+++ b/test/ipt/cluster-tests.fwb
@@ -1341,579 +1341,262 @@
       </PolicyRule>
       <RuleSetOptions/>
     </Policy>
-  </Library>
-  <Library id="id1495X69605" color="#d2ffd0" name="User" comment="" ro="False">
-    <ObjectGroup id="id1502X69605" name="Clusters" comment="" ro="False">
-      <Cluster id="id2366X75741" host_OS="secuwall" inactive="True" lastCompiled="1248670597" lastInstalled="0" lastModified="1289439976" platform="iptables" name="cluster1" comment="" ro="False">
-        <NAT id="id2370X75741" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
-          <NATRule id="id4606X78273" disabled="False" group="" position="0" action="Translate" comment="">
-            <OSrc neg="False">
-              <ObjectRef ref="id3DC75CE7-1"/>
-            </OSrc>
-            <ODst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </ODst>
-            <OSrv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </OSrv>
-            <TSrc neg="False">
-              <ObjectRef ref="id2374X75741"/>
-            </TSrc>
-            <TDst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </TDst>
-            <TSrv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </TSrv>
-            <ItfInb neg="False">
-              <ObjectRef ref="sysid0"/>
-            </ItfInb>
-            <ItfOutb neg="False">
-              <ObjectRef ref="sysid0"/>
-            </ItfOutb>
-            <NATRuleOptions/>
-          </NATRule>
-          <NATRule id="id8387X11449" disabled="False" group="" position="1" action="Translate" comment="">
-            <OSrc neg="False">
-              <ObjectRef ref="id3DC75CE7-1"/>
-            </OSrc>
-            <ODst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </ODst>
-            <OSrv neg="False">
-              <ServiceRef ref="tcp-HTTP"/>
-            </OSrv>
-            <TSrc neg="False">
-              <ObjectRef ref="sysid0"/>
-            </TSrc>
-            <TDst neg="False">
-              <ObjectRef ref="id2366X75741"/>
-            </TDst>
-            <TSrv neg="False">
-              <ServiceRef ref="id3B4FF09A"/>
-            </TSrv>
-            <ItfInb neg="False">
-              <ObjectRef ref="sysid0"/>
-            </ItfInb>
-            <ItfOutb neg="False">
-              <ObjectRef ref="sysid0"/>
-            </ItfOutb>
-            <NATRuleOptions/>
-          </NATRule>
+    <Firewall id="id4021X2906" host_OS="secuwall" inactive="False" lastCompiled="0" lastInstalled="0" lastModified="1244045700" platform="iptables" version="" name="secuwall-1" comment="This firewall has two interfaces. Eth0 faces outside and has a dynamic address; eth1 faces inside.&#10;Policy includes basic rules to permit unrestricted outbound access and anti-spoofing rules. Access to the firewall is permitted only from internal network and only using SSH. The firewall uses one of the machines on internal network for DNS. Internal network is configured with address 192.168.1.0/255.255.255.0" ro="False">
+      <NAT id="id4028X2906" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </NAT>
-        <Policy id="id2369X75741" name="Policy" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
-          <PolicyRule id="id2913X78273" disabled="False" group="" log="True" position="0" action="Deny" direction="Inbound" comment="anti spoofing rule">
-            <Src neg="False">
-              <ObjectRef ref="id3DC75CE7-1"/>
-              <ObjectRef ref="id2366X75741"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id2374X75741"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="pf_classify_str"></Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id2896X78273" disabled="False" group="" log="False" position="1" action="Accept" direction="Both" comment="">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id7784X43611"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="pf_classify_str"></Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id7697X27234" disabled="False" group="" log="False" position="2" action="Accept" direction="Both" comment="">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </Srv>
-            <Itf neg="True">
-              <ObjectRef ref="id2374X75741"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="pf_classify_str"></Option>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id36344X28692" disabled="False" group="" log="False" position="3" action="Accept" direction="Both" comment="&quot;firewall is part of any&quot; OFF">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </Srv>
-            <Itf neg="True">
-              <ObjectRef ref="id2374X75741"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="connlimit_above_not">False</Option>
-              <Option name="connlimit_masklen">0</Option>
-              <Option name="connlimit_value">0</Option>
-              <Option name="firewall_is_part_of_any_and_networks">0</Option>
-              <Option name="hashlimit_burst">0</Option>
-              <Option name="hashlimit_dstlimit">False</Option>
-              <Option name="hashlimit_expire">0</Option>
-              <Option name="hashlimit_gcinterval">0</Option>
-              <Option name="hashlimit_max">0</Option>
-              <Option name="hashlimit_mode_dstip">False</Option>
-              <Option name="hashlimit_mode_dstport">False</Option>
-              <Option name="hashlimit_mode_srcip">False</Option>
-              <Option name="hashlimit_mode_srcport">False</Option>
-              <Option name="hashlimit_name"></Option>
-              <Option name="hashlimit_size">0</Option>
-              <Option name="hashlimit_suffix"></Option>
-              <Option name="hashlimit_value">0</Option>
-              <Option name="limit_burst">0</Option>
-              <Option name="limit_suffix"></Option>
-              <Option name="limit_value">0</Option>
-              <Option name="limit_value_not">False</Option>
-              <Option name="log_level"></Option>
-              <Option name="log_prefix"></Option>
-              <Option name="pf_classify_str"></Option>
-              <Option name="stateless">False</Option>
-              <Option name="ulog_nlgroup">1</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id65013X28692" disabled="False" group="" log="False" position="4" action="Accept" direction="Both" comment="&quot;firewall is part of any&quot; OFF">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id2374X75741"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="connlimit_above_not">False</Option>
-              <Option name="connlimit_masklen">0</Option>
-              <Option name="connlimit_value">0</Option>
-              <Option name="firewall_is_part_of_any_and_networks">0</Option>
-              <Option name="hashlimit_burst">0</Option>
-              <Option name="hashlimit_dstlimit">False</Option>
-              <Option name="hashlimit_expire">0</Option>
-              <Option name="hashlimit_gcinterval">0</Option>
-              <Option name="hashlimit_max">0</Option>
-              <Option name="hashlimit_mode_dstip">False</Option>
-              <Option name="hashlimit_mode_dstport">False</Option>
-              <Option name="hashlimit_mode_srcip">False</Option>
-              <Option name="hashlimit_mode_srcport">False</Option>
-              <Option name="hashlimit_name"></Option>
-              <Option name="hashlimit_size">0</Option>
-              <Option name="hashlimit_suffix"></Option>
-              <Option name="hashlimit_value">0</Option>
-              <Option name="limit_burst">0</Option>
-              <Option name="limit_suffix"></Option>
-              <Option name="limit_value">0</Option>
-              <Option name="limit_value_not">False</Option>
-              <Option name="log_level"></Option>
-              <Option name="log_prefix"></Option>
-              <Option name="pf_classify_str"></Option>
-              <Option name="stateless">False</Option>
-              <Option name="ulog_nlgroup">1</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id8117X67022" disabled="False" group="interface group test" log="False" position="5" action="Accept" direction="Both" comment="">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id2366X75741"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="tcp-SSH"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id2374X75741"/>
-              <ObjectRef ref="id2379X75741"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="color">#C0BA44</Option>
-              <Option name="pf_classify_str"></Option>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id39519X67022" disabled="False" group="interface group test" log="False" position="6" action="Accept" direction="Both" comment="">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id2366X75741"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="tcp-SSH"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id39477X67022"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="color">#C0BA44</Option>
-              <Option name="connlimit_above_not">False</Option>
-              <Option name="connlimit_masklen">0</Option>
-              <Option name="connlimit_value">0</Option>
-              <Option name="firewall_is_part_of_any_and_networks"></Option>
-              <Option name="hashlimit_burst">0</Option>
-              <Option name="hashlimit_dstlimit">False</Option>
-              <Option name="hashlimit_expire">0</Option>
-              <Option name="hashlimit_gcinterval">0</Option>
-              <Option name="hashlimit_max">0</Option>
-              <Option name="hashlimit_mode_dstip">False</Option>
-              <Option name="hashlimit_mode_dstport">False</Option>
-              <Option name="hashlimit_mode_srcip">False</Option>
-              <Option name="hashlimit_mode_srcport">False</Option>
-              <Option name="hashlimit_name"></Option>
-              <Option name="hashlimit_size">0</Option>
-              <Option name="hashlimit_suffix"></Option>
-              <Option name="hashlimit_value">0</Option>
-              <Option name="limit_burst">0</Option>
-              <Option name="limit_suffix"></Option>
-              <Option name="limit_value">0</Option>
-              <Option name="limit_value_not">False</Option>
-              <Option name="log_level"></Option>
-              <Option name="log_prefix"></Option>
-              <Option name="pf_classify_str"></Option>
-              <Option name="stateless">False</Option>
-              <Option name="ulog_nlgroup">1</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id103230X67022" disabled="False" group="interface group test" log="False" position="7" action="Accept" direction="Both" comment="&quot;firewall is part of any&quot; OFF">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id2366X75741"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="tcp-SSH"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id2374X75741"/>
-              <ObjectRef ref="id2379X75741"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="color">#8BC065</Option>
-              <Option name="connlimit_above_not">False</Option>
-              <Option name="connlimit_masklen">0</Option>
-              <Option name="connlimit_value">0</Option>
-              <Option name="firewall_is_part_of_any_and_networks">0</Option>
-              <Option name="hashlimit_burst">0</Option>
-              <Option name="hashlimit_dstlimit">False</Option>
-              <Option name="hashlimit_expire">0</Option>
-              <Option name="hashlimit_gcinterval">0</Option>
-              <Option name="hashlimit_max">0</Option>
-              <Option name="hashlimit_mode_dstip">False</Option>
-              <Option name="hashlimit_mode_dstport">False</Option>
-              <Option name="hashlimit_mode_srcip">False</Option>
-              <Option name="hashlimit_mode_srcport">False</Option>
-              <Option name="hashlimit_name"></Option>
-              <Option name="hashlimit_size">0</Option>
-              <Option name="hashlimit_suffix"></Option>
-              <Option name="hashlimit_value">0</Option>
-              <Option name="limit_burst">0</Option>
-              <Option name="limit_suffix"></Option>
-              <Option name="limit_value">0</Option>
-              <Option name="limit_value_not">False</Option>
-              <Option name="log_level"></Option>
-              <Option name="log_prefix"></Option>
-              <Option name="pf_classify_str"></Option>
-              <Option name="stateless">False</Option>
-              <Option name="ulog_nlgroup">1</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id103183X67022" disabled="False" group="interface group test" log="False" position="8" action="Accept" direction="Both" comment="&quot;firewall is part of any&quot; OFF">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id2366X75741"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="tcp-SSH"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id39477X67022"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="color">#8BC065</Option>
-              <Option name="connlimit_above_not">False</Option>
-              <Option name="connlimit_masklen">0</Option>
-              <Option name="connlimit_value">0</Option>
-              <Option name="firewall_is_part_of_any_and_networks">0</Option>
-              <Option name="hashlimit_burst">0</Option>
-              <Option name="hashlimit_dstlimit">False</Option>
-              <Option name="hashlimit_expire">0</Option>
-              <Option name="hashlimit_gcinterval">0</Option>
-              <Option name="hashlimit_max">0</Option>
-              <Option name="hashlimit_mode_dstip">False</Option>
-              <Option name="hashlimit_mode_dstport">False</Option>
-              <Option name="hashlimit_mode_srcip">False</Option>
-              <Option name="hashlimit_mode_srcport">False</Option>
-              <Option name="hashlimit_name"></Option>
-              <Option name="hashlimit_size">0</Option>
-              <Option name="hashlimit_suffix"></Option>
-              <Option name="hashlimit_value">0</Option>
-              <Option name="limit_burst">0</Option>
-              <Option name="limit_suffix"></Option>
-              <Option name="limit_value">0</Option>
-              <Option name="limit_value_not">False</Option>
-              <Option name="log_level"></Option>
-              <Option name="log_prefix"></Option>
-              <Option name="pf_classify_str"></Option>
-              <Option name="stateless">False</Option>
-              <Option name="ulog_nlgroup">1</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id2879X78273" disabled="False" group="" log="False" position="9" action="Accept" direction="Both" comment="SSH Access to firewall is permitted&#10;only from internal network">
-            <Src neg="False">
-              <ObjectRef ref="id3DC75CE7-1"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id2366X75741"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="tcp-SSH"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="pf_classify_str"></Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id2862X78273" disabled="False" group="" log="True" position="10" action="Accept" direction="Both" comment="Firewall uses one of the machines&#10;on internal network for DNS">
-            <Src neg="False">
-              <ObjectRef ref="id2366X75741"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id3DC75CE7-1"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id3F530CC8"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="pf_classify_str"></Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id2845X78273" disabled="False" group="" log="True" position="11" action="Deny" direction="Both" comment="All other attempts to connect to&#10;the firewall are denied and logged">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id2366X75741"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="pf_classify_str"></Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id2828X78273" disabled="False" group="" log="False" position="12" action="Accept" direction="Both" comment="">
-            <Src neg="False">
-              <ObjectRef ref="id3DC75CE7-1"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="pf_classify_str"></Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id2811X78273" disabled="False" group="" log="True" position="13" action="Deny" direction="Both" comment="">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="pf_classify_str"></Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
+      <Policy id="id4027X2906" name="Policy" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </Policy>
-        <Routing id="id2371X75741" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
+      <Routing id="id4029X2906" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </Routing>
-        <Interface id="id2374X75741" dedicated_failover="False" dyn="False" label="cluster1 eth0" mgmt="False" security_level="0" unnum="False" unprotected="False" name="eth0" comment="" ro="False">
-          <IPv4 id="id2375X75741" name="cluster1:eth0:ip" comment="" ro="False" address="172.24.0.1" netmask="255.255.0.0"/>
-          <InterfaceOptions>
-            <Option name="iface_mtu">1500</Option>
-            <Option name="type">vrrp</Option>
-          </InterfaceOptions>
-          <FailoverClusterGroup id="id2377X75741" type="vrrp" name="cluster1:eth0:members" comment="">
-            <ObjectRef ref="id4030X2906"/>
-            <ObjectRef ref="id4055X2906"/>
-            <ClusterGroupOptions>
-              <Option name="vrrp_secret">not so secret</Option>
-              <Option name="vrrp_vrid">100</Option>
-            </ClusterGroupOptions>
-          </FailoverClusterGroup>
-        </Interface>
-        <Interface id="id2379X75741" dedicated_failover="False" dyn="False" label="cluster1 eth1" mgmt="False" security_level="0" unnum="False" unprotected="False" name="eth1" comment="" ro="False">
-          <IPv4 id="id2380X75741" name="cluster1:eth1:ip" comment="" ro="False" address="192.168.1.1" netmask="255.255.255.0"/>
+      <Interface id="id4030X2906" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="False" unprotected="False" name="eth0" comment="" ro="False">
+        <IPv4 id="id4032X2906" name="secuwall-1:eth0:ip" comment="" ro="False" address="172.24.0.2" netmask="255.255.0.0"/>
           <InterfaceOptions>
             <Option name="iface_mtu">1500</Option>
-            <Option name="type">vrrp</Option>
+          <Option name="type">ethernet</Option>
           </InterfaceOptions>
-          <FailoverClusterGroup id="id2382X75741" master_iface="id4033X2906" type="vrrp" name="cluster1:eth1:members" comment="">
-            <ObjectRef ref="id4033X2906"/>
-            <ObjectRef ref="id4058X2906"/>
-            <ClusterGroupOptions/>
-          </FailoverClusterGroup>
         </Interface>
-        <Interface id="id3213X42281" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="False" unprotected="False" name="eth2" comment="" ro="False">
+      <Interface id="id4033X2906" dedicated_failover="False" dyn="False" label="" mgmt="True" security_level="100" unnum="False" unprotected="False" name="eth1" comment="" ro="False">
+        <IPv4 id="id4036X2906" name="secuwall-1:eth1:ip" comment="" ro="False" address="192.168.1.2" netmask="255.255.255.0"/>
           <InterfaceOptions>
+          <Option name="iface_disablearp">False</Option>
+          <Option name="iface_disableboot">False</Option>
             <Option name="iface_mtu">1500</Option>
-            <Option name="type">vrrp</Option>
-            <Option name="vrrp_secret">my_secret</Option>
+          <Option name="iface_options"></Option>
+          <Option name="type">ethernet</Option>
+          <Option name="vlan_id"></Option>
           </InterfaceOptions>
         </Interface>
-        <Interface id="id7784X43611" dedicated_failover="False" dyn="False" label="cluster1 lo" mgmt="False" security_level="0" unnum="False" unprotected="False" name="lo" comment="" ro="False">
-          <IPv4 id="id7858X43611" name="cluster1:lo:ip" comment="" ro="False" address="127.0.0.1" netmask="255.0.0.0"/>
+      <Interface id="id4038X2906" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="100" unnum="False" unprotected="False" name="lo" comment="" ro="False">
+        <IPv4 id="id4040X2906" name="secuwall-1:lo:ip" comment="" ro="False" address="127.0.0.1" netmask="255.0.0.0"/>
           <InterfaceOptions>
             <Option name="iface_mtu">1500</Option>
             <Option name="iface_type">ethernet</Option>
-            <Option name="type">ethernet</Option>
           </InterfaceOptions>
-          <FailoverClusterGroup id="id7818X43611" type="vrrp" name="Failover group" comment="">
-            <ObjectRef ref="id4038X2906"/>
-            <ObjectRef ref="id4061X2906"/>
-            <ClusterGroupOptions/>
-          </FailoverClusterGroup>
         </Interface>
-        <FirewallOptions/>
-        <StateSyncClusterGroup id="id2372X75741" type="conntrack" name="State Sync Group" comment="">
-          <ObjectRef ref="id4030X2906"/>
-          <ObjectRef ref="id4055X2906"/>
-          <ClusterGroupOptions/>
-        </StateSyncClusterGroup>
-      </Cluster>
-      <Cluster id="id2708X89830" host_OS="secuwall" inactive="False" lastCompiled="1248541093" lastInstalled="0" lastModified="1244047289" platform="iptables" name="secuwall_cluster_1" comment="" ro="False">
-        <NAT id="id2712X89830" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
+      <Management address="192.168.1.2">
+        <SNMPManagement enabled="False" snmp_read_community="" snmp_write_community=""/>
+        <FWBDManagement enabled="False" identity="" port="-1"/>
+        <PolicyInstallScript arguments="" command="" enabled="False"/>
+      </Management>
+      <FirewallOptions>
+        <Option name="accept_established">True</Option>
+        <Option name="accept_new_tcp_with_no_syn">True</Option>
+        <Option name="action_on_reject"></Option>
+        <Option name="activationCmd"></Option>
+        <Option name="admUser"></Option>
+        <Option name="altAddress"></Option>
+        <Option name="bridging_fw">False</Option>
+        <Option name="check_shading">False</Option>
+        <Option name="clamp_mss_to_mtu">False</Option>
+        <Option name="classify_mark_terminating">False</Option>
+        <Option name="cmdline"></Option>
+        <Option name="compiler"></Option>
+        <Option name="configure_interfaces">True</Option>
+        <Option name="debug">False</Option>
+        <Option name="drop_invalid">False</Option>
+        <Option name="eliminate_duplicates">true</Option>
+        <Option name="epilog_script"></Option>
+        <Option name="firewall_dir">/etc</Option>
+        <Option name="firewall_is_part_of_any_and_networks">True</Option>
+        <Option name="flush_and_set_default_policy">True</Option>
+        <Option name="freebsd_ip_forward">1</Option>
+        <Option name="ignore_empty_groups">False</Option>
+        <Option name="ipv4_6_order">ipv4_first</Option>
+        <Option name="limit_suffix"></Option>
+        <Option name="limit_value">0</Option>
+        <Option name="linux24_ip_forward">1</Option>
+        <Option name="load_modules">True</Option>
+        <Option name="local_nat">False</Option>
+        <Option name="log_all">False</Option>
+        <Option name="log_invalid">False</Option>
+        <Option name="log_ip_opt">False</Option>
+        <Option name="log_level">info</Option>
+        <Option name="log_prefix">RULE %N -- %A </Option>
+        <Option name="log_tcp_opt">False</Option>
+        <Option name="log_tcp_seq">False</Option>
+        <Option name="loopback_interface">lo</Option>
+        <Option name="macosx_ip_forward">1</Option>
+        <Option name="manage_virtual_addr">True</Option>
+        <Option name="mgmt_addr"></Option>
+        <Option name="mgmt_ssh">False</Option>
+        <Option name="modules_dir">/lib/modules/`uname -r`/kernel/net/</Option>
+        <Option name="openbsd_ip_forward">1</Option>
+        <Option name="output_file"></Option>
+        <Option name="pf_limit_frags">5000</Option>
+        <Option name="pf_limit_states">10000</Option>
+        <Option name="pf_timeout_frag">30</Option>
+        <Option name="pf_timeout_interval">10</Option>
+        <Option name="pix_add_clear_statements">true</Option>
+        <Option name="pix_assume_fw_part_of_any">true</Option>
+        <Option name="pix_default_logint">300</Option>
+        <Option name="pix_emblem_log_format">false</Option>
+        <Option name="pix_emulate_out_acl">true</Option>
+        <Option name="pix_floodguard">true</Option>
+        <Option name="pix_include_comments">true</Option>
+        <Option name="pix_route_dnat_supported">true</Option>
+        <Option name="pix_rule_syslog_settings">false</Option>
+        <Option name="pix_security_fragguard_supported">true</Option>
+        <Option name="pix_syslog_device_id_supported">false</Option>
+        <Option name="pix_use_acl_remarks">true</Option>
+        <Option name="prolog_place">top</Option>
+        <Option name="prolog_script"></Option>
+        <Option name="scpArgs"></Option>
+        <Option name="secuwall_add_files">False</Option>
+        <Option name="secuwall_add_files_dir">/opt/secuwall/templates/default</Option>
+        <Option name="secuwall_dns_reso1">files</Option>
+        <Option name="solaris_ip_forward">1</Option>
+        <Option name="sshArgs"></Option>
+        <Option name="ulog_cprange">0</Option>
+        <Option name="ulog_nlgroup">1</Option>
+        <Option name="ulog_qthreshold">1</Option>
+        <Option name="use_ULOG">False</Option>
+        <Option name="use_iptables_restore">False</Option>
+        <Option name="use_numeric_log_levels">False</Option>
+        <Option name="verify_interfaces">True</Option>
+      </FirewallOptions>
+    </Firewall>
+    <Firewall id="id4046X2906" host_OS="secuwall" inactive="False" lastCompiled="0" lastInstalled="0" lastModified="1243788928" platform="iptables" version="" name="secuwall-2" comment="This firewall has two interfaces. Eth0 faces outside and has a dynamic address; eth1 faces inside.&#10;Policy includes basic rules to permit unrestricted outbound access and anti-spoofing rules. Access to the firewall is permitted only from internal network and only using SSH. The firewall uses one of the machines on internal network for DNS. Internal network is configured with address 192.168.1.0/255.255.255.0" ro="False">
+      <NAT id="id4053X2906" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </NAT>
-        <Policy id="id2711X89830" name="Policy" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
+      <Policy id="id4052X2906" name="Policy" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </Policy>
-        <Routing id="id2713X89830" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
+      <Routing id="id4054X2906" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </Routing>
-        <Interface id="id2716X89830" dedicated_failover="False" dyn="False" label="" security_level="0" unnum="False" unprotected="False" name="vrrp0" comment="" ro="False">
-          <IPv4 id="id2717X89830" name="cluster3:vrrp0:ip" comment="" ro="False" address="192.168.1.1" netmask="255.255.255.0"/>
+      <Interface id="id4055X2906" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="False" unprotected="False" name="eth0" comment="" ro="False">
+        <IPv4 id="id4057X2906" name="secuwall-2:eth0:ip" comment="" ro="False" address="172.24.0.3" netmask="255.255.0.0"/>
           <InterfaceOptions>
             <Option name="iface_mtu">1500</Option>
-            <Option name="type">vrrp</Option>
+          <Option name="iface_type">ethernet</Option>
           </InterfaceOptions>
-          <FailoverClusterGroup id="id3048X95200" master_iface="id4030X2906" type="vrrp" name="Failover group" comment="">
-            <ObjectRef ref="id4030X2906"/>
-            <ObjectRef ref="id4055X2906"/>
-          </FailoverClusterGroup>
         </Interface>
-        <Interface id="id2721X89830" dedicated_failover="False" dyn="False" label="" security_level="0" unnum="False" unprotected="False" name="vrrp1" comment="" ro="False">
-          <IPv4 id="id2722X89830" name="cluster3:vrrp1:ip" comment="" ro="False" address="172.24.0.1" netmask="255.255.255.0"/>
+      <Interface id="id4058X2906" dedicated_failover="False" dyn="False" label="" mgmt="True" security_level="100" unnum="False" unprotected="False" name="eth1" comment="" ro="False">
+        <IPv4 id="id4060X2906" name="secuwall-2:eth1:ip" comment="" ro="False" address="192.168.1.3" netmask="255.255.255.0"/>
           <InterfaceOptions>
             <Option name="iface_mtu">1500</Option>
-            <Option name="type">vrrp</Option>
+          <Option name="iface_type">ethernet</Option>
           </InterfaceOptions>
-          <FailoverClusterGroup id="id2724X89830" master_iface="id4033X2906" type="vrrp" name="cluster3:vrrp1:members" comment="">
-            <ObjectRef ref="id4033X2906"/>
-            <ObjectRef ref="id4058X2906"/>
-          </FailoverClusterGroup>
         </Interface>
-        <FirewallOptions/>
-        <StateSyncClusterGroup id="id2714X89830" master_iface="id4030X2906" type="conntrack" name="State Sync Group" comment="">
-          <ObjectRef ref="id4030X2906"/>
-          <ObjectRef ref="id4055X2906"/>
-        </StateSyncClusterGroup>
-      </Cluster>
+      <Interface id="id4061X2906" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="100" unnum="False" unprotected="False" name="lo" comment="" ro="False">
+        <IPv4 id="id4063X2906" name="secuwall-2:lo:ip" comment="" ro="False" address="127.0.0.1" netmask="255.0.0.0"/>
+        <InterfaceOptions>
+          <Option name="iface_mtu">1500</Option>
+          <Option name="iface_type">ethernet</Option>
+        </InterfaceOptions>
+      </Interface>
+      <Interface id="id3805X49120" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="False" unprotected="False" name="br0" comment="" ro="False">
+        <IPv4 id="id3809X49120" name="secuwall-2:br0:ip" comment="" ro="False" address="2.2.2.2" netmask="255.255.255.0"/>
+        <InterfaceOptions>
+          <Option name="iface_disablearp">False</Option>
+          <Option name="iface_disableboot">False</Option>
+          <Option name="iface_mtu">1500</Option>
+          <Option name="iface_options"></Option>
+          <Option name="type">bonding</Option>
+          <Option name="vlan_id"></Option>
+        </InterfaceOptions>
+        <Interface id="id3807X49120" dedicated_failover="False" dyn="False" label="" security_level="0" unnum="False" unprotected="False" name="eth2" comment="" ro="False">
+          <InterfaceOptions>
+            <Option name="iface_mtu">1500</Option>
+            <Option name="type">ethernet</Option>
+          </InterfaceOptions>
+        </Interface>
+        <Interface id="id3808X49120" dedicated_failover="False" dyn="False" label="" security_level="0" unnum="False" unprotected="False" name="eth3" comment="" ro="False">
+          <InterfaceOptions>
+            <Option name="iface_mtu">1500</Option>
+            <Option name="iface_type">ethernet</Option>
+          </InterfaceOptions>
+        </Interface>
+      </Interface>
+      <Management address="192.168.1.3">
+        <SNMPManagement enabled="False" snmp_read_community="" snmp_write_community=""/>
+        <FWBDManagement enabled="False" identity="" port="-1"/>
+        <PolicyInstallScript arguments="" command="" enabled="False"/>
+      </Management>
+      <FirewallOptions>
+        <Option name="accept_established">True</Option>
+        <Option name="accept_new_tcp_with_no_syn">True</Option>
+        <Option name="action_on_reject"></Option>
+        <Option name="activationCmd"></Option>
+        <Option name="admUser"></Option>
+        <Option name="altAddress"></Option>
+        <Option name="bridging_fw">False</Option>
+        <Option name="check_shading">False</Option>
+        <Option name="clamp_mss_to_mtu">False</Option>
+        <Option name="classify_mark_terminating">False</Option>
+        <Option name="cmdline"></Option>
+        <Option name="compiler"></Option>
+        <Option name="configure_interfaces">True</Option>
+        <Option name="debug">False</Option>
+        <Option name="drop_invalid">False</Option>
+        <Option name="eliminate_duplicates">true</Option>
+        <Option name="epilog_script"></Option>
+        <Option name="firewall_dir">/etc</Option>
+        <Option name="firewall_is_part_of_any_and_networks">True</Option>
+        <Option name="flush_and_set_default_policy">True</Option>
+        <Option name="freebsd_ip_forward">1</Option>
+        <Option name="ignore_empty_groups">False</Option>
+        <Option name="ipv4_6_order">ipv4_first</Option>
+        <Option name="limit_suffix"></Option>
+        <Option name="limit_value">0</Option>
+        <Option name="linux24_ip_forward">1</Option>
+        <Option name="load_modules">True</Option>
+        <Option name="local_nat">False</Option>
+        <Option name="log_all">False</Option>
+        <Option name="log_invalid">False</Option>
+        <Option name="log_ip_opt">False</Option>
+        <Option name="log_level">info</Option>
+        <Option name="log_prefix">RULE %N -- %A </Option>
+        <Option name="log_tcp_opt">False</Option>
+        <Option name="log_tcp_seq">False</Option>
+        <Option name="loopback_interface">lo</Option>
+        <Option name="macosx_ip_forward">1</Option>
+        <Option name="manage_virtual_addr">True</Option>
+        <Option name="mgmt_addr"></Option>
+        <Option name="mgmt_ssh">False</Option>
+        <Option name="modules_dir">/lib/modules/`uname -r`/kernel/net/</Option>
+        <Option name="openbsd_ip_forward">1</Option>
+        <Option name="output_file"></Option>
+        <Option name="pf_limit_frags">5000</Option>
+        <Option name="pf_limit_states">10000</Option>
+        <Option name="pf_timeout_frag">30</Option>
+        <Option name="pf_timeout_interval">10</Option>
+        <Option name="pix_add_clear_statements">true</Option>
+        <Option name="pix_assume_fw_part_of_any">true</Option>
+        <Option name="pix_default_logint">300</Option>
+        <Option name="pix_emblem_log_format">false</Option>
+        <Option name="pix_emulate_out_acl">true</Option>
+        <Option name="pix_floodguard">true</Option>
+        <Option name="pix_include_comments">true</Option>
+        <Option name="pix_route_dnat_supported">true</Option>
+        <Option name="pix_rule_syslog_settings">false</Option>
+        <Option name="pix_security_fragguard_supported">true</Option>
+        <Option name="pix_syslog_device_id_supported">false</Option>
+        <Option name="pix_use_acl_remarks">true</Option>
+        <Option name="prolog_place">top</Option>
+        <Option name="prolog_script"></Option>
+        <Option name="scpArgs"></Option>
+        <Option name="secuwall_add_files">False</Option>
+        <Option name="secuwall_add_files_dir">/opt/secuwall/templates/default</Option>
+        <Option name="secuwall_dns_reso1">files</Option>
+        <Option name="solaris_ip_forward">1</Option>
+        <Option name="sshArgs"></Option>
+        <Option name="ulog_cprange">0</Option>
+        <Option name="ulog_nlgroup">1</Option>
+        <Option name="ulog_qthreshold">1</Option>
+        <Option name="use_ULOG">False</Option>
+        <Option name="use_iptables_restore">False</Option>
+        <Option name="use_numeric_log_levels">False</Option>
+        <Option name="verify_interfaces">True</Option>
+      </FirewallOptions>
+    </Firewall>
+  </Library>
+  <Library id="id1495X69605" color="#d2ffd0" name="User" comment="" ro="False">
+    <ObjectGroup id="id1502X69605" name="Clusters" comment="" ro="False">
       <Cluster id="id2772X94039" host_OS="linux24" inactive="False" lastCompiled="1248541095" lastInstalled="0" lastModified="1325552048" platform="iptables" name="vrrp_cluster_1" comment="" ro="False">
         <NAT id="id2866X94039" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <NATRule id="id2867X94039" disabled="False" group="" position="0" action="Translate" comment="">
@@ -5635,10 +5318,7 @@
       <ObjectGroup id="id1498X69605" name="DNS Names" comment="" ro="False"/>
       <ObjectGroup id="id1499X69605" name="Address Tables" comment="" ro="False"/>
       <ObjectGroup id="id1500X69605" name="Groups" comment="" ro="False">
-        <ObjectGroup id="id39477X67022" name="cl1 intf 0,1" comment="" ro="False">
-          <ObjectRef ref="id2374X75741"/>
-          <ObjectRef ref="id2379X75741"/>
-        </ObjectGroup>
+        <ObjectGroup id="id39477X67022" name="cl1 intf 0,1" comment="" ro="False"/>
       </ObjectGroup>
       <ObjectGroup id="id1501X69605" name="Hosts" comment="" ro="False"/>
       <ObjectGroup id="id1503X69605" name="Networks" comment="" ro="False">
@@ -5993,259 +5673,6 @@
           <Option name="verify_interfaces">True</Option>
         </FirewallOptions>
       </Firewall>
-      <Firewall id="id4021X2906" host_OS="secuwall" inactive="False" lastCompiled="0" lastInstalled="0" lastModified="1244045700" platform="iptables" version="" name="secuwall-1" comment="This firewall has two interfaces. Eth0 faces outside and has a dynamic address; eth1 faces inside.&#10;Policy includes basic rules to permit unrestricted outbound access and anti-spoofing rules. Access to the firewall is permitted only from internal network and only using SSH. The firewall uses one of the machines on internal network for DNS. Internal network is configured with address 192.168.1.0/255.255.255.0" ro="False">
-        <NAT id="id4028X2906" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
-          <RuleSetOptions/>
-        </NAT>
-        <Policy id="id4027X2906" name="Policy" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
-          <RuleSetOptions/>
-        </Policy>
-        <Routing id="id4029X2906" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
-          <RuleSetOptions/>
-        </Routing>
-        <Interface id="id4030X2906" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="False" unprotected="False" name="eth0" comment="" ro="False">
-          <IPv4 id="id4032X2906" name="secuwall-1:eth0:ip" comment="" ro="False" address="172.24.0.2" netmask="255.255.0.0"/>
-          <InterfaceOptions>
-            <Option name="iface_mtu">1500</Option>
-            <Option name="type">ethernet</Option>
-          </InterfaceOptions>
-        </Interface>
-        <Interface id="id4033X2906" dedicated_failover="False" dyn="False" label="" mgmt="True" security_level="100" unnum="False" unprotected="False" name="eth1" comment="" ro="False">
-          <IPv4 id="id4036X2906" name="secuwall-1:eth1:ip" comment="" ro="False" address="192.168.1.2" netmask="255.255.255.0"/>
-          <InterfaceOptions>
-            <Option name="iface_disablearp">False</Option>
-            <Option name="iface_disableboot">False</Option>
-            <Option name="iface_mtu">1500</Option>
-            <Option name="iface_options"></Option>
-            <Option name="type">ethernet</Option>
-            <Option name="vlan_id"></Option>
-          </InterfaceOptions>
-        </Interface>
-        <Interface id="id4038X2906" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="100" unnum="False" unprotected="False" name="lo" comment="" ro="False">
-          <IPv4 id="id4040X2906" name="secuwall-1:lo:ip" comment="" ro="False" address="127.0.0.1" netmask="255.0.0.0"/>
-          <InterfaceOptions>
-            <Option name="iface_mtu">1500</Option>
-            <Option name="iface_type">ethernet</Option>
-          </InterfaceOptions>
-        </Interface>
-        <Management address="192.168.1.2">
-          <SNMPManagement enabled="False" snmp_read_community="" snmp_write_community=""/>
-          <FWBDManagement enabled="False" identity="" port="-1"/>
-          <PolicyInstallScript arguments="" command="" enabled="False"/>
-        </Management>
-        <FirewallOptions>
-          <Option name="accept_established">True</Option>
-          <Option name="accept_new_tcp_with_no_syn">True</Option>
-          <Option name="action_on_reject"></Option>
-          <Option name="activationCmd"></Option>
-          <Option name="admUser"></Option>
-          <Option name="altAddress"></Option>
-          <Option name="bridging_fw">False</Option>
-          <Option name="check_shading">False</Option>
-          <Option name="clamp_mss_to_mtu">False</Option>
-          <Option name="classify_mark_terminating">False</Option>
-          <Option name="cmdline"></Option>
-          <Option name="compiler"></Option>
-          <Option name="configure_interfaces">True</Option>
-          <Option name="debug">False</Option>
-          <Option name="drop_invalid">False</Option>
-          <Option name="eliminate_duplicates">true</Option>
-          <Option name="epilog_script"></Option>
-          <Option name="firewall_dir">/etc</Option>
-          <Option name="firewall_is_part_of_any_and_networks">True</Option>
-          <Option name="flush_and_set_default_policy">True</Option>
-          <Option name="freebsd_ip_forward">1</Option>
-          <Option name="ignore_empty_groups">False</Option>
-          <Option name="ipv4_6_order">ipv4_first</Option>
-          <Option name="limit_suffix"></Option>
-          <Option name="limit_value">0</Option>
-          <Option name="linux24_ip_forward">1</Option>
-          <Option name="load_modules">True</Option>
-          <Option name="local_nat">False</Option>
-          <Option name="log_all">False</Option>
-          <Option name="log_invalid">False</Option>
-          <Option name="log_ip_opt">False</Option>
-          <Option name="log_level">info</Option>
-          <Option name="log_prefix">RULE %N -- %A </Option>
-          <Option name="log_tcp_opt">False</Option>
-          <Option name="log_tcp_seq">False</Option>
-          <Option name="loopback_interface">lo</Option>
-          <Option name="macosx_ip_forward">1</Option>
-          <Option name="manage_virtual_addr">True</Option>
-          <Option name="mgmt_addr"></Option>
-          <Option name="mgmt_ssh">False</Option>
-          <Option name="modules_dir">/lib/modules/`uname -r`/kernel/net/</Option>
-          <Option name="openbsd_ip_forward">1</Option>
-          <Option name="output_file"></Option>
-          <Option name="pf_limit_frags">5000</Option>
-          <Option name="pf_limit_states">10000</Option>
-          <Option name="pf_timeout_frag">30</Option>
-          <Option name="pf_timeout_interval">10</Option>
-          <Option name="pix_add_clear_statements">true</Option>
-          <Option name="pix_assume_fw_part_of_any">true</Option>
-          <Option name="pix_default_logint">300</Option>
-          <Option name="pix_emblem_log_format">false</Option>
-          <Option name="pix_emulate_out_acl">true</Option>
-          <Option name="pix_floodguard">true</Option>
-          <Option name="pix_include_comments">true</Option>
-          <Option name="pix_route_dnat_supported">true</Option>
-          <Option name="pix_rule_syslog_settings">false</Option>
-          <Option name="pix_security_fragguard_supported">true</Option>
-          <Option name="pix_syslog_device_id_supported">false</Option>
-          <Option name="pix_use_acl_remarks">true</Option>
-          <Option name="prolog_place">top</Option>
-          <Option name="prolog_script"></Option>
-          <Option name="scpArgs"></Option>
-          <Option name="secuwall_add_files">False</Option>
-          <Option name="secuwall_add_files_dir">/opt/secuwall/templates/default</Option>
-          <Option name="secuwall_dns_reso1">files</Option>
-          <Option name="solaris_ip_forward">1</Option>
-          <Option name="sshArgs"></Option>
-          <Option name="ulog_cprange">0</Option>
-          <Option name="ulog_nlgroup">1</Option>
-          <Option name="ulog_qthreshold">1</Option>
-          <Option name="use_ULOG">False</Option>
-          <Option name="use_iptables_restore">False</Option>
-          <Option name="use_numeric_log_levels">False</Option>
-          <Option name="verify_interfaces">True</Option>
-        </FirewallOptions>
-      </Firewall>
-      <Firewall id="id4046X2906" host_OS="secuwall" inactive="False" lastCompiled="0" lastInstalled="0" lastModified="1243788928" platform="iptables" version="" name="secuwall-2" comment="This firewall has two interfaces. Eth0 faces outside and has a dynamic address; eth1 faces inside.&#10;Policy includes basic rules to permit unrestricted outbound access and anti-spoofing rules. Access to the firewall is permitted only from internal network and only using SSH. The firewall uses one of the machines on internal network for DNS. Internal network is configured with address 192.168.1.0/255.255.255.0" ro="False">
-        <NAT id="id4053X2906" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
-          <RuleSetOptions/>
-        </NAT>
-        <Policy id="id4052X2906" name="Policy" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
-          <RuleSetOptions/>
-        </Policy>
-        <Routing id="id4054X2906" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
-          <RuleSetOptions/>
-        </Routing>
-        <Interface id="id4055X2906" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="False" unprotected="False" name="eth0" comment="" ro="False">
-          <IPv4 id="id4057X2906" name="secuwall-2:eth0:ip" comment="" ro="False" address="172.24.0.3" netmask="255.255.0.0"/>
-          <InterfaceOptions>
-            <Option name="iface_mtu">1500</Option>
-            <Option name="iface_type">ethernet</Option>
-          </InterfaceOptions>
-        </Interface>
-        <Interface id="id4058X2906" dedicated_failover="False" dyn="False" label="" mgmt="True" security_level="100" unnum="False" unprotected="False" name="eth1" comment="" ro="False">
-          <IPv4 id="id4060X2906" name="secuwall-2:eth1:ip" comment="" ro="False" address="192.168.1.3" netmask="255.255.255.0"/>
-          <InterfaceOptions>
-            <Option name="iface_mtu">1500</Option>
-            <Option name="iface_type">ethernet</Option>
-          </InterfaceOptions>
-        </Interface>
-        <Interface id="id4061X2906" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="100" unnum="False" unprotected="False" name="lo" comment="" ro="False">
-          <IPv4 id="id4063X2906" name="secuwall-2:lo:ip" comment="" ro="False" address="127.0.0.1" netmask="255.0.0.0"/>
-          <InterfaceOptions>
-            <Option name="iface_mtu">1500</Option>
-            <Option name="iface_type">ethernet</Option>
-          </InterfaceOptions>
-        </Interface>
-        <Interface id="id3805X49120" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="False" unprotected="False" name="br0" comment="" ro="False">
-          <IPv4 id="id3809X49120" name="secuwall-2:br0:ip" comment="" ro="False" address="2.2.2.2" netmask="255.255.255.0"/>
-          <InterfaceOptions>
-            <Option name="iface_disablearp">False</Option>
-            <Option name="iface_disableboot">False</Option>
-            <Option name="iface_mtu">1500</Option>
-            <Option name="iface_options"></Option>
-            <Option name="type">bonding</Option>
-            <Option name="vlan_id"></Option>
-          </InterfaceOptions>
-          <Interface id="id3807X49120" dedicated_failover="False" dyn="False" label="" security_level="0" unnum="False" unprotected="False" name="eth2" comment="" ro="False">
-            <InterfaceOptions>
-              <Option name="iface_mtu">1500</Option>
-              <Option name="type">ethernet</Option>
-            </InterfaceOptions>
-          </Interface>
-          <Interface id="id3808X49120" dedicated_failover="False" dyn="False" label="" security_level="0" unnum="False" unprotected="False" name="eth3" comment="" ro="False">
-            <InterfaceOptions>
-              <Option name="iface_mtu">1500</Option>
-              <Option name="iface_type">ethernet</Option>
-            </InterfaceOptions>
-          </Interface>
-        </Interface>
-        <Management address="192.168.1.3">
-          <SNMPManagement enabled="False" snmp_read_community="" snmp_write_community=""/>
-          <FWBDManagement enabled="False" identity="" port="-1"/>
-          <PolicyInstallScript arguments="" command="" enabled="False"/>
-        </Management>
-        <FirewallOptions>
-          <Option name="accept_established">True</Option>
-          <Option name="accept_new_tcp_with_no_syn">True</Option>
-          <Option name="action_on_reject"></Option>
-          <Option name="activationCmd"></Option>
-          <Option name="admUser"></Option>
-          <Option name="altAddress"></Option>
-          <Option name="bridging_fw">False</Option>
-          <Option name="check_shading">False</Option>
-          <Option name="clamp_mss_to_mtu">False</Option>
-          <Option name="classify_mark_terminating">False</Option>
-          <Option name="cmdline"></Option>
-          <Option name="compiler"></Option>
-          <Option name="configure_interfaces">True</Option>
-          <Option name="debug">False</Option>
-          <Option name="drop_invalid">False</Option>
-          <Option name="eliminate_duplicates">true</Option>
-          <Option name="epilog_script"></Option>
-          <Option name="firewall_dir">/etc</Option>
-          <Option name="firewall_is_part_of_any_and_networks">True</Option>
-          <Option name="flush_and_set_default_policy">True</Option>
-          <Option name="freebsd_ip_forward">1</Option>
-          <Option name="ignore_empty_groups">False</Option>
-          <Option name="ipv4_6_order">ipv4_first</Option>
-          <Option name="limit_suffix"></Option>
-          <Option name="limit_value">0</Option>
-          <Option name="linux24_ip_forward">1</Option>
-          <Option name="load_modules">True</Option>
-          <Option name="local_nat">False</Option>
-          <Option name="log_all">False</Option>
-          <Option name="log_invalid">False</Option>
-          <Option name="log_ip_opt">False</Option>
-          <Option name="log_level">info</Option>
-          <Option name="log_prefix">RULE %N -- %A </Option>
-          <Option name="log_tcp_opt">False</Option>
-          <Option name="log_tcp_seq">False</Option>
-          <Option name="loopback_interface">lo</Option>
-          <Option name="macosx_ip_forward">1</Option>
-          <Option name="manage_virtual_addr">True</Option>
-          <Option name="mgmt_addr"></Option>
-          <Option name="mgmt_ssh">False</Option>
-          <Option name="modules_dir">/lib/modules/`uname -r`/kernel/net/</Option>
-          <Option name="openbsd_ip_forward">1</Option>
-          <Option name="output_file"></Option>
-          <Option name="pf_limit_frags">5000</Option>
-          <Option name="pf_limit_states">10000</Option>
-          <Option name="pf_timeout_frag">30</Option>
-          <Option name="pf_timeout_interval">10</Option>
-          <Option name="pix_add_clear_statements">true</Option>
-          <Option name="pix_assume_fw_part_of_any">true</Option>
-          <Option name="pix_default_logint">300</Option>
-          <Option name="pix_emblem_log_format">false</Option>
-          <Option name="pix_emulate_out_acl">true</Option>
-          <Option name="pix_floodguard">true</Option>
-          <Option name="pix_include_comments">true</Option>
-          <Option name="pix_route_dnat_supported">true</Option>
-          <Option name="pix_rule_syslog_settings">false</Option>
-          <Option name="pix_security_fragguard_supported">true</Option>
-          <Option name="pix_syslog_device_id_supported">false</Option>
-          <Option name="pix_use_acl_rem...
 
[truncated message content]

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-15-g3520002

From: <gi...@ir...> - 2012-03-19 03:37:16

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  3520002f56a834639ef60c97a044951190eec70b (commit)
       via  0e9b904d1deb433ee4d9f682e5f0eafde5280b61 (commit)
      from  890d89506f2199ba4faefa6f581eeed5528ab4e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3520002f56a834639ef60c97a044951190eec70b
Merge: 0e9b904 890d895
Author: Vadim Kurland <va...@sl...>
Date:   Sun Mar 18 21:21:30 2012 -0700

    merged previous changes, updated release notes 5.0.2

diff --cc doc/ChangeLog
index 2188aa8,2197952..fd302e0
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@@ -1,13 -1,30 +1,40 @@@
 +2012-03-18  Vadim Kurland  <va...@ne...>
 +
 +	* CompilerDriver.cpp (CompilerDriver::populateClusterElements):
 +	fixes #2686 "automatic rules for heartbeat are not generated for
 +	vlan subinterfaces"
 +
 +	* clusterMembersDialog.cpp (clusterMembersDialog::clusterMembersDialog):
 +	fixes #2685 "Clicking "Manage Members" in a vlan subinterface of a
 +	cluster causes crash".
 +
+ 2012-02-20  Vadim Kurland  <va...@ne...>
+ 
+ 	* configlets/linux24/routing_functions (OLD_ROUTES): fixes SF bug
+ 	3489096 "dd-wrt-jffs: all routes are deleted if there is an
+ 	error". The problem affects all supported Linux-like
+ 	systems. Shell code that restores old static routing table entries
+ 	in case of an error with commands adding new routing entries was
+ 	broken and left the machine with no routes at all.
+ 
+ 	* configlets/linux24/routing_functions: using mktemp to create
+ 	temporary directory. If mktemp is not available, fall back onto
+ 	less secure but guaranteed to work method where I generate
+ 	randomized the name of the temporary directory using process ID.
+ 
+ 	* OSConfigurator_linux24_interfaces.cpp (printInterfaceConfigurationCommands):
+ 	fixes #2684 "fix address deletion in configlet update_addresses".
+ 	This only applies to Linux firewalls and configurations where an
+ 	interface has two or more ip addresses. If user deleted one of the
+ 	addresses that happens to be the "primary" address of the
+ 	interface in the GUI, generated script deleted both addresses on
+ 	the firewall machine instead of just one and left interface with
+ 	no addresses at all. The fix is to use /proc variable
+ 	/proc/sys/net/ipv4/conf/all/promote_secondaries that makes the
+ 	kernel "promote" secondary address to a "primary" status when
+ 	primary address is deleted. Default behavior in Linux kernel is to
+ 	delete all addresses when primary address is deleted.
+ 
  2012-02-13  Vadim Kurland  <va...@ne...>
  
  	* qmake.inc.in (QMAKE_CXXFLAGS_DEBUG): fix for SF bug #3468802.
diff --cc src/res/help/en_US/release_notes_5.0.2.html
index f9cbd22,0000000..5d4c887
mode 100644,000000..100644
--- a/src/res/help/en_US/release_notes_5.0.2.html
+++ b/src/res/help/en_US/release_notes_5.0.2.html
@@@ -1,115 -1,0 +1,133 @@@
 +<h1>Firewall Builder 5.1.0 Release Notes</h1>
 +
 +
 +<p>
 +  <a href="https://sourceforge.net/tracker/?atid=1129518&group_id=5314">SourceForge: Tickets</a>
 +</p>
 +
 +<!-- Highlights for this release -->
 +
 +<a name="summary"></a>
 +<h2>Summary</h2>
 +
 +<p>
 +  v 5.1.0 is a bug fix release.
 +</p>
 +
 +
 +<hr style="display: block">     
 +
 +
 +<!-- ######################################################################### -->
 +<a name="gui"></a>
 +<h2>GUI Updates</h2>
 +
 +<ul>
 +
 +  <li>
 +    <p>
 +      fixes #2685 "Clicking "Manage Members" in a vlan subinterface of a
 +      cluster causes crash".
 +    </p>
 +  </li>
 +
 +</ul>
 +
 +
 +<!-- ######################################################################### -->
 +<a name="import"></a>
 +<h2>Changes in policy importer for all supported platforms</h2>
 +
 +<h3>Changes that affect import of PIX configurations</h3>
 +<ul>
 +
 +  <li>
 +    <p>
 +    </p>
 +  </li>
 +
 +</ul>
 +
 +
- 
- <!-- ######################################################################### -->
- <a name="libfwbuilder"></a>
- <h2>Changes and improvements in the API library libfwbuilder</h2>
- 
- <ul>
- 
-   <li>
-     <p>
-     </p>
-   </li>
- 
- 
- </ul>
- 
- 
- 
 +<!-- ######################################################################### -->
 +<a name="iptables"></a>
 +<h2>Changes in support for iptables</h2>
 +
 +<ul>
 +
 +  <li>
 +    <p>
 +      fixed SF bug #3468358 "change in rule-compilation between 5.0.0
 +      and 5.0.1". Rule with cluster interface in "Destination"
 +      should compile into matching ip addresses assigned to the cluster
 +      interface object and corresponding member firewall's interface
 +      object, but in v5.0.1 it only matched member interface
 +      address. This bug triggered when iptables version was set to
 +      1.2.11 or greater. This was a regression from v5.0.0
 +    </p>
 +  </li>
 +
 +  <li>
 +    <p>
 +      fixes #2686 "automatic rules for heartbeat are not generated for
 +      vlan subinterfaces"
 +    </p>
 +  </li>
 +
++  <li>
++    <p>
++      fixes #2684 "fix address deletion in configlet
++      update_addresses".  This only applies to Linux firewalls and
++      configurations where an interface has two or more ip
++      addresses. If user deleted one of the addresses that happens to
++      be the "primary" address of the interface in the GUI, generated
++      script deleted both addresses on the firewall machine instead of
++      just one and left interface with no addresses at all. The fix is
++      to use /proc variable
++      /proc/sys/net/ipv4/conf/all/promote_secondaries that makes the
++      kernel "promote" secondary address to a "primary" status when
++      primary address is deleted. Default behavior in Linux kernel is
++      to delete all addresses when primary address is deleted.
++    </p>
++  </li>
++
++  <li>
++    <p>
++      using mktemp to create temporary directory in the generated
++      script. If mktemp is not available, fall back onto less secure
++      but guaranteed to work method where I generate randomized the
++      name of the temporary directory using process ID.
++    </p>
++  </li>
++
++  <li>
++    <p>
++      fixes SF bug 3489096 "dd-wrt-jffs: all routes are deleted if
++      there is an error". The problem affects all supported Linux-like
++      systems. Shell code that restores old static routing table
++      entries in case of an error with commands adding new routing
++      entries was broken and left the machine with no routes at all.
++    </p>
++  </li>
 +
 +</ul>
 +
 +
 +<!-- ######################################################################### -->
 +<a name="other"></a>
 +<h2>Other changes</h2>
 +
 +<ul>
 +
 +  <li>
 +    <p>
 +      fix for SF bug #3468802.  Need to define macro
 +      __STDC_FORMAT_MACROS. This still needs to be tested on all build
 +      machines.
 +    </p>
 +  </li>
 +
 +</ul>
 +
 +
 +
diff --cc test/ipt/cluster1_secuwall-1.fw.orig
index 3177c61,96827bd..8ea844d
--- a/test/ipt/cluster1_secuwall-1.fw.orig
+++ b/test/ipt/cluster1_secuwall-1.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:44:04 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:45 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:40 2012 PDT by vadim
  #
  # files: * cluster1_secuwall-1.fw /etc/cluster1_secuwall-1.fw
  #
@@@ -610,7 -610,7 +610,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:44:04 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:45 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:40 2012 by vadim"
          log "Database was cluster-tests.fwb"
          check_tools
          check_run_time_address_table_files
diff --cc test/ipt/firewall-base-rulesets.fw.orig
index 23a1ba7,afcb288..ab6cb33
--- a/test/ipt/firewall-base-rulesets.fw.orig
+++ b/test/ipt/firewall-base-rulesets.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:43 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:06 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:19 2012 PDT by vadim
  #
  # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw
  #
@@@ -467,7 -467,7 +467,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:43 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:06 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:19 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-1.fw.orig
index 4d35ff3,b8916de..07af5f9
--- a/test/ipt/firewall-ipv6-1.fw.orig
+++ b/test/ipt/firewall-ipv6-1.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:44 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:10 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:21 2012 PDT by vadim
  #
  # files: * firewall-ipv6-1.fw /etc/firewall-ipv6-1.fw
  #
@@@ -704,7 -731,7 +711,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:44 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:10 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:21 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-2.fw.orig
index 5130d66,c010cfc..95cf441
--- a/test/ipt/firewall-ipv6-2.fw.orig
+++ b/test/ipt/firewall-ipv6-2.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:45 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:11 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:21 2012 PDT by vadim
  #
  # files: * firewall-ipv6-2.fw /etc/firewall-ipv6-2.fw
  #
@@@ -968,7 -995,7 +975,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:45 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:11 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:21 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-3.fw.orig
index 3e0368c,4703645..9cf4b92
--- a/test/ipt/firewall-ipv6-3.fw.orig
+++ b/test/ipt/firewall-ipv6-3.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:46 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:11 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:22 2012 PDT by vadim
  #
  # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw
  #
@@@ -598,7 -625,7 +605,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:46 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:11 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:22 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-4-1.fw.orig
index 770d83f,ef88ce3..5f0f849
--- a/test/ipt/firewall-ipv6-4-1.fw.orig
+++ b/test/ipt/firewall-ipv6-4-1.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:48 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:18 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:24 2012 PDT by vadim
  #
  # files: * firewall-ipv6-4-1.fw /etc/firewall-ipv6-4-1.fw
  #
@@@ -551,7 -576,7 +558,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:48 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:18 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:24 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-4.fw.orig
index 044ee04,de6db02..cf64920
--- a/test/ipt/firewall-ipv6-4.fw.orig
+++ b/test/ipt/firewall-ipv6-4.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:46 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:12 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:23 2012 PDT by vadim
  #
  # files: * firewall-ipv6-4.fw /etc/firewall-ipv6-4.fw
  #
@@@ -588,7 -612,7 +595,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:46 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:12 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:23 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-5.fw.orig
index 20f6bb1,d785ddb..36b715c
--- a/test/ipt/firewall-ipv6-5.fw.orig
+++ b/test/ipt/firewall-ipv6-5.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:48 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:17 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:24 2012 PDT by vadim
  #
  # files: * firewall-ipv6-5.fw /etc/firewall-ipv6-5.fw
  #
@@@ -434,7 -434,7 +434,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:48 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:17 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:24 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-6.fw.orig
index 4e2ed44,0c9c1f3..b06f829
--- a/test/ipt/firewall-ipv6-6.fw.orig
+++ b/test/ipt/firewall-ipv6-6.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:49 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:17 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:26 2012 PDT by vadim
  #
  # files: * firewall-ipv6-6.fw /etc/firewall-ipv6-6.fw
  #
@@@ -423,7 -430,7 +430,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:49 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:17 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:26 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-7.fw.orig
index 5d43838,14c26bd..3c8345c
--- a/test/ipt/firewall-ipv6-7.fw.orig
+++ b/test/ipt/firewall-ipv6-7.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:49 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:17 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:26 2012 PDT by vadim
  #
  # files: * firewall-ipv6-7.fw /etc/firewall-ipv6-7.fw
  #
@@@ -467,7 -474,7 +474,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:49 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:17 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:26 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-8.fw.orig
index 73fd58f,19fd87b..5841484
--- a/test/ipt/firewall-ipv6-8.fw.orig
+++ b/test/ipt/firewall-ipv6-8.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:51 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:24 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:27 2012 PDT by vadim
  #
  # files: * firewall-ipv6-8.fw /etc/firewall-ipv6-8.fw
  #
@@@ -540,7 -547,7 +547,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:51 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:24 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:27 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig
index 18af207,749e25b..c110f44
--- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig
+++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:51 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:24 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:27 2012 PDT by vadim
  #
  # files: * firewall-ipv6-ipt-reset-prolog-after-flush.fw /etc/firewall-ipv6-ipt-reset-prolog-after-flush.fw
  #
@@@ -464,7 -471,7 +471,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:51 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:24 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:27 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig
index 8ab4e0c,1ce08a0..19b467c
--- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig
+++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:52 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:24 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:29 2012 PDT by vadim
  #
  # files: * firewall-ipv6-ipt-reset-prolog-after-interfaces.fw /etc/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw
  #
@@@ -464,7 -471,7 +471,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:52 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:24 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:29 2012 by vadim"
          check_tools
          
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig
index 1c345fa,8c1896e..0bc74f1
--- a/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig
+++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:52 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:24 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:29 2012 PDT by vadim
  #
  # files: * firewall-ipv6-ipt-reset-prolog-top.fw /etc/firewall-ipv6-ipt-reset-prolog-top.fw
  #
@@@ -464,7 -471,7 +471,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:52 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:24 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:29 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-nd-ns-1.fw.orig
index bdbfa3a,1398764..5e38dd4
--- a/test/ipt/firewall-ipv6-nd-ns-1.fw.orig
+++ b/test/ipt/firewall-ipv6-nd-ns-1.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:54 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:30 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:30 2012 PDT by vadim
  #
  # files: * firewall-ipv6-nd-ns-1.fw /etc/firewall-ipv6-nd-ns-1.fw
  #
@@@ -464,7 -471,7 +471,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:54 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:30 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:30 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-nd-ns-2.fw.orig
index a97cf41,f8702bb..6c94b35
--- a/test/ipt/firewall-ipv6-nd-ns-2.fw.orig
+++ b/test/ipt/firewall-ipv6-nd-ns-2.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:54 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:30 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:30 2012 PDT by vadim
  #
  # files: * firewall-ipv6-nd-ns-2.fw /etc/firewall-ipv6-nd-ns-2.fw
  #
@@@ -468,7 -475,7 +475,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:54 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:30 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:30 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-prolog-after-flush.fw.orig
index 70cdc5a,29ed5b7..7adc05d
--- a/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig
+++ b/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:55 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:31 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:32 2012 PDT by vadim
  #
  # files: * firewall-ipv6-prolog-after-flush.fw /etc/firewall-ipv6-prolog-after-flush.fw
  #
@@@ -442,7 -449,7 +449,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:55 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:31 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:32 2012 by vadim"
          check_tools
          
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig
index 7f1e0bb,152484f..ff460a8
--- a/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig
+++ b/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:55 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:31 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:32 2012 PDT by vadim
  #
  # files: * firewall-ipv6-prolog-after-interfaces.fw /etc/firewall-ipv6-prolog-after-interfaces.fw
  #
@@@ -442,7 -449,7 +449,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:55 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:31 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:32 2012 by vadim"
          check_tools
          
          check_run_time_address_table_files
diff --cc test/ipt/firewall-ipv6-prolog-top.fw.orig
index 0ea5280,9c3e41a..7489612
--- a/test/ipt/firewall-ipv6-prolog-top.fw.orig
+++ b/test/ipt/firewall-ipv6-prolog-top.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:57 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:36 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:33 2012 PDT by vadim
  #
  # files: * firewall-ipv6-prolog-top.fw /etc/firewall-ipv6-prolog-top.fw
  #
@@@ -442,7 -449,7 +449,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:57 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:36 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:33 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall-server-1-s.fw.orig
index 3f63188,a6600ad..4fbd053
--- a/test/ipt/firewall-server-1-s.fw.orig
+++ b/test/ipt/firewall-server-1-s.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:43:57 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:12:36 2012 PST by vadim
++#  Generated Sun Mar 18 21:17:33 2012 PDT by vadim
  #
  # files: * firewall-server-1-s.fw /etc/fw/firewall-server-1-s.fw
  #
@@@ -415,7 -415,7 +415,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:43:57 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:12:36 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:17:33 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall.fw.orig
index f161b48,115302f..88b35ac
--- a/test/ipt/firewall.fw.orig
+++ b/test/ipt/firewall.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:32 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:09:42 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:06 2012 PDT by vadim
  #
  # files: * firewall.fw /etc/fw/firewall.fw
  #
@@@ -1398,7 -1405,7 +1405,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:32 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:09:42 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:06 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall1.fw.orig
index a693d7b,93d898a..ccafe3f
--- a/test/ipt/firewall1.fw.orig
+++ b/test/ipt/firewall1.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:33 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:09:42 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:07 2012 PDT by vadim
  #
  # files: * firewall1.fw /etc/fw/firewall1.fw
  #
@@@ -1270,7 -1277,7 +1277,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:33 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:09:42 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:07 2012 by vadim"
          check_tools
          
          check_run_time_address_table_files
diff --cc test/ipt/firewall10.fw.orig
index a8f8fe4,b1e0620..a2cd115
--- a/test/ipt/firewall10.fw.orig
+++ b/test/ipt/firewall10.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:33 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:09:41 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:08 2012 PDT by vadim
  #
  # files: * firewall10.fw /etc/fw/firewall10.fw
  #
@@@ -495,7 -495,7 +495,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:33 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:09:41 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:08 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall11.fw.orig
index df0e44c,dd3fa25..695c06e
--- a/test/ipt/firewall11.fw.orig
+++ b/test/ipt/firewall11.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:34 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:09:47 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:09 2012 PDT by vadim
  #
  # files: * firewall11.fw /etc/fw/firewall11.fw
  #
@@@ -615,7 -615,7 +615,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:34 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:09:47 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:09 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall12.fw.orig
index f3de9c1,d13269a..c72357b
--- a/test/ipt/firewall12.fw.orig
+++ b/test/ipt/firewall12.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:35 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:09:47 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:09 2012 PDT by vadim
  #
  # files: * firewall12.fw /etc/fw/firewall12.fw
  #
@@@ -533,7 -540,7 +540,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:35 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:09:47 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:09 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall13.fw.orig
index 788d64a,b7d4df0..9033c06
--- a/test/ipt/firewall13.fw.orig
+++ b/test/ipt/firewall13.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:36 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:09:48 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:11 2012 PDT by vadim
  #
  # files: * firewall13.fw /etc/fw/firewall13.fw
  #
@@@ -407,7 -407,7 +407,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:36 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:09:48 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:11 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall14.fw.orig
index 51e3b43,ea9e88f..3e0524f
--- a/test/ipt/firewall14.fw.orig
+++ b/test/ipt/firewall14.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:36 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:09:48 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:11 2012 PDT by vadim
  #
  # files: * firewall14.fw /etc/fw/firewall14.fw
  #
@@@ -426,7 -433,7 +433,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:36 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:09:48 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:11 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall15.fw.orig
index 26edfe6,681d350..c61ca80
--- a/test/ipt/firewall15.fw.orig
+++ b/test/ipt/firewall15.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:38 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:09:53 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:12 2012 PDT by vadim
  #
  # files: * firewall15.fw /etc/fw/firewall15.fw
  #
@@@ -410,7 -410,7 +410,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:38 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:09:53 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:12 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall16.fw.orig
index bde0463,12b1e75..f917cea
--- a/test/ipt/firewall16.fw.orig
+++ b/test/ipt/firewall16.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:38 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:09:54 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:12 2012 PDT by vadim
  #
  # files: * firewall16.fw /etc/fw/firewall16.fw
  #
@@@ -514,7 -514,7 +514,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:38 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:09:54 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:12 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall17.fw.orig
index 4c929b2,b561bfd..38f0635
--- a/test/ipt/firewall17.fw.orig
+++ b/test/ipt/firewall17.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:39 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:09:54 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:14 2012 PDT by vadim
  #
  # files: * firewall17.fw /etc/fw/firewall17.fw
  #
@@@ -493,7 -500,7 +500,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:39 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:09:54 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:14 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall18.fw.orig
index 03dad9e,f7193e1..fac1963
--- a/test/ipt/firewall18.fw.orig
+++ b/test/ipt/firewall18.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:39 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:09:54 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:14 2012 PDT by vadim
  #
  # files: * firewall18.fw /etc/fw/firewall18.fw
  #
@@@ -528,7 -528,7 +528,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:39 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:09:54 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:14 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall19.fw.orig
index dd09fb6,da3d753..5b6e967
--- a/test/ipt/firewall19.fw.orig
+++ b/test/ipt/firewall19.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:41 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:09:59 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:15 2012 PDT by vadim
  #
  # files: * firewall19.fw /etc/fw/firewall19.fw
  #
@@@ -532,7 -532,7 +532,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:41 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:09:59 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:15 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall2-1.fw.orig
index 048f035,8eb2615..005256b
--- a/test/ipt/firewall2-1.fw.orig
+++ b/test/ipt/firewall2-1.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:46 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:09 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:21 2012 PDT by vadim
  #
  # files: * firewall2-1.fw /etc/fw/firewall2-1.fw
  #
@@@ -1452,7 -1459,7 +1459,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:46 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:09 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:21 2012 by vadim"
          check_tools
          
          check_run_time_address_table_files
diff --cc test/ipt/firewall2-2.fw.orig
index 04bfe93,978fa74..0de837d
--- a/test/ipt/firewall2-2.fw.orig
+++ b/test/ipt/firewall2-2.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:48 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:11 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:23 2012 PDT by vadim
  #
  # files: * firewall2-2.fw /etc/fw/firewall2-2.fw
  #
@@@ -1282,7 -1289,7 +1289,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:48 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:11 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:23 2012 by vadim"
          check_tools
          
          check_run_time_address_table_files
diff --cc test/ipt/firewall2-3.fw.orig
index 7c6e1bf,0f0356f..76612b0
--- a/test/ipt/firewall2-3.fw.orig
+++ b/test/ipt/firewall2-3.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:50 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:16 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:25 2012 PDT by vadim
  #
  # files: * firewall2-3.fw /etc/fw/firewall2-3.fw
  #
@@@ -1140,7 -1147,7 +1147,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:50 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:16 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:25 2012 by vadim"
          check_tools
          
          check_run_time_address_table_files
diff --cc test/ipt/firewall2-4.fw.orig
index 768732f,2a1aa89..aa731b1
--- a/test/ipt/firewall2-4.fw.orig
+++ b/test/ipt/firewall2-4.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:53 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:23 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:28 2012 PDT by vadim
  #
  # files: * firewall2-4.fw /etc/fw/firewall2-4.fw
  #
@@@ -446,7 -453,7 +453,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:53 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:23 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:28 2012 by vadim"
          check_tools
          
          check_run_time_address_table_files
diff --cc test/ipt/firewall2-5.fw.orig
index de2e2cb,6e8498a..04a245c
--- a/test/ipt/firewall2-5.fw.orig
+++ b/test/ipt/firewall2-5.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:55 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:27 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:30 2012 PDT by vadim
  #
  # files: * firewall2-5.fw /etc/fw/firewall2-5.fw
  #
@@@ -477,7 -484,7 +484,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:55 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:27 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:30 2012 by vadim"
          check_tools
          
          check_run_time_address_table_files
diff --cc test/ipt/firewall2-6.fw.orig
index 3f32d3a,8b68edb..a630cc1
--- a/test/ipt/firewall2-6.fw.orig
+++ b/test/ipt/firewall2-6.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:56 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:30 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:31 2012 PDT by vadim
  #
  # files: * firewall2-6.fw /etc/fw/firewall2-6.fw
  #
@@@ -502,7 -509,7 +509,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:56 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:30 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:31 2012 by vadim"
          check_tools
          
          check_run_time_address_table_files
diff --cc test/ipt/firewall2-7.fw.orig
index b5d9001,17a6e84..0777a8d
--- a/test/ipt/firewall2-7.fw.orig
+++ b/test/ipt/firewall2-7.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:58 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:32 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:33 2012 PDT by vadim
  #
  # files: * firewall2-7.fw /etc/fw/firewall2-7.fw
  #
@@@ -442,7 -449,7 +449,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:58 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:32 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:33 2012 by vadim"
          check_tools
          
          check_run_time_address_table_files
diff --cc test/ipt/firewall2.fw.orig
index e9c8dda,e2b12a2..edcd99b
--- a/test/ipt/firewall2.fw.orig
+++ b/test/ipt/firewall2.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:42 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:02 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:17 2012 PDT by vadim
  #
  # files: * firewall2.fw /etc/fw/firewall2.fw
  #
@@@ -1504,7 -1511,7 +1511,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:42 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:02 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:17 2012 by vadim"
          check_tools
          
          check_run_time_address_table_files
diff --cc test/ipt/firewall20-ipv6.fw.orig
index 1c2ed3b,e23bce4..1efcadf
--- a/test/ipt/firewall20-ipv6.fw.orig
+++ b/test/ipt/firewall20-ipv6.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:43 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:01 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:18 2012 PDT by vadim
  #
  # files: * firewall20-ipv6.fw /etc/fw/firewall20-ipv6.fw
  #
@@@ -478,7 -485,7 +485,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:43 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:01 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:18 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall20.fw.orig
index 7fb30c4,b7d2915..793f080
--- a/test/ipt/firewall20.fw.orig
+++ b/test/ipt/firewall20.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:42 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:01 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:17 2012 PDT by vadim
  #
  # files: * firewall20.fw /etc/fw/firewall20.fw
  #
@@@ -696,7 -696,7 +696,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:42 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:01 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:17 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall21-1.fw.orig
index 45cc627,5cbf28e..b156ba4
--- a/test/ipt/firewall21-1.fw.orig
+++ b/test/ipt/firewall21-1.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:45 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:08 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:20 2012 PDT by vadim
  #
  # files: * firewall21-1.fw /etc/fw/firewall21-1.fw
  #
@@@ -496,7 -496,7 +496,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:45 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:08 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:20 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall21.fw.orig
index ecfde09,becaa6d..1e14488
--- a/test/ipt/firewall21.fw.orig
+++ b/test/ipt/firewall21.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:44 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:05 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:19 2012 PDT by vadim
  #
  # files: * firewall21.fw /etc/fw/firewall21.fw
  #
@@@ -495,7 -495,7 +495,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:44 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:05 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:19 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall22.fw.orig
index a8a515d,cf9dc5c..aceaac0
--- a/test/ipt/firewall22.fw.orig
+++ b/test/ipt/firewall22.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:47 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:08 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:22 2012 PDT by vadim
  #
  # files: * firewall22.fw /etc/fw/firewall22.fw
  #
@@@ -412,7 -412,7 +412,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:47 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:08 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:22 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall23-1.fw.orig
index e6361e9,9aafd5c..1079a87
--- a/test/ipt/firewall23-1.fw.orig
+++ b/test/ipt/firewall23-1.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:50 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:16 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:25 2012 PDT by vadim
  #
  # files: * firewall23-1.fw /etc/fw/firewall23-1.fw
  #
@@@ -586,7 -586,7 +586,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:50 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:16 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:25 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall23-2.fw.orig
index 1fd2c68,e3f458a..1edaae7
--- a/test/ipt/firewall23-2.fw.orig
+++ b/test/ipt/firewall23-2.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:51 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:16 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:26 2012 PDT by vadim
  #
  # files: * firewall23-2.fw /etc/fw/firewall23-2.fw
  #
@@@ -402,7 -402,7 +402,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:51 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:16 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:26 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall23-3.fw.orig
index c46a021,34cb0d6..4d189ae
--- a/test/ipt/firewall23-3.fw.orig
+++ b/test/ipt/firewall23-3.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:52 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:22 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:27 2012 PDT by vadim
  #
  # files: * firewall23-3.fw /etc/fw/firewall23-3.fw
  #
@@@ -388,7 -388,7 +388,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:52 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:22 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:27 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall23.fw.orig
index 7a21517,983d9e8..c259d4e
--- a/test/ipt/firewall23.fw.orig
+++ b/test/ipt/firewall23.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:48 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:15 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:23 2012 PDT by vadim
  #
  # files: * firewall23.fw /etc/fw/firewall23.fw
  #
@@@ -498,7 -498,7 +498,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:48 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:15 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:23 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall24.fw.orig
index 9e37161,87780b2..5598998
--- a/test/ipt/firewall24.fw.orig
+++ b/test/ipt/firewall24.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:53 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:23 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:28 2012 PDT by vadim
  #
  # files: * firewall24.fw /etc/fw/firewall24.fw
  #
@@@ -515,7 -515,7 +515,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:53 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:23 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:28 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall25.fw.orig
index a4cba05,598cce6..e5890f0
--- a/test/ipt/firewall25.fw.orig
+++ b/test/ipt/firewall25.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:54 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:23 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:30 2012 PDT by vadim
  #
  # files: * firewall25.fw /etc/fw/firewall25.fw
  #
@@@ -706,7 -706,7 +706,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script generated Sun Mar 18 19:42:54 2012 by vadim"
 -        log "Activating firewall script generated Mon Feb 20 14:10:23 2012 by vadim"
++        log "Activating firewall script generated Sun Mar 18 21:16:30 2012 by vadim"
          check_tools
           prolog_commands 
          check_run_time_address_table_files
diff --cc test/ipt/firewall26.fw.orig
index b91334a,93bdd22..934a95e
--- a/test/ipt/firewall26.fw.orig
+++ b/test/ipt/firewall26.fw.orig
@@@ -2,9 -2,9 +2,9 @@@
  #
  #  This is automatically generated file. DO NOT MODIFY !
  #
- #  Firewall Builder  fwb_ipt v5.0.2.3594
 -#  Firewall Builder  fwb_ipt v5.0.2.3595
++#  Firewall Builder  fwb_ipt v5.0.2.3596
  #
- #  Generated Sun Mar 18 19:42:56 2012 PDT by vadim
 -#  Generated Mon Feb 20 14:10:29 2012 PST by vadim
++#  Generated Sun Mar 18 21:16:31 2012 PDT by vadim
  #
  # files: * firewall26.fw /etc/fw/firewall26.fw
  #
@@@ -586,7 -586,7 +586,7 @@@ test -z "$cmd" && 
  
  case "$cmd" in
      start)
-         log "Activating firewall script...
 
[truncated message content]

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, builds, updated. v5.0.1-13-g890d895

From: <gi...@ir...> - 2012-02-20 22:53:16

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, builds has been updated
       via  890d89506f2199ba4faefa6f581eeed5528ab4e9 (commit)
       via  c5ca42940f1f9101ee3ded6a3003d673d5ac5535 (commit)
       via  ca17dccfcc55bb98665f9177bf305298a7483b33 (commit)
       via  8a456b3c7ddee38656a80e4e4ec565b39f7bbde1 (commit)
       via  c89b691effd439792ae160c7d0278e5bce84d7f4 (commit)
      from  d5911066cff87b5b92bd27aad5fd4da5bccdfeb4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 VERSION                                            |    2 +-
 VERSION.h                                          |    2 +-
 doc/ChangeLog                                      |   27 ++++++++++++++++++++
 packaging/fwbuilder-static-qt.spec                 |    2 +-
 packaging/fwbuilder.control                        |    2 +-
 packaging/fwbuilder.spec                           |    2 +-
 src/iptlib/OSConfigurator_linux24_interfaces.cpp   |   19 ++++++++++++-
 src/res/configlets/linux24/configure_interfaces    |   20 ++++++++++++++
 src/res/configlets/linux24/routing_functions       |   21 +++++++++++---
 test/ipt/cluster1_secuwall-1.fw.orig               |    6 ++--
 test/ipt/firewall-base-rulesets.fw.orig            |    6 ++--
 test/ipt/firewall-ipv6-1.fw.orig                   |   13 +++++++--
 test/ipt/firewall-ipv6-2.fw.orig                   |   13 +++++++--
 test/ipt/firewall-ipv6-3.fw.orig                   |   13 +++++++--
 test/ipt/firewall-ipv6-4-1.fw.orig                 |   13 +++++++--
 test/ipt/firewall-ipv6-4.fw.orig                   |   13 +++++++--
 test/ipt/firewall-ipv6-5.fw.orig                   |    6 ++--
 test/ipt/firewall-ipv6-6.fw.orig                   |   13 +++++++--
 test/ipt/firewall-ipv6-7.fw.orig                   |   13 +++++++--
 test/ipt/firewall-ipv6-8.fw.orig                   |   13 +++++++--
 ...ewall-ipv6-ipt-reset-prolog-after-flush.fw.orig |   13 +++++++--
 ...-ipv6-ipt-reset-prolog-after-interfaces.fw.orig |   13 +++++++--
 .../ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig |   13 +++++++--
 test/ipt/firewall-ipv6-nd-ns-1.fw.orig             |   13 +++++++--
 test/ipt/firewall-ipv6-nd-ns-2.fw.orig             |   13 +++++++--
 test/ipt/firewall-ipv6-prolog-after-flush.fw.orig  |   13 +++++++--
 .../firewall-ipv6-prolog-after-interfaces.fw.orig  |   13 +++++++--
 test/ipt/firewall-ipv6-prolog-top.fw.orig          |   13 +++++++--
 test/ipt/firewall-server-1-s.fw.orig               |    6 ++--
 test/ipt/firewall.fw.orig                          |   13 +++++++--
 test/ipt/firewall1.fw.orig                         |   13 +++++++--
 test/ipt/firewall10.fw.orig                        |    6 ++--
 test/ipt/firewall11.fw.orig                        |    6 ++--
 test/ipt/firewall12.fw.orig                        |   13 +++++++--
 test/ipt/firewall13.fw.orig                        |    6 ++--
 test/ipt/firewall14.fw.orig                        |   13 +++++++--
 test/ipt/firewall15.fw.orig                        |    6 ++--
 test/ipt/firewall16.fw.orig                        |    6 ++--
 test/ipt/firewall17.fw.orig                        |   13 +++++++--
 test/ipt/firewall18.fw.orig                        |    6 ++--
 test/ipt/firewall19.fw.orig                        |    6 ++--
 test/ipt/firewall2-1.fw.orig                       |   13 +++++++--
 test/ipt/firewall2-2.fw.orig                       |   13 +++++++--
 test/ipt/firewall2-3.fw.orig                       |   13 +++++++--
 test/ipt/firewall2-4.fw.orig                       |   13 +++++++--
 test/ipt/firewall2-5.fw.orig                       |   13 +++++++--
 test/ipt/firewall2-6.fw.orig                       |   13 +++++++--
 test/ipt/firewall2-7.fw.orig                       |   13 +++++++--
 test/ipt/firewall2.fw.orig                         |   13 +++++++--
 test/ipt/firewall20-ipv6.fw.orig                   |   13 +++++++--
 test/ipt/firewall20.fw.orig                        |    6 ++--
 test/ipt/firewall21-1.fw.orig                      |    6 ++--
 test/ipt/firewall21.fw.orig                        |    6 ++--
 test/ipt/firewall22.fw.orig                        |    6 ++--
 test/ipt/firewall23-1.fw.orig                      |    6 ++--
 test/ipt/firewall23-2.fw.orig                      |    6 ++--
 test/ipt/firewall23-3.fw.orig                      |    6 ++--
 test/ipt/firewall23.fw.orig                        |    6 ++--
 test/ipt/firewall24.fw.orig                        |    6 ++--
 test/ipt/firewall25.fw.orig                        |    6 ++--
 test/ipt/firewall26.fw.orig                        |    6 ++--
 test/ipt/firewall27.fw.orig                        |    6 ++--
 test/ipt/firewall28.fw.orig                        |    6 ++--
 test/ipt/firewall29.fw.orig                        |    6 ++--
 test/ipt/firewall3.fw.orig                         |    6 ++--
 test/ipt/firewall30.fw.orig                        |    6 ++--
 test/ipt/firewall31.fw.orig                        |    6 ++--
 test/ipt/firewall32.fw.orig                        |    6 ++--
 test/ipt/firewall33-1.fw.orig                      |   16 ++++++------
 test/ipt/firewall33.fw.orig                        |   16 ++++++------
 test/ipt/firewall34.fw.orig                        |    6 ++--
 test/ipt/firewall35.fw.orig                        |    6 ++--
 test/ipt/firewall36-1.fw.orig                      |   27 ++++++++++++++------
 test/ipt/firewall36-2.fw.orig                      |   27 ++++++++++++++------
 test/ipt/firewall36.fw.orig                        |   27 ++++++++++++++------
 test/ipt/firewall37-1.fw.orig                      |    6 ++--
 test/ipt/firewall37-2.fw.orig                      |    6 ++--
 test/ipt/firewall37.fw.orig                        |    6 ++--
 test/ipt/firewall38.fw.orig                        |    6 ++--
 test/ipt/firewall39.fw.orig                        |    6 ++--
 test/ipt/firewall4.fw.orig                         |   13 +++++++--
 test/ipt/firewall40-1.fw.orig                      |    6 ++--
 test/ipt/firewall40-2.fw.orig                      |    6 ++--
 test/ipt/firewall40.fw.orig                        |    6 ++--
 test/ipt/firewall41-1.fw.orig                      |    6 ++--
 test/ipt/firewall41.fw.orig                        |    6 ++--
 test/ipt/firewall42.fw.orig                        |    6 ++--
 test/ipt/firewall5.fw.orig                         |    6 ++--
 test/ipt/firewall50.fw.orig                        |    6 ++--
 test/ipt/firewall51.fw.orig                        |    6 ++--
 test/ipt/firewall6.fw.orig                         |   13 +++++++--
 test/ipt/firewall60.fw.orig                        |    6 ++--
 test/ipt/firewall61-1.2.5.fw.orig                  |    6 ++--
 test/ipt/firewall61-1.2.6.fw.orig                  |    6 ++--
 test/ipt/firewall61-1.3.x.fw.orig                  |    6 ++--
 test/ipt/firewall61-1.4.fw.orig                    |    6 ++--
 test/ipt/firewall62.fw.orig                        |    6 ++--
 test/ipt/firewall63.fw.orig                        |    6 ++--
 test/ipt/firewall7.fw.orig                         |    6 ++--
 test/ipt/firewall70.fw.orig                        |    6 ++--
 test/ipt/firewall71.fw.orig                        |    6 ++--
 test/ipt/firewall72-1.3.x.fw.orig                  |    6 ++--
 test/ipt/firewall72-1.4.3.fw.orig                  |    6 ++--
 test/ipt/firewall73.fw.orig                        |    6 ++--
 test/ipt/firewall74.fw.orig                        |    6 ++--
 test/ipt/firewall8.fw.orig                         |    6 ++--
 test/ipt/firewall80.fw.orig                        |    6 ++--
 test/ipt/firewall81.fw.orig                        |    6 ++--
 test/ipt/firewall82.fw.orig                        |    6 ++--
 test/ipt/firewall82_A.fw.orig                      |    6 ++--
 test/ipt/firewall82_B.fw.orig                      |    6 ++--
 test/ipt/firewall9.fw.orig                         |    6 ++--
 test/ipt/firewall90.fw.orig                        |    6 ++--
 test/ipt/firewall91.fw.orig                        |    6 ++--
 test/ipt/firewall92.fw.orig                        |    6 ++--
 test/ipt/firewall93.fw.orig                        |   13 +++++++--
 test/ipt/firewall94.fw.orig                        |   13 +++++++--
 test/ipt/firewall95.fw.orig                        |    6 ++--
 test/ipt/fw-A.fw.orig                              |   27 ++++++++++++++------
 test/ipt/fw1.fw.orig                               |   13 +++++++--
 test/ipt/fwbuilder.fw.orig                         |    6 ++--
 test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig   |    6 ++--
 test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig   |    6 ++--
 test/ipt/heartbeat_cluster_1_linux-1.fw.orig       |   27 ++++++++++++++------
 test/ipt/heartbeat_cluster_1_linux-2.fw.orig       |   27 ++++++++++++++------
 test/ipt/heartbeat_cluster_2_linux-1.fw.orig       |   27 ++++++++++++++------
 test/ipt/heartbeat_cluster_2_linux-2.fw.orig       |   27 ++++++++++++++------
 test/ipt/host.fw.orig                              |    6 ++--
 test/ipt/openais_cluster_1_linux-1.fw.orig         |   27 ++++++++++++++------
 test/ipt/openais_cluster_1_linux-2.fw.orig         |   27 ++++++++++++++------
 test/ipt/rh90.fw.orig                              |    6 ++--
 test/ipt/secuwall_cluster_1_secuwall-1.fw.orig     |    6 ++--
 test/ipt/server-cluster-1_server-1.fw.orig         |    6 ++--
 test/ipt/server-cluster-1_server-2.fw.orig         |    6 ++--
 test/ipt/test-shadowing-1.fw.orig                  |    6 ++--
 test/ipt/test-shadowing-2.fw.orig                  |    6 ++--
 test/ipt/test-shadowing-3.fw.orig                  |    6 ++--
 test/ipt/test_fw.fw.orig                           |   13 +++++++--
 test/ipt/vrrp_cluster_1_linux-1.fw.orig            |   27 ++++++++++++++------
 test/ipt/vrrp_cluster_1_linux-2.fw.orig            |   27 ++++++++++++++------
 test/ipt/vrrp_cluster_2_linux-1.fw.orig            |    6 ++--
 test/ipt/vrrp_cluster_2_linux-2.fw.orig            |    6 ++--
 test/ipt/vrrp_cluster_2_linux-3.fw.orig            |    6 ++--
 143 files changed, 941 insertions(+), 484 deletions(-)
 create mode 100644 src/res/configlets/linux24/configure_interfaces


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-13-g890d895

From: <gi...@ir...> - 2012-02-20 22:52:54

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  890d89506f2199ba4faefa6f581eeed5528ab4e9 (commit)
      from  c5ca42940f1f9101ee3ded6a3003d673d5ac5535 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 890d89506f2199ba4faefa6f581eeed5528ab4e9
Author: Vadim Kurland <va...@ne...>
Date:   Mon Feb 20 14:23:16 2012 -0800

    build 5.0.2.3596

diff --git a/VERSION b/VERSION
index 0c35fa7..204c1f2 100644
--- a/VERSION
+++ b/VERSION
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=2
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3595"
+BUILD_NUM="3596"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 
diff --git a/VERSION.h b/VERSION.h
index e010e3e..798cb35 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION      "5.0.2.3595"
+#define VERSION      "5.0.2.3596"
 #define GENERATION   "5.0"
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index 20ebdf6..e567bda 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
 
 
 %define name    fwbuilder
-%define version 5.0.2.3595
+%define version 5.0.2.3596
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index 1cecab6..a7ebaa5 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: va...@fw...
-Version: 5.0.2.3595-1
+Version: 5.0.2.3596-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 baa41f5..4ab71ad 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 5.0.2.3595
+%define version 5.0.2.3596
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"

-----------------------------------------------------------------------

Summary of changes:
 VERSION                            |    2 +-
 VERSION.h                          |    2 +-
 packaging/fwbuilder-static-qt.spec |    2 +-
 packaging/fwbuilder.control        |    2 +-
 packaging/fwbuilder.spec           |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-12-gc5ca429

From: <gi...@ir...> - 2012-02-20 22:48:26

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  c5ca42940f1f9101ee3ded6a3003d673d5ac5535 (commit)
      from  ca17dccfcc55bb98665f9177bf305298a7483b33 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c5ca42940f1f9101ee3ded6a3003d673d5ac5535
Author: Vadim Kurland <va...@ne...>
Date:   Mon Feb 20 14:18:10 2012 -0800

    fixes SF bug 3489096, Shell code that restores old static routing
    table entries in case of an error with commands adding new routing
    entries was broken and left the machine with no routes at all.
    
    Also, using mktemp to create temporary directory. If mktemp is not
    available, fall back onto less secure but guaranteed to work method
    where I generate randomized the name of the temporary directory using
    process ID.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0db54a8..2197952 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,17 @@
 2012-02-20  Vadim Kurland  <va...@ne...>
 
+	* configlets/linux24/routing_functions (OLD_ROUTES): fixes SF bug
+	3489096 "dd-wrt-jffs: all routes are deleted if there is an
+	error". The problem affects all supported Linux-like
+	systems. Shell code that restores old static routing table entries
+	in case of an error with commands adding new routing entries was
+	broken and left the machine with no routes at all.
+
+	* configlets/linux24/routing_functions: using mktemp to create
+	temporary directory. If mktemp is not available, fall back onto
+	less secure but guaranteed to work method where I generate
+	randomized the name of the temporary directory using process ID.
+
 	* OSConfigurator_linux24_interfaces.cpp (printInterfaceConfigurationCommands):
 	fixes #2684 "fix address deletion in configlet update_addresses".
 	This only applies to Linux firewalls and configurations where an
diff --git a/src/res/configlets/linux24/routing_functions b/src/res/configlets/linux24/routing_functions
index 859ecd9..e3024e2 100644
--- a/src/res/configlets/linux24/routing_functions
+++ b/src/res/configlets/linux24/routing_functions
@@ -14,9 +14,20 @@
 
 # ============== ROUTING RULES ============== 
 
+HAVE_MKTEMP=$(which mktemp)
+
+test -n "$HAVE_MKTEMP" && {
+  TMPDIRNAME=$(mktemp -d)
+  test -z "$TMPDIRNAME" && exit 1
+}
+
+test -z "$HAVE_MKTEMP" && {
 TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$"
-TMPFILENAME="$TMPDIRNAME/.fwbuilder.out"
 (umask 077 && mkdir $TMPDIRNAME) || exit 1
+}
+
+TMPFILENAME="$TMPDIRNAME/.fwbuilder.out"
+OLD_ROUTES="$TMPDIRNAME/.old_routes"
 
 #
 # This function stops stdout redirection
@@ -36,8 +47,7 @@ route_command_error()
   # delete current routing rules
   $IP route show | while read route ; do $IP route del $route ; done
   # restore old routing rules
-  (IFS="
-"; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done)
+  sh $OLD_ROUTES
   echo "...done"
   restore_script_output
   epilog_commands
@@ -51,7 +61,8 @@ exec 2>&1
 
 # store previous routing configuration (sort: 'via' GW has to be
 # inserted after device routes)
-oldRoutes=$($IP route show | sort -k 2)
+
+$IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES
 
 echo "Deleting routing rules previously set by user space processes..."
 $IP route show | grep -v {{$proto_filter}} | \
diff --git a/test/ipt/cluster1_secuwall-1.fw.orig b/test/ipt/cluster1_secuwall-1.fw.orig
index 33b8980..96827bd 100755
--- a/test/ipt/cluster1_secuwall-1.fw.orig
+++ b/test/ipt/cluster1_secuwall-1.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:35 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:45 2012 PST by vadim
 #
 # files: * cluster1_secuwall-1.fw /etc/cluster1_secuwall-1.fw
 #
@@ -610,7 +610,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:35 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:45 2012 by vadim"
         log "Database was cluster-tests.fwb"
         check_tools
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-base-rulesets.fw.orig b/test/ipt/firewall-base-rulesets.fw.orig
index 882f12c..afcb288 100755
--- a/test/ipt/firewall-base-rulesets.fw.orig
+++ b/test/ipt/firewall-base-rulesets.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:51:54 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:06 2012 PST by vadim
 #
 # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw
 #
@@ -467,7 +467,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:51:54 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:06 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-1.fw.orig b/test/ipt/firewall-ipv6-1.fw.orig
index 0acddac..b8916de 100755
--- a/test/ipt/firewall-ipv6-1.fw.orig
+++ b/test/ipt/firewall-ipv6-1.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:51:58 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:10 2012 PST by vadim
 #
 # files: * firewall-ipv6-1.fw /etc/firewall-ipv6-1.fw
 #
@@ -731,7 +731,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:51:58 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:10 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-2.fw.orig b/test/ipt/firewall-ipv6-2.fw.orig
index fb90691..c010cfc 100755
--- a/test/ipt/firewall-ipv6-2.fw.orig
+++ b/test/ipt/firewall-ipv6-2.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:02 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:11 2012 PST by vadim
 #
 # files: * firewall-ipv6-2.fw /etc/firewall-ipv6-2.fw
 #
@@ -995,7 +995,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:02 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:11 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-3.fw.orig b/test/ipt/firewall-ipv6-3.fw.orig
index 625d946..4703645 100755
--- a/test/ipt/firewall-ipv6-3.fw.orig
+++ b/test/ipt/firewall-ipv6-3.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:02 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:11 2012 PST by vadim
 #
 # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw
 #
@@ -625,7 +625,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:02 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:11 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-4-1.fw.orig b/test/ipt/firewall-ipv6-4-1.fw.orig
index 4bff0d5..ef88ce3 100755
--- a/test/ipt/firewall-ipv6-4-1.fw.orig
+++ b/test/ipt/firewall-ipv6-4-1.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:03 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:18 2012 PST by vadim
 #
 # files: * firewall-ipv6-4-1.fw /etc/firewall-ipv6-4-1.fw
 #
@@ -576,7 +576,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:03 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:18 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-4.fw.orig b/test/ipt/firewall-ipv6-4.fw.orig
index 3b10c7a..de6db02 100755
--- a/test/ipt/firewall-ipv6-4.fw.orig
+++ b/test/ipt/firewall-ipv6-4.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:02 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:12 2012 PST by vadim
 #
 # files: * firewall-ipv6-4.fw /etc/firewall-ipv6-4.fw
 #
@@ -612,7 +612,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:02 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:12 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-5.fw.orig b/test/ipt/firewall-ipv6-5.fw.orig
index a93bc24..d785ddb 100755
--- a/test/ipt/firewall-ipv6-5.fw.orig
+++ b/test/ipt/firewall-ipv6-5.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:08 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:17 2012 PST by vadim
 #
 # files: * firewall-ipv6-5.fw /etc/firewall-ipv6-5.fw
 #
@@ -434,7 +434,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:08 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:17 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-6.fw.orig b/test/ipt/firewall-ipv6-6.fw.orig
index 98dae16..0c9c1f3 100755
--- a/test/ipt/firewall-ipv6-6.fw.orig
+++ b/test/ipt/firewall-ipv6-6.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:09 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:17 2012 PST by vadim
 #
 # files: * firewall-ipv6-6.fw /etc/firewall-ipv6-6.fw
 #
@@ -430,7 +430,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:09 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:17 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-7.fw.orig b/test/ipt/firewall-ipv6-7.fw.orig
index 5effb93..14c26bd 100755
--- a/test/ipt/firewall-ipv6-7.fw.orig
+++ b/test/ipt/firewall-ipv6-7.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:09 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:17 2012 PST by vadim
 #
 # files: * firewall-ipv6-7.fw /etc/firewall-ipv6-7.fw
 #
@@ -474,7 +474,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:09 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:17 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-8.fw.orig b/test/ipt/firewall-ipv6-8.fw.orig
index bda7cfd..19fd87b 100755
--- a/test/ipt/firewall-ipv6-8.fw.orig
+++ b/test/ipt/firewall-ipv6-8.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:09 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:24 2012 PST by vadim
 #
 # files: * firewall-ipv6-8.fw /etc/firewall-ipv6-8.fw
 #
@@ -547,7 +547,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:09 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:24 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig
index 08c0509..749e25b 100755
--- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig
+++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:14 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:24 2012 PST by vadim
 #
 # files: * firewall-ipv6-ipt-reset-prolog-after-flush.fw /etc/firewall-ipv6-ipt-reset-prolog-after-flush.fw
 #
@@ -471,7 +471,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:14 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:24 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig
index 3519ea5..1ce08a0 100755
--- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig
+++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:15 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:24 2012 PST by vadim
 #
 # files: * firewall-ipv6-ipt-reset-prolog-after-interfaces.fw /etc/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw
 #
@@ -471,7 +471,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:15 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:24 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig
index 6576fa1..8c1896e 100755
--- a/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig
+++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:15 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:24 2012 PST by vadim
 #
 # files: * firewall-ipv6-ipt-reset-prolog-top.fw /etc/firewall-ipv6-ipt-reset-prolog-top.fw
 #
@@ -471,7 +471,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:15 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:24 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-nd-ns-1.fw.orig b/test/ipt/firewall-ipv6-nd-ns-1.fw.orig
index 8e7b5f7..1398764 100755
--- a/test/ipt/firewall-ipv6-nd-ns-1.fw.orig
+++ b/test/ipt/firewall-ipv6-nd-ns-1.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:15 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:30 2012 PST by vadim
 #
 # files: * firewall-ipv6-nd-ns-1.fw /etc/firewall-ipv6-nd-ns-1.fw
 #
@@ -471,7 +471,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:15 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:30 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-nd-ns-2.fw.orig b/test/ipt/firewall-ipv6-nd-ns-2.fw.orig
index 2d47c1f..f8702bb 100755
--- a/test/ipt/firewall-ipv6-nd-ns-2.fw.orig
+++ b/test/ipt/firewall-ipv6-nd-ns-2.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:21 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:30 2012 PST by vadim
 #
 # files: * firewall-ipv6-nd-ns-2.fw /etc/firewall-ipv6-nd-ns-2.fw
 #
@@ -475,7 +475,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:21 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:30 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig b/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig
index 79f44cb..29ed5b7 100755
--- a/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig
+++ b/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:21 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:31 2012 PST by vadim
 #
 # files: * firewall-ipv6-prolog-after-flush.fw /etc/firewall-ipv6-prolog-after-flush.fw
 #
@@ -449,7 +449,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:21 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:31 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig b/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig
index bf7badd..152484f 100755
--- a/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig
+++ b/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:22 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:31 2012 PST by vadim
 #
 # files: * firewall-ipv6-prolog-after-interfaces.fw /etc/firewall-ipv6-prolog-after-interfaces.fw
 #
@@ -449,7 +449,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:22 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:31 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-prolog-top.fw.orig b/test/ipt/firewall-ipv6-prolog-top.fw.orig
index 54655a1..9c3e41a 100755
--- a/test/ipt/firewall-ipv6-prolog-top.fw.orig
+++ b/test/ipt/firewall-ipv6-prolog-top.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:22 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:36 2012 PST by vadim
 #
 # files: * firewall-ipv6-prolog-top.fw /etc/firewall-ipv6-prolog-top.fw
 #
@@ -449,7 +449,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:22 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:36 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-server-1-s.fw.orig b/test/ipt/firewall-server-1-s.fw.orig
index a6684a7..a6600ad 100755
--- a/test/ipt/firewall-server-1-s.fw.orig
+++ b/test/ipt/firewall-server-1-s.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:52:26 2012 PST by vadim
+#  Generated Mon Feb 20 14:12:36 2012 PST by vadim
 #
 # files: * firewall-server-1-s.fw /etc/fw/firewall-server-1-s.fw
 #
@@ -415,7 +415,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:52:26 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:12:36 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall.fw.orig b/test/ipt/firewall.fw.orig
index 8974aff..115302f 100755
--- a/test/ipt/firewall.fw.orig
+++ b/test/ipt/firewall.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:32 2012 PST by vadim
+#  Generated Mon Feb 20 14:09:42 2012 PST by vadim
 #
 # files: * firewall.fw /etc/fw/firewall.fw
 #
@@ -1405,7 +1405,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:32 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:09:42 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall1.fw.orig b/test/ipt/firewall1.fw.orig
index 55e1e0b..93d898a 100755
--- a/test/ipt/firewall1.fw.orig
+++ b/test/ipt/firewall1.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:32 2012 PST by vadim
+#  Generated Mon Feb 20 14:09:42 2012 PST by vadim
 #
 # files: * firewall1.fw /etc/fw/firewall1.fw
 #
@@ -1277,7 +1277,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:32 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:09:42 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall10.fw.orig b/test/ipt/firewall10.fw.orig
index 33d239d..b1e0620 100755
--- a/test/ipt/firewall10.fw.orig
+++ b/test/ipt/firewall10.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:31 2012 PST by vadim
+#  Generated Mon Feb 20 14:09:41 2012 PST by vadim
 #
 # files: * firewall10.fw /etc/fw/firewall10.fw
 #
@@ -495,7 +495,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:31 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:09:41 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall11.fw.orig b/test/ipt/firewall11.fw.orig
index ef1085e..dd3fa25 100755
--- a/test/ipt/firewall11.fw.orig
+++ b/test/ipt/firewall11.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:38 2012 PST by vadim
+#  Generated Mon Feb 20 14:09:47 2012 PST by vadim
 #
 # files: * firewall11.fw /etc/fw/firewall11.fw
 #
@@ -615,7 +615,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:38 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:09:47 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall12.fw.orig b/test/ipt/firewall12.fw.orig
index f48f61f..d13269a 100755
--- a/test/ipt/firewall12.fw.orig
+++ b/test/ipt/firewall12.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:38 2012 PST by vadim
+#  Generated Mon Feb 20 14:09:47 2012 PST by vadim
 #
 # files: * firewall12.fw /etc/fw/firewall12.fw
 #
@@ -540,7 +540,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:38 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:09:47 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall13.fw.orig b/test/ipt/firewall13.fw.orig
index df78c3b..b7d4df0 100755
--- a/test/ipt/firewall13.fw.orig
+++ b/test/ipt/firewall13.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:38 2012 PST by vadim
+#  Generated Mon Feb 20 14:09:48 2012 PST by vadim
 #
 # files: * firewall13.fw /etc/fw/firewall13.fw
 #
@@ -407,7 +407,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:38 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:09:48 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall14.fw.orig b/test/ipt/firewall14.fw.orig
index fd1b808..ea9e88f 100755
--- a/test/ipt/firewall14.fw.orig
+++ b/test/ipt/firewall14.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:38 2012 PST by vadim
+#  Generated Mon Feb 20 14:09:48 2012 PST by vadim
 #
 # files: * firewall14.fw /etc/fw/firewall14.fw
 #
@@ -433,7 +433,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:38 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:09:48 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall15.fw.orig b/test/ipt/firewall15.fw.orig
index e9658ee..681d350 100755
--- a/test/ipt/firewall15.fw.orig
+++ b/test/ipt/firewall15.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:44 2012 PST by vadim
+#  Generated Mon Feb 20 14:09:53 2012 PST by vadim
 #
 # files: * firewall15.fw /etc/fw/firewall15.fw
 #
@@ -410,7 +410,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:44 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:09:53 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall16.fw.orig b/test/ipt/firewall16.fw.orig
index 3432f7b..12b1e75 100755
--- a/test/ipt/firewall16.fw.orig
+++ b/test/ipt/firewall16.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:45 2012 PST by vadim
+#  Generated Mon Feb 20 14:09:54 2012 PST by vadim
 #
 # files: * firewall16.fw /etc/fw/firewall16.fw
 #
@@ -514,7 +514,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:45 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:09:54 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall17.fw.orig b/test/ipt/firewall17.fw.orig
index 2cd0370..b561bfd 100755
--- a/test/ipt/firewall17.fw.orig
+++ b/test/ipt/firewall17.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:45 2012 PST by vadim
+#  Generated Mon Feb 20 14:09:54 2012 PST by vadim
 #
 # files: * firewall17.fw /etc/fw/firewall17.fw
 #
@@ -500,7 +500,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:45 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:09:54 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall18.fw.orig b/test/ipt/firewall18.fw.orig
index e8ebfb4..f7193e1 100755
--- a/test/ipt/firewall18.fw.orig
+++ b/test/ipt/firewall18.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:45 2012 PST by vadim
+#  Generated Mon Feb 20 14:09:54 2012 PST by vadim
 #
 # files: * firewall18.fw /etc/fw/firewall18.fw
 #
@@ -528,7 +528,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:45 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:09:54 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall19.fw.orig b/test/ipt/firewall19.fw.orig
index bce265f..da3d753 100755
--- a/test/ipt/firewall19.fw.orig
+++ b/test/ipt/firewall19.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:50 2012 PST by vadim
+#  Generated Mon Feb 20 14:09:59 2012 PST by vadim
 #
 # files: * firewall19.fw /etc/fw/firewall19.fw
 #
@@ -532,7 +532,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:50 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:09:59 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-1.fw.orig b/test/ipt/firewall2-1.fw.orig
index df4c905..8eb2615 100755
--- a/test/ipt/firewall2-1.fw.orig
+++ b/test/ipt/firewall2-1.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:01 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:09 2012 PST by vadim
 #
 # files: * firewall2-1.fw /etc/fw/firewall2-1.fw
 #
@@ -1459,7 +1459,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:01 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:09 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-2.fw.orig b/test/ipt/firewall2-2.fw.orig
index 513d725..978fa74 100755
--- a/test/ipt/firewall2-2.fw.orig
+++ b/test/ipt/firewall2-2.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:01 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:11 2012 PST by vadim
 #
 # files: * firewall2-2.fw /etc/fw/firewall2-2.fw
 #
@@ -1289,7 +1289,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:01 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:11 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-3.fw.orig b/test/ipt/firewall2-3.fw.orig
index 0ea8209..0f0356f 100755
--- a/test/ipt/firewall2-3.fw.orig
+++ b/test/ipt/firewall2-3.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:07 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:16 2012 PST by vadim
 #
 # files: * firewall2-3.fw /etc/fw/firewall2-3.fw
 #
@@ -1147,7 +1147,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:07 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:16 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-4.fw.orig b/test/ipt/firewall2-4.fw.orig
index e41a839..2a1aa89 100755
--- a/test/ipt/firewall2-4.fw.orig
+++ b/test/ipt/firewall2-4.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:14 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:23 2012 PST by vadim
 #
 # files: * firewall2-4.fw /etc/fw/firewall2-4.fw
 #
@@ -453,7 +453,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:14 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:23 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-5.fw.orig b/test/ipt/firewall2-5.fw.orig
index c2399c5..6e8498a 100755
--- a/test/ipt/firewall2-5.fw.orig
+++ b/test/ipt/firewall2-5.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:17 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:27 2012 PST by vadim
 #
 # files: * firewall2-5.fw /etc/fw/firewall2-5.fw
 #
@@ -484,7 +484,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:17 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:27 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-6.fw.orig b/test/ipt/firewall2-6.fw.orig
index 64fa5ea..8b68edb 100755
--- a/test/ipt/firewall2-6.fw.orig
+++ b/test/ipt/firewall2-6.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:20 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:30 2012 PST by vadim
 #
 # files: * firewall2-6.fw /etc/fw/firewall2-6.fw
 #
@@ -509,7 +509,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:20 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:30 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-7.fw.orig b/test/ipt/firewall2-7.fw.orig
index 0e12d27..17a6e84 100755
--- a/test/ipt/firewall2-7.fw.orig
+++ b/test/ipt/firewall2-7.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:22 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:32 2012 PST by vadim
 #
 # files: * firewall2-7.fw /etc/fw/firewall2-7.fw
 #
@@ -449,7 +449,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:22 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:32 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2.fw.orig b/test/ipt/firewall2.fw.orig
index c71648f..e2b12a2 100755
--- a/test/ipt/firewall2.fw.orig
+++ b/test/ipt/firewall2.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:52 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:02 2012 PST by vadim
 #
 # files: * firewall2.fw /etc/fw/firewall2.fw
 #
@@ -1511,7 +1511,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:52 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:02 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall20-ipv6.fw.orig b/test/ipt/firewall20-ipv6.fw.orig
index 1950dd8..e23bce4 100755
--- a/test/ipt/firewall20-ipv6.fw.orig
+++ b/test/ipt/firewall20-ipv6.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:52 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:01 2012 PST by vadim
 #
 # files: * firewall20-ipv6.fw /etc/fw/firewall20-ipv6.fw
 #
@@ -485,7 +485,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:52 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:01 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall20.fw.orig b/test/ipt/firewall20.fw.orig
index c5fc0de..b7d2915 100755
--- a/test/ipt/firewall20.fw.orig
+++ b/test/ipt/firewall20.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:52 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:01 2012 PST by vadim
 #
 # files: * firewall20.fw /etc/fw/firewall20.fw
 #
@@ -696,7 +696,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:52 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:01 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall21-1.fw.orig b/test/ipt/firewall21-1.fw.orig
index f7032c6..5cbf28e 100755
--- a/test/ipt/firewall21-1.fw.orig
+++ b/test/ipt/firewall21-1.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:59 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:08 2012 PST by vadim
 #
 # files: * firewall21-1.fw /etc/fw/firewall21-1.fw
 #
@@ -496,7 +496,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:59 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:08 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall21.fw.orig b/test/ipt/firewall21.fw.orig
index 3161c7d..becaa6d 100755
--- a/test/ipt/firewall21.fw.orig
+++ b/test/ipt/firewall21.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:54 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:05 2012 PST by vadim
 #
 # files: * firewall21.fw /etc/fw/firewall21.fw
 #
@@ -495,7 +495,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:54 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:05 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall22.fw.orig b/test/ipt/firewall22.fw.orig
index 5f6d321..cf9dc5c 100755
--- a/test/ipt/firewall22.fw.orig
+++ b/test/ipt/firewall22.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:49:59 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:08 2012 PST by vadim
 #
 # files: * firewall22.fw /etc/fw/firewall22.fw
 #
@@ -412,7 +412,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:49:59 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:08 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall23-1.fw.orig b/test/ipt/firewall23-1.fw.orig
index 120218a..9aafd5c 100755
--- a/test/ipt/firewall23-1.fw.orig
+++ b/test/ipt/firewall23-1.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:07 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:16 2012 PST by vadim
 #
 # files: * firewall23-1.fw /etc/fw/firewall23-1.fw
 #
@@ -586,7 +586,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:07 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:16 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall23-2.fw.orig b/test/ipt/firewall23-2.fw.orig
index 59bc74a..e3f458a 100755
--- a/test/ipt/firewall23-2.fw.orig
+++ b/test/ipt/firewall23-2.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:07 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:16 2012 PST by vadim
 #
 # files: * firewall23-2.fw /etc/fw/firewall23-2.fw
 #
@@ -402,7 +402,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:07 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:16 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall23-3.fw.orig b/test/ipt/firewall23-3.fw.orig
index 3fdc212..34cb0d6 100755
--- a/test/ipt/firewall23-3.fw.orig
+++ b/test/ipt/firewall23-3.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:11 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:22 2012 PST by vadim
 #
 # files: * firewall23-3.fw /etc/fw/firewall23-3.fw
 #
@@ -388,7 +388,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:11 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:22 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall23.fw.orig b/test/ipt/firewall23.fw.orig
index fafb39d..983d9e8 100755
--- a/test/ipt/firewall23.fw.orig
+++ b/test/ipt/firewall23.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:05 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:15 2012 PST by vadim
 #
 # files: * firewall23.fw /etc/fw/firewall23.fw
 #
@@ -498,7 +498,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:05 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:15 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall24.fw.orig b/test/ipt/firewall24.fw.orig
index 81116e8..87780b2 100755
--- a/test/ipt/firewall24.fw.orig
+++ b/test/ipt/firewall24.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:13 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:23 2012 PST by vadim
 #
 # files: * firewall24.fw /etc/fw/firewall24.fw
 #
@@ -515,7 +515,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:13 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:23 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall25.fw.orig b/test/ipt/firewall25.fw.orig
index 4d0b9d1..598cce6 100755
--- a/test/ipt/firewall25.fw.orig
+++ b/test/ipt/firewall25.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:14 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:23 2012 PST by vadim
 #
 # files: * firewall25.fw /etc/fw/firewall25.fw
 #
@@ -706,7 +706,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:14 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:23 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall26.fw.orig b/test/ipt/firewall26.fw.orig
index 0aabdd9..93bdd22 100755
--- a/test/ipt/firewall26.fw.orig
+++ b/test/ipt/firewall26.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:20 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:29 2012 PST by vadim
 #
 # files: * firewall26.fw /etc/fw/firewall26.fw
 #
@@ -586,7 +586,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:20 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:29 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall27.fw.orig b/test/ipt/firewall27.fw.orig
index 32dfb9c..0edd0f3 100755
--- a/test/ipt/firewall27.fw.orig
+++ b/test/ipt/firewall27.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:21 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:30 2012 PST by vadim
 #
 # files: * firewall27.fw /etc/fw/firewall27.fw
 #
@@ -568,7 +568,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:21 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:30 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall28.fw.orig b/test/ipt/firewall28.fw.orig
index 9f9eabf..2ad586d 100755
--- a/test/ipt/firewall28.fw.orig
+++ b/test/ipt/firewall28.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:27 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:36 2012 PST by vadim
 #
 # files: * firewall28.fw /etc/fw/firewall28.fw
 #
@@ -431,7 +431,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:27 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:36 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall29.fw.orig b/test/ipt/firewall29.fw.orig
index 3400b4e..2f49a96 100755
--- a/test/ipt/firewall29.fw.orig
+++ b/test/ipt/firewall29.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:27 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:36 2012 PST by vadim
 #
 # files: * firewall29.fw /etc/fw/firewall29.fw
 #
@@ -466,7 +466,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:27 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:36 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall3.fw.orig b/test/ipt/firewall3.fw.orig
index a1078e2..c13830b 100755
--- a/test/ipt/firewall3.fw.orig
+++ b/test/ipt/firewall3.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:27 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:36 2012 PST by vadim
 #
 # files: * firewall3.fw /etc/fw/firewall3.fw
 #
@@ -600,7 +600,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:27 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:36 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall30.fw.orig b/test/ipt/firewall30.fw.orig
index 2086e52..b46a951 100755
--- a/test/ipt/firewall30.fw.orig
+++ b/test/ipt/firewall30.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:28 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:37 2012 PST by vadim
 #
 # files: * firewall30.fw /etc/fw/firewall30.fw
 #
@@ -397,7 +397,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:28 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:37 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall31.fw.orig b/test/ipt/firewall31.fw.orig
index e46fb7f..55d95cb 100755
--- a/test/ipt/firewall31.fw.orig
+++ b/test/ipt/firewall31.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:33 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:43 2012 PST by vadim
 #
 # files: * firewall31.fw /etc/fw/firewall31.fw
 #
@@ -469,7 +469,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:33 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:43 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall32.fw.orig b/test/ipt/firewall32.fw.orig
index 7ef6925..11a2a3f 100755
--- a/test/ipt/firewall32.fw.orig
+++ b/test/ipt/firewall32.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:33 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:43 2012 PST by vadim
 #
 # files: * firewall32.fw /etc/fw/firewall32.fw
 #
@@ -440,7 +440,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:33 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:43 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall33-1.fw.orig b/test/ipt/firewall33-1.fw.orig
index a5caf2d..e7619f7 100755
--- a/test/ipt/firewall33-1.fw.orig
+++ b/test/ipt/firewall33-1.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:34 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:44 2012 PST by vadim
 #
 # files: * firewall33-1.fw /etc/fw/firewall33-1.fw
 #
@@ -539,7 +539,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:34 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:44 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall33.fw.orig b/test/ipt/firewall33.fw.orig
index 7035553..5536e16 100755
--- a/test/ipt/firewall33.fw.orig
+++ b/test/ipt/firewall33.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:34 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:44 2012 PST by vadim
 #
 # files: * firewall33.fw /etc/fw/firewall33.fw
 #
@@ -584,7 +584,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:34 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:44 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall34.fw.orig b/test/ipt/firewall34.fw.orig
index f26c5a5..58ecb6a 100755
--- a/test/ipt/firewall34.fw.orig
+++ b/test/ipt/firewall34.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:38 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:48 2012 PST by vadim
 #
 # files: * firewall34.fw /etc/fw/firewall34.fw
 #
@@ -672,7 +672,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:38 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:48 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall35.fw.orig b/test/ipt/firewall35.fw.orig
index 88872bc..faa97cb 100755
--- a/test/ipt/firewall35.fw.orig
+++ b/test/ipt/firewall35.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:40 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:49 2012 PST by vadim
 #
 # files: * firewall35.fw /etc/fw/firewall35.fw
 #
@@ -564,7 +564,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:40 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:49 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall36-1.fw.orig b/test/ipt/firewall36-1.fw.orig
index 74707dd..29baecc 100755
--- a/test/ipt/firewall36-1.fw.orig
+++ b/test/ipt/firewall36-1.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:41 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:50 2012 PST by vadim
 #
 # files: * firewall36-1.fw /etc/firewall36-1.fw
 #
@@ -343,9 +343,20 @@ script_body() {
 
     # ============== ROUTING RULES ============== 
 
+    HAVE_MKTEMP=$(which mktemp)
+
+    test -n "$HAVE_MKTEMP" && {
+      TMPDIRNAME=$(mktemp -d)
+      test -z "$TMPDIRNAME" && exit 1
+    }
+
+    test -z "$HAVE_MKTEMP" && {
     TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$"
-    TMPFILENAME="$TMPDIRNAME/.fwbuilder.out"
     (umask 077 && mkdir $TMPDIRNAME) || exit 1
+    }
+
+    TMPFILENAME="$TMPDIRNAME/.fwbuilder.out"
+    OLD_ROUTES="$TMPDIRNAME/.old_routes"
 
     #
     # This function stops stdout redirection
@@ -365,8 +376,7 @@ script_body() {
       # delete current routing rules
       $IP route show | while read route ; do $IP route del $route ; done
       # restore old routing rules
-      (IFS="
-    "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done)
+      sh $OLD_ROUTES
       echo "...done"
       restore_script_output
       epilog_commands
@@ -380,7 +390,8 @@ script_body() {
 
     # store previous routing configuration (sort: 'via' GW has to be
     # inserted after device routes)
-    oldRoutes=$($IP route show | sort -k 2)
+
+    $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES
 
     echo "Deleting routing rules previously set by user space processes..."
     $IP route show | grep -v '\( proto kernel \)\|\(default via \)' | \
@@ -455,7 +466,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:41 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:50 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall36-2.fw.orig b/test/ipt/firewall36-2.fw.orig
index 2fe5f70..e6a03be 100755
--- a/test/ipt/firewall36-2.fw.orig
+++ b/test/ipt/firewall36-2.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:45 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:54 2012 PST by vadim
 #
 # files: * firewall36-2.fw /etc/firewall36-2.fw
 #
@@ -343,9 +343,20 @@ script_body() {
 
     # ============== ROUTING RULES ============== 
 
+    HAVE_MKTEMP=$(which mktemp)
+
+    test -n "$HAVE_MKTEMP" && {
+      TMPDIRNAME=$(mktemp -d)
+      test -z "$TMPDIRNAME" && exit 1
+    }
+
+    test -z "$HAVE_MKTEMP" && {
     TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$"
-    TMPFILENAME="$TMPDIRNAME/.fwbuilder.out"
     (umask 077 && mkdir $TMPDIRNAME) || exit 1
+    }
+
+    TMPFILENAME="$TMPDIRNAME/.fwbuilder.out"
+    OLD_ROUTES="$TMPDIRNAME/.old_routes"
 
     #
     # This function stops stdout redirection
@@ -365,8 +376,7 @@ script_body() {
       # delete current routing rules
       $IP route show | while read route ; do $IP route del $route ; done
       # restore old routing rules
-      (IFS="
-    "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done)
+      sh $OLD_ROUTES
       echo "...done"
       restore_script_output
       epilog_commands
@@ -380,7 +390,8 @@ script_body() {
 
     # store previous routing configuration (sort: 'via' GW has to be
     # inserted after device routes)
-    oldRoutes=$($IP route show | sort -k 2)
+
+    $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES
 
     echo "Deleting routing rules previously set by user space processes..."
     $IP route show | grep -v 'proto kernel' | \
@@ -455,7 +466,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:45 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:54 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall36.fw.orig b/test/ipt/firewall36.fw.orig
index 94a8b1a..5dd2961 100755
--- a/test/ipt/firewall36.fw.orig
+++ b/test/ipt/firewall36.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:41 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:50 2012 PST by vadim
 #
 # files: * firewall36.fw /etc/firewall36.fw
 #
@@ -346,9 +346,20 @@ script_body() {
 
     # ============== ROUTING RULES ============== 
 
+    HAVE_MKTEMP=$(which mktemp)
+
+    test -n "$HAVE_MKTEMP" && {
+      TMPDIRNAME=$(mktemp -d)
+      test -z "$TMPDIRNAME" && exit 1
+    }
+
+    test -z "$HAVE_MKTEMP" && {
     TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$"
-    TMPFILENAME="$TMPDIRNAME/.fwbuilder.out"
     (umask 077 && mkdir $TMPDIRNAME) || exit 1
+    }
+
+    TMPFILENAME="$TMPDIRNAME/.fwbuilder.out"
+    OLD_ROUTES="$TMPDIRNAME/.old_routes"
 
     #
     # This function stops stdout redirection
@@ -368,8 +379,7 @@ script_body() {
       # delete current routing rules
       $IP route show | while read route ; do $IP route del $route ; done
       # restore old routing rules
-      (IFS="
-    "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done)
+      sh $OLD_ROUTES
       echo "...done"
       restore_script_output
       epilog_commands
@@ -383,7 +393,8 @@ script_body() {
 
     # store previous routing configuration (sort: 'via' GW has to be
     # inserted after device routes)
-    oldRoutes=$($IP route show | sort -k 2)
+
+    $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES
 
     echo "Deleting routing rules previously set by user space processes..."
     $IP route show | grep -v 'proto kernel' | \
@@ -519,7 +530,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:41 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:50 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall37-1.fw.orig b/test/ipt/firewall37-1.fw.orig
index ea80970..f417d37 100755
--- a/test/ipt/firewall37-1.fw.orig
+++ b/test/ipt/firewall37-1.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:48 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:57 2012 PST by vadim
 #
 # files: * firewall37-1.fw /etc/fw/firewall37-1.fw
 #
@@ -988,7 +988,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:48 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:57 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall37-2.fw.orig b/test/ipt/firewall37-2.fw.orig
index 7519e2a..4746f42 100755
--- a/test/ipt/firewall37-2.fw.orig
+++ b/test/ipt/firewall37-2.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:48 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:57 2012 PST by vadim
 #
 # files: * firewall37-2.fw /etc/fw/firewall37-2.fw
 #
@@ -705,7 +705,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:48 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:57 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall37.fw.orig b/test/ipt/firewall37.fw.orig
index 7c404df..d5b1038 100755
--- a/test/ipt/firewall37.fw.orig
+++ b/test/ipt/firewall37.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:48 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:57 2012 PST by vadim
 #
 # files: * firewall37.fw /etc/fw/firewall37.fw
 #
@@ -1314,7 +1314,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:48 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:57 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall38.fw.orig b/test/ipt/firewall38.fw.orig
index f58ac94..279ce7f 100755
--- a/test/ipt/firewall38.fw.orig
+++ b/test/ipt/firewall38.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:49 2012 PST by vadim
+#  Generated Mon Feb 20 14:10:58 2012 PST by vadim
 #
 # files: * firewall38.fw /etc/fw/firewall38.fw
 #
@@ -541,7 +541,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:49 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:10:58 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall39.fw.orig b/test/ipt/firewall39.fw.orig
index 4ecf2a4..03493ea 100755
--- a/test/ipt/firewall39.fw.orig
+++ b/test/ipt/firewall39.fw.orig
@@ -4,7 +4,7 @@
 #
 #  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Feb 20 11:50:54 2012 PST by vadim
+#  Generated Mon Feb 20 14:11:04 2012 PST by vadim
 #
 # files: * firewall39.fw /etc/fw/firewall39.fw
 #
@@ -821,7 +821,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Feb 20 11:50:54 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 14:11:04 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall4.fw.orig b/test/ipt/firewall4.fw.orig
index fa2c862..2fe924a...
 
[truncated message content]

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-11-gca17dcc

From: <gi...@ir...> - 2012-02-20 20:25:24

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  ca17dccfcc55bb98665f9177bf305298a7483b33 (commit)
       via  8a456b3c7ddee38656a80e4e4ec565b39f7bbde1 (commit)
       via  c89b691effd439792ae160c7d0278e5bce84d7f4 (commit)
      from  d5911066cff87b5b92bd27aad5fd4da5bccdfeb4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ca17dccfcc55bb98665f9177bf305298a7483b33
Author: Vadim Kurland <va...@ne...>
Date:   Mon Feb 20 11:55:46 2012 -0800

    updated test cases

diff --git a/test/ipt/cluster1_secuwall-1.fw.orig b/test/ipt/cluster1_secuwall-1.fw.orig
index 5f31443..33b8980 100755
--- a/test/ipt/cluster1_secuwall-1.fw.orig
+++ b/test/ipt/cluster1_secuwall-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:54:16 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:35 2012 PST by vadim
 #
 # files: * cluster1_secuwall-1.fw /etc/cluster1_secuwall-1.fw
 #
@@ -610,7 +610,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:54:16 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:35 2012 by vadim"
         log "Database was cluster-tests.fwb"
         check_tools
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-base-rulesets.fw.orig b/test/ipt/firewall-base-rulesets.fw.orig
index 5615291..882f12c 100755
--- a/test/ipt/firewall-base-rulesets.fw.orig
+++ b/test/ipt/firewall-base-rulesets.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:14 2012 PST by vadim
+#  Generated Mon Feb 20 11:51:54 2012 PST by vadim
 #
 # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw
 #
@@ -467,7 +467,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:14 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:51:54 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-1.fw.orig b/test/ipt/firewall-ipv6-1.fw.orig
index 243e3f1..0acddac 100755
--- a/test/ipt/firewall-ipv6-1.fw.orig
+++ b/test/ipt/firewall-ipv6-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:23 2012 PST by vadim
+#  Generated Mon Feb 20 11:51:58 2012 PST by vadim
 #
 # files: * firewall-ipv6-1.fw /etc/firewall-ipv6-1.fw
 #
@@ -343,6 +343,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
 }
 
@@ -724,7 +731,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:23 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:51:58 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-2.fw.orig b/test/ipt/firewall-ipv6-2.fw.orig
index c4c8131..fb90691 100755
--- a/test/ipt/firewall-ipv6-2.fw.orig
+++ b/test/ipt/firewall-ipv6-2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:23 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:02 2012 PST by vadim
 #
 # files: * firewall-ipv6-2.fw /etc/firewall-ipv6-2.fw
 #
@@ -371,6 +371,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
 }
 
@@ -988,7 +995,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:23 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:02 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-3.fw.orig b/test/ipt/firewall-ipv6-3.fw.orig
index eee4411..625d946 100755
--- a/test/ipt/firewall-ipv6-3.fw.orig
+++ b/test/ipt/firewall-ipv6-3.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:31 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:02 2012 PST by vadim
 #
 # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw
 #
@@ -320,6 +320,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     update_addresses_of_interface "eth1 22.22.22.22/24" ""
 }
@@ -618,7 +625,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:31 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:02 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-4-1.fw.orig b/test/ipt/firewall-ipv6-4-1.fw.orig
index 6995b95..4bff0d5 100755
--- a/test/ipt/firewall-ipv6-4-1.fw.orig
+++ b/test/ipt/firewall-ipv6-4-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:39 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:03 2012 PST by vadim
 #
 # files: * firewall-ipv6-4-1.fw /etc/firewall-ipv6-4-1.fw
 #
@@ -324,6 +324,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     getaddr eth1  i_eth1
     getaddr6 eth1  i_eth1_v6
@@ -569,7 +576,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:39 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:03 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-4.fw.orig b/test/ipt/firewall-ipv6-4.fw.orig
index 1fb1f62..3b10c7a 100755
--- a/test/ipt/firewall-ipv6-4.fw.orig
+++ b/test/ipt/firewall-ipv6-4.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:31 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:02 2012 PST by vadim
 #
 # files: * firewall-ipv6-4.fw /etc/firewall-ipv6-4.fw
 #
@@ -322,6 +322,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     getaddr eth1  i_eth1
     getaddr6 eth1  i_eth1_v6
@@ -605,7 +612,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:31 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:02 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-5.fw.orig b/test/ipt/firewall-ipv6-5.fw.orig
index 5a33440..a93bc24 100755
--- a/test/ipt/firewall-ipv6-5.fw.orig
+++ b/test/ipt/firewall-ipv6-5.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:34 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:08 2012 PST by vadim
 #
 # files: * firewall-ipv6-5.fw /etc/firewall-ipv6-5.fw
 #
@@ -434,7 +434,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:34 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:08 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-6.fw.orig b/test/ipt/firewall-ipv6-6.fw.orig
index d693d8f..98dae16 100755
--- a/test/ipt/firewall-ipv6-6.fw.orig
+++ b/test/ipt/firewall-ipv6-6.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:36 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:09 2012 PST by vadim
 #
 # files: * firewall-ipv6-6.fw /etc/firewall-ipv6-6.fw
 #
@@ -311,6 +311,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     getaddr eth1  i_eth1
     getaddr6 eth1  i_eth1_v6
@@ -423,7 +430,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:36 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:09 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-7.fw.orig b/test/ipt/firewall-ipv6-7.fw.orig
index 5ad8c61..5effb93 100755
--- a/test/ipt/firewall-ipv6-7.fw.orig
+++ b/test/ipt/firewall-ipv6-7.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:38 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:09 2012 PST by vadim
 #
 # files: * firewall-ipv6-7.fw /etc/firewall-ipv6-7.fw
 #
@@ -313,6 +313,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     getaddr eth1  i_eth1
     getaddr6 eth1  i_eth1_v6
@@ -467,7 +474,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:38 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:09 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-8.fw.orig b/test/ipt/firewall-ipv6-8.fw.orig
index e52d588..bda7cfd 100755
--- a/test/ipt/firewall-ipv6-8.fw.orig
+++ b/test/ipt/firewall-ipv6-8.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:39 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:09 2012 PST by vadim
 #
 # files: * firewall-ipv6-8.fw /etc/firewall-ipv6-8.fw
 #
@@ -313,6 +313,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     getaddr eth1  i_eth1
     getaddr6 eth1  i_eth1_v6
@@ -540,7 +547,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:39 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:09 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig
index d4277e3..08c0509 100755
--- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig
+++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:42 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:14 2012 PST by vadim
 #
 # files: * firewall-ipv6-ipt-reset-prolog-after-flush.fw /etc/firewall-ipv6-ipt-reset-prolog-after-flush.fw
 #
@@ -313,6 +313,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     update_addresses_of_interface "eth1 22.22.22.22/24" ""
 }
@@ -464,7 +471,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:42 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:14 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig
index b484310..3519ea5 100755
--- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig
+++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:42 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:15 2012 PST by vadim
 #
 # files: * firewall-ipv6-ipt-reset-prolog-after-interfaces.fw /etc/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw
 #
@@ -313,6 +313,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     update_addresses_of_interface "eth1 22.22.22.22/24" ""
 }
@@ -464,7 +471,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:42 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:15 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig
index 8e394c3..6576fa1 100755
--- a/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig
+++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:45 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:15 2012 PST by vadim
 #
 # files: * firewall-ipv6-ipt-reset-prolog-top.fw /etc/firewall-ipv6-ipt-reset-prolog-top.fw
 #
@@ -313,6 +313,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     update_addresses_of_interface "eth1 22.22.22.22/24" ""
 }
@@ -464,7 +471,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:45 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:15 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-nd-ns-1.fw.orig b/test/ipt/firewall-ipv6-nd-ns-1.fw.orig
index a184433..8e7b5f7 100755
--- a/test/ipt/firewall-ipv6-nd-ns-1.fw.orig
+++ b/test/ipt/firewall-ipv6-nd-ns-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:45 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:15 2012 PST by vadim
 #
 # files: * firewall-ipv6-nd-ns-1.fw /etc/firewall-ipv6-nd-ns-1.fw
 #
@@ -313,6 +313,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     update_addresses_of_interface "eth1 192.0.2.1/24" ""
 }
@@ -464,7 +471,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:45 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:15 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-nd-ns-2.fw.orig b/test/ipt/firewall-ipv6-nd-ns-2.fw.orig
index adf8f46..2d47c1f 100755
--- a/test/ipt/firewall-ipv6-nd-ns-2.fw.orig
+++ b/test/ipt/firewall-ipv6-nd-ns-2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:47 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:21 2012 PST by vadim
 #
 # files: * firewall-ipv6-nd-ns-2.fw /etc/firewall-ipv6-nd-ns-2.fw
 #
@@ -313,6 +313,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     update_addresses_of_interface "eth1 192.0.2.1/24" ""
 }
@@ -468,7 +475,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:47 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:21 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig b/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig
index 37b9b8c..79f44cb 100755
--- a/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig
+++ b/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:47 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:21 2012 PST by vadim
 #
 # files: * firewall-ipv6-prolog-after-flush.fw /etc/firewall-ipv6-prolog-after-flush.fw
 #
@@ -311,6 +311,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     update_addresses_of_interface "eth1 22.22.22.22/24" ""
 }
@@ -442,7 +449,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:47 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:21 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig b/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig
index 6571ec6..bf7badd 100755
--- a/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig
+++ b/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:50 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:22 2012 PST by vadim
 #
 # files: * firewall-ipv6-prolog-after-interfaces.fw /etc/firewall-ipv6-prolog-after-interfaces.fw
 #
@@ -311,6 +311,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     update_addresses_of_interface "eth1 22.22.22.22/24" ""
 }
@@ -442,7 +449,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:50 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:22 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-prolog-top.fw.orig b/test/ipt/firewall-ipv6-prolog-top.fw.orig
index 67f65de..54655a1 100755
--- a/test/ipt/firewall-ipv6-prolog-top.fw.orig
+++ b/test/ipt/firewall-ipv6-prolog-top.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:50 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:22 2012 PST by vadim
 #
 # files: * firewall-ipv6-prolog-top.fw /etc/firewall-ipv6-prolog-top.fw
 #
@@ -311,6 +311,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 fe80::21d:9ff:fe8b:8e94/64 1.1.1.1/24" ""
     update_addresses_of_interface "eth1 22.22.22.22/24" ""
 }
@@ -442,7 +449,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:50 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:22 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-server-1-s.fw.orig b/test/ipt/firewall-server-1-s.fw.orig
index da32d29..a6684a7 100755
--- a/test/ipt/firewall-server-1-s.fw.orig
+++ b/test/ipt/firewall-server-1-s.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:46:52 2012 PST by vadim
+#  Generated Mon Feb 20 11:52:26 2012 PST by vadim
 #
 # files: * firewall-server-1-s.fw /etc/fw/firewall-server-1-s.fw
 #
@@ -415,7 +415,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:46:52 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:52:26 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall.fw.orig b/test/ipt/firewall.fw.orig
index f009ac1..8974aff 100755
--- a/test/ipt/firewall.fw.orig
+++ b/test/ipt/firewall.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:13 2012 PST by vadim
+#  Generated Mon Feb 20 11:49:32 2012 PST by vadim
 #
 # files: * firewall.fw /etc/fw/firewall.fw
 #
@@ -341,6 +341,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth1 222.222.222.222/24 222.222.222.0/32 222.222.222.1/32 222.222.222.2/32 222.222.222.3/32 222.222.222.4/32 222.222.222.5/32 222.222.222.6/32 222.222.222.7/32 222.222.222.8/32 222.222.222.9/32 222.222.222.10/32 222.222.222.11/32 222.222.222.12/32 222.222.222.13/32 222.222.222.14/32 222.222.222.15/32 222.222.222.16/32 222.222.222.17/32 222.222.222.18/32 222.222.222.19/32 222.222.222.20/32 222.222.222.21/32 222.222.222.22/32 222.222.222.23/32 222.222.222.24/32 222.222.222.25/32 222.222.222.26/32 222.222.222.27/32 222.222.222.28/32 222.222.222.29/32 222.222.222.30/32 222.222.222.31/32 222.222.222.32/32 222.222.222.33/32 222.222.222.34/32 222.222.222.35/32 222.222.222.36/32 222.222.222.37/32 222.222.222.38/32 222.222.222.39/32 222.222.222.40/32 222.222.222.41/32 222.222.222.42/32 222.222.222.43/32 222.222.222.44/32 222.222.222.45/32 222.222.222.46/32 222.222.222.47/32 222.222.222.48/32 222.222.222.49/32 222.222.222.50/32 222.222.222.51/32 222.
 222.222.52/32 222.222.222.53/32 222.222.222.54/32 222.222.222.55/32 222.222.222.56/32 222.222.222.57/32 222.222.222.58/32 222.222.222.59/32 222.222.222.60/32 222.222.222.61/32 222.222.222.62/32 222.222.222.63/32 222.222.222.64/32 222.222.222.65/32 222.222.222.66/32 222.222.222.67/32 222.222.222.68/32 222.222.222.69/32 222.222.222.70/32 222.222.222.71/32 222.222.222.72/32 222.222.222.73/32 222.222.222.74/32 222.222.222.75/32 222.222.222.76/32 222.222.222.77/32 222.222.222.78/32 222.222.222.79/32 222.222.222.80/32 222.222.222.81/32 222.222.222.82/32 222.222.222.83/32 222.222.222.84/32 222.222.222.85/32 222.222.222.86/32 222.222.222.87/32 222.222.222.88/32 222.222.222.89/32 222.222.222.90/32 222.222.222.91/32 222.222.222.92/32 222.222.222.93/32 222.222.222.94/32 222.222.222.95/32 222.222.222.96/32 222.222.222.97/32 222.222.222.98/32 222.222.222.99/32 222.222.222.100/32 222.222.222.101/32 222.222.222.102/32 222.222.222.103/32 222.222.222.104/32 222.222.222.105/32 222.222.222.106
 /32 222.222.222.107/32 222.222.222.108/32 222.222.222.109/32 222.222.222.110/32 222.222.222.111/32 222.222.222.112/32 222.222.222.113/32 222.222.222.114/32 222.222.222.115/32 222.222.222.116/32 222.222.222.117/32 222.222.222.118/32 222.222.222.119/32 222.222.222.120/32 222.222.222.121/32 222.222.222.122/32 222.222.222.123/32 222.222.222.124/32 222.222.222.125/32 222.222.222.126/32 222.222.222.127/32 222.222.222.128/32 222.222.222.129/32 222.222.222.130/32 222.222.222.131/32 222.222.222.132/32 222.222.222.133/32 222.222.222.134/32 222.222.222.135/32 222.222.222.136/32 222.222.222.137/32 222.222.222.138/32 222.222.222.139/32 222.222.222.140/32 222.222.222.141/32 222.222.222.142/32 222.222.222.143/32 222.222.222.144/32 222.222.222.145/32 222.222.222.146/32 222.222.222.147/32 222.222.222.148/32 222.222.222.149/32 222.222.222.150/32 222.222.222.151/32 222.222.222.152/32 222.222.222.153/32 222.222.222.154/32 222.222.222.155/32 222.222.222.156/32 222.222.222.157/32 222.222.222.158/
 32 222.222.222.159/32 222.222.222.160/32 222.222.222.161/32 222.222.222.162/32 222.222.222.163/32 222.222.222.164/32 222.222.222.165/32 222.222.222.166/32 222.222.222.167/32 222.222.222.168/32 222.222.222.169/32 222.222.222.170/32 222.222.222.171/32 222.222.222.172/32 222.222.222.173/32 222.222.222.174/32 222.222.222.175/32 222.222.222.176/32 222.222.222.177/32 222.222.222.178/32 222.222.222.179/32 222.222.222.180/32 222.222.222.181/32 222.222.222.182/32 222.222.222.183/32 222.222.222.184/32 222.222.222.185/32 222.222.222.186/32 222.222.222.187/32 222.222.222.188/32 222.222.222.189/32 222.222.222.190/32 222.222.222.191/32 222.222.222.192/32 222.222.222.193/32 222.222.222.194/32 222.222.222.195/32 222.222.222.196/32 222.222.222.197/32 222.222.222.198/32 222.222.222.199/32 222.222.222.200/32 222.222.222.201/32 222.222.222.202/32 222.222.222.203/32 222.222.222.204/32 222.222.222.205/32 222.222.222.206/32 222.222.222.207/32 222.222.222.208/32 222.222.222.209/32 222.222.222.210/3
 2 222.222.222.211/32 222.222.222.212/32 222.222.222.213/32 222.222.222.214/32 222.222.222.215/32 222.222.222.216/32 222.222.222.217/32 222.222.222.218/32 222.222.222.219/32 222.222.222.220/32 222.222.222.221/32 222.222.222.222/32 222.222.222.223/32 222.222.222.224/32 222.222.222.225/32 222.222.222.226/32 222.222.222.227/32 222.222.222.228/32 222.222.222.229/32 222.222.222.230/32 222.222.222.231/32 222.222.222.232/32 222.222.222.233/32 222.222.222.234/32 222.222.222.235/32 222.222.222.236/32 222.222.222.237/32 222.222.222.238/32 222.222.222.239/32 222.222.222.240/32 222.222.222.241/32 222.222.222.242/32 222.222.222.243/32 222.222.222.244/32 222.222.222.245/32 222.222.222.246/32 222.222.222.247/32 222.222.222.248/32 222.222.222.249/32 222.222.222.250/32 222.222.222.251/32 222.222.222.252/32 222.222.222.253/32 222.222.222.254/32 222.222.222.40/24 222.222.222.41/24" ""
     update_addresses_of_interface "eth0 192.168.1.1/24 192.168.1.20/24 192.168.1.10/24" ""
 }
@@ -1398,7 +1405,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:13 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:49:32 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall1.fw.orig b/test/ipt/firewall1.fw.orig
index 78fa9f9..55e1e0b 100755
--- a/test/ipt/firewall1.fw.orig
+++ b/test/ipt/firewall1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:15 2012 PST by vadim
+#  Generated Mon Feb 20 11:49:32 2012 PST by vadim
 #
 # files: * firewall1.fw /etc/fw/firewall1.fw
 #
@@ -293,6 +293,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 192.168.1.1/24 192.168.1.0/24" ""
     update_addresses_of_interface "eth1 22.22.22.22/24 22.22.22.23/24" ""
     update_addresses_of_interface "eth2 192.168.2.1/24 192.168.2.0/24" ""
@@ -1270,7 +1277,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:15 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:49:32 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall10.fw.orig b/test/ipt/firewall10.fw.orig
index b648be7..33d239d 100755
--- a/test/ipt/firewall10.fw.orig
+++ b/test/ipt/firewall10.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:15 2012 PST by vadim
+#  Generated Mon Feb 20 11:49:31 2012 PST by vadim
 #
 # files: * firewall10.fw /etc/fw/firewall10.fw
 #
@@ -495,7 +495,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:15 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:49:31 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall11.fw.orig b/test/ipt/firewall11.fw.orig
index a6aa94f..ef1085e 100755
--- a/test/ipt/firewall11.fw.orig
+++ b/test/ipt/firewall11.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:17 2012 PST by vadim
+#  Generated Mon Feb 20 11:49:38 2012 PST by vadim
 #
 # files: * firewall11.fw /etc/fw/firewall11.fw
 #
@@ -615,7 +615,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:17 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:49:38 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall12.fw.orig b/test/ipt/firewall12.fw.orig
index cf4ba2f..f48f61f 100755
--- a/test/ipt/firewall12.fw.orig
+++ b/test/ipt/firewall12.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:18 2012 PST by vadim
+#  Generated Mon Feb 20 11:49:38 2012 PST by vadim
 #
 # files: * firewall12.fw /etc/fw/firewall12.fw
 #
@@ -319,6 +319,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 22.22.22.22/24 22.22.22.23/24" ""
     update_addresses_of_interface "eth1 22.22.23.22/24" ""
 }
@@ -533,7 +540,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:18 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:49:38 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall13.fw.orig b/test/ipt/firewall13.fw.orig
index 5bf279e..df78c3b 100755
--- a/test/ipt/firewall13.fw.orig
+++ b/test/ipt/firewall13.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:20 2012 PST by vadim
+#  Generated Mon Feb 20 11:49:38 2012 PST by vadim
 #
 # files: * firewall13.fw /etc/fw/firewall13.fw
 #
@@ -407,7 +407,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:20 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:49:38 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall14.fw.orig b/test/ipt/firewall14.fw.orig
index 0fbafbf..fd1b808 100755
--- a/test/ipt/firewall14.fw.orig
+++ b/test/ipt/firewall14.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:20 2012 PST by vadim
+#  Generated Mon Feb 20 11:49:38 2012 PST by vadim
 #
 # files: * firewall14.fw /etc/fw/firewall14.fw
 #
@@ -306,6 +306,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 192.168.1.22/24" ""
     update_addresses_of_interface "eth1 22.22.23.22/24 22.22.23.160/24 22.22.23.40/24" ""
     update_addresses_of_interface "eth2 22.22.23.132/25" ""
@@ -426,7 +433,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:20 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:49:38 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall15.fw.orig b/test/ipt/firewall15.fw.orig
index cd1fc47..e9658ee 100755
--- a/test/ipt/firewall15.fw.orig
+++ b/test/ipt/firewall15.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:22 2012 PST by vadim
+#  Generated Mon Feb 20 11:49:44 2012 PST by vadim
 #
 # files: * firewall15.fw /etc/fw/firewall15.fw
 #
@@ -410,7 +410,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:22 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:49:44 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall16.fw.orig b/test/ipt/firewall16.fw.orig
index 7b397c2..3432f7b 100755
--- a/test/ipt/firewall16.fw.orig
+++ b/test/ipt/firewall16.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:22 2012 PST by vadim
+#  Generated Mon Feb 20 11:49:45 2012 PST by vadim
 #
 # files: * firewall16.fw /etc/fw/firewall16.fw
 #
@@ -514,7 +514,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:22 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:49:45 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall17.fw.orig b/test/ipt/firewall17.fw.orig
index 1d62ddf..2cd0370 100755
--- a/test/ipt/firewall17.fw.orig
+++ b/test/ipt/firewall17.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:25 2012 PST by vadim
+#  Generated Mon Feb 20 11:49:45 2012 PST by vadim
 #
 # files: * firewall17.fw /etc/fw/firewall17.fw
 #
@@ -303,6 +303,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 192.168.1.1/24" ""
     update_addresses_of_interface "eth1 22.22.22.22/24 33.33.33.33/24" ""
     update_addresses_of_interface "eth2 192.168.2.1/24" ""
@@ -493,7 +500,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:25 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:49:45 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall18.fw.orig b/test/ipt/firewall18.fw.orig
index bcc1683..e8ebfb4 100755
--- a/test/ipt/firewall18.fw.orig
+++ b/test/ipt/firewall18.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:25 2012 PST by vadim
+#  Generated Mon Feb 20 11:49:45 2012 PST by vadim
 #
 # files: * firewall18.fw /etc/fw/firewall18.fw
 #
@@ -528,7 +528,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:25 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:49:45 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall19.fw.orig b/test/ipt/firewall19.fw.orig
index cb66397..bce265f 100755
--- a/test/ipt/firewall19.fw.orig
+++ b/test/ipt/firewall19.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:27 2012 PST by vadim
+#  Generated Mon Feb 20 11:49:50 2012 PST by vadim
 #
 # files: * firewall19.fw /etc/fw/firewall19.fw
 #
@@ -532,7 +532,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:27 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:49:50 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-1.fw.orig b/test/ipt/firewall2-1.fw.orig
index 57a8dc4..df4c905 100755
--- a/test/ipt/firewall2-1.fw.orig
+++ b/test/ipt/firewall2-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:34 2012 PST by vadim
+#  Generated Mon Feb 20 11:50:01 2012 PST by vadim
 #
 # files: * firewall2-1.fw /etc/fw/firewall2-1.fw
 #
@@ -315,6 +315,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 192.168.1.1/24 192.168.1.10/24 192.168.1.50/24" ""
     update_addresses_of_interface "eth1 22.22.22.22/24 22.22.22.23/24 22.22.22.24/24 22.22.22.25/24 22.22.22.0/32 22.22.22.1/32 22.22.22.2/32 22.22.22.3/32 22.22.22.4/32 22.22.22.5/32 22.22.22.6/32 22.22.22.7/32 22.22.22.8/32 22.22.22.9/32 22.22.22.10/32 22.22.22.11/32 22.22.22.12/32 22.22.22.13/32 22.22.22.14/32 22.22.22.15/32 22.22.22.16/32 22.22.22.17/32 22.22.22.18/32 22.22.22.19/32 22.22.22.20/32 22.22.22.21/32 22.22.22.22/32 22.22.22.23/32 22.22.22.24/32 22.22.22.25/32 22.22.22.26/32 22.22.22.27/32 22.22.22.28/32 22.22.22.29/32 22.22.22.30/32 22.22.22.31/32 22.22.22.32/32 22.22.22.33/32 22.22.22.34/32 22.22.22.35/32 22.22.22.36/32 22.22.22.37/32 22.22.22.38/32 22.22.22.39/32 22.22.22.40/32 22.22.22.41/32 22.22.22.42/32 22.22.22.43/32 22.22.22.44/32 22.22.22.45/32 22.22.22.46/32 22.22.22.47/32 22.22.22.48/32 22.22.22.49/32 22.22.22.50/32 22.22.22.51/32 22.22.22.52/32 22.22.22.53/32 22.22.22.54/32 22.22.22.55/32 22.22.22.56/32 22.22.22.57/32 22.22.22.58/32 22.22.22.59/32
  22.22.22.60/32 22.22.22.61/32 22.22.22.62/32 22.22.22.63/32 22.22.22.64/32 22.22.22.65/32 22.22.22.66/32 22.22.22.67/32 22.22.22.68/32 22.22.22.69/32 22.22.22.70/32 22.22.22.71/32 22.22.22.72/32 22.22.22.73/32 22.22.22.74/32 22.22.22.75/32 22.22.22.76/32 22.22.22.77/32 22.22.22.78/32 22.22.22.79/32 22.22.22.80/32 22.22.22.81/32 22.22.22.82/32 22.22.22.83/32 22.22.22.84/32 22.22.22.85/32 22.22.22.86/32 22.22.22.87/32 22.22.22.88/32 22.22.22.89/32 22.22.22.90/32 22.22.22.91/32 22.22.22.92/32 22.22.22.93/32 22.22.22.94/32 22.22.22.95/32 22.22.22.96/32 22.22.22.97/32 22.22.22.98/32 22.22.22.99/32 22.22.22.100/32 22.22.22.101/32 22.22.22.102/32 22.22.22.103/32 22.22.22.104/32 22.22.22.105/32 22.22.22.106/32 22.22.22.107/32 22.22.22.108/32 22.22.22.109/32 22.22.22.110/32 22.22.22.111/32 22.22.22.112/32 22.22.22.113/32 22.22.22.114/32 22.22.22.115/32 22.22.22.116/32 22.22.22.117/32 22.22.22.118/32 22.22.22.119/32 22.22.22.120/32 22.22.22.121/32 22.22.22.122/32 22.22.22.123/32 22.2
 2.22.124/32 22.22.22.125/32 22.22.22.126/32 22.22.22.127/32 22.22.22.128/32 22.22.22.129/32 22.22.22.130/32 22.22.22.131/32 22.22.22.132/32 22.22.22.133/32 22.22.22.134/32 22.22.22.135/32 22.22.22.136/32 22.22.22.137/32 22.22.22.138/32 22.22.22.139/32 22.22.22.140/32 22.22.22.141/32 22.22.22.142/32 22.22.22.143/32 22.22.22.144/32 22.22.22.145/32 22.22.22.146/32 22.22.22.147/32 22.22.22.148/32 22.22.22.149/32 22.22.22.150/32 22.22.22.151/32 22.22.22.152/32 22.22.22.153/32 22.22.22.154/32 22.22.22.155/32 22.22.22.156/32 22.22.22.157/32 22.22.22.158/32 22.22.22.159/32 22.22.22.160/32 22.22.22.161/32 22.22.22.162/32 22.22.22.163/32 22.22.22.164/32 22.22.22.165/32 22.22.22.166/32 22.22.22.167/32 22.22.22.168/32 22.22.22.169/32 22.22.22.170/32 22.22.22.171/32 22.22.22.172/32 22.22.22.173/32 22.22.22.174/32 22.22.22.175/32 22.22.22.176/32 22.22.22.177/32 22.22.22.178/32 22.22.22.179/32 22.22.22.180/32 22.22.22.181/32 22.22.22.182/32 22.22.22.183/32 22.22.22.184/32 22.22.22.185/32 2
 2.22.22.186/32 22.22.22.187/32 22.22.22.188/32 22.22.22.189/32 22.22.22.190/32 22.22.22.191/32 22.22.22.192/32 22.22.22.193/32 22.22.22.194/32 22.22.22.195/32 22.22.22.196/32 22.22.22.197/32 22.22.22.198/32 22.22.22.199/32 22.22.22.200/32 22.22.22.201/32 22.22.22.202/32 22.22.22.203/32 22.22.22.204/32 22.22.22.205/32 22.22.22.206/32 22.22.22.207/32 22.22.22.208/32 22.22.22.209/32 22.22.22.210/32 22.22.22.211/32 22.22.22.212/32 22.22.22.213/32 22.22.22.214/32 22.22.22.215/32 22.22.22.216/32 22.22.22.217/32 22.22.22.218/32 22.22.22.219/32 22.22.22.220/32 22.22.22.221/32 22.22.22.222/32 22.22.22.223/32 22.22.22.224/32 22.22.22.225/32 22.22.22.226/32 22.22.22.227/32 22.22.22.228/32 22.22.22.229/32 22.22.22.230/32 22.22.22.231/32 22.22.22.232/32 22.22.22.233/32 22.22.22.234/32 22.22.22.235/32 22.22.22.236/32 22.22.22.237/32 22.22.22.238/32 22.22.22.239/32 22.22.22.240/32 22.22.22.241/32 22.22.22.242/32 22.22.22.243/32 22.22.22.244/32 22.22.22.245/32 22.22.22.246/32 22.22.22.247/3
 2 22.22.22.248/32 22.22.22.249/32 22.22.22.250/32 22.22.22.251/32 22.22.22.252/32 22.22.22.253/32 22.22.22.254/32" ""
     update_addresses_of_interface "eth3 22.22.23.23/24 22.22.25.50/24 22.22.23.24/24" ""
@@ -1452,7 +1459,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:34 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:50:01 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-2.fw.orig b/test/ipt/firewall2-2.fw.orig
index 90c4389..513d725 100755
--- a/test/ipt/firewall2-2.fw.orig
+++ b/test/ipt/firewall2-2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:37 2012 PST by vadim
+#  Generated Mon Feb 20 11:50:01 2012 PST by vadim
 #
 # files: * firewall2-2.fw /etc/fw/firewall2-2.fw
 #
@@ -315,6 +315,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 192.168.1.1/24 192.168.1.10/24 192.168.1.50/24" ""
     update_addresses_of_interface "eth1 22.22.22.22/24 22.22.22.23/24 22.22.22.24/24 22.22.22.25/24 22.22.22.0/32 22.22.22.1/32 22.22.22.2/32 22.22.22.3/32 22.22.22.4/32 22.22.22.5/32 22.22.22.6/32 22.22.22.7/32 22.22.22.8/32 22.22.22.9/32 22.22.22.10/32 22.22.22.11/32 22.22.22.12/32 22.22.22.13/32 22.22.22.14/32 22.22.22.15/32 22.22.22.16/32 22.22.22.17/32 22.22.22.18/32 22.22.22.19/32 22.22.22.20/32 22.22.22.21/32 22.22.22.22/32 22.22.22.23/32 22.22.22.24/32 22.22.22.25/32 22.22.22.26/32 22.22.22.27/32 22.22.22.28/32 22.22.22.29/32 22.22.22.30/32 22.22.22.31/32 22.22.22.32/32 22.22.22.33/32 22.22.22.34/32 22.22.22.35/32 22.22.22.36/32 22.22.22.37/32 22.22.22.38/32 22.22.22.39/32 22.22.22.40/32 22.22.22.41/32 22.22.22.42/32 22.22.22.43/32 22.22.22.44/32 22.22.22.45/32 22.22.22.46/32 22.22.22.47/32 22.22.22.48/32 22.22.22.49/32 22.22.22.50/32 22.22.22.51/32 22.22.22.52/32 22.22.22.53/32 22.22.22.54/32 22.22.22.55/32 22.22.22.56/32 22.22.22.57/32 22.22.22.58/32 22.22.22.59/32
  22.22.22.60/32 22.22.22.61/32 22.22.22.62/32 22.22.22.63/32 22.22.22.64/32 22.22.22.65/32 22.22.22.66/32 22.22.22.67/32 22.22.22.68/32 22.22.22.69/32 22.22.22.70/32 22.22.22.71/32 22.22.22.72/32 22.22.22.73/32 22.22.22.74/32 22.22.22.75/32 22.22.22.76/32 22.22.22.77/32 22.22.22.78/32 22.22.22.79/32 22.22.22.80/32 22.22.22.81/32 22.22.22.82/32 22.22.22.83/32 22.22.22.84/32 22.22.22.85/32 22.22.22.86/32 22.22.22.87/32 22.22.22.88/32 22.22.22.89/32 22.22.22.90/32 22.22.22.91/32 22.22.22.92/32 22.22.22.93/32 22.22.22.94/32 22.22.22.95/32 22.22.22.96/32 22.22.22.97/32 22.22.22.98/32 22.22.22.99/32 22.22.22.100/32 22.22.22.101/32 22.22.22.102/32 22.22.22.103/32 22.22.22.104/32 22.22.22.105/32 22.22.22.106/32 22.22.22.107/32 22.22.22.108/32 22.22.22.109/32 22.22.22.110/32 22.22.22.111/32 22.22.22.112/32 22.22.22.113/32 22.22.22.114/32 22.22.22.115/32 22.22.22.116/32 22.22.22.117/32 22.22.22.118/32 22.22.22.119/32 22.22.22.120/32 22.22.22.121/32 22.22.22.122/32 22.22.22.123/32 22.2
 2.22.124/32 22.22.22.125/32 22.22.22.126/32 22.22.22.127/32 22.22.22.128/32 22.22.22.129/32 22.22.22.130/32 22.22.22.131/32 22.22.22.132/32 22.22.22.133/32 22.22.22.134/32 22.22.22.135/32 22.22.22.136/32 22.22.22.137/32 22.22.22.138/32 22.22.22.139/32 22.22.22.140/32 22.22.22.141/32 22.22.22.142/32 22.22.22.143/32 22.22.22.144/32 22.22.22.145/32 22.22.22.146/32 22.22.22.147/32 22.22.22.148/32 22.22.22.149/32 22.22.22.150/32 22.22.22.151/32 22.22.22.152/32 22.22.22.153/32 22.22.22.154/32 22.22.22.155/32 22.22.22.156/32 22.22.22.157/32 22.22.22.158/32 22.22.22.159/32 22.22.22.160/32 22.22.22.161/32 22.22.22.162/32 22.22.22.163/32 22.22.22.164/32 22.22.22.165/32 22.22.22.166/32 22.22.22.167/32 22.22.22.168/32 22.22.22.169/32 22.22.22.170/32 22.22.22.171/32 22.22.22.172/32 22.22.22.173/32 22.22.22.174/32 22.22.22.175/32 22.22.22.176/32 22.22.22.177/32 22.22.22.178/32 22.22.22.179/32 22.22.22.180/32 22.22.22.181/32 22.22.22.182/32 22.22.22.183/32 22.22.22.184/32 22.22.22.185/32 2
 2.22.22.186/32 22.22.22.187/32 22.22.22.188/32 22.22.22.189/32 22.22.22.190/32 22.22.22.191/32 22.22.22.192/32 22.22.22.193/32 22.22.22.194/32 22.22.22.195/32 22.22.22.196/32 22.22.22.197/32 22.22.22.198/32 22.22.22.199/32 22.22.22.200/32 22.22.22.201/32 22.22.22.202/32 22.22.22.203/32 22.22.22.204/32 22.22.22.205/32 22.22.22.206/32 22.22.22.207/32 22.22.22.208/32 22.22.22.209/32 22.22.22.210/32 22.22.22.211/32 22.22.22.212/32 22.22.22.213/32 22.22.22.214/32 22.22.22.215/32 22.22.22.216/32 22.22.22.217/32 22.22.22.218/32 22.22.22.219/32 22.22.22.220/32 22.22.22.221/32 22.22.22.222/32 22.22.22.223/32 22.22.22.224/32 22.22.22.225/32 22.22.22.226/32 22.22.22.227/32 22.22.22.228/32 22.22.22.229/32 22.22.22.230/32 22.22.22.231/32 22.22.22.232/32 22.22.22.233/32 22.22.22.234/32 22.22.22.235/32 22.22.22.236/32 22.22.22.237/32 22.22.22.238/32 22.22.22.239/32 22.22.22.240/32 22.22.22.241/32 22.22.22.242/32 22.22.22.243/32 22.22.22.244/32 22.22.22.245/32 22.22.22.246/32 22.22.22.247/3
 2 22.22.22.248/32 22.22.22.249/32 22.22.22.250/32 22.22.22.251/32 22.22.22.252/32 22.22.22.253/32 22.22.22.254/32" ""
     update_addresses_of_interface "eth3 22.22.23.23/24 22.22.25.50/24 22.22.23.24/24" ""
@@ -1282,7 +1289,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Jan  2 16:44:37 2012 by vadim"
+        log "Activating firewall script generated Mon Feb 20 11:50:01 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-3.fw.orig b/test/ipt/firewall2-3.fw.orig
index bd8bb99..0ea8209 100755
--- a/test/ipt/firewall2-3.fw.orig
+++ b/test/ipt/firewall2-3.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.2.3593
+#  Firewall Builder  fwb_ipt v5.0.2.3595
 #
-#  Generated Mon Jan  2 16:44:40 2012 PST by vadim
+#  Generated Mon Feb 20 11:50:07 2012 PST by vadim
 #
 # files: * firewall2-3.fw /etc/fw/firewall2-3.fw
 #
@@ -299,6 +299,13 @@ run_epilog_and_exit() {
 configure_interfaces() {
     :
     # Configure interfaces
+    # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429689
+    # this ensures that secondary ip address is "promoted" to primary
+    # when primary address is deleted, instead of deleting both
+    # primary and secondary addresses. It looks like this is only
+    # available starting from Linux 2.6.16 
+    test -f /proc/sys/net/ipv4/conf/all/promote_secondaries && \
+        echo 1 >  /proc/sys/net/ipv4/conf/all/promote_secondaries
     update_addresses_of_interface "eth0 192.168.1.1/24 192.16...
 
[truncated message content]

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, builds, updated. v5.0.1-8-gd591106

From: <gi...@ir...> - 2012-02-14 19:34:49

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, builds has been updated
       via  d5911066cff87b5b92bd27aad5fd4da5bccdfeb4 (commit)
       via  f9fa1ecbaa24fe5c65562514a936e469840067ab (commit)
       via  18eae7e63d8708f2828b0f15d4219064ee00b44c (commit)
      from  878f18d63f6a85d31c06d502835fd7e3a24dc394 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 VERSION                                            |    2 +-
 VERSION.h                                          |    2 +-
 doc/ChangeLog                                      |    4 +---
 packaging/fwbuilder-static-qt.spec                 |    2 +-
 packaging/fwbuilder.control                        |    2 +-
 packaging/fwbuilder.spec                           |    2 +-
 qmake.inc.in                                       |    2 ++
 src/libgui/FWWindow.cpp                            |    4 ----
 src/libgui/HttpGet.cpp                             |    9 ++-------
 src/libgui/ObjectManipulator_new_object_checks.cpp |    2 --
 src/libgui/aboutdialog_q.ui                        |    2 +-
 11 files changed, 11 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-8-gd591106

From: <gi...@ir...> - 2012-02-14 19:29:30

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  d5911066cff87b5b92bd27aad5fd4da5bccdfeb4 (commit)
       via  f9fa1ecbaa24fe5c65562514a936e469840067ab (commit)
       via  18eae7e63d8708f2828b0f15d4219064ee00b44c (commit)
      from  878f18d63f6a85d31c06d502835fd7e3a24dc394 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d5911066cff87b5b92bd27aad5fd4da5bccdfeb4
Author: Vadim Kurland <va...@ne...>
Date:   Tue Feb 14 11:00:20 2012 -0800

    updated ChangeLog

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 72d70f9..f695664 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -4,8 +4,6 @@
 	Need to define macro __STDC_FORMAT_MACROS. This still needs to be
 	tested on all build machines.
 
-	build 3594
-	
 2012-01-02  Vadim Kurland  <va...@ne...>
 
 	* PolicyCompiler_ipt.cpp (specialCaseAddressRangeInRE::processNext):

commit f9fa1ecbaa24fe5c65562514a936e469840067ab
Merge: 18eae7e 878f18d
Author: Vadim Kurland <va...@ne...>
Date:   Tue Feb 14 10:59:46 2012 -0800

    merge my previous changes for __STDC_FORMAT_MACROS


commit 18eae7e63d8708f2828b0f15d4219064ee00b44c
Author: Vadim Kurland <va...@ne...>
Date:   Tue Feb 14 10:57:50 2012 -0800

    removed all ELC

diff --git a/VERSION b/VERSION
index eec5d24..0c35fa7 100644
--- a/VERSION
+++ b/VERSION
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=2
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3594"
+BUILD_NUM="3595"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 
diff --git a/VERSION.h b/VERSION.h
index 0f7ccd1..e010e3e 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION      "5.0.2.3594"
+#define VERSION      "5.0.2.3595"
 #define GENERATION   "5.0"
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index 2146529..20ebdf6 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
 
 
 %define name    fwbuilder
-%define version 5.0.2.3594
+%define version 5.0.2.3595
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index 4bd7201..1cecab6 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: va...@fw...
-Version: 5.0.2.3594-1
+Version: 5.0.2.3595-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 50421fd..baa41f5 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 5.0.2.3594
+%define version 5.0.2.3595
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/qmake.inc.in b/qmake.inc.in
index 6bf27e0..7ba79f1 100644
--- a/qmake.inc.in
+++ b/qmake.inc.in
@@ -67,6 +67,7 @@ unix {
 
         CONFIG += warn_on
 
+#		DEFINES += __STDC_FORMAT_MACROS
     }
 }
 
diff --git a/src/libgui/FWWindow.cpp b/src/libgui/FWWindow.cpp
index f38c4b4..982a4b2 100644
--- a/src/libgui/FWWindow.cpp
+++ b/src/libgui/FWWindow.cpp
@@ -620,10 +620,6 @@ void FWWindow::showIntroDialog()
         return;
     }
 
-#ifdef ELC
-    if (regCheck()) return;
-#endif
-
     if (!st->getBool("UI/NoStartTip"))
     {
         StartTipDialog *stdlg = new StartTipDialog(this);
diff --git a/src/libgui/HttpGet.cpp b/src/libgui/HttpGet.cpp
index be21238..938495d 100644
--- a/src/libgui/HttpGet.cpp
+++ b/src/libgui/HttpGet.cpp
@@ -113,13 +113,8 @@ bool HttpGet::get(const QUrl &_url)
   #endif
 #endif
 
-    QString reg = "u";
-#ifdef ELC
-    if (getRegistrationStatus()==2) reg = "r";
-#endif
-
-    QString agent = QString("fwbuilder/%1 (%2; %3; b:999999; s:%5; %6)")
-        .arg(VERSION).arg(os).arg(locale).arg(sig).arg(reg);
+    QString agent = QString("fwbuilder/%1 (%2; %3; b:999999; s:%5; u)")
+        .arg(VERSION).arg(os).arg(locale).arg(sig);
 
     hdr.setValue("User-Agent", agent);
     request_id = http.request(hdr, NULL, &strm);
diff --git a/src/libgui/ObjectManipulator_new_object_checks.cpp b/src/libgui/ObjectManipulator_new_object_checks.cpp
index 5cf862a..b2c75f5 100644
--- a/src/libgui/ObjectManipulator_new_object_checks.cpp
+++ b/src/libgui/ObjectManipulator_new_object_checks.cpp
@@ -34,7 +34,6 @@
 using namespace std;
 using namespace libfwbuilder;
 
-#ifndef ELC
 bool ObjectManipulator::isObjectAllowed(const QString&)
 {
     return true;
@@ -46,4 +45,3 @@ bool ObjectManipulator::isObjectAllowed(FWObject*, FWObject*)
     return true;
 }
 
-#endif
diff --git a/src/libgui/aboutdialog_q.ui b/src/libgui/aboutdialog_q.ui
index 852d3d1..f1fd6be 100644
--- a/src/libgui/aboutdialog_q.ui
+++ b/src/libgui/aboutdialog_q.ui
@@ -470,7 +470,7 @@ p, li { white-space: pre-wrap; }
       </sizepolicy>
      </property>
      <property name="text">
-      <string>Copyright 2002-2011  NetCitadel, LLC</string>
+      <string>Copyright 2002-2011  NetCitadel, Inc</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>

-----------------------------------------------------------------------

Summary of changes:
 VERSION                                            |    2 +-
 VERSION.h                                          |    2 +-
 doc/ChangeLog                                      |    4 +---
 packaging/fwbuilder-static-qt.spec                 |    2 +-
 packaging/fwbuilder.control                        |    2 +-
 packaging/fwbuilder.spec                           |    2 +-
 qmake.inc.in                                       |    2 ++
 src/libgui/FWWindow.cpp                            |    4 ----
 src/libgui/HttpGet.cpp                             |    9 ++-------
 src/libgui/ObjectManipulator_new_object_checks.cpp |    2 --
 src/libgui/aboutdialog_q.ui                        |    2 +-
 11 files changed, 11 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, builds, updated. v5.0.1-5-g878f18d

From: <gi...@ir...> - 2012-02-14 04:55:37

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, builds has been updated
       via  878f18d63f6a85d31c06d502835fd7e3a24dc394 (commit)
      from  f97a1b50ba51be5fa31cc54dba829a9e77609160 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 qmake.inc.in                  |    7 +++----
 src/libfwbuilder/qmake.inc.in |    6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-5-g878f18d

From: <gi...@ir...> - 2012-02-14 04:55:35

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  878f18d63f6a85d31c06d502835fd7e3a24dc394 (commit)
      from  f97a1b50ba51be5fa31cc54dba829a9e77609160 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 878f18d63f6a85d31c06d502835fd7e3a24dc394
Author: Vadim Kurland <va...@sl...>
Date:   Mon Feb 13 21:40:03 2012 -0800

    need to define macros for all OS

diff --git a/qmake.inc.in b/qmake.inc.in
index 3e31fd6..ceabe17 100644
--- a/qmake.inc.in
+++ b/qmake.inc.in
@@ -66,10 +66,6 @@ unix {
         PKGLOCALEDIR = $$res.path/locale
 
         CONFIG += warn_on
-
-        QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
-        QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
-
     }
 }
 
@@ -81,6 +77,9 @@ FWB_SIG = $$(FWB_SIG)
 if (isEmpty(FWB_SIG)) { FWB_SIG=26932 }
 DEFINES += FWB_SIG=$$FWB_SIG
 
+QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
+QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
+
 exists(qmake2.inc) {
   include(qmake2.inc)
 }
diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in
index a8114cf..a73207c 100644
--- a/src/libfwbuilder/qmake.inc.in
+++ b/src/libfwbuilder/qmake.inc.in
@@ -34,9 +34,6 @@ unix {
     QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
     QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
 
-    QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
-    QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
-
     exec_prefix = @EXEC_PREFIX@
     DESTDIR =
 
@@ -46,6 +43,9 @@ unix {
     doc.path = @DOCDIR@
 }
 
+QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
+QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
+
 exists(qmake2.inc) {
   include( qmake2.inc)
 }

-----------------------------------------------------------------------

Summary of changes:
 qmake.inc.in                  |    7 +++----
 src/libfwbuilder/qmake.inc.in |    6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-4-gf97a1b5

From: <gi...@ir...> - 2012-02-14 04:22:14

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  f97a1b50ba51be5fa31cc54dba829a9e77609160 (commit)
      from  15565ade5dc843e5fefe83568a023c37256c3c3c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f97a1b50ba51be5fa31cc54dba829a9e77609160
Author: Vadim Kurland <va...@sl...>
Date:   Mon Feb 13 20:59:26 2012 -0800

    fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still
    needs to be tested on all build machines.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 720f412..72d70f9 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-13  Vadim Kurland  <va...@ne...>
+
+	* qmake.inc.in (QMAKE_CXXFLAGS_DEBUG): fix for SF bug #3468802.
+	Need to define macro __STDC_FORMAT_MACROS. This still needs to be
+	tested on all build machines.
+
+	build 3594
+	
 2012-01-02  Vadim Kurland  <va...@ne...>
 
 	* PolicyCompiler_ipt.cpp (specialCaseAddressRangeInRE::processNext):
diff --git a/qmake.inc.in b/qmake.inc.in
index 6bf27e0..3e31fd6 100644
--- a/qmake.inc.in
+++ b/qmake.inc.in
@@ -67,6 +67,9 @@ unix {
 
         CONFIG += warn_on
 
+        QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
+        QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
+
     }
 }
 
diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in
index b4f15bb..a8114cf 100644
--- a/src/libfwbuilder/qmake.inc.in
+++ b/src/libfwbuilder/qmake.inc.in
@@ -34,6 +34,9 @@ unix {
     QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
     QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
 
+    QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
+    QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
+
     exec_prefix = @EXEC_PREFIX@
     DESTDIR =
 
diff --git a/src/libfwbuilder/src/fwbuilder/uint128.h b/src/libfwbuilder/src/fwbuilder/uint128.h
index 0a2e7a4..b00ab47 100644
--- a/src/libfwbuilder/src/fwbuilder/uint128.h
+++ b/src/libfwbuilder/src/fwbuilder/uint128.h
@@ -36,7 +36,7 @@
 
 #include <stdio.h>
 
-#define __STDC_FORMAT_MACROS
+// #define __STDC_FORMAT_MACROS
 #include <inttypes.h>   // for sprintf formats for "long long"
 
 // convinience macro

-----------------------------------------------------------------------

Summary of changes:
 doc/ChangeLog                            |    8 ++++++++
 qmake.inc.in                             |    3 +++
 src/libfwbuilder/qmake.inc.in            |    3 +++
 src/libfwbuilder/src/fwbuilder/uint128.h |    2 +-
 4 files changed, 15 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, builds, updated. v5.0.1-4-gf97a1b5

From: <gi...@ir...> - 2012-02-14 04:15:55

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, builds has been updated
       via  f97a1b50ba51be5fa31cc54dba829a9e77609160 (commit)
       via  15565ade5dc843e5fefe83568a023c37256c3c3c (commit)
      from  24d8a8db3f85118095482438f42a049b5a198969 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 VERSION                                        |    2 +-
 VERSION.h                                      |    2 +-
 doc/ChangeLog                                  |    8 +
 packaging/fwbuilder-static-qt.spec             |    2 +-
 packaging/fwbuilder.control                    |    2 +-
 packaging/fwbuilder.spec                       |    2 +-
 qmake.inc.in                                   |    3 +
 src/fwbedit/fwbedit.cpp                        |    2 -
 src/gui/main.cpp                               |    6 +-
 src/libfwbuilder/qmake.inc.in                  |    3 +
 src/libfwbuilder/src/fwbuilder/uint128.h       |    2 +-
 src/libgui/DiscoveryDruid.cpp                  |    3 -
 src/libgui/FWBApplication.cpp                  |    9 --
 src/libgui/FWBSettings.cpp                     |   10 --
 src/libgui/FWBSettings.h                       |    3 -
 src/libgui/FWCmdRule.cpp                       |   14 --
 src/libgui/FWWindow.cpp                        |    2 -
 src/libgui/FirewallInstaller.cpp               |    3 -
 src/libgui/PrefsDialog.cpp                     |   28 ----
 src/libgui/ProjectPanel.cpp                    |    9 --
 src/libgui/StartTipDialog.cpp                  |    2 -
 src/libgui/TutorialDialog.cpp                  |    2 -
 src/libgui/UserWorkflow.cpp                    |  175 ------------------------
 src/libgui/UserWorkflow.h                      |  114 ---------------
 src/libgui/global.h                            |    2 -
 src/libgui/instDialog_ui_ops.cpp               |    4 -
 src/libgui/libgui.pro                          |    2 -
 src/libgui/newFirewallDialog.cpp               |    3 -
 src/libgui/newFirewallDialog_from_template.cpp |    3 -
 29 files changed, 21 insertions(+), 401 deletions(-)
 delete mode 100644 src/libgui/UserWorkflow.cpp
 delete mode 100644 src/libgui/UserWorkflow.h


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-3-g15565ad

From: <gi...@ir...> - 2012-02-14 02:25:16

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  15565ade5dc843e5fefe83568a023c37256c3c3c (commit)
      from  24d8a8db3f85118095482438f42a049b5a198969 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 15565ade5dc843e5fefe83568a023c37256c3c3c
Author: Vadim Kurland <va...@ne...>
Date:   Mon Feb 13 17:55:56 2012 -0800

    build 3594; removed UserWorkflow and all calls to assemble and send user workflow report

diff --git a/VERSION b/VERSION
index fe2545e..eec5d24 100644
--- a/VERSION
+++ b/VERSION
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=2
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3593"
+BUILD_NUM="3594"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 
diff --git a/VERSION.h b/VERSION.h
index 21a6fc3..0f7ccd1 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION      "5.0.2.3593"
+#define VERSION      "5.0.2.3594"
 #define GENERATION   "5.0"
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index b2ef5e1..2146529 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
 
 
 %define name    fwbuilder
-%define version 5.0.2.3593
+%define version 5.0.2.3594
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index eb1e339..4bd7201 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: va...@fw...
-Version: 5.0.2.3593-1
+Version: 5.0.2.3594-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 1a8136a..50421fd 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 5.0.2.3593
+%define version 5.0.2.3594
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/src/fwbedit/fwbedit.cpp b/src/fwbedit/fwbedit.cpp
index 8392e5d..6ea0c51 100644
--- a/src/fwbedit/fwbedit.cpp
+++ b/src/fwbedit/fwbedit.cpp
@@ -104,7 +104,6 @@ extern int errno;
 #include "FWWindow.h"
 #include "FWBSettings.h"
 #include "FWBApplication.h"
-#include "UserWorkflow.h"
 
 #include <QStringList>
 #include <QFile>
@@ -117,7 +116,6 @@ using namespace std;
 FWWindow *mw = NULL; 
 FWBSettings *st = NULL; 
 FWBApplication *app = NULL; 
-UserWorkflow *wfl; 
 int sig = FWB_SIG; 
 
 string cmd_str = "";
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 3052a23..1e7e122 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -62,7 +62,6 @@
 #include "findDialog.h"
 #include "ProjectPanel.h"
 #include "RCS.h"
-#include "UserWorkflow.h"
 
 #include "fwbuilder/FWObject.h"
 #include "fwbuilder/Tools.h"
@@ -94,7 +93,6 @@ bool auto_load_from_rcs_head_revision = false;
 FWBApplication *app = NULL;
 FWWindow *mw = NULL;
 FWBSettings *st = NULL;
-UserWorkflow *wfl = NULL;
 int fwbdebug = 0;
 bool safemode = false;
 bool cli_print = false;
@@ -185,11 +183,9 @@ int main( int argc, char *argv[] )
     FWObject::setDataDir(st->getDataDir().toUtf8().constData());
     if (fwbdebug) qDebug("done");
 
-    wfl = new UserWorkflow();
-
     QPixmapCache::setCacheLimit(4096);
 
-    INIT2;
+//    INIT2;
 
     string full_res_path = Constants::getResourcesFilePath();
 
diff --git a/src/libgui/DiscoveryDruid.cpp b/src/libgui/DiscoveryDruid.cpp
index b16f8c2..bba91a2 100644
--- a/src/libgui/DiscoveryDruid.cpp
+++ b/src/libgui/DiscoveryDruid.cpp
@@ -82,7 +82,6 @@
 #include "fwbuilder/Logger.h"
 
 #include "FWBSettings.h"
-#include "UserWorkflow.h"
 #include "ObjectManipulator.h"
 #include "FWWindow.h"
 #include "networkZoneManager.h"
@@ -852,8 +851,6 @@ void DiscoveryDruid::startConfigImport()
         thread->setTargetWidget(this);
         thread->start();
 
-        wfl->registerFlag(UserWorkflow::IMPORT, true);
-
     } else
     {
         QMessageBox::critical(this, tr("Discovery error"),
diff --git a/src/libgui/FWBApplication.cpp b/src/libgui/FWBApplication.cpp
index d378c43..3d74ff9 100644
--- a/src/libgui/FWBApplication.cpp
+++ b/src/libgui/FWBApplication.cpp
@@ -25,7 +25,6 @@
 
 
 #include "global.h"
-#include "UserWorkflow.h"
 #include "FWBSettings.h"
 #include "FWBApplication.h"
 #include "FWWindow.h"
@@ -48,7 +47,6 @@ void FWBApplication::quit()
 
     if (st->getCheckUpdates())
     {
-        wfl->report();
         QTimer::singleShot(100, this, SLOT(delayedQuit()));
     } else
         delayedQuit();
@@ -58,13 +56,6 @@ void FWBApplication::delayedQuit()
 {
     if (fwbdebug) qDebug() << "FWBApplication::delayedQuit()";
 
-    if (timeout < 20 && wfl->reportInProgress())
-    {
-        timeout++;
-        QTimer::singleShot(100, this, SLOT(delayedQuit()));
-        return;
-    }
-
     QApplication::quit();
 }
 
diff --git a/src/libgui/FWBSettings.cpp b/src/libgui/FWBSettings.cpp
index e6ade1b..053440a 100644
--- a/src/libgui/FWBSettings.cpp
+++ b/src/libgui/FWBSettings.cpp
@@ -601,16 +601,6 @@ void FWBSettings::setShowUndoPanel(bool f) {setValue(showUndoPanel, f);}
 bool FWBSettings::getIconsWithText() { return value(iconsWithText).toBool(); }
 void FWBSettings::setIconsWithText(bool f) {setValue(iconsWithText, f);}
 
-QByteArray FWBSettings::getUserWorkflowFlags()
-{
-    return value(userWorkflowFlags).toByteArray();
-}
-
-void FWBSettings::setUserWorkflowFlags(const QByteArray &f)
-{
-    setValue(userWorkflowFlags, f);
-}
-
 bool FWBSettings::haveScreenPosition(const QString &wname)
 {
     QString val = value(QString(screenPositionSetpath)+wname ).toString();
diff --git a/src/libgui/FWBSettings.h b/src/libgui/FWBSettings.h
index 5e8b577..8b42932 100644
--- a/src/libgui/FWBSettings.h
+++ b/src/libgui/FWBSettings.h
@@ -267,9 +267,6 @@ class FWBSettings : public QSettings
     bool getShowUndoPanel();
     void setShowUndoPanel(bool);
 
-    QByteArray getUserWorkflowFlags();
-    void setUserWorkflowFlags(const QByteArray &);
-    
     bool getIconsWithText();
     void setIconsWithText(bool f);
     
diff --git a/src/libgui/FWCmdRule.cpp b/src/libgui/FWCmdRule.cpp
index cf5b71c..a20aa5c 100644
--- a/src/libgui/FWCmdRule.cpp
+++ b/src/libgui/FWCmdRule.cpp
@@ -28,7 +28,6 @@
 #include "FWWindow.h"
 #include "FWCmdRule.h"
 #include "FindObjectWidget.h"
-#include "UserWorkflow.h"
 
 #include "events.h"
 
@@ -75,7 +74,6 @@ void FWCmdRule::notify()
 
 void FWCmdRule::redo()
 {
-    wfl->registerFlag(UserWorkflow::RULE_MOD, true);
     RuleSetModel* md = getRuleSetModel();
     redoOnModel(md);
     notify();
@@ -115,7 +113,6 @@ FWCmdRuleInsert::~FWCmdRuleInsert()
 
 void FWCmdRuleInsert::redoOnModel(RuleSetModel *md)
 {
-    wfl->registerFlag(UserWorkflow::RULE_MOD, true);
     if (insertedRule == 0) {
         if (ruleToInsert == 0)
         {
@@ -217,7 +214,6 @@ FWCmdRuleDelete::~FWCmdRuleDelete()
 
 void FWCmdRuleDelete::redoOnModel(RuleSetModel *md)
 {
-    wfl->registerFlag(UserWorkflow::RULE_MOD, true);
     if (fwbdebug)
         qDebug() << "FWCmdRuleDelete::redoOnModel(RuleSetModel *md)";
     foreach(Rule* rule, rulesToDelete)
@@ -278,8 +274,6 @@ void FWCmdRuleColor::redoOnModel(RuleSetModel *md)
 {
     QModelIndexList indexes;
 
-    wfl->registerFlag(UserWorkflow::RULE_MOD, true);
-
     foreach(int ruleId, oldColors.keys())
     {
         Rule* rule = Rule::cast(getObject(ruleId));
@@ -322,7 +316,6 @@ FWCmdRuleMove::FWCmdRuleMove(ProjectPanel *project, RuleSet* ruleset,
 
 void FWCmdRuleMove::redoOnModel(RuleSetModel *md)
 {
-    wfl->registerFlag(UserWorkflow::RULE_MOD, true);
     move(md, direction);
 }
 
@@ -371,7 +364,6 @@ FWCmdRuleRenameGroup::FWCmdRuleRenameGroup(
 
 void FWCmdRuleRenameGroup::redoOnModel(RuleSetModel *md)
 {
-    wfl->registerFlag(UserWorkflow::RULE_MOD, true);
     QModelIndex grp = md->index(oldName);
     md->renameGroup(grp, newName);
 }
@@ -397,7 +389,6 @@ FWCmdRuleRemoveFromGroup::FWCmdRuleRemoveFromGroup(
 
 void FWCmdRuleRemoveFromGroup::redoOnModel(RuleSetModel *md)
 {
-    wfl->registerFlag(UserWorkflow::RULE_MOD, true);
     QModelIndex group = md->index(groupName);
     QModelIndex first = md->index(firstRule, 0);
     QModelIndex last = md->index(lastRule, 0);
@@ -443,7 +434,6 @@ FWCmdRuleNewGroup::FWCmdRuleNewGroup(
 
 void FWCmdRuleNewGroup::redoOnModel(RuleSetModel *md)
 {
-    wfl->registerFlag(UserWorkflow::RULE_MOD, true);
     QModelIndex first = md->index(firstRule, 0);
     QModelIndex last = md->index(lastRule, 0);
     QModelIndex index = md->createNewGroup(groupName, first.row(), last.row());
@@ -475,7 +465,6 @@ FWCmdRuleAddToGroup::FWCmdRuleAddToGroup(
 
 void FWCmdRuleAddToGroup::redoOnModel(RuleSetModel *md)
 {
-    wfl->registerFlag(UserWorkflow::RULE_MOD, true);
     QModelIndex first = md->index(firstRule, 0);
     QModelIndex last = md->index(lastRule, 0);
 
@@ -515,7 +504,6 @@ void FWCmdRuleChange::selectAffectedRule()
 
 void FWCmdRuleChange::redo()
 {
-    wfl->registerFlag(UserWorkflow::RULE_MOD, true);
     prepareRuleSetView();
     FWCmdChange::redo();
     selectAffectedRule();
@@ -670,8 +658,6 @@ FWCmdRuleNegateRE::FWCmdRuleNegateRE(
 
 void FWCmdRuleNegateRE::redo()
 {
-    wfl->registerFlag(UserWorkflow::RULE_MOD, true);
-
     prepareRuleSetView();
     RuleElement* ruleElement = RuleElement::cast(getObject());
     ruleElement->toggleNeg();
diff --git a/src/libgui/FWWindow.cpp b/src/libgui/FWWindow.cpp
index f089a1c..f38c4b4 100644
--- a/src/libgui/FWWindow.cpp
+++ b/src/libgui/FWWindow.cpp
@@ -42,7 +42,6 @@
 #include "FWObjectClipboard.h"
 #include "FWBTree.h"
 #include "FWBSettings.h"
-#include "UserWorkflow.h"
 #include "FWObjectPropertiesFactory.h"
 #include "upgradePredicate.h"
 #include "ObjConflictResolutionDialog.h"
@@ -613,7 +612,6 @@ void FWWindow::showIntroDialog()
 
         if (msg_box.clickedButton() == watch_button)
         {
-            wfl->registerFlag(UserWorkflow::INTRO_TUTOTIAL, true);
             int ab_group = st->getABTestingGroup();
             QString url("http://www.fwbuilder.org/4.0/quick_start_guide_%1.html");
             QDesktopServices::openUrl(QUrl(url.arg(ab_group), QUrl::StrictMode));
diff --git a/src/libgui/FirewallInstaller.cpp b/src/libgui/FirewallInstaller.cpp
index c58b29d..0b9098c 100644
--- a/src/libgui/FirewallInstaller.cpp
+++ b/src/libgui/FirewallInstaller.cpp
@@ -35,7 +35,6 @@
 #include "FirewallInstaller.h"
 #include "SSHSession.h"
 #include "SSHUnx.h"
-#include "UserWorkflow.h"
 #include "instDialog.h"
 
 #include "fwbuilder/Resources.h"
@@ -536,8 +535,6 @@ void FirewallInstaller::runJobs()
     instJob current_job = job_list.front();
     job_list.pop_front();
 
-    wfl->registerFlag(UserWorkflow::INSTALL_RAN, true);
-
     switch (current_job.job) 
     {
     case COPY_FILE:
diff --git a/src/libgui/PrefsDialog.cpp b/src/libgui/PrefsDialog.cpp
index dcbe9d7..b27784d 100644
--- a/src/libgui/PrefsDialog.cpp
+++ b/src/libgui/PrefsDialog.cpp
@@ -38,7 +38,6 @@
 #include "ProjectPanel.h"
 #include "HttpGet.h"
 #include "RuleSetView.h"
-#include "UserWorkflow.h"
 
 #include "fwbuilder/Resources.h"
 
@@ -551,14 +550,9 @@ void PrefsDialog::accept()
 
     st->setCheckUpdatesProxy(m_dialog->checkUpdatesProxy->text());
 
-    wfl->registerFlag(UserWorkflow::USING_HTTP_PROXY,
-                      !st->getCheckUpdatesProxy().isEmpty());
-
     // annoyingly, widget shotTip has the name opposite to its meaning.
     // When it is checked, we do not show tip of the day.
 
-    wfl->registerFlag(UserWorkflow::TIP_OF_THE_DAY_DISABLED,
-                      m_dialog->showTips->isChecked());
     st->setBool("UI/NoStartTip", m_dialog->showTips->isChecked());
 
     st->setSSHPath( m_dialog->sshPath->text() );
@@ -567,28 +561,6 @@ void PrefsDialog::accept()
 
     st->setBool("Environment/RememberSshPassEnabled", m_dialog->rememberSshPass->isChecked());
     
-    wfl->registerFlag(UserWorkflow::SSH_CONFIGURED, 
-                      !m_dialog->sshPath->text().isEmpty() &&
-                      !m_dialog->scpPath->text().isEmpty());
-
-
-    if (m_dialog->checkUpdates->isChecked())
-    {
-        wfl->registerFlag(UserWorkflow::UPDATE_CHECKS_DISABLED, false);
-    } else
-    {
-        wfl->registerFlag(UserWorkflow::UPDATE_CHECKS_DISABLED, true);
-
-        if (st->getCheckUpdates())
-        {
-            // update checking was enabled but the user disabled it in
-            // this preferences dialog session. Run last closing
-            // report before disabling both update check and closing
-            // report.
-            wfl->report();
-        }
-    }
-
     st->setCheckUpdates(m_dialog->checkUpdates->isChecked());
 
     for (int row=0; row < m_dialog->enabled_platforms->rowCount(); ++row)
diff --git a/src/libgui/ProjectPanel.cpp b/src/libgui/ProjectPanel.cpp
index 849a1db..d35252a 100644
--- a/src/libgui/ProjectPanel.cpp
+++ b/src/libgui/ProjectPanel.cpp
@@ -39,7 +39,6 @@
 #include "fwbuilder/RuleElement.h"
 
 #include "FWBSettings.h"
-#include "UserWorkflow.h"
 #include "FWBTree.h"
 #include "FWObjectPropertiesFactory.h"
 #include "FWWindow.h"
@@ -704,8 +703,6 @@ void ProjectPanel::compileThis()
     // see comment in FWWindow::compile()
     if (db()->isDirty()) return;
 
-    wfl->registerFlag(UserWorkflow::COMPILE, true);
-
     set<Firewall*> fw;
     Firewall *f = Firewall::cast(visibleRuleSet->getParent());
     if (f)
@@ -723,8 +720,6 @@ void ProjectPanel::installThis()
     // see comment in FWWindow::compile()
     if (db()->isDirty()) return;
 
-    wfl->registerFlag(UserWorkflow::INSTALL, true);
-
     set<Firewall*> fw;
     Firewall *f = Firewall::cast(visibleRuleSet->getParent());
     if (f)
@@ -794,7 +789,6 @@ void ProjectPanel::compile()
     if (db()->isDirty()) return;
 
     //fileSave();
-    wfl->registerFlag(UserWorkflow::COMPILE, true);
     mainW->compile();
 }
 
@@ -809,7 +803,6 @@ void ProjectPanel::compile(set<Firewall*> vf)
     if (db()->isDirty()) return;
 
     //fileSave();
-    wfl->registerFlag(UserWorkflow::COMPILE, true);
     mainW->compile(vf);
 }
 
@@ -819,7 +812,6 @@ void ProjectPanel::install(set<Firewall*> vf)
     // see comment in FWWindow::compile()
     if (db()->isDirty()) return;
 
-    wfl->registerFlag(UserWorkflow::INSTALL, true);
     mainW->install(vf);
 }
 
@@ -829,7 +821,6 @@ void ProjectPanel::install()
     // see comment in FWWindow::compile()
     if (db()->isDirty()) return;
 
-    wfl->registerFlag(UserWorkflow::INSTALL, true);
     mainW->install();
 }
 
diff --git a/src/libgui/StartTipDialog.cpp b/src/libgui/StartTipDialog.cpp
index 6c94d9a..37e9d12 100644
--- a/src/libgui/StartTipDialog.cpp
+++ b/src/libgui/StartTipDialog.cpp
@@ -32,7 +32,6 @@
 #include "FWBSettings.h"
 #include "FWWindow.h"
 #include "Help.h"
-#include "UserWorkflow.h"
 
 #include "fwbuilder/Constants.h"
 
@@ -231,7 +230,6 @@ void StartTipDialog::prevTip()
 
 void StartTipDialog::showGettingStartedTutorial()
 {
-    wfl->registerFlag(UserWorkflow::INTRO_TUTOTIAL, true);
     int ab_group = st->getABTestingGroup();
     QString url("http://www.fwbuilder.org/4.0/quick_start_guide_%1.html");
     QDesktopServices::openUrl(QUrl(url.arg(ab_group), QUrl::StrictMode));
diff --git a/src/libgui/TutorialDialog.cpp b/src/libgui/TutorialDialog.cpp
index f5ea3c0..ec9bef4 100644
--- a/src/libgui/TutorialDialog.cpp
+++ b/src/libgui/TutorialDialog.cpp
@@ -27,7 +27,6 @@
 
 #include "TutorialDialog.h"
 #include "ui_TutorialDialog.h"
-#include "UserWorkflow.h"
 
 #include <QDebug>
 #include <QFile>
@@ -82,7 +81,6 @@ void TutorialDialog::initializeTutorial(QString tutorial)
     currentPage = 0;
     showPage(currentPage);
 
-    wfl->registerTutorialViewing(tutorial);
 }
 
 TutorialDialog::~TutorialDialog()
diff --git a/src/libgui/UserWorkflow.cpp b/src/libgui/UserWorkflow.cpp
deleted file mode 100644
index 8d3263d..0000000
--- a/src/libgui/UserWorkflow.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-
-                          Firewall Builder
-
-                 Copyright (C) 2010 NetCitadel, LLC
-
-  Author:  Vadim Kurland     va...@fw...
-
-  $Id$
-
-  This program is free software which we release under the GNU General Public
-  License. You may redistribute and/or modify this program under the terms
-  of that license as published by the Free Software Foundation; either
-  version 2 of the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  To get a copy of the GNU General Public License, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-#include "global.h"
-
-#include "UserWorkflow.h"
-#include "FWBSettings.h"
-#include "HttpGet.h"
-
-#include <QtDebug>
-#include <QTimer>
-#include <QDataStream>
-
-
-/*
- * Create object UserWorkflow only after FWBSettings object has been
- * created and initialized.
- */
-UserWorkflow::UserWorkflow()
-{
-    assert(st != NULL);
-    start_timestamp = QDateTime::currentDateTime();
-    report_query = NULL;
-
-    QDataStream str(st->getUserWorkflowFlags());
-    str.setVersion(QDataStream::Qt_4_0);
-    str >> flags;
-
-    if (fwbdebug)
-        qDebug() << "UserWorkflow flags initialization:" << flagsToQueryString(0);
-
-    // what if the user disabled tip of the day before they upgraded
-    // to the version with UserWorkflow ? Or re-enabled version update
-    // check ?
-
-    registerFlag(TIP_OF_THE_DAY_DISABLED, st->getBool("UI/NoStartTip"));
-    registerFlag(UPDATE_CHECKS_DISABLED, !st->getCheckUpdates());
-
-    registerFlag(UserWorkflow::SSH_CONFIGURED, 
-                 !st->getSCPPath().isEmpty() && !st->getSCPPath().isEmpty());
-}
-
-UserWorkflow::~UserWorkflow()
-{
-    if (report_query != NULL) delete report_query;
-}
-
-void UserWorkflow::registerFlag(enum workflowFlags e, quint32 f)
-{
-    if (fwbdebug)
-        qDebug() << "UserWorkflow::registerFlag(" << e << "," << f << ")";
-    flags.insert(e, f);
-
-    QByteArray buffer;
-    QDataStream str(&buffer, QIODevice::WriteOnly);
-    str.setVersion(QDataStream::Qt_4_0);
-    str << flags;
-
-    st->setUserWorkflowFlags(buffer);
-}
-
-void UserWorkflow::registerTutorialViewing(const QString &tutorial_name)
-{
-    if (tutorial_name == "getting_started")
-        registerFlag(UserWorkflow::GETTING_STARTED_TUTOTIAL, true);
-}
-
-QString UserWorkflow::flagsToQueryString(int session_duration)
-{
-    // query string of flags has the format uc=0&gs=1&ft=0 ...
-    // each flag is a two-characters variable with a value of 0 or 1
-    QStringList fl;
-    fl << QString("ab=%1").arg(st->getABTestingGroup());
-    fl << QString("co=%1").arg(flags.value(COMPILE));
-    fl << QString("fn=%1").arg(flags.value(NEW_FW_NO_TEMPLATE));
-    fl << QString("ft=%1").arg(flags.value(NEW_FW_WITH_TEMPLATE));
-    fl << QString("gs=%1").arg(flags.value(GETTING_STARTED_TUTOTIAL));
-    fl << QString("im=%1").arg(flags.value(IMPORT));
-    fl << QString("in=%1").arg(flags.value(INSTALL));
-    fl << QString("ir=%1").arg(flags.value(INSTALL_RAN));
-    fl << QString("is=%1").arg(flags.value(INSTALL_SUCCESS));
-    fl << QString("it=%1").arg(flags.value(INTRO_TUTOTIAL));
-    fl << QString("pr=%1").arg(flags.value(USING_HTTP_PROXY));
-    fl << QString("rm=%1").arg(flags.value(RULE_MOD));
-    fl << QString("sc=%1").arg(flags.value(SSH_CONFIGURED));
-    fl << QString("sd=%1").arg(session_duration);
-    fl << QString("ti=%1").arg(flags.value(TIP_OF_THE_DAY_DISABLED));
-    fl << QString("uc=%1").arg(flags.value(UPDATE_CHECKS_DISABLED));
-    return fl.join("&");
-}
-
-void UserWorkflow::report()
-{
-    uint elapsed_time = QDateTime::currentDateTime().toTime_t() -
-        start_timestamp.toTime_t();
-
-    // Note that QTime::elapsed() wraps to zero after ~24hr. If
-    // program stayed open for over 24 hr, it would return incorrect
-    // session duration.
-
-    if (fwbdebug)
-    {
-        QByteArray buffer;
-        QDataStream str(&buffer, QIODevice::WriteOnly);
-        str.setVersion(QDataStream::Qt_4_0);
-        str << flags;
-
-        qDebug() << "UserWorkflow::report():" << flagsToQueryString(elapsed_time);
-        qDebug() << "Session:" << elapsed_time << "sec";
-    }
-
-    report_query = new HttpGet();
-    connect(report_query, SIGNAL(done(const QString&)),
-            this, SLOT(reportDone(const QString&)));
-
-    QString report_url = CLOSING_REPORT_URL;
-
-    // Use env variable FWBUILDER_CLOSING_REPORT_URL to override url to test
-    // e.g. export FWBUILDER_CLOSING_REPORT_URL="file://$(pwd)/report_%1"
-    //
-    char* report_override_url = getenv("FWBUILDER_CLOSING_REPORT_URL");
-    if (report_override_url != NULL)
-        report_url = QString(report_override_url);
-
-    // closing report url has three parameters: 
-    // %1 = version
-    // %2 = uuid
-    // %3 = a query string of flags in the format uc=0&gs=1&ft=0 ...
-    // each flag is a two-characters variable with a value of 0 or 1
-
-    QString url = QString(report_url)
-        .arg(VERSION).arg(st->getAppGUID()).arg(flagsToQueryString(elapsed_time));
-
-    // start http query
-    if (!report_query->get(url) && fwbdebug)
-    {
-        qDebug() << "HttpGet error: " << report_query->getLastError();
-        qDebug() << "Url: " << url;
-    }
-
-    if (fwbdebug) qDebug() << "Request launched";
-}
-
-void UserWorkflow::reportDone(const QString& resp)
-{
-    if (fwbdebug) qDebug() << "UserWorkflow::reportDone" << resp;
-
-    disconnect(report_query, SIGNAL(done(const QString&)),
-               this, SLOT(reportDone(const QString&)));
-    // we ignore server response for the closing reports.
-    if (report_query != NULL) report_query->deleteLater();
-    report_query = NULL;
-}
diff --git a/src/libgui/UserWorkflow.h b/src/libgui/UserWorkflow.h
deleted file mode 100644
index db071f5..0000000
--- a/src/libgui/UserWorkflow.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-
-                          Firewall Builder
-
-                 Copyright (C) 2010 NetCitadel, LLC
-
-  Author:  Vadim Kurland     va...@fw...
-
-  $Id$
-
-  This program is free software which we release under the GNU General Public
-  License. You may redistribute and/or modify this program under the terms
-  of that license as published by the Free Software Foundation; either
-  version 2 of the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  To get a copy of the GNU General Public License, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-#ifndef __USERWORKFLOW_H_
-#define __USERWORKFLOW_H_
-
-#include <QObject>
-#include <QDateTime>
-#include <QHash>
-
-#include "HttpGet.h"
-
-/*
- * We track certain events in the new user workflow to optimize user
- * experience. This helps us understand things such as if "Getting
- * Started" tutorial helps convert users that just experiment with the
- * program into active users. We would like to know at what point
- * users abandon the program after they launch it for the first
- * time. We keep a boolean flag for each event in the settings (to
- * make it presistent) and report combination of the flags when the
- * GUI is closed.
- *
- * To report workflow statistics, the program connects to our web
- * server when user closes the program. If update checking is disabled
- * in the global preferences, this closing report is disabled as
- * well.
- *
- * Connection sends the following data to the server:
- *
- * version, uuid and a combination of bit flags of the following (each
- * flag is set once when corresponding even happens for the first
- * time; flag is not updated ever since)
- * 
- * - user disabled version update and closing reports checks (sent once when checks and reports are disabled)
- * - user looked at the "Getting Started" tutorial at least once
- * - user created their first firewall object using template
- * - user created their first firewall object without template
- * - user did their first rule modification of any kind
- * - user ran their first policy compile
- * - user ran their first policy install
- * - user ran their first policy import
- *
- */
-
-#define CLOSING_REPORT_URL \
-    "http://update.fwbuilder.org/reports/closing.cgi?v=%1&uuid=%2&%3"
-
-class UserWorkflow : public QObject {
-
-    Q_OBJECT;
-
-public:
-
-    enum workflowFlags
-    {
-         UPDATE_CHECKS_DISABLED,
-         GETTING_STARTED_TUTOTIAL,
-         NEW_FW_WITH_TEMPLATE,
-         NEW_FW_NO_TEMPLATE,
-         RULE_MOD,
-         COMPILE,
-         INSTALL,
-         INSTALL_RAN,
-         INSTALL_SUCCESS,
-         IMPORT,
-         TIP_OF_THE_DAY_DISABLED,
-         USING_HTTP_PROXY,
-         SSH_CONFIGURED,
-         INTRO_TUTOTIAL,
-    };
-
-private:
-    QDateTime start_timestamp;
-    QHash<quint32, quint32> flags;
-    HttpGet *report_query;
-
-    QString flagsToQueryString(int session_duration);
-
-public:
-    UserWorkflow();
-    virtual ~UserWorkflow();
-    void registerFlag(enum workflowFlags e, quint32 f);
-    void registerTutorialViewing(const QString &tutorial_name);
-    void report();
-    bool reportInProgress() { return report_query != NULL; }
-    
-public slots:
-    void reportDone(const QString&);
-};
-
-#endif
-
diff --git a/src/libgui/global.h b/src/libgui/global.h
index 19c8bb1..f798c3d 100644
--- a/src/libgui/global.h
+++ b/src/libgui/global.h
@@ -35,12 +35,10 @@ class QString;
 class FWBApplication;
 class FWWindow;
 class FWBSettings;
-class UserWorkflow;
 
 extern FWBApplication *app;
 extern FWWindow *mw;
 extern FWBSettings *st;
-extern UserWorkflow *wfl;
 
 extern std::string     appRootDir;
 extern std::string     userDataDir;
diff --git a/src/libgui/instDialog_ui_ops.cpp b/src/libgui/instDialog_ui_ops.cpp
index b92ad11..2615974 100644
--- a/src/libgui/instDialog_ui_ops.cpp
+++ b/src/libgui/instDialog_ui_ops.cpp
@@ -35,7 +35,6 @@
 #include "InstallFirewallViewItem.h"
 #include "instOptionsDialog.h"
 #include "instBatchOptionsDialog.h"
-#include "UserWorkflow.h"
 #include "FirewallCodeViewer.h"
 
 #include <qcheckbox.h>
@@ -370,9 +369,6 @@ void instDialog::opSuccess(Firewall *fw)
         setSuccessState(itm);
     }
     currentLabel->setText("");
-
-    if (installer)
-        wfl->registerFlag(UserWorkflow::INSTALL_SUCCESS, true);
 }
 
 void instDialog::opError(Firewall *fw)
diff --git a/src/libgui/libgui.pro b/src/libgui/libgui.pro
index 24ba8a4..38a9c7e 100644
--- a/src/libgui/libgui.pro
+++ b/src/libgui/libgui.pro
@@ -185,7 +185,6 @@ HEADERS += ../../config.h \
     IconSetter.h \
     TutorialDialog.h \
     MDIEventFilter.h \
-    UserWorkflow.h \
     FWBApplication.h \
     WorkflowIcons.h \
     FirewallCodeViewer.h \
@@ -403,7 +402,6 @@ SOURCES += ProjectPanel.cpp \
     UsageResolver.cpp \
     TutorialDialog.cpp \
     MDIEventFilter.cpp \
-    UserWorkflow.cpp \
     FWBApplication.cpp \
     WorkflowIcons.cpp \
     FirewallCodeViewer.cpp \
diff --git a/src/libgui/newFirewallDialog.cpp b/src/libgui/newFirewallDialog.cpp
index 8afb2b5..2480b5d 100644
--- a/src/libgui/newFirewallDialog.cpp
+++ b/src/libgui/newFirewallDialog.cpp
@@ -33,7 +33,6 @@
 #include "FWBSettings.h"
 #include "FWBTree.h"
 #include "events.h"
-#include "UserWorkflow.h"
 #include "FWBApplication.h"
 #include "QDesktopWidget"
 #include "networkZoneManager.h"
@@ -1125,8 +1124,6 @@ void newFirewallDialog::finishClicked()
 
     } else
     {
-        wfl->registerFlag(UserWorkflow::NEW_FW_NO_TEMPLATE, true);
-
         // Create from interface list (obtained either manually or via snmp)
         if ( !this->m_dialog->interfaceEditor1->isValid() )
             return;
diff --git a/src/libgui/newFirewallDialog_from_template.cpp b/src/libgui/newFirewallDialog_from_template.cpp
index 03841bb..d39252f 100644
--- a/src/libgui/newFirewallDialog_from_template.cpp
+++ b/src/libgui/newFirewallDialog_from_template.cpp
@@ -30,7 +30,6 @@
 
 #include "newFirewallDialog.h"
 #include "FWBSettings.h"
-#include "UserWorkflow.h"
 #include "FWBTree.h"
 #include "InterfaceEditorWidget.h"
 #include "InterfacesTabWidget.h"
@@ -75,8 +74,6 @@ class FindNetwork : public FWObjectFindPredicate
 
 void newFirewallDialog::createFirewallFromTemplate()
 {
-    wfl->registerFlag(UserWorkflow::NEW_FW_WITH_TEMPLATE, true);
-
     QListWidgetItem *itm = m_dialog->templateList->currentItem();
     FWObject *template_fw = templates[itm];
     assert (template_fw!=NULL);

-----------------------------------------------------------------------

Summary of changes:
 VERSION                                        |    2 +-
 VERSION.h                                      |    2 +-
 packaging/fwbuilder-static-qt.spec             |    2 +-
 packaging/fwbuilder.control                    |    2 +-
 packaging/fwbuilder.spec                       |    2 +-
 src/fwbedit/fwbedit.cpp                        |    2 -
 src/gui/main.cpp                               |    6 +-
 src/libgui/DiscoveryDruid.cpp                  |    3 -
 src/libgui/FWBApplication.cpp                  |    9 --
 src/libgui/FWBSettings.cpp                     |   10 --
 src/libgui/FWBSettings.h                       |    3 -
 src/libgui/FWCmdRule.cpp                       |   14 --
 src/libgui/FWWindow.cpp                        |    2 -
 src/libgui/FirewallInstaller.cpp               |    3 -
 src/libgui/PrefsDialog.cpp                     |   28 ----
 src/libgui/ProjectPanel.cpp                    |    9 --
 src/libgui/StartTipDialog.cpp                  |    2 -
 src/libgui/TutorialDialog.cpp                  |    2 -
 src/libgui/UserWorkflow.cpp                    |  175 ------------------------
 src/libgui/UserWorkflow.h                      |  114 ---------------
 src/libgui/global.h                            |    2 -
 src/libgui/instDialog_ui_ops.cpp               |    4 -
 src/libgui/libgui.pro                          |    2 -
 src/libgui/newFirewallDialog.cpp               |    3 -
 src/libgui/newFirewallDialog_from_template.cpp |    3 -
 25 files changed, 6 insertions(+), 400 deletions(-)
 delete mode 100644 src/libgui/UserWorkflow.cpp
 delete mode 100644 src/libgui/UserWorkflow.h


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, builds, updated. v5.0.1-2-g24d8a8d

From: <gi...@ir...> - 2012-01-03 00:21:04

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, builds has been updated
       via  24d8a8db3f85118095482438f42a049b5a198969 (commit)
       via  e80f2e0d4790ba5e7aab356cad96cef18941145e (commit)
      from  b89bf502d373259fc2c2d4bbe4d883638fc47de2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 VERSION                                            |    4 +-
 VERSION.h                                          |    2 +-
 doc/ChangeLog                                      |   17 ++++++++++
 packaging/fwbuilder-static-qt.spec                 |    2 +-
 packaging/fwbuilder.control                        |    2 +-
 packaging/fwbuilder.spec                           |    2 +-
 src/iptlib/PolicyCompiler_ipt.cpp                  |   12 +++++--
 test/ipt/cluster-tests.fwb                         |   33 ++++++++++++++------
 test/ipt/cluster1_secuwall-1.fw.orig               |    6 ++--
 test/ipt/firewall-base-rulesets.fw.orig            |    6 ++--
 test/ipt/firewall-ipv6-1.fw.orig                   |    6 ++--
 test/ipt/firewall-ipv6-2.fw.orig                   |    6 ++--
 test/ipt/firewall-ipv6-3.fw.orig                   |    6 ++--
 test/ipt/firewall-ipv6-4-1.fw.orig                 |    6 ++--
 test/ipt/firewall-ipv6-4.fw.orig                   |    6 ++--
 test/ipt/firewall-ipv6-5.fw.orig                   |    6 ++--
 test/ipt/firewall-ipv6-6.fw.orig                   |    6 ++--
 test/ipt/firewall-ipv6-7.fw.orig                   |    6 ++--
 test/ipt/firewall-ipv6-8.fw.orig                   |    6 ++--
 ...ewall-ipv6-ipt-reset-prolog-after-flush.fw.orig |    6 ++--
 ...-ipv6-ipt-reset-prolog-after-interfaces.fw.orig |    6 ++--
 .../ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig |    6 ++--
 test/ipt/firewall-ipv6-nd-ns-1.fw.orig             |    6 ++--
 test/ipt/firewall-ipv6-nd-ns-2.fw.orig             |    6 ++--
 test/ipt/firewall-ipv6-prolog-after-flush.fw.orig  |    6 ++--
 .../firewall-ipv6-prolog-after-interfaces.fw.orig  |    6 ++--
 test/ipt/firewall-ipv6-prolog-top.fw.orig          |    6 ++--
 test/ipt/firewall-server-1-s.fw.orig               |    6 ++--
 test/ipt/firewall.fw.orig                          |    6 ++--
 test/ipt/firewall1.fw.orig                         |    6 ++--
 test/ipt/firewall10.fw.orig                        |    6 ++--
 test/ipt/firewall11.fw.orig                        |    6 ++--
 test/ipt/firewall12.fw.orig                        |    6 ++--
 test/ipt/firewall13.fw.orig                        |    6 ++--
 test/ipt/firewall14.fw.orig                        |    6 ++--
 test/ipt/firewall15.fw.orig                        |    6 ++--
 test/ipt/firewall16.fw.orig                        |    6 ++--
 test/ipt/firewall17.fw.orig                        |    6 ++--
 test/ipt/firewall18.fw.orig                        |    6 ++--
 test/ipt/firewall19.fw.orig                        |    6 ++--
 test/ipt/firewall2-1.fw.orig                       |    6 ++--
 test/ipt/firewall2-2.fw.orig                       |    6 ++--
 test/ipt/firewall2-3.fw.orig                       |    6 ++--
 test/ipt/firewall2-4.fw.orig                       |    6 ++--
 test/ipt/firewall2-5.fw.orig                       |    6 ++--
 test/ipt/firewall2-6.fw.orig                       |    6 ++--
 test/ipt/firewall2-7.fw.orig                       |    6 ++--
 test/ipt/firewall2.fw.orig                         |    6 ++--
 test/ipt/firewall20-ipv6.fw.orig                   |    6 ++--
 test/ipt/firewall20.fw.orig                        |    6 ++--
 test/ipt/firewall21-1.fw.orig                      |    6 ++--
 test/ipt/firewall21.fw.orig                        |    6 ++--
 test/ipt/firewall22.fw.orig                        |    6 ++--
 test/ipt/firewall23-1.fw.orig                      |    6 ++--
 test/ipt/firewall23-2.fw.orig                      |    6 ++--
 test/ipt/firewall23-3.fw.orig                      |    6 ++--
 test/ipt/firewall23.fw.orig                        |    6 ++--
 test/ipt/firewall24.fw.orig                        |    6 ++--
 test/ipt/firewall25.fw.orig                        |    6 ++--
 test/ipt/firewall26.fw.orig                        |    6 ++--
 test/ipt/firewall27.fw.orig                        |    6 ++--
 test/ipt/firewall28.fw.orig                        |    6 ++--
 test/ipt/firewall29.fw.orig                        |    6 ++--
 test/ipt/firewall3.fw.orig                         |    6 ++--
 test/ipt/firewall30.fw.orig                        |    6 ++--
 test/ipt/firewall31.fw.orig                        |    6 ++--
 test/ipt/firewall32.fw.orig                        |    6 ++--
 test/ipt/firewall33-1.fw.orig                      |   16 +++++-----
 test/ipt/firewall33.fw.orig                        |   16 +++++-----
 test/ipt/firewall34.fw.orig                        |    6 ++--
 test/ipt/firewall35.fw.orig                        |    6 ++--
 test/ipt/firewall36-1.fw.orig                      |    6 ++--
 test/ipt/firewall36-2.fw.orig                      |    6 ++--
 test/ipt/firewall36.fw.orig                        |    6 ++--
 test/ipt/firewall37-1.fw.orig                      |    6 ++--
 test/ipt/firewall37-2.fw.orig                      |    6 ++--
 test/ipt/firewall37.fw.orig                        |    6 ++--
 test/ipt/firewall38.fw.orig                        |    6 ++--
 test/ipt/firewall39.fw.orig                        |    6 ++--
 test/ipt/firewall4.fw.orig                         |    6 ++--
 test/ipt/firewall40-1.fw.orig                      |    6 ++--
 test/ipt/firewall40-2.fw.orig                      |    6 ++--
 test/ipt/firewall40.fw.orig                        |    6 ++--
 test/ipt/firewall41-1.fw.orig                      |    6 ++--
 test/ipt/firewall41.fw.orig                        |    6 ++--
 test/ipt/firewall42.fw.orig                        |    6 ++--
 test/ipt/firewall5.fw.orig                         |    6 ++--
 test/ipt/firewall50.fw.orig                        |    6 ++--
 test/ipt/firewall51.fw.orig                        |    6 ++--
 test/ipt/firewall6.fw.orig                         |    6 ++--
 test/ipt/firewall60.fw.orig                        |    6 ++--
 test/ipt/firewall61-1.2.5.fw.orig                  |    6 ++--
 test/ipt/firewall61-1.2.6.fw.orig                  |    6 ++--
 test/ipt/firewall61-1.3.x.fw.orig                  |    6 ++--
 test/ipt/firewall61-1.4.fw.orig                    |    6 ++--
 test/ipt/firewall62.fw.orig                        |    6 ++--
 test/ipt/firewall63.fw.orig                        |    6 ++--
 test/ipt/firewall7.fw.orig                         |    6 ++--
 test/ipt/firewall70.fw.orig                        |    6 ++--
 test/ipt/firewall71.fw.orig                        |    6 ++--
 test/ipt/firewall72-1.3.x.fw.orig                  |    6 ++--
 test/ipt/firewall72-1.4.3.fw.orig                  |    6 ++--
 test/ipt/firewall73.fw.orig                        |    6 ++--
 test/ipt/firewall74.fw.orig                        |    6 ++--
 test/ipt/firewall8.fw.orig                         |    6 ++--
 test/ipt/firewall80.fw.orig                        |    6 ++--
 test/ipt/firewall81.fw.orig                        |    6 ++--
 test/ipt/firewall82.fw.orig                        |    6 ++--
 test/ipt/firewall82_A.fw.orig                      |    6 ++--
 test/ipt/firewall82_B.fw.orig                      |    6 ++--
 test/ipt/firewall9.fw.orig                         |    6 ++--
 test/ipt/firewall90.fw.orig                        |    6 ++--
 test/ipt/firewall91.fw.orig                        |    6 ++--
 test/ipt/firewall92.fw.orig                        |    6 ++--
 test/ipt/firewall93.fw.orig                        |    6 ++--
 test/ipt/firewall94.fw.orig                        |    6 ++--
 test/ipt/firewall95.fw.orig                        |    6 ++--
 test/ipt/fw-A.fw.orig                              |    6 ++--
 test/ipt/fw1.fw.orig                               |    6 ++--
 test/ipt/fwbuilder.fw.orig                         |    6 ++--
 test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig   |    6 ++--
 test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig   |    6 ++--
 test/ipt/heartbeat_cluster_1_linux-1.fw.orig       |    8 ++--
 test/ipt/heartbeat_cluster_1_linux-2.fw.orig       |    8 ++--
 test/ipt/heartbeat_cluster_2_linux-1.fw.orig       |    8 ++--
 test/ipt/heartbeat_cluster_2_linux-2.fw.orig       |    8 ++--
 test/ipt/host.fw.orig                              |    6 ++--
 test/ipt/openais_cluster_1_linux-1.fw.orig         |    8 ++--
 test/ipt/openais_cluster_1_linux-2.fw.orig         |    8 ++--
 test/ipt/rc.firewall.local                         |    4 +-
 test/ipt/rh90.fw.orig                              |    6 ++--
 test/ipt/secuwall_cluster_1_secuwall-1.fw.orig     |    6 ++--
 test/ipt/server-cluster-1_server-1.fw.orig         |    6 ++--
 test/ipt/server-cluster-1_server-2.fw.orig         |    6 ++--
 test/ipt/test-shadowing-1.fw.orig                  |    6 ++--
 test/ipt/test-shadowing-2.fw.orig                  |    6 ++--
 test/ipt/test-shadowing-3.fw.orig                  |    6 ++--
 test/ipt/test_fw.fw.orig                           |    6 ++--
 test/ipt/vrrp_cluster_1_linux-1.fw.orig            |    8 ++--
 test/ipt/vrrp_cluster_1_linux-2.fw.orig            |    8 ++--
 test/ipt/vrrp_cluster_2_linux-1.fw.orig            |    8 ++--
 test/ipt/vrrp_cluster_2_linux-2.fw.orig            |    8 ++--
 test/ipt/vrrp_cluster_2_linux-3.fw.orig            |    6 ++--
 143 files changed, 479 insertions(+), 443 deletions(-)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-2-g24d8a8d

From: <gi...@ir...> - 2012-01-03 00:16:58

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  24d8a8db3f85118095482438f42a049b5a198969 (commit)
      from  e80f2e0d4790ba5e7aab356cad96cef18941145e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 24d8a8db3f85118095482438f42a049b5a198969
Author: Vadim Kurland <va...@sl...>
Date:   Mon Jan 2 16:55:25 2012 -0800

    fixed SF bug #3468358 "change in rule-compilation between 5.0.0 and
    5.0.1". Rule with cluster interface in "Destination" should compile
    into matching ip addresses assigned to the cluster interface object
    and corresponding member firewall's interface object, but in v5.0.1 it
    only matched member interface address. This bug triggered when
    iptables version was set to 1.2.11 or greater. This was a regression
    from v5.0.0

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0d628b6..720f412 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,14 @@
 2012-01-02  Vadim Kurland  <va...@ne...>
 
+	* PolicyCompiler_ipt.cpp (specialCaseAddressRangeInRE::processNext):
+	fixed SF bug #3468358 "change in rule-compilation between 5.0.0
+	and 5.0.1". Rule with cluster interface in "Destination"
+	should compile into matching ip addresses assigned to the cluster
+	interface object and corresponding member firewall's interface
+	object, but in v5.0.1 it only matched member interface
+	address. This bug triggered when iptables version was set to
+	1.2.11 or greater. This was a regression from v5.0.0
+	
 	* VERSION (FWB_MICRO_VERSION): v 5.0.2
 
 2011-12-23  Vadim Kurland  <va...@ne...>
diff --git a/src/iptlib/PolicyCompiler_ipt.cpp b/src/iptlib/PolicyCompiler_ipt.cpp
index cea015f..9226a76 100644
--- a/src/iptlib/PolicyCompiler_ipt.cpp
+++ b/src/iptlib/PolicyCompiler_ipt.cpp
@@ -2328,9 +2328,15 @@ bool PolicyCompiler_ipt::specialCaseAddressRangeInRE::processNext()
 
     for (list<FWObject*>::iterator i1=rel->begin(); i1!=rel->end(); ++i1) 
     {
-        FWObject *ref = *i1;
-        Address *addr_obj = compiler->correctForCluster(
-            Address::cast(FWReference::getObject(ref)));
+        Address *addr_obj = Address::cast(FWReference::getObject(*i1));
+        if (addr_obj == NULL) continue;
+/*
+ * commented out for SF bug 3468358
+ * Why did I need to replace cluster interface with member interface if
+ * addresses of interfaces can not be AddressRange objects ?
+ *        Address *addr_obj = compiler->correctForCluster(Address::cast(obj));
+ */
+
         if (addr_obj && !addr_obj->isAny() && AddressRange::isA(addr_obj) &&
             addr_obj->dimension() == 1)
         {
diff --git a/test/ipt/cluster-tests.fwb b/test/ipt/cluster-tests.fwb
index ff010b6..48b5a58 100644
--- a/test/ipt/cluster-tests.fwb
+++ b/test/ipt/cluster-tests.fwb
@@ -92,6 +92,13 @@
         <NetworkIPv6 id="id2383X75851" name="link-local ipv6" comment="RFC4291   Link-local unicast net" ro="False" address="fe80::" netmask="10"/>
         <NetworkIPv6 id="id2685X75851" name="multicast ipv6" comment="RFC4291  ipv6 multicast addresses" ro="False" address="ff00::" netmask="8"/>
         <NetworkIPv6 id="id2986X75851" name="experimental ipv6" comment="RFC2928, RFC4773 &#10;&#10;&quot;The block of Sub-TLA IDs assigned to the IANA&#10;(i.e., 2001:0000::/29 - 2001:01F8::/29) is for&#10;assignment for testing and experimental usage to&#10;support activities such as the 6bone, and&#10;for new approaches like exchanges.&quot;  [RFC2928]&#10;&#10;" ro="False" address="2001::" netmask="23"/>
+        <Network id="id3289X12564" name="TEST-NET-2" comment="RFC 5735&#10;RFC 5737&#10;" ro="False" address="198.51.100.0" netmask="255.255.255.0"/>
+        <Network id="id3300X12564" name="TEST-NET-3" comment="RFC 5735&#10;RFC 5737" ro="False" address="203.0.113.0" netmask="255.255.255.0"/>
+        <Network id="id3311X12564" name="Benchmark tests network" comment="RFC 5735" ro="False" address="198.18.0.0" netmask="255.254.0.0"/>
+        <NetworkIPv6 id="id3326X12564" name="mapped-ipv4" comment="" ro="False" address="::ffff:0.0.0.0" netmask="96"/>
+        <NetworkIPv6 id="id3341X12564" name="translated-ipv4" comment="" ro="False" address="::ffff:0:0:0" netmask="96"/>
+        <NetworkIPv6 id="id3350X12564" name="Teredo" comment="" ro="False" address="2001::" netmask="32"/>
+        <NetworkIPv6 id="id3359X12564" name="unique-local" comment="" ro="False" address="fc00::" netmask="7"/>
       </ObjectGroup>
       <ObjectGroup id="stdid15" name="Address Ranges" comment="" ro="False">
         <AddressRange id="id3F6D115C" name="broadcast" comment="" ro="False" start_address="255.255.255.255" end_address="255.255.255.255"/>
@@ -318,6 +325,12 @@
         <TCPService id="id41291887" ack_flag="False" ack_flag_mask="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="vnc-java-1" comment="Java VNC viewer, display 1" ro="False" src_range_start="0" src_range_end="0" dst_range_start="5801" dst_range_end="5801"/>
         <TCPService id="id41291888" ack_flag="False" ack_flag_mask="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="vnc-1" comment="Regular VNC viewer, display 1" ro="False" src_range_start="0" src_range_end="0" dst_range_start="5901" dst_range_end="5901"/>
         <TCPService id="id463FE5FE11008" ack_flag="False" ack_flag_mask="False" established="True" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="All TCP established" comment="Some firewall platforms can match TCP packets with flags ACK or RST set; the option is usually called &quot;established&quot;.&#10;&#10;Note that you can use this object only in the policy rules of the firewall that supports this option.&#10;&#10;If you need to match reply packets for a specific TCP service and wish to use option &quot;established&quot;, make a copy of this object and set source port range to match the service.&#10;" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id1577X28030" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="rtmp" comment="Real Time Messaging Protocol" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1935" dst_range_end="1935"/>
+        <TCPService id="id1590X28030" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="xmpp-client" comment="Extensible Messaging and Presence Protocol (XMPP)   RFC3920&#10;" ro="False" src_range_start="0" src_range_end="0" dst_range_start="5222" dst_range_end="5222"/>
+        <TCPService id="id1609X28030" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="xmpp-server" comment="Extensible Messaging and Presence Protocol (XMPP)   RFC3920&#10;" ro="False" src_range_start="0" src_range_end="0" dst_range_start="5269" dst_range_end="5269"/>
+        <TCPService id="id1622X28030" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="xmpp-client-ssl" comment="Extensible Messaging and Presence Protocol (XMPP)   RFC3920&#10;" ro="False" src_range_start="0" src_range_end="0" dst_range_start="5223" dst_range_end="5223"/>
+        <TCPService id="id1631X28030" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="xmpp-server-ssl" comment="Extensible Messaging and Presence Protocol (XMPP)   RFC3920&#10;" ro="False" src_range_start="0" src_range_end="0" dst_range_start="5270" dst_range_end="5270"/>
+        <TCPService id="id1644X28030" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="nrpe" comment="NRPE add-on for Nagios  http://www.nagios.org/&#10;" ro="False" src_range_start="0" src_range_end="0" dst_range_start="5666" dst_range_end="5666"/>
       </ServiceGroup>
       <ServiceGroup id="stdid08" name="UDP" comment="" ro="False">
         <UDPService id="udp-ALL_UDP_Masqueraded" name="ALL UDP Masqueraded" comment="ipchains used to use this port range for masqueraded packets" ro="False" src_range_start="61000" src_range_end="65095" dst_range_start="0" dst_range_end="0"/>
@@ -1901,7 +1914,7 @@
           <ObjectRef ref="id4055X2906"/>
         </StateSyncClusterGroup>
       </Cluster>
-      <Cluster id="id2772X94039" host_OS="linux24" inactive="False" lastCompiled="1248541095" lastInstalled="0" lastModified="1272731835" platform="iptables" name="vrrp_cluster_1" comment="" ro="False">
+      <Cluster id="id2772X94039" host_OS="linux24" inactive="False" lastCompiled="1248541095" lastInstalled="0" lastModified="1325552048" platform="iptables" name="vrrp_cluster_1" comment="" ro="False">
         <NAT id="id2866X94039" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <NATRule id="id2867X94039" disabled="False" group="" position="0" action="Translate" comment="">
             <OSrc neg="False">
@@ -2222,7 +2235,7 @@
           <ClusterGroupOptions/>
         </StateSyncClusterGroup>
       </Cluster>
-      <Cluster id="id3433X13311" host_OS="linux24" inactive="False" lastCompiled="1265516307" lastInstalled="0" lastModified="1294434730" platform="iptables" name="heartbeat_cluster_1" comment="This is an example of linux/heartbeat cluster with two policy rule sets. Branching rule in the top policy passes control to rule set to_fw, which is different in member firewalls.  See ticket #372 for explanation.&#10;" ro="False">
+      <Cluster id="id3433X13311" host_OS="linux24" inactive="False" lastCompiled="1265516307" lastInstalled="0" lastModified="1325552048" platform="iptables" name="heartbeat_cluster_1" comment="This is an example of linux/heartbeat cluster with two policy rule sets. Branching rule in the top policy passes control to rule set to_fw, which is different in member firewalls.  See ticket #372 for explanation.&#10;" ro="False">
         <NAT id="id3587X13311" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <NATRule id="id5131X78768" disabled="False" group="" position="0" action="Translate" comment="">
             <OSrc neg="False">
@@ -3231,7 +3244,7 @@
           </ClusterGroupOptions>
         </StateSyncClusterGroup>
       </Cluster>
-      <Cluster id="id3937X13563" host_OS="linux24" lastCompiled="1272731846" lastInstalled="0" lastModified="1272731842" platform="iptables" name="vrrp_cluster_2" comment="" ro="False">
+      <Cluster id="id3937X13563" host_OS="linux24" lastCompiled="1272731846" lastInstalled="0" lastModified="1325552048" platform="iptables" name="vrrp_cluster_2" comment="" ro="False">
         <NAT id="id3941X13563" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <NATRule id="id5083X25627" disabled="False" group="" position="0" action="Translate" comment="">
             <OSrc neg="False">
@@ -3537,7 +3550,7 @@
           <ClusterGroupOptions/>
         </StateSyncClusterGroup>
       </Cluster>
-      <Cluster id="id4400X28690" host_OS="linux24" inactive="False" lastCompiled="1248555910" lastInstalled="0" lastModified="1272731835" platform="iptables" name="openais_cluster_1" comment="" ro="False">
+      <Cluster id="id4400X28690" host_OS="linux24" inactive="False" lastCompiled="1248555910" lastInstalled="0" lastModified="1325552048" platform="iptables" name="openais_cluster_1" comment="" ro="False">
         <NAT id="id4568X28690" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <NATRule id="id4569X28690" disabled="False" group="" position="0" action="Translate" comment="">
             <OSrc neg="False">
@@ -3911,7 +3924,7 @@
           </ClusterGroupOptions>
         </StateSyncClusterGroup>
       </Cluster>
-      <Cluster id="id5184X20350" host_OS="linux24" inactive="False" lastCompiled="1265516308" lastInstalled="0" lastModified="1272731835" platform="iptables" name="heartbeat_cluster_2" comment="This is an example of linux/heartbeat cluster with two policy rule sets. Branching rule in the top policy passes control to rule set to_fw, which is different in member firewalls.  See ticket #372 for explanation.&#10;&#10;same as heartbeat_cluster_1 except using unicast for conntrack and heartbeat&#10;" ro="False">
+      <Cluster id="id5184X20350" host_OS="linux24" inactive="False" lastCompiled="1265516308" lastInstalled="0" lastModified="1325552048" platform="iptables" name="heartbeat_cluster_2" comment="This is an example of linux/heartbeat cluster with two policy rule sets. Branching rule in the top policy passes control to rule set to_fw, which is different in member firewalls.  See ticket #372 for explanation.&#10;&#10;same as heartbeat_cluster_1 except using unicast for conntrack and heartbeat&#10;" ro="False">
         <NAT id="id5369X20350" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <NATRule id="id5370X20350" disabled="False" group="" position="0" action="Translate" comment="">
             <OSrc neg="False">
@@ -4395,7 +4408,7 @@
           </ClusterGroupOptions>
         </StateSyncClusterGroup>
       </Cluster>
-      <Cluster id="id58476X27834" host_OS="linux24" inactive="False" lastCompiled="0" lastInstalled="0" lastModified="1269724200" platform="iptables" name="heartbeat_cluster_1_d" comment="" ro="False">
+      <Cluster id="id58476X27834" host_OS="linux24" inactive="False" lastCompiled="0" lastInstalled="0" lastModified="1325552042" platform="iptables" name="heartbeat_cluster_1_d" comment="" ro="False">
         <NAT id="id58844X27834" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <NATRule id="id288869X75145" disabled="False" group="" position="0" action="Translate" comment="">
             <OSrc neg="False">
@@ -5647,7 +5660,7 @@
       <ServiceGroup id="id1513X69605" name="TagServices" comment="" ro="False"/>
     </ServiceGroup>
     <ObjectGroup id="id1514X69605" name="Firewalls" comment="" ro="False">
-      <Firewall id="id2735X69605" host_OS="linux24" inactive="False" lastCompiled="1272731846" lastInstalled="0" lastModified="1272731828" platform="iptables" version="" name="linux-1" comment="  " ro="False">
+      <Firewall id="id2735X69605" host_OS="linux24" inactive="False" lastCompiled="1272731846" lastInstalled="0" lastModified="1325552048" platform="iptables" version="1.4.0" name="linux-1" comment="  " ro="False">
         <NAT id="id2827X69605" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </NAT>
@@ -5822,7 +5835,7 @@
           <Option name="verify_interfaces">True</Option>
         </FirewallOptions>
       </Firewall>
-      <Firewall id="id3009X69605" host_OS="linux24" inactive="False" lastCompiled="1272731846" lastInstalled="0" lastModified="1272731835" platform="iptables" version="" name="linux-2" comment="" ro="False">
+      <Firewall id="id3009X69605" host_OS="linux24" inactive="False" lastCompiled="1272731846" lastInstalled="0" lastModified="1325552045" platform="iptables" version="1.4.0" name="linux-2" comment="" ro="False">
         <NAT id="id3101X69605" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </NAT>
@@ -6567,7 +6580,7 @@
           <Option name="verify_interfaces">True</Option>
         </FirewallOptions>
       </Firewall>
-      <Firewall id="id57974X27834" host_OS="linux24" lastCompiled="0" lastInstalled="0" lastModified="1269723357" platform="iptables" version="" name="linux-1-d" comment="This firewall has two interfaces. Eth0 faces outside and has a dynamic address; eth1 faces inside.&#10;Policy includes basic rules to permit unrestricted outbound access and anti-spoofing rules. Access to the firewall is permitted only from internal network and only using SSH. The firewall uses one of the machines on internal network for DNS. Internal network is configured with address 192.168.1.0/255.255.255.0" ro="False">
+      <Firewall id="id57974X27834" host_OS="linux24" inactive="False" lastCompiled="0" lastInstalled="0" lastModified="1325552038" platform="iptables" version="" name="linux-1-d" comment="This firewall has two interfaces. Eth0 faces outside and has a dynamic address; eth1 faces inside.&#10;Policy includes basic rules to permit unrestricted outbound access and anti-spoofing rules. Access to the firewall is permitted only from internal network and only using SSH. The firewall uses one of the machines on internal network for DNS. Internal network is configured with address 192.168.1.0/255.255.255.0" ro="False">
         <NAT id="id58864X27834" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="False">
           <RuleSetOptions/>
         </NAT>
@@ -6686,7 +6699,7 @@
           <Option name="verify_interfaces">True</Option>
         </FirewallOptions>
       </Firewall>
-      <Firewall id="id58236X27834" host_OS="linux24" inactive="False" lastCompiled="0" lastInstalled="0" lastModified="1269723372" platform="iptables" version="" name="linux-2-d" comment="This firewall has two interfaces. Eth0 faces outside and has a dynamic address; eth1 faces inside.&#10;Policy includes basic rules to permit unrestricted outbound access and anti-spoofing rules. Access to the firewall is permitted only from internal network and only using SSH. The firewall uses one of the machines on internal network for DNS. Internal network is configured with address 192.168.1.0/255.255.255.0" ro="False">
+      <Firewall id="id58236X27834" host_OS="linux24" inactive="False" lastCompiled="0" lastInstalled="0" lastModified="1325552042" platform="iptables" version="" name="linux-2-d" comment="This firewall has two interfaces. Eth0 faces outside and has a dynamic address; eth1 faces inside.&#10;Policy includes basic rules to permit unrestricted outbound access and anti-spoofing rules. Access to the firewall is permitted only from internal network and only using SSH. The firewall uses one of the machines on internal network for DNS. Internal network is configured with address 192.168.1.0/255.255.255.0" ro="False">
         <NAT id="id58870X27834" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="False">
           <RuleSetOptions/>
         </NAT>
diff --git a/test/ipt/cluster1_secuwall-1.fw.orig b/test/ipt/cluster1_secuwall-1.fw.orig
index 4500ca4..5f31443 100755
--- a/test/ipt/cluster1_secuwall-1.fw.orig
+++ b/test/ipt/cluster1_secuwall-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:42 2011 PST by vadim
+#  Generated Mon Jan  2 16:54:16 2012 PST by vadim
 #
 # files: * cluster1_secuwall-1.fw /etc/cluster1_secuwall-1.fw
 #
@@ -610,7 +610,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:42 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:54:16 2012 by vadim"
         log "Database was cluster-tests.fwb"
         check_tools
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-base-rulesets.fw.orig b/test/ipt/firewall-base-rulesets.fw.orig
index 5ad97e5..5615291 100755
--- a/test/ipt/firewall-base-rulesets.fw.orig
+++ b/test/ipt/firewall-base-rulesets.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:04 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:14 2012 PST by vadim
 #
 # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw
 #
@@ -467,7 +467,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:04 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:14 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-1.fw.orig b/test/ipt/firewall-ipv6-1.fw.orig
index cca17d4..243e3f1 100755
--- a/test/ipt/firewall-ipv6-1.fw.orig
+++ b/test/ipt/firewall-ipv6-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:10 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:23 2012 PST by vadim
 #
 # files: * firewall-ipv6-1.fw /etc/firewall-ipv6-1.fw
 #
@@ -724,7 +724,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:10 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:23 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-2.fw.orig b/test/ipt/firewall-ipv6-2.fw.orig
index ab132e4..c4c8131 100755
--- a/test/ipt/firewall-ipv6-2.fw.orig
+++ b/test/ipt/firewall-ipv6-2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:10 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:23 2012 PST by vadim
 #
 # files: * firewall-ipv6-2.fw /etc/firewall-ipv6-2.fw
 #
@@ -988,7 +988,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:10 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:23 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-3.fw.orig b/test/ipt/firewall-ipv6-3.fw.orig
index 0e4aeef..eee4411 100755
--- a/test/ipt/firewall-ipv6-3.fw.orig
+++ b/test/ipt/firewall-ipv6-3.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:10 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:31 2012 PST by vadim
 #
 # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw
 #
@@ -618,7 +618,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:10 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:31 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-4-1.fw.orig b/test/ipt/firewall-ipv6-4-1.fw.orig
index 64d39b4..6995b95 100755
--- a/test/ipt/firewall-ipv6-4-1.fw.orig
+++ b/test/ipt/firewall-ipv6-4-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:18 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:39 2012 PST by vadim
 #
 # files: * firewall-ipv6-4-1.fw /etc/firewall-ipv6-4-1.fw
 #
@@ -569,7 +569,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:18 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:39 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-4.fw.orig b/test/ipt/firewall-ipv6-4.fw.orig
index 5196823..1fb1f62 100755
--- a/test/ipt/firewall-ipv6-4.fw.orig
+++ b/test/ipt/firewall-ipv6-4.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:11 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:31 2012 PST by vadim
 #
 # files: * firewall-ipv6-4.fw /etc/firewall-ipv6-4.fw
 #
@@ -605,7 +605,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:11 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:31 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-5.fw.orig b/test/ipt/firewall-ipv6-5.fw.orig
index 869db6f..5a33440 100755
--- a/test/ipt/firewall-ipv6-5.fw.orig
+++ b/test/ipt/firewall-ipv6-5.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:16 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:34 2012 PST by vadim
 #
 # files: * firewall-ipv6-5.fw /etc/firewall-ipv6-5.fw
 #
@@ -434,7 +434,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:16 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:34 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-6.fw.orig b/test/ipt/firewall-ipv6-6.fw.orig
index f8f4625..d693d8f 100755
--- a/test/ipt/firewall-ipv6-6.fw.orig
+++ b/test/ipt/firewall-ipv6-6.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:16 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:36 2012 PST by vadim
 #
 # files: * firewall-ipv6-6.fw /etc/firewall-ipv6-6.fw
 #
@@ -423,7 +423,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:16 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:36 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-7.fw.orig b/test/ipt/firewall-ipv6-7.fw.orig
index 85c5ce7..5ad8c61 100755
--- a/test/ipt/firewall-ipv6-7.fw.orig
+++ b/test/ipt/firewall-ipv6-7.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:16 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:38 2012 PST by vadim
 #
 # files: * firewall-ipv6-7.fw /etc/firewall-ipv6-7.fw
 #
@@ -467,7 +467,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:16 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:38 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-8.fw.orig b/test/ipt/firewall-ipv6-8.fw.orig
index 0986eba..e52d588 100755
--- a/test/ipt/firewall-ipv6-8.fw.orig
+++ b/test/ipt/firewall-ipv6-8.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:22 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:39 2012 PST by vadim
 #
 # files: * firewall-ipv6-8.fw /etc/firewall-ipv6-8.fw
 #
@@ -540,7 +540,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:22 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:39 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig
index 0825085..d4277e3 100755
--- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig
+++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:22 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:42 2012 PST by vadim
 #
 # files: * firewall-ipv6-ipt-reset-prolog-after-flush.fw /etc/firewall-ipv6-ipt-reset-prolog-after-flush.fw
 #
@@ -464,7 +464,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:22 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:42 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig
index 274f847..b484310 100755
--- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig
+++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:23 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:42 2012 PST by vadim
 #
 # files: * firewall-ipv6-ipt-reset-prolog-after-interfaces.fw /etc/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw
 #
@@ -464,7 +464,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:23 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:42 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig
index 9e50dfd..8e394c3 100755
--- a/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig
+++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:23 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:45 2012 PST by vadim
 #
 # files: * firewall-ipv6-ipt-reset-prolog-top.fw /etc/firewall-ipv6-ipt-reset-prolog-top.fw
 #
@@ -464,7 +464,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:23 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:45 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-nd-ns-1.fw.orig b/test/ipt/firewall-ipv6-nd-ns-1.fw.orig
index 6a998f8..a184433 100755
--- a/test/ipt/firewall-ipv6-nd-ns-1.fw.orig
+++ b/test/ipt/firewall-ipv6-nd-ns-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:28 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:45 2012 PST by vadim
 #
 # files: * firewall-ipv6-nd-ns-1.fw /etc/firewall-ipv6-nd-ns-1.fw
 #
@@ -464,7 +464,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:28 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:45 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-nd-ns-2.fw.orig b/test/ipt/firewall-ipv6-nd-ns-2.fw.orig
index 8c4a857..adf8f46 100755
--- a/test/ipt/firewall-ipv6-nd-ns-2.fw.orig
+++ b/test/ipt/firewall-ipv6-nd-ns-2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:29 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:47 2012 PST by vadim
 #
 # files: * firewall-ipv6-nd-ns-2.fw /etc/firewall-ipv6-nd-ns-2.fw
 #
@@ -468,7 +468,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:29 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:47 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig b/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig
index 8b8c021..37b9b8c 100755
--- a/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig
+++ b/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:29 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:47 2012 PST by vadim
 #
 # files: * firewall-ipv6-prolog-after-flush.fw /etc/firewall-ipv6-prolog-after-flush.fw
 #
@@ -442,7 +442,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:29 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:47 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig b/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig
index 84316e3..6571ec6 100755
--- a/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig
+++ b/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:29 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:50 2012 PST by vadim
 #
 # files: * firewall-ipv6-prolog-after-interfaces.fw /etc/firewall-ipv6-prolog-after-interfaces.fw
 #
@@ -442,7 +442,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:29 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:50 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-ipv6-prolog-top.fw.orig b/test/ipt/firewall-ipv6-prolog-top.fw.orig
index ebce4f9..67f65de 100755
--- a/test/ipt/firewall-ipv6-prolog-top.fw.orig
+++ b/test/ipt/firewall-ipv6-prolog-top.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:34 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:50 2012 PST by vadim
 #
 # files: * firewall-ipv6-prolog-top.fw /etc/firewall-ipv6-prolog-top.fw
 #
@@ -442,7 +442,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:34 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:50 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall-server-1-s.fw.orig b/test/ipt/firewall-server-1-s.fw.orig
index f27734d..da32d29 100755
--- a/test/ipt/firewall-server-1-s.fw.orig
+++ b/test/ipt/firewall-server-1-s.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:23:35 2011 PST by vadim
+#  Generated Mon Jan  2 16:46:52 2012 PST by vadim
 #
 # files: * firewall-server-1-s.fw /etc/fw/firewall-server-1-s.fw
 #
@@ -415,7 +415,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:23:35 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:46:52 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall.fw.orig b/test/ipt/firewall.fw.orig
index fc7ff9e..f009ac1 100755
--- a/test/ipt/firewall.fw.orig
+++ b/test/ipt/firewall.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:20:46 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:13 2012 PST by vadim
 #
 # files: * firewall.fw /etc/fw/firewall.fw
 #
@@ -1398,7 +1398,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:20:46 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:13 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall1.fw.orig b/test/ipt/firewall1.fw.orig
index 20105a1..78fa9f9 100755
--- a/test/ipt/firewall1.fw.orig
+++ b/test/ipt/firewall1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:20:46 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:15 2012 PST by vadim
 #
 # files: * firewall1.fw /etc/fw/firewall1.fw
 #
@@ -1270,7 +1270,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:20:46 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:15 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall10.fw.orig b/test/ipt/firewall10.fw.orig
index 341826a..b648be7 100755
--- a/test/ipt/firewall10.fw.orig
+++ b/test/ipt/firewall10.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:20:45 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:15 2012 PST by vadim
 #
 # files: * firewall10.fw /etc/fw/firewall10.fw
 #
@@ -495,7 +495,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:20:45 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:15 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall11.fw.orig b/test/ipt/firewall11.fw.orig
index 7061e99..a6aa94f 100755
--- a/test/ipt/firewall11.fw.orig
+++ b/test/ipt/firewall11.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:20:51 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:17 2012 PST by vadim
 #
 # files: * firewall11.fw /etc/fw/firewall11.fw
 #
@@ -615,7 +615,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:20:51 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:17 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall12.fw.orig b/test/ipt/firewall12.fw.orig
index 408a0ea..cf4ba2f 100755
--- a/test/ipt/firewall12.fw.orig
+++ b/test/ipt/firewall12.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:20:51 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:18 2012 PST by vadim
 #
 # files: * firewall12.fw /etc/fw/firewall12.fw
 #
@@ -533,7 +533,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:20:51 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:18 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall13.fw.orig b/test/ipt/firewall13.fw.orig
index 848c01b..5bf279e 100755
--- a/test/ipt/firewall13.fw.orig
+++ b/test/ipt/firewall13.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:20:52 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:20 2012 PST by vadim
 #
 # files: * firewall13.fw /etc/fw/firewall13.fw
 #
@@ -407,7 +407,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:20:52 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:20 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall14.fw.orig b/test/ipt/firewall14.fw.orig
index fb9986b..0fbafbf 100755
--- a/test/ipt/firewall14.fw.orig
+++ b/test/ipt/firewall14.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:20:52 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:20 2012 PST by vadim
 #
 # files: * firewall14.fw /etc/fw/firewall14.fw
 #
@@ -426,7 +426,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:20:52 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:20 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall15.fw.orig b/test/ipt/firewall15.fw.orig
index 731c453..cd1fc47 100755
--- a/test/ipt/firewall15.fw.orig
+++ b/test/ipt/firewall15.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:20:57 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:22 2012 PST by vadim
 #
 # files: * firewall15.fw /etc/fw/firewall15.fw
 #
@@ -410,7 +410,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:20:57 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:22 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall16.fw.orig b/test/ipt/firewall16.fw.orig
index e622653..7b397c2 100755
--- a/test/ipt/firewall16.fw.orig
+++ b/test/ipt/firewall16.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:20:57 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:22 2012 PST by vadim
 #
 # files: * firewall16.fw /etc/fw/firewall16.fw
 #
@@ -514,7 +514,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:20:57 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:22 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall17.fw.orig b/test/ipt/firewall17.fw.orig
index 15c26b9..1d62ddf 100755
--- a/test/ipt/firewall17.fw.orig
+++ b/test/ipt/firewall17.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:20:58 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:25 2012 PST by vadim
 #
 # files: * firewall17.fw /etc/fw/firewall17.fw
 #
@@ -493,7 +493,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:20:58 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:25 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall18.fw.orig b/test/ipt/firewall18.fw.orig
index 9bf61dd..bcc1683 100755
--- a/test/ipt/firewall18.fw.orig
+++ b/test/ipt/firewall18.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:20:58 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:25 2012 PST by vadim
 #
 # files: * firewall18.fw /etc/fw/firewall18.fw
 #
@@ -528,7 +528,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:20:58 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:25 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall19.fw.orig b/test/ipt/firewall19.fw.orig
index 9f7e9b5..cb66397 100755
--- a/test/ipt/firewall19.fw.orig
+++ b/test/ipt/firewall19.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:02 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:27 2012 PST by vadim
 #
 # files: * firewall19.fw /etc/fw/firewall19.fw
 #
@@ -532,7 +532,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:02 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:27 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-1.fw.orig b/test/ipt/firewall2-1.fw.orig
index 93a146b..57a8dc4 100755
--- a/test/ipt/firewall2-1.fw.orig
+++ b/test/ipt/firewall2-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:12 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:34 2012 PST by vadim
 #
 # files: * firewall2-1.fw /etc/fw/firewall2-1.fw
 #
@@ -1452,7 +1452,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:12 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:34 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-2.fw.orig b/test/ipt/firewall2-2.fw.orig
index 70c1381..90c4389 100755
--- a/test/ipt/firewall2-2.fw.orig
+++ b/test/ipt/firewall2-2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:14 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:37 2012 PST by vadim
 #
 # files: * firewall2-2.fw /etc/fw/firewall2-2.fw
 #
@@ -1282,7 +1282,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:14 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:37 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-3.fw.orig b/test/ipt/firewall2-3.fw.orig
index 525e0aa..bd8bb99 100755
--- a/test/ipt/firewall2-3.fw.orig
+++ b/test/ipt/firewall2-3.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:19 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:40 2012 PST by vadim
 #
 # files: * firewall2-3.fw /etc/fw/firewall2-3.fw
 #
@@ -1140,7 +1140,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:19 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:40 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-4.fw.orig b/test/ipt/firewall2-4.fw.orig
index 820d2b2..547d121 100755
--- a/test/ipt/firewall2-4.fw.orig
+++ b/test/ipt/firewall2-4.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:25 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:45 2012 PST by vadim
 #
 # files: * firewall2-4.fw /etc/fw/firewall2-4.fw
 #
@@ -446,7 +446,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:25 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:45 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-5.fw.orig b/test/ipt/firewall2-5.fw.orig
index f0971ca..36f6661 100755
--- a/test/ipt/firewall2-5.fw.orig
+++ b/test/ipt/firewall2-5.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:30 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:48 2012 PST by vadim
 #
 # files: * firewall2-5.fw /etc/fw/firewall2-5.fw
 #
@@ -477,7 +477,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:30 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:48 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-6.fw.orig b/test/ipt/firewall2-6.fw.orig
index a353bb6..43ffe13 100755
--- a/test/ipt/firewall2-6.fw.orig
+++ b/test/ipt/firewall2-6.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:31 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:51 2012 PST by vadim
 #
 # files: * firewall2-6.fw /etc/fw/firewall2-6.fw
 #
@@ -502,7 +502,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:31 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:51 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2-7.fw.orig b/test/ipt/firewall2-7.fw.orig
index ba6a2bc..01283ee 100755
--- a/test/ipt/firewall2-7.fw.orig
+++ b/test/ipt/firewall2-7.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:36 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:54 2012 PST by vadim
 #
 # files: * firewall2-7.fw /etc/fw/firewall2-7.fw
 #
@@ -442,7 +442,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:36 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:54 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall2.fw.orig b/test/ipt/firewall2.fw.orig
index eeb4053..82278d8 100755
--- a/test/ipt/firewall2.fw.orig
+++ b/test/ipt/firewall2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:05 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:28 2012 PST by vadim
 #
 # files: * firewall2.fw /etc/fw/firewall2.fw
 #
@@ -1504,7 +1504,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:05 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:28 2012 by vadim"
         check_tools
         
         check_run_time_address_table_files
diff --git a/test/ipt/firewall20-ipv6.fw.orig b/test/ipt/firewall20-ipv6.fw.orig
index 5a577e8..469f886 100755
--- a/test/ipt/firewall20-ipv6.fw.orig
+++ b/test/ipt/firewall20-ipv6.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:04 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:31 2012 PST by vadim
 #
 # files: * firewall20-ipv6.fw /etc/fw/firewall20-ipv6.fw
 #
@@ -478,7 +478,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:04 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:31 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall20.fw.orig b/test/ipt/firewall20.fw.orig
index 9c66a2c..872036d 100755
--- a/test/ipt/firewall20.fw.orig
+++ b/test/ipt/firewall20.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:04 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:29 2012 PST by vadim
 #
 # files: * firewall20.fw /etc/fw/firewall20.fw
 #
@@ -696,7 +696,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:04 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:29 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall21-1.fw.orig b/test/ipt/firewall21-1.fw.orig
index 4d3c6fe..b514fc1 100755
--- a/test/ipt/firewall21-1.fw.orig
+++ b/test/ipt/firewall21-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:11 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:34 2012 PST by vadim
 #
 # files: * firewall21-1.fw /etc/fw/firewall21-1.fw
 #
@@ -496,7 +496,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:11 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:34 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall21.fw.orig b/test/ipt/firewall21.fw.orig
index 84d3b2f..77500b5 100755
--- a/test/ipt/firewall21.fw.orig
+++ b/test/ipt/firewall21.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:08 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:31 2012 PST by vadim
 #
 # files: * firewall21.fw /etc/fw/firewall21.fw
 #
@@ -495,7 +495,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:08 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:31 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall22.fw.orig b/test/ipt/firewall22.fw.orig
index 13375d8..65ca68a 100755
--- a/test/ipt/firewall22.fw.orig
+++ b/test/ipt/firewall22.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:11 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:36 2012 PST by vadim
 #
 # files: * firewall22.fw /etc/fw/firewall22.fw
 #
@@ -412,7 +412,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:11 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:36 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall23-1.fw.orig b/test/ipt/firewall23-1.fw.orig
index 9aea639..d4f9a0a 100755
--- a/test/ipt/firewall23-1.fw.orig
+++ b/test/ipt/firewall23-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:18 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:40 2012 PST by vadim
 #
 # files: * firewall23-1.fw /etc/fw/firewall23-1.fw
 #
@@ -586,7 +586,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:18 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:40 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall23-2.fw.orig b/test/ipt/firewall23-2.fw.orig
index 086ac73..20207f7 100755
--- a/test/ipt/firewall23-2.fw.orig
+++ b/test/ipt/firewall23-2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipt v5.0.1.3590
+#  Firewall Builder  fwb_ipt v5.0.2.3593
 #
-#  Generated Mon Nov 28 12:21:20 2011 PST by vadim
+#  Generated Mon Jan  2 16:44:43 2012 PST by vadim
 #
 # files: * firewall23-2.fw /etc/fw/firewall23-2.fw
 #
@@ -402,7 +402,7 @@ test -z "$cmd" && {
 
 case "$cmd" in
     start)
-        log "Activating firewall script generated Mon Nov 28 12:21:20 2011 by vadim"
+        log "Activating firewall script generated Mon Jan  2 16:44:43 2012 by vadim"
         check_tools
          prolog_commands 
         check_run_time_address_table_files
diff --git a/test/ipt/firewall23-3.fw.orig b/test/ipt/firewall23-3.fw.orig
index 6b82072..6f69fb9 100755
--- a/test/ipt/firewall23-...
 
[truncated message content]

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v5.0.1-1-ge80f2e0

From: <gi...@ir...> - 2012-01-02 22:27:44

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, development has been updated
       via  e80f2e0d4790ba5e7aab356cad96cef18941145e (commit)
      from  b89bf502d373259fc2c2d4bbe4d883638fc47de2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e80f2e0d4790ba5e7aab356cad96cef18941145e
Author: Vadim Kurland <va...@sl...>
Date:   Mon Jan 2 14:59:54 2012 -0800

    v5.0.2

diff --git a/VERSION b/VERSION
index 13623d1..fe2545e 100644
--- a/VERSION
+++ b/VERSION
@@ -2,12 +2,12 @@
 
 FWB_MAJOR_VERSION=5
 FWB_MINOR_VERSION=0
-FWB_MICRO_VERSION=1
+FWB_MICRO_VERSION=2
 
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3592"
+BUILD_NUM="3593"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 
diff --git a/VERSION.h b/VERSION.h
index f9ec2cb..21a6fc3 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION      "5.0.1.3592"
+#define VERSION      "5.0.2.3593"
 #define GENERATION   "5.0"
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 008f91e..0d628b6 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-02  Vadim Kurland  <va...@ne...>
+
+	* VERSION (FWB_MICRO_VERSION): v 5.0.2
+
+2011-12-23  Vadim Kurland  <va...@ne...>
+
+	* v5.0.1 released
+
 2011-12-07  Vadim Kurland  <va...@ne...>
 
 	* pix.g (nat_command_last_parameters): fixes #2678 Policy importer
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index 4a496c8..b2ef5e1 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.3592
+%define version 5.0.2.3593
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index 2ec3855..eb1e339 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: va...@fw...
-Version: 5.0.1.3592-1
+Version: 5.0.2.3593-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 0f90d22..1a8136a 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 5.0.1.3592
+%define version 5.0.2.3593
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"

-----------------------------------------------------------------------

Summary of changes:
 VERSION                            |    4 ++--
 VERSION.h                          |    2 +-
 doc/ChangeLog                      |    8 ++++++++
 packaging/fwbuilder-static-qt.spec |    2 +-
 packaging/fwbuilder.control        |    2 +-
 packaging/fwbuilder.spec           |    2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code annotated tag, v5.0.1, created. v5.0.1

From: <gi...@ir...> - 2012-01-02 22:21:25

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The annotated tag, v5.0.1 has been created
        at  5e0b108113f43a53b9304affafe3fb7e42eded60 (tag)
   tagging  b89bf502d373259fc2c2d4bbe4d883638fc47de2 (commit)
  replaces  v5.0.0
 tagged by  Vadim Kurland
        on  Mon Jan 2 14:52:18 2012 -0800

- Log -----------------------------------------------------------------
v5.0.1 release tag
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAk8CNSIACgkQ7y7dmOruCP6hLACgnQWhL5ETd0Pev/5iQqu7CjLd
8ksAnjVDKZhEkmSMl/jgPZxbOyQcAM+H
=gSIt
-----END PGP SIGNATURE-----

Vadim Kurland (81):
      changelog update; fixed unit test ObjectMatcherTest
      changed token name from "ESP" to "ESP_WORD" to avoid conflict with
      moved "batch install" button from the main installer wizard to the
      fixed bug in the installer introduced yesterday, if user cancelled install, next attempt to run installer caused crash
      see #2628 fixed crash that happened if user create new firewall object
      see #2634 User cant duplicate or move MAC Address objects
      v5.0.1.3572
      see #2635 Object type AttachedNetworks is not allowed in the
      see #2636 "carp : Incorrect output in rc.conf.local format". Should
      fixes
      fixes #2637 improved cluster group dialog layout
      Merge branch 'development' of ssh://vc.netcitadel.com:2222/var/git/fwbuilder into development
      the drop-down list of interfaces for the "route-through" rule option
      fixes #2642 "GUI crashes if user cancels newFirewall dialog".
      fixes #2641 "newFirewall dialog does not accept ipv6 addresses with
      see #2639 "support for vlan subinterfaces of bridge interfaces (e.g.
      see #2638 "When CARP password is empty the advskew value is not
      fixes #2643 "GUI crashes when user cuts a rule, then right-mouse click
      function InetAddr::isValidV4Netmask() checks that netmask represented
      see #2644 added check for netmask validity in the ip4 address dialog
      fixes #2650 "rules with address range that includes firewall address
      fixes #2648 "right mouse click on firewall object in "Deleted objects"
      fixes #2647 remove description of the option "make actions Tag and Classify terminating" from the help page
      see #2646 and SF bug 3395658: Added few ipv4 and ipv6 network objects
      fixes SF bug 3388055 Adding a "DNS Name" with a trailing space causes
      fixes SF bug 3302121 "cosmetic mis-format in fwb Linux paths dialog"
      fixes SF bug 3247094 "Nomenclature of IP address edit dialog".
      added release notes for 5.0.1
      see #2654 fixes GUI crash that occured if user copied a rule from file A to file B, then closed file B, opened file C and tried to copy the same rule from A to C
      see #2654 ChangeLog and release notes entries
      new build 5.0.1.3578
      see #2653 Importer for iptables checks that netfilter table used in
      see #2655 Interface names are not allowed to have dash "-" even with
      see #2657 snmp network discovery crashed if option "Confine scan
      fixes #2658 "snmp network discovery creates duplicate address
      see #2656 "Generated Cisco ASA access-list has duplicate entry".
      fixes #2660 "compiler for IOSACL crashed when address range appears in
      v5.0.1.3580
      fixes SF bug #3414382 "Segfault in fwb_ipt dealing with empty
      v5.0.1.3581
      enable fwbuilder to take advantage of GSSAPIAuthentication with
      fixed unit tests that broke when new objects were added to the StandardObjects library
      see SF bug #3416900 "Replace `command` with `which`".  Generated
      v5.0.1.3582
      trim strings provided by the user in various dialogs to make sure we dont end up with file names and other parameters that end with a white space
      reset pix test files to v5.0.1.3581
      Merge branch 'development' of ssh://vc.netcitadel.com:2222/var/git/fwbuilder into development
      see #2662 "Crash when compiling ASA rule with IP range". Need to split
      reset test files for iptables
      fixed SF bug 3426843 "ipfw doesn't work for self-reference, in
      build 5.0.1.3584
      fixed SF bug #3433587 "Manual edit of new service Destination Port END
      fixed SF bug #3429377 "PF: IPv6 rules are not added in IPv4/IPv6
      fixed SF bug 3428992: "PF: rules order problem with IPv4 and
      fixed SF bug 3435004: "Empty lines in comment result in "Incomplete
      fixes #2665 "Adding text to comment causes rule to go from 2 rows to 1
      fixes #2663 "Rule with "old-broadcast" object results in invalid
      added release notes record
      fixes #2670. Per RFC3021 network with netmask /31 has no network and
      fixes #2668 Remove "static routes" from the explanation text in
      fixes #2664 Update error message when "which" command fails. Generated
      added latest changes to 5.0.1 release notes
      fixes #2669 "Cant inspect custom Service object in Standard objects
      see #2667
      merge 5.0.1.3586
      v5.0.1.3587
      fixed problem in Inet6AddrMask related to the latest change for /31 subnets; fixed unit tests; build 3588
      SF bug #3439613.  physdev module does not allow --physdev-out for
      build 5.0.13589
      see #2671, #2672
      more fixes for SF bug #3439613. Adding "-i" / "-o" clause to match
      fixes #2673: fwbuilder GUI still wants to connect to X11 server when cli printing option -P is used
      fixed SF bug #3443609 Return of ID: 3059893": iptables "--set" option
      see #2676
      v5.0.1.3591
      fixes #2674 NAT compiler for PF crashed when AttachedNetworks
      fixed strings that should be translated
      v5.0.1.3592
      fixes #2677 Policy importer for PIX/ASA could not parse command
      fixes #2679 import of PIX "nat exemptions" rules
      fixes #2678 Policy importer for PIX/ASA could not parse nat command

-----------------------------------------------------------------------


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, builds, updated. v5.0.0-81-gb89bf50

From: <gi...@ir...> - 2011-12-08 00:54:46

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".

The branch, builds has been updated
       via  b89bf502d373259fc2c2d4bbe4d883638fc47de2 (commit)
       via  eacdadc1b94ddcad64b589962e6f94244aeb1896 (commit)
       via  b0dcb679dce1da4b3ca753d27717727eae69b866 (commit)
       via  7b45a1f8c8944f78c354ed785f358f90396e1845 (commit)
       via  0aae126c003b711659e94085668429137f9dc248 (commit)
      from  739edc8c3509a87eebba77ad7a0af26fb889b040 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 VERSION                                            |    2 +-
 VERSION.h                                          |    2 +-
 doc/ChangeLog                                      |   16 +
 packaging/fwbuilder-static-qt.spec                 |    2 +-
 packaging/fwbuilder.control                        |    2 +-
 packaging/fwbuilder.spec                           |    2 +-
 src/import/PIXImporter.h                           |    2 +
 src/import/PIXImporterNat.cpp                      |  264 +++--
 src/libgui/DialogData.cpp                          |    8 +-
 src/libgui/iosaclAdvancedDialog.cpp                |    4 +-
 src/libgui/ipcopAdvancedDialog.cpp                 |    4 +-
 src/libgui/ipfAdvancedDialog.cpp                   |    3 +-
 src/libgui/ipfwAdvancedDialog.cpp                  |    4 +-
 src/libgui/iptAdvancedDialog.cpp                   |    4 +-
 src/libgui/pfAdvancedDialog.cpp                    |    4 +-
 src/libgui/pixAdvancedDialog.cpp                   |    3 +-
 src/libgui/procurveaclAdvancedDialog.cpp           |    6 +-
 src/parsers/PIXCfgLexer.cpp                        |  202 ++--
 src/parsers/PIXCfgLexer.hpp                        |    2 +-
 src/parsers/PIXCfgParser.cpp                       |  401 ++++----
 src/parsers/PIXCfgParser.hpp                       |    5 +-
 src/parsers/PIXCfgParserTokenTypes.hpp             |    2 +-
 src/parsers/PIXCfgParserTokenTypes.txt             |    2 +-
 src/parsers/pix.g                                  |   71 +-
 src/res/help/en_US/release_notes_5.0.1.html        |   21 +
 .../PIXImporterTest/test_data/pix7-nat.fwb         | 1103 ++++++++++++--------
 .../PIXImporterTest/test_data/pix7-nat.output      |   71 +-
 .../PIXImporterTest/test_data/pix7-nat.test        |   12 +
 28 files changed, 1293 insertions(+), 931 deletions(-)


hooks/post-receive
-- 
Firewall Builder GUI and Policy Compilers Open Source Code

1 message has been excluded from this view by a project administrator.

Flat | Threaded

1 2 3 .. 531 > >> (Page 1 of 531)