diff --git a/VERSION b/VERSION index f8d411e68..6f84f0e30 100644 --- a/VERSION +++ b/VERSION @@ -7,13 +7,13 @@ FWB_MICRO_VERSION=1 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3537" +BUILD_NUM="3538" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" GENERATION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION" # Data format version -FWBUILDER_XML_VERSION=19 +FWBUILDER_XML_VERSION=20 diff --git a/VERSION.h b/VERSION.h index 225e7ef60..64be3d007 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.1.3537" +#define VERSION "4.2.1.3538" #define GENERATION "4.2" diff --git a/doc/ChangeLog b/doc/ChangeLog index 163dca7a0..9d020a88b 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,24 @@ +2011-05-05 Vadim Kurland + + * FWObjectDatabase_19.xslt: see #2385 "PF action Classify uses + wrong parameter". This change fixes a bug introduced in 4.2.0 + that affects rules with action Classify in PF firewalls. + + The bug causes the following problems: + + For users who built their rules before v4.2.0: + - rules compile normally, both in the single rule compile and + when the whole firewall is compiled + - if they opened the action of one of such rules in the action + editor, the classification string would look empty + - if they entered new classification string in the editor, + compiler kept using the old one (which they can not see or + change in the editor) + + For users who tried to build rules with action Classify with v4.2.0: + - no matter what classification string they enter in the action + dialog, generated code does not use it + 2011-05-04 Vadim Kurland * FWObjectDatabase_18.xslt: XSLT transformation to upgrade data diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index ed87a85c2..25629bdf8 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 4.2.1.3537 +%define version 4.2.1.3538 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index d8f1e52a5..9b1b661e4 100644 --- a/packaging/fwbuilder.control +++ b/packaging/fwbuilder.control @@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu Priority: extra Section: checkinstall Maintainer: vadim@fwbuilder.org -Version: 4.2.1.3537-1 +Version: 4.2.1.3538-1 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Description: Firewall Builder GUI and policy compilers diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec index f889f6565..a2b199fef 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.1.3537 +%define version 4.2.1.3538 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/libfwbuilder/etc/fwbuilder.dtd b/src/libfwbuilder/etc/fwbuilder.dtd index 6e89cbf67..eb38f61cc 100644 --- a/src/libfwbuilder/etc/fwbuilder.dtd +++ b/src/libfwbuilder/etc/fwbuilder.dtd @@ -79,7 +79,7 @@ diff --git a/src/libfwbuilder/migration/FWObjectDatabase_19.xslt b/src/libfwbuilder/migration/FWObjectDatabase_19.xslt new file mode 100644 index 000000000..56051b47c --- /dev/null +++ b/src/libfwbuilder/migration/FWObjectDatabase_19.xslt @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + pf_classify_str + + + + + + + + + + + + + + + + 20 + + root + + + + + + + diff --git a/src/libfwbuilder/migration/migration.pro b/src/libfwbuilder/migration/migration.pro index 829945a29..7e71b6137 100644 --- a/src/libfwbuilder/migration/migration.pro +++ b/src/libfwbuilder/migration/migration.pro @@ -93,5 +93,6 @@ target.files = FWObjectDatabase_0.8.7.xslt \ FWObjectDatabase_16.xslt \ FWObjectDatabase_17.xslt \ FWObjectDatabase_18.xslt \ + FWObjectDatabase_19.xslt \ diff --git a/src/res/help/en_US/release_notes_4.2.1.html b/src/res/help/en_US/release_notes_4.2.1.html index 54a32583e..84520c9d4 100644 --- a/src/res/help/en_US/release_notes_4.2.1.html +++ b/src/res/help/en_US/release_notes_4.2.1.html @@ -50,6 +50,41 @@

+
  • +

    + fixes #2385 "PF action Classify uses wrong parameter". This + change fixes a bug introduced in 4.2.0 that affects rules with + action Classify in PF firewalls. The bug causes the following + problems: +

    + +

    + For users who built their rules before v4.2.0: +

    + +

    +

      +
    • rules compile normally, both in the single rule compile and + when the whole firewall is compiled
      • +
    • if they opened the action of one of such rules in the action + editor, the classification string would look empty
      • +
    • if they entered new classification string in the editor, + compiler kept using the old one (which they can not see or + change in the editor)
      • +
    +

    + +

    + For users who tried to build rules with action Classify with v4.2.0: +

    + +

    +

      +
    • no matter what classification string they enter in the action + dialog, generated code does not use it
      • +
    +

    +
    • diff --git a/src/res/objects_init.xml b/src/res/objects_init.xml index 6e4f94df5..e1263269a 100644 --- a/src/res/objects_init.xml +++ b/src/res/objects_init.xml @@ -1,6 +1,6 @@ - + diff --git a/src/res/templates.xml b/src/res/templates.xml index 64c6af93c..70e7c1d18 100644 --- a/src/res/templates.xml +++ b/src/res/templates.xml @@ -1,6 +1,6 @@ - + diff --git a/test/iosacl/cluster-tests.fwb b/test/iosacl/cluster-tests.fwb index 4f4f58503..f7c939522 100644 --- a/test/iosacl/cluster-tests.fwb +++ b/test/iosacl/cluster-tests.fwb @@ -1,6 +1,6 @@ - + @@ -652,105 +652,120 @@ - + - + - + - + - + - + + + - + + - + - + - + - + - + - + + + - + + - + - + - + - + - + - + + + - + + - + - + - + - + - + - + + + - + + - + - + - + - + - + - + + + - + + @@ -1348,25 +1363,28 @@ - + - + - + - + - + - + + + - + + @@ -1592,133 +1610,151 @@ - + - + - + - + - + - + + + - + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - + + + - + + - + - + - + - + - + - + @@ -1807,64 +1846,76 @@ + + - + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1959,133 +2010,151 @@ - + - + - + - + - + - + + + - + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - + @@ -2109,25 +2178,28 @@ + + - + + - + - + - + - + - + - + @@ -2151,64 +2223,76 @@ + + - + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2312,133 +2396,151 @@ - + - + - + - + - + - + + + - + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - + @@ -2462,64 +2564,76 @@ + + - + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2612,133 +2726,151 @@ - + - + - + - + - + - + + + - + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - + @@ -2762,64 +2894,76 @@ + + - + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3062,7 +3206,10 @@ - + + + @@ -3080,7 +3227,10 @@ - + + + @@ -3098,7 +3248,10 @@ - + + + @@ -3116,7 +3269,10 @@ - + + + @@ -3134,7 +3290,10 @@ - + + + @@ -3152,7 +3311,10 @@ - + + + @@ -3170,7 +3332,10 @@ - + + + @@ -3292,7 +3457,10 @@ - + +