From 6dcf4026c6d72934534d754d7fa67df8fa397201 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Tue, 17 May 2011 10:56:16 -0700 Subject: [PATCH 1/7] see #2408 catching exceptions in FWBApplication::notify() --- src/libgui/FWBApplication.cpp | 27 +++++++++++++++++++++++++++ src/libgui/FWBApplication.h | 5 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/libgui/FWBApplication.cpp b/src/libgui/FWBApplication.cpp index 2e14e5d0d..d378c4378 100644 --- a/src/libgui/FWBApplication.cpp +++ b/src/libgui/FWBApplication.cpp @@ -30,9 +30,14 @@ #include "FWBApplication.h" #include "FWWindow.h" +#include "fwbuilder/FWException.h" + #include #include +using namespace libfwbuilder; +using namespace std; + void FWBApplication::quit() { @@ -63,3 +68,25 @@ void FWBApplication::delayedQuit() QApplication::quit(); } +bool FWBApplication::notify(QObject *receiver, QEvent *event) +{ + try + { + return QApplication::notify(receiver, event); + } catch (const libfwbuilder::FWException &ex) + { + cerr << "Caught FWException: " << ex.toString() << std::endl; + QCoreApplication::exit(1); + } catch (const std::string &s) { + cerr << s << std::endl; + QCoreApplication::exit(1); + } catch (const std::exception &ex) { + cerr << ex.what() << std::endl; + QCoreApplication::exit(1); + } + catch (...) { + cerr << "Caught unsupported exception" << std::endl; + QCoreApplication::exit(1); + } + return false; +} diff --git a/src/libgui/FWBApplication.h b/src/libgui/FWBApplication.h index c16fd25d2..57c1e5e08 100644 --- a/src/libgui/FWBApplication.h +++ b/src/libgui/FWBApplication.h @@ -29,7 +29,8 @@ #include -class FWBApplication : public QApplication { +class FWBApplication : public QApplication +{ Q_OBJECT; int timeout; @@ -37,6 +38,8 @@ class FWBApplication : public QApplication { public: FWBApplication(int &argc, char **argv) : QApplication(argc, argv) {} + virtual bool notify(QObject *receiver, QEvent *event); + public slots: void quit(); From ea7f28e1efd257cd05c617a91d53500d352a2e5b Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Tue, 17 May 2011 11:56:21 -0700 Subject: [PATCH 2/7] * FWObjectDatabase_tree_ops.cpp (merge): see #2420 "Crash when selecting New Firewall and existing firewall has interface that is locked". Fixed GUI crash that happened on some operations if an object in the tree was locked. For example, if the user locked an interface of one of the firewall objects that then proceeded to create new firewall object, the GUI would crash. The problem was not limited to locking specifically interface objects. --- doc/ChangeLog | 10 +++++++++ src/libfwbuilder/src/fwbuilder/FWObject.cpp | 4 ++-- .../src/fwbuilder/FWObjectDatabase.cpp | 2 ++ .../src/fwbuilder/FWObjectDatabase.h | 21 ++++++++++++++++--- .../fwbuilder/FWObjectDatabase_tree_ops.cpp | 10 +++++++++ 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index e2b061833..eb2a9a7d8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,13 @@ +2011-05-17 vadim + + * FWObjectDatabase_tree_ops.cpp (merge): see #2420 "Crash when + selecting New Firewall and existing firewall has interface that is + locked". Fixed GUI crash that happened on some operations if an + object in the tree was locked. For example, if the user locked an + interface of one of the firewall objects that then proceeded to + create new firewall object, the GUI would crash. The problem was + not limited to locking specifically interface objects. + 2011-05-15 vadim * IPTImporter.cpp (pushPolicyRule): see #2411 Implemented import diff --git a/src/libfwbuilder/src/fwbuilder/FWObject.cpp b/src/libfwbuilder/src/fwbuilder/FWObject.cpp index 6f1081482..d7487ca8e 100644 --- a/src/libfwbuilder/src/fwbuilder/FWObject.cpp +++ b/src/libfwbuilder/src/fwbuilder/FWObject.cpp @@ -1346,8 +1346,8 @@ bool FWObject::isReadOnly() void FWObject::checkReadOnly() throw(FWException) { - if (isReadOnly()) throw FWException( - string("Attempt to modify read-only object ")+getName()); + if (isReadOnly() && ! getRoot()->getIgnoreReadOnlyFlag()) + throw FWException(string("Attempt to modify read-only object ")+getName()); } FWObjectTypedChildIterator::FWObjectTypedChildIterator( diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp index 94ce9a865..048d8c107 100644 --- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp +++ b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp @@ -123,6 +123,7 @@ FWObjectDatabase::FWObjectDatabase() : FWObject(false), data_file(), obj_index() index_hits = index_misses = 0; init_id_dict(); predictable_id_tracker = 0; + ignore_read_only = false; searchId =0; lastModified = 0; @@ -142,6 +143,7 @@ FWObjectDatabase::FWObjectDatabase(FWObjectDatabase& d) : index_hits = index_misses = 0; init_id_dict(); predictable_id_tracker = 0; + ignore_read_only = false; data_file = d.data_file; diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.h b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.h index ed630aa3e..c497e725d 100644 --- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.h +++ b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.h @@ -251,7 +251,8 @@ protected: std::map obj_index; int searchId; int predictable_id_tracker; - + bool ignore_read_only; + void init_create_methods_table(); void init_id_dict(); @@ -332,6 +333,13 @@ public: */ void getIndexStats(int &index_size, int &hit_counter, int &miss_counter); + /** + * Some operations, such as object tree merging, should ignore + * read-only flag on individual objects. + */ + bool getIgnoreReadOnlyFlag() { return ignore_read_only; } + void setIgnoreReadOnlyFlag(bool f) { ignore_read_only = f; } + // --- XML import/export --- virtual void fromXML(xmlNodePtr xml_parent_node) throw(FWException); @@ -380,7 +388,15 @@ public: void findObjectsInGroup( libfwbuilder::Group *g, std::set &resset); - + + /** + * We ignore read-only flag on individual objects when whole object + * tree is duplicated + */ + virtual FWObject& duplicate(const FWObject *obj, + bool preserve_id = true) throw(FWException); + + void recursivelyRemoveObjFromTree(FWObject* obj, bool remove_ref=false); /** @@ -400,7 +416,6 @@ public: * This means returned object can be a parent for the copy of . */ FWObject* reproduceRelativePath(FWObject *lib, const FWObject *source); - /** * fix references in children of obj according to the map_ids which diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp index 3eaa7ff17..04b3a23db 100644 --- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp +++ b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp @@ -479,10 +479,12 @@ void FWObjectDatabase::merge( FWObjectDatabase *ndb, ConflictResolutionPredicate *crp) { busy = true; + setIgnoreReadOnlyFlag(true); FWObjectTreeScanner scanner(this, crp); scanner.merge(NULL, ndb); + setIgnoreReadOnlyFlag(false); busy = false; } @@ -701,3 +703,11 @@ FWObject* FWObjectDatabase::reproduceRelativePath(FWObject *lib, return target; } +FWObject& FWObjectDatabase::duplicate(const FWObject *obj, + bool preserve_id) throw(FWException) +{ + setIgnoreReadOnlyFlag(true); + FWObject::duplicate(obj, preserve_id); + setIgnoreReadOnlyFlag(false); +} + From c91740d36660941e173f62d9560fb9db84b02a56 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Tue, 17 May 2011 12:00:43 -0700 Subject: [PATCH 3/7] build 3543 --- 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(-) diff --git a/VERSION b/VERSION index b204c4347..0c6520b7f 100644 --- a/VERSION +++ b/VERSION @@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3542" +BUILD_NUM="3543" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index 3edc6811d..8b1d4c3ec 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.3.0.3542" +#define VERSION "4.3.0.3543" #define GENERATION "4.3" diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index fbbafcb37..fbc193edc 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 4.3.0.3542 +%define version 4.3.0.3543 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index 62c39b591..602d867b8 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.3.0.3542-1 +Version: 4.3.0.3543-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 bef15468f..b2fb05b6c 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.3.0.3542 +%define version 4.3.0.3543 %define release 1 %if "%_vendor" == "MandrakeSoft" From 24314576f44aa9f22b0c860f226928218a367669 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Tue, 17 May 2011 12:45:48 -0700 Subject: [PATCH 4/7] see #2420 fixed the function (forgot to return value) --- src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp index 04b3a23db..1b2b481e7 100644 --- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp +++ b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp @@ -707,7 +707,8 @@ FWObject& FWObjectDatabase::duplicate(const FWObject *obj, bool preserve_id) throw(FWException) { setIgnoreReadOnlyFlag(true); - FWObject::duplicate(obj, preserve_id); + FWObject &o = FWObject::duplicate(obj, preserve_id); setIgnoreReadOnlyFlag(false); + return o; } From ad73a04eae83231842a1d5d02dba2ef1fccccd8f Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Tue, 17 May 2011 13:56:25 -0700 Subject: [PATCH 5/7] fixes #2421 windows build failure --- src/libgui/FirewallInstaller.cpp | 9 ++++----- src/libgui/libgui.pro | 1 + src/libgui/transferDialog.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libgui/FirewallInstaller.cpp b/src/libgui/FirewallInstaller.cpp index 6502d1c42..be1fbbefd 100644 --- a/src/libgui/FirewallInstaller.cpp +++ b/src/libgui/FirewallInstaller.cpp @@ -28,15 +28,15 @@ #include "utils.h" #include "utils_no_qt.h" -#include "compiler_lib/CompilerDriver.h" -#include "FirewallInstaller.h" -#include "instDialog.h" +#include "CompilerDriver.h" +#include "Configlet.h" #include "FWBSettings.h" #include "FWWindow.h" +#include "FirewallInstaller.h" #include "SSHSession.h" #include "SSHUnx.h" -#include "Configlet.h" #include "UserWorkflow.h" +#include "instDialog.h" #include "fwbuilder/Resources.h" #include "fwbuilder/FWObjectDatabase.h" @@ -193,7 +193,6 @@ not root. */ -#include "CompilerDriver.h" bool FirewallInstaller::readManifest(const QString &script, QMap *all_files) diff --git a/src/libgui/libgui.pro b/src/libgui/libgui.pro index 6495c9a5c..cd9b32063 100644 --- a/src/libgui/libgui.pro +++ b/src/libgui/libgui.pro @@ -581,6 +581,7 @@ INCLUDEPATH += \ ../pflib \ ../cisco_lib \ ../compiler_lib \ + ../fwtransfer \ ../libfwbuilder/src DEPENDPATH += \ ../import \ diff --git a/src/libgui/transferDialog.cpp b/src/libgui/transferDialog.cpp index fff73f3dd..97a37a6a2 100644 --- a/src/libgui/transferDialog.cpp +++ b/src/libgui/transferDialog.cpp @@ -27,7 +27,7 @@ #include "fwbuilder/Resources.h" #include "fwbuilder/Cluster.h" -#include "fwtransfer/TransferDevice.h" +#include "TransferDevice.h" #include "FWWindow.h" #include "FWBSettings.h" From af8031a87aa88a5c878f34a1fe21ee10238fe633 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Thu, 19 May 2011 19:22:58 -0700 Subject: [PATCH 6/7] building with mingw on windows --- src/cisco_lib/cisco_lib.pro | 2 +- src/fwbedit/fwbedit.pro | 28 +++----- src/gui/gui.pro | 67 +++++-------------- src/gui/main.cpp | 2 + src/import/import.pro | 3 +- src/iosacl/iosacl.pro | 30 ++------- src/ipf/ipf.pro | 29 ++------ src/ipfw/ipfw.pro | 30 ++------- src/ipt/ipt.cpp | 9 +++ src/ipt/ipt.pro | 29 ++------ src/iptlib/iptlib.pro | 6 +- .../src/fwbuilder/FWObjectDatabase.cpp | 2 + .../fwbuilder/FWObjectDatabase_tree_ops.cpp | 3 - src/libfwbuilder/src/fwbuilder/RuleElement.h | 5 -- .../src/fwbuilder/TCPUDPService.cpp | 3 - src/libfwbuilder/src/fwbuilder/dns.cpp | 3 +- src/libfwbuilder/src/fwbuilder/uint128.h | 7 +- src/pf/pf.pro | 29 ++------ src/pflib/pflib.pro | 2 +- src/pix/pix.pro | 29 ++------ src/procurve_acl/procurve_acl.pro | 30 ++------- src/src.pro | 10 +-- src/transfer_agents/secuwall/secuwall.pro | 6 +- 23 files changed, 99 insertions(+), 265 deletions(-) diff --git a/src/cisco_lib/cisco_lib.pro b/src/cisco_lib/cisco_lib.pro index e7be7b572..3baf6c257 100644 --- a/src/cisco_lib/cisco_lib.pro +++ b/src/cisco_lib/cisco_lib.pro @@ -101,7 +101,7 @@ macx:LIBS += $$LIBS_FWCOMPILER INCLUDEPATH += ../compiler_lib ../libfwbuilder/src DEPENDPATH += ../compiler_lib ../libfwbuilder/src -win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib +win32:PRE_TARGETDEPS = ../compiler_lib/release/libcompilerdriver.a !win32:PRE_TARGETDEPS = ../compiler_lib/libcompilerdriver.a CONFIG += staticlib diff --git a/src/fwbedit/fwbedit.pro b/src/fwbedit/fwbedit.pro index 048c87c97..8027ccf65 100644 --- a/src/fwbedit/fwbedit.pro +++ b/src/fwbedit/fwbedit.pro @@ -22,28 +22,16 @@ TARGET = fwbedit QMAKE_COPY = ../../install.sh -m 0755 -s } -!win32:LIBS = ../common/libcommon.a \ - ../import/libimport.a \ - ../parsers/libfwbparser.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a \ - ../libgui/libgui.a \ - $$ANTLR_LIBS \ - $$LIBS +PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \ + ../import/$$BINARY_SUBDIR/libimport.a \ + ../parsers/$$BINARY_SUBDIR/libfwbparser.a \ + ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \ + ../libgui/$$BINARY_SUBDIR/libgui.a \ + ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \ + ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \ -!win32:PRE_TARGETDEPS = ../common/libcommon.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a +LIBS += $$PRE_TARGETDEPS $$ANTLR_LIBS $$LIBS win32:CONFIG += console -win32:LIBS += ../common/release/common.lib \ - ../import/release/import.lib \ - ../parsers/release/fwbparser.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libgui/release/gui.lib \ - $$ANTLR_LIBS \ - $$LIBS -win32:PRE_TARGETDEPS = ../common/release/common.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 976d7f62c..66f59e005 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -11,24 +11,17 @@ SOURCES += main.cpp # Arrange static libraries before dynamic ones in the linker command # line. libgui goes first -win32 { - IMPORT_LIB = ../import/release/import.lib - FWBPARSER_LIB = ../parsers/release/fwbparser.lib - FWTRANSFER_LIB = ../fwtransfer/release/fwtransfer.lib - STATIC_LIBS += ../libgui/release/gui.lib -} -!win32 { - IMPORT_LIB = ../import/libimport.a - FWBPARSER_LIB = ../parsers/libfwbparser.a - FWTRANSFER_LIB = ../fwtransfer/libfwtransfer.a - STATIC_LIBS += ../libgui/libgui.a -} +IMPORT_LIB = ../import/$$BINARY_SUBDIR/libimport.a +FWBPARSER_LIB = ../parsers/$$BINARY_SUBDIR/libfwbparser.a +FWTRANSFER_LIB = ../fwtransfer/$$BINARY_SUBDIR/libfwtransfer.a INCLUDEPATH += $$ANTLR_INCLUDEPATH -STATIC_LIBS += $$IMPORT_LIB $$FWBPARSER_LIB $$ANTLR_LIBS DEFINES += $$ANTLR_DEFINES +STATIC_LIBS += ../libgui/$$BINARY_SUBDIR/libgui.a \ + $$IMPORT_LIB $$FWBPARSER_LIB $$ANTLR_LIBS + # fwtransfer lib. Add this before adding -lQtDBus to LIBS below STATIC_LIBS += $$FWTRANSFER_LIB contains( HAVE_QTDBUS, 1 ):unix { @@ -53,47 +46,17 @@ DEPENDPATH += \ ../compiler_lib \ ../libfwbuilder/src -win32:STATIC_LIBS += \ - ../common/release/common.lib \ - ../iptlib/release/iptlib.lib \ - ../pflib/release/fwbpf.lib \ - ../cisco_lib/release/fwbcisco.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib +OTHER_LIBS = ../common/$$BINARY_SUBDIR/libcommon.a \ + ../iptlib/$$BINARY_SUBDIR/libiptlib.a \ + ../pflib/$$BINARY_SUBDIR/libfwbpf.a \ + ../cisco_lib/$$BINARY_SUBDIR/libfwbcisco.a \ + ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \ + ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \ + ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a -!win32:STATIC_LIBS += \ - ../common/libcommon.a \ - ../iptlib/libiptlib.a \ - ../pflib/libfwbpf.a \ - ../cisco_lib/libfwbcisco.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a \ +PRE_TARGETDEPS = $$OTHER_LIBS $$IMPORT_LIB $$FWBPARSER_LIB $$ANTLR_LIBS -win32:PRE_TARGETDEPS = \ - ../libgui/release/gui.lib \ - ../common/release/common.lib \ - ../iptlib/release/iptlib.lib \ - ../pflib/release/fwbpf.lib \ - ../cisco_lib/release/fwbcisco.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib \ - $$FWBPARSER_LIB \ - $$IMPORT_LIB - -!win32:PRE_TARGETDEPS = \ - ../libgui/libgui.a \ - ../common/libcommon.a \ - ../iptlib/libiptlib.a \ - ../pflib/libfwbpf.a \ - ../cisco_lib/libfwbcisco.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - $$FWBPARSER_LIB \ - $$IMPORT_LIB +STATIC_LIBS += $$OTHER_LIBS macx:STATIC_LIBS += -framework \ Carbon diff --git a/src/gui/main.cpp b/src/gui/main.cpp index eebab305a..d94d9a4e0 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -109,6 +109,8 @@ void usage() int main( int argc, char *argv[] ) { + cout << "Firewall Builder GUI " VERSION << endl << flush; + filename = ""; print_output_file_name = ""; fwbdebug = 0; diff --git a/src/import/import.pro b/src/import/import.pro index 54dc3aace..cbe638b8a 100644 --- a/src/import/import.pro +++ b/src/import/import.pro @@ -35,7 +35,8 @@ HEADERS = QStringListOperators.h \ CONFIG += staticlib -INCLUDEPATH += $$ANTLR_INCLUDEPATH ../libfwbuilder/src ../compiler_lib +# need to add "." for g++ on mingw +INCLUDEPATH += $$ANTLR_INCLUDEPATH ../libfwbuilder/src ../compiler_lib . DEPENDPATH += $$ANTLR_INCLUDEPATH ../libfwbuilder/src ../compiler_lib LIBS += $$ANTLR_LIBS diff --git a/src/iosacl/iosacl.pro b/src/iosacl/iosacl.pro index f96e86bd9..21f3527ab 100644 --- a/src/iosacl/iosacl.pro +++ b/src/iosacl/iosacl.pro @@ -21,31 +21,13 @@ win32:CONFIG += console INCLUDEPATH += ../cisco_lib ../compiler_lib ../libfwbuilder/src DEPENDPATH += ../cisco_lib ../compiler_lib ../libfwbuilder/src -win32:LIBS += ../common/release/common.lib \ - ../cisco_lib/release/fwbcisco.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib - -!win32:LIBS = ../common/libcommon.a \ - ../cisco_lib/libfwbcisco.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a \ - $$LIBS - -win32:PRE_TARGETDEPS = ../common/release/common.lib \ - ../cisco_lib/release/fwbcisco.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib - -!win32:PRE_TARGETDEPS = ../common/libcommon.a \ - ../cisco_lib/libfwbcisco.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a +PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \ + ../cisco_lib/$$BINARY_SUBDIR/libfwbcisco.a \ + ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \ + ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \ + ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \ +LIBS += $$PRE_TARGETDEPS $$LIBS TARGET = fwb_iosacl diff --git a/src/ipf/ipf.pro b/src/ipf/ipf.pro index 968f3452f..e3b58e681 100644 --- a/src/ipf/ipf.pro +++ b/src/ipf/ipf.pro @@ -17,29 +17,12 @@ win32:CONFIG += console INCLUDEPATH += ../pflib ../compiler_lib ../libfwbuilder/src DEPENDPATH += ../pflib ../compiler_lib ../libfwbuilder/src -win32:LIBS += ../common/release/common.lib \ - ../pflib/release/fwbpf.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib +PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \ + ../pflib/$$BINARY_SUBDIR/libfwbpf.a \ + ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \ + ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \ + ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \ -!win32:LIBS = ../common/libcommon.a \ - ../pflib/libfwbpf.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a \ - $$LIBS - -win32:PRE_TARGETDEPS = ../common/release/common.lib \ - ../pflib/release/fwbpf.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib - -!win32:PRE_TARGETDEPS = ../common/libcommon.a \ - ../pflib/libfwbpf.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a +LIBS += $$PRE_TARGETDEPS $$LIBS TARGET = fwb_ipf diff --git a/src/ipfw/ipfw.pro b/src/ipfw/ipfw.pro index 3874a1af2..62df5521b 100644 --- a/src/ipfw/ipfw.pro +++ b/src/ipfw/ipfw.pro @@ -15,30 +15,12 @@ win32:CONFIG += console INCLUDEPATH += ../pflib ../compiler_lib ../libfwbuilder/src DEPENDPATH += ../pflib ../compiler_lib ../libfwbuilder/src -win32:LIBS += ../common/release/common.lib \ - ../pflib/release/fwbpf.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib - -!win32:LIBS = ../common/libcommon.a \ - ../pflib/libfwbpf.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a \ - $$LIBS - -win32:PRE_TARGETDEPS = ../common/release/common.lib \ - ../pflib/release/fwbpf.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib - -!win32:PRE_TARGETDEPS = ../common/libcommon.a \ - ../pflib/libfwbpf.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a +PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \ + ../pflib/$$BINARY_SUBDIR/libfwbpf.a \ + ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \ + ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \ + ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \ +LIBS += $$PRE_TARGETDEPS $$LIBS TARGET = fwb_ipfw diff --git a/src/ipt/ipt.cpp b/src/ipt/ipt.cpp index e4ce3f506..4deb0c1d3 100644 --- a/src/ipt/ipt.cpp +++ b/src/ipt/ipt.cpp @@ -43,6 +43,8 @@ #include #include #include +#include + #include "../common/init.cpp" @@ -76,6 +78,9 @@ int main(int argc, char **argv) { QApplication app(argc, argv, false); + QTime total_time_timer; + total_time_timer.start(); + // compilers always write file names into manifest in Utf8 QTextCodec::setCodecForCStrings(QTextCodec::codecForName("Utf8")); QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8")); @@ -153,6 +158,10 @@ int main(int argc, char **argv) driver->compile(); int ret = (driver->getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1; + QTime time_spent = QTime().addMSecs(total_time_timer.elapsed()); + cerr << "Compile time: " + << time_spent.toString("hh:mm:ss").toStdString() << endl; + delete driver; delete objdb; diff --git a/src/ipt/ipt.pro b/src/ipt/ipt.pro index d5bbfbaa5..e6a4e671f 100644 --- a/src/ipt/ipt.pro +++ b/src/ipt/ipt.pro @@ -15,30 +15,13 @@ win32: CONFIG += console INCLUDEPATH += ../iptlib ../compiler_lib ../libfwbuilder/src DEPENDPATH += ../iptlib ../compiler_lib ../libfwbuilder/src -win32:LIBS += ../common/release/common.lib \ - ../iptlib/release/iptlib.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib +PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \ + ../iptlib/$$BINARY_SUBDIR/libiptlib.a \ + ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \ + ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \ + ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \ -!win32:LIBS = ../common/libcommon.a \ - ../iptlib/libiptlib.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a \ - $$LIBS - -win32:PRE_TARGETDEPS = ../common/release/common.lib \ - ../iptlib/release/iptlib.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib - -!win32:PRE_TARGETDEPS = ../common/libcommon.a \ - ../iptlib/libiptlib.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a +LIBS += $$PRE_TARGETDEPS $$LIBS TARGET = fwb_ipt diff --git a/src/iptlib/iptlib.pro b/src/iptlib/iptlib.pro index 255e65195..65dcca877 100644 --- a/src/iptlib/iptlib.pro +++ b/src/iptlib/iptlib.pro @@ -53,9 +53,9 @@ CONFIG += staticlib INCLUDEPATH += ../compiler_lib ../libfwbuilder/src DEPENDPATH += ../compiler_lib ../libfwbuilder/src -win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib +win32:PRE_TARGETDEPS = ../compiler_lib/release/libcompilerdriver.a \ + ../libfwbuilder/src/fwcompiler/release/libfwcompiler.a \ + ../libfwbuilder/src/fwbuilder/release/libfwbuilder.a !win32:PRE_TARGETDEPS = ../compiler_lib/libcompilerdriver.a \ ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp index 048d8c107..43d44ff47 100644 --- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp +++ b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp @@ -100,7 +100,9 @@ using namespace libfwbuilder; int id_seed = 1000; #ifdef _WIN32 static int cached_pid = _getpid(); +# ifndef __GNUC__ #define snprintf sprintf_s +# endif #else static int cached_pid = getpid(); #endif diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp index 1b2b481e7..94011bcb1 100644 --- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp +++ b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp @@ -48,9 +48,6 @@ using namespace std; using namespace libfwbuilder; -#ifdef _WIN32 -#define snprintf sprintf_s -#endif class FWObjectTreeScanner { diff --git a/src/libfwbuilder/src/fwbuilder/RuleElement.h b/src/libfwbuilder/src/fwbuilder/RuleElement.h index 51b47cf8d..2490cd80b 100644 --- a/src/libfwbuilder/src/fwbuilder/RuleElement.h +++ b/src/libfwbuilder/src/fwbuilder/RuleElement.h @@ -36,11 +36,6 @@ #include #include -#ifdef _WIN32 -// disable "warning C4250: 'libfwbuilder::RuleElementTDst' : inherits 'libfwbuilder::RuleElement::addRef' via dominance" -# pragma warning(disable:4250) -#endif - namespace libfwbuilder { diff --git a/src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp b/src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp index 7d88673ec..6c7a36395 100644 --- a/src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp +++ b/src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp @@ -33,9 +33,6 @@ using namespace libfwbuilder; using namespace std; -#ifdef _WIN32 -#define snprintf sprintf_s -#endif const char *TCPUDPService::TYPENAME={"TCPUDPService"}; diff --git a/src/libfwbuilder/src/fwbuilder/dns.cpp b/src/libfwbuilder/src/fwbuilder/dns.cpp index 4ee63f620..52a9e42e3 100644 --- a/src/libfwbuilder/src/fwbuilder/dns.cpp +++ b/src/libfwbuilder/src/fwbuilder/dns.cpp @@ -40,8 +40,7 @@ # include # include #else -# include -# pragma warning(disable:4101) +# include #endif #include diff --git a/src/libfwbuilder/src/fwbuilder/uint128.h b/src/libfwbuilder/src/fwbuilder/uint128.h index 4669924a8..0a2e7a4c3 100644 --- a/src/libfwbuilder/src/fwbuilder/uint128.h +++ b/src/libfwbuilder/src/fwbuilder/uint128.h @@ -36,6 +36,9 @@ #include +#define __STDC_FORMAT_MACROS +#include // for sprintf formats for "long long" + // convinience macro #define U128_C(s) uint128(#s) @@ -463,9 +466,9 @@ public: { char buf[33]; if (hi) - sprintf(buf,"%llX%08llX",(unsigned long long)hi,(unsigned long long)lo); + sprintf(buf, "%"PRIX64"%08"PRIX64, (unsigned long long)hi,(unsigned long long)lo); else - sprintf(buf,"%llX",(unsigned long long)lo); + sprintf(buf,"%"PRIX64,(unsigned long long)lo); return buf; } diff --git a/src/pf/pf.pro b/src/pf/pf.pro index a790b0185..31a8ba695 100644 --- a/src/pf/pf.pro +++ b/src/pf/pf.pro @@ -15,30 +15,13 @@ win32:CONFIG += console INCLUDEPATH += ../pflib ../compiler_lib ../libfwbuilder/src DEPENDPATH += ../pflib ../compiler_lib ../libfwbuilder/src -win32:LIBS += ../common/release/common.lib \ - ../pflib/release/fwbpf.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib +PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \ + ../pflib/$$BINARY_SUBDIR/libfwbpf.a \ + ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \ + ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \ + ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \ -!win32:LIBS = ../common/libcommon.a \ - ../pflib/libfwbpf.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a \ - $$LIBS - -win32:PRE_TARGETDEPS = ../common/release/common.lib \ - ../pflib/release/fwbpf.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib - -!win32:PRE_TARGETDEPS = ../common/libcommon.a \ - ../pflib/libfwbpf.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a +LIBS += $$PRE_TARGETDEPS $$LIBS TARGET = fwb_pf diff --git a/src/pflib/pflib.pro b/src/pflib/pflib.pro index db74c300d..969ad4a47 100644 --- a/src/pflib/pflib.pro +++ b/src/pflib/pflib.pro @@ -66,7 +66,7 @@ macx:LIBS += $$LIBS_FWCOMPILER INCLUDEPATH += ../compiler_lib ../libfwbuilder/src DEPENDPATH += ../compiler_lib ../libfwbuilder/src -win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib +win32:PRE_TARGETDEPS = ../compiler_lib/release/libcompilerdriver.a !win32:PRE_TARGETDEPS = ../compiler_lib/libcompilerdriver.a diff --git a/src/pix/pix.pro b/src/pix/pix.pro index 2f6e44dc3..441b4a54e 100644 --- a/src/pix/pix.pro +++ b/src/pix/pix.pro @@ -15,30 +15,13 @@ win32:CONFIG += console INCLUDEPATH += ../cisco_lib ../compiler_lib ../libfwbuilder/src DEPENDPATH += ../cisco_lib ../compiler_lib ../libfwbuilder/src -win32:LIBS += ../common/release/common.lib \ - ../cisco_lib/release/fwbcisco.lib\ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib +PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \ + ../cisco_lib/$$BINARY_SUBDIR/libfwbcisco.a \ + ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \ + ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \ + ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \ -!win32:LIBS = ../common/libcommon.a \ - ../cisco_lib/libfwbcisco.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a \ - $$LIBS - -win32:PRE_TARGETDEPS = ../common/release/common.lib \ - ../cisco_lib/release/fwbcisco.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib - -!win32:PRE_TARGETDEPS = ../common/libcommon.a \ - ../cisco_lib/libfwbcisco.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a +LIBS += $$PRE_TARGETDEPS $$LIBS TARGET = fwb_pix diff --git a/src/procurve_acl/procurve_acl.pro b/src/procurve_acl/procurve_acl.pro index feaaf6bd7..88d109d52 100644 --- a/src/procurve_acl/procurve_acl.pro +++ b/src/procurve_acl/procurve_acl.pro @@ -21,31 +21,13 @@ win32:CONFIG += console INCLUDEPATH += ../cisco_lib ../compiler_lib ../libfwbuilder/src DEPENDPATH += ../cisco_lib ../compiler_lib ../libfwbuilder/src -win32:LIBS += ../common/release/common.lib \ - ../cisco_lib/release/fwbcisco.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib - -!win32:LIBS = ../common/libcommon.a \ - ../cisco_lib/libfwbcisco.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a \ - $$LIBS - -win32:PRE_TARGETDEPS = ../common/release/common.lib \ - ../cisco_lib/release/fwbcisco.lib \ - ../compiler_lib/release/compilerdriver.lib \ - ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \ - ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib - -!win32:PRE_TARGETDEPS = ../common/libcommon.a \ - ../cisco_lib/libfwbcisco.a \ - ../compiler_lib/libcompilerdriver.a \ - ../libfwbuilder/src/fwcompiler/libfwcompiler.a \ - ../libfwbuilder/src/fwbuilder/libfwbuilder.a +PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \ + ../cisco_lib/$$BINARY_SUBDIR/libfwbcisco.a \ + ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \ + ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \ + ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \ +LIBS += $$PRE_TARGETDEPS $$LIBS TARGET = fwb_procurve_acl diff --git a/src/src.pro b/src/src.pro index 55220d867..94e934ed3 100644 --- a/src/src.pro +++ b/src/src.pro @@ -18,17 +18,17 @@ SUBDIRS = libfwbuilder \ compiler_lib \ fwtransfer \ iptlib \ - pflib \ - cisco_lib \ - libgui \ - gui \ ipt \ + pflib \ pf \ ipf \ ipfw \ + cisco_lib \ iosacl \ pix \ procurve_acl \ transfer_agents \ - fwbedit + libgui \ + fwbedit \ + gui \ diff --git a/src/transfer_agents/secuwall/secuwall.pro b/src/transfer_agents/secuwall/secuwall.pro index 12a5cc411..765764cbd 100644 --- a/src/transfer_agents/secuwall/secuwall.pro +++ b/src/transfer_agents/secuwall/secuwall.pro @@ -26,9 +26,9 @@ contains( HAVE_QTDBUS, 1 ):unix { win32 { CONFIG += console - LIBS += ../../fwtransfer/release/fwtransfer.lib \ # -lQtDBus - ../../libfwbuilder/src/fwcompiler/release/fwcompiler.lib \ - ../../libfwbuilder/src/fwbuilder/release/fwbuilder.lib + LIBS += ../../fwtransfer/release/libfwtransfer.a \ # -lQtDBus + ../../libfwbuilder/src/fwcompiler/release/libfwcompiler.a \ + ../../libfwbuilder/src/fwbuilder/release/libfwbuilder.a } TARGET = transfer_secuwall From bf41a75454524f2eebd17696b06c268dbb61c189 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Fri, 20 May 2011 10:33:22 -0700 Subject: [PATCH 7/7] build 3544 --- 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(-) diff --git a/VERSION b/VERSION index 0c6520b7f..88a58f763 100644 --- a/VERSION +++ b/VERSION @@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3543" +BUILD_NUM="3544" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index 8b1d4c3ec..8965f5512 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.3.0.3543" +#define VERSION "4.3.0.3544" #define GENERATION "4.3" diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index fbc193edc..b7b3f2899 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 4.3.0.3543 +%define version 4.3.0.3544 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index 602d867b8..70231ebcb 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.3.0.3543-1 +Version: 4.3.0.3544-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 b2fb05b6c..3bc20f0d6 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.3.0.3543 +%define version 4.3.0.3544 %define release 1 %if "%_vendor" == "MandrakeSoft"