From 880cfb13fc75e10a9764b5c60e6d61b875ee74fb Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Fri, 6 May 2011 18:36:23 -0700 Subject: [PATCH] * PolicyCompiler_pf_writers.cpp (_printQueue): see #2390 Classify does not generate "queue" string for rules created in V4.2.1.3538 This completes the fix for the bug #2385. --- VERSION | 2 +- VERSION.h | 2 +- doc/ChangeLog | 6 ++++++ packaging/fwbuilder-static-qt.spec | 2 +- packaging/fwbuilder.control | 2 +- packaging/fwbuilder.spec | 2 +- src/pflib/PolicyCompiler_pf_writers.cpp | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index 6f84f0e30..4a4dfeecc 100644 --- a/VERSION +++ b/VERSION @@ -7,7 +7,7 @@ FWB_MICRO_VERSION=1 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3538" +BUILD_NUM="3539" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index 64be3d007..d2b7880f8 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.1.3538" +#define VERSION "4.2.1.3539" #define GENERATION "4.2" diff --git a/doc/ChangeLog b/doc/ChangeLog index 9d020a88b..b6a33e797 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2011-05-06 vadim + + * PolicyCompiler_pf_writers.cpp (_printQueue): see #2390 Classify + does not generate "queue" string for rules created in V4.2.1.3538 + This completes the fix for the bug #2385. + 2011-05-05 Vadim Kurland * FWObjectDatabase_19.xslt: see #2385 "PF action Classify uses diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index 25629bdf8..2bc784aa4 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.3538 +%define version 4.2.1.3539 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index 9b1b661e4..b6a387371 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.3538-1 +Version: 4.2.1.3539-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 a2b199fef..5d93ef08e 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.1.3538 +%define version 4.2.1.3539 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/pflib/PolicyCompiler_pf_writers.cpp b/src/pflib/PolicyCompiler_pf_writers.cpp index 8dab38435..d0029ee48 100644 --- a/src/pflib/PolicyCompiler_pf_writers.cpp +++ b/src/pflib/PolicyCompiler_pf_writers.cpp @@ -337,7 +337,7 @@ void PolicyCompiler_pf::PrintRule::_printQueue(PolicyRule *rule) FWOptions *ruleopt =rule->getOptionsObject(); if (rule->getAction() == PolicyRule::Classify) - compiler->output << "queue " << ruleopt->getStr("classify_str") << " "; + compiler->output << "queue " << ruleopt->getStr("pf_classify_str") << " "; } void PolicyCompiler_pf::PrintRule::_printUser(PolicyRule *rule)