[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, develo
Brought to you by:
mikehorn
Menu
▾
▴
[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v4.1.3-1092-gee35e66
|
From: <gi...@ir...> - 2011-03-23 23:42:42
|
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 ee35e668184e11ceca3ddfe27e48129b2d0414f7 (commit)
from 1612ad88cd70eb284c58fb8456863b3b910eff85 (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 ee35e668184e11ceca3ddfe27e48129b2d0414f7
Author: Vadim Kurland <va...@ne...>
Date: Wed Mar 23 16:33:54 2011 -0700
fixed SF bug 3238026: build
failure on systems without net-snmp development libraries.
diff --git a/VERSION b/VERSION
index 721254f..0dc6c60 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="3506"
+BUILD_NUM="3507"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
diff --git a/VERSION.h b/VERSION.h
index a16c6aa..8b0f799 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION "4.2.0.3506"
+#define VERSION "4.2.0.3507"
#define GENERATION "4.2"
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 093fa9b..6c0c4d2 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-23 Vadim Kurland <va...@ne...>
+
+ * FWWindow.cpp (prepareToolsMenu): fixed SF bug 3238026: build
+ failure on systems without net-snmp development libraries.
+
2011-03-22 vadim <va...@ne...>
* parsers/pix.g (acl_xoperator_src): first attempt at PIX/ASA
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index 6f2bb86..e54cc13 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
%define name fwbuilder
-%define version 4.2.0.3506
+%define version 4.2.0.3507
%define release 1
%if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index 53a6b58..9fdef4e 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: 4.2.0.3506-1
+Version: 4.2.0.3507-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 263dd45..0226351 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
%define name fwbuilder
-%define version 4.2.0.3506
+%define version 4.2.0.3507
%define release 1
%if "%_vendor" == "MandrakeSoft"
diff --git a/src/libgui/FWWindow.cpp b/src/libgui/FWWindow.cpp
index 6aed279..9e1ba44 100644
--- a/src/libgui/FWWindow.cpp
+++ b/src/libgui/FWWindow.cpp
@@ -1024,6 +1024,9 @@ void FWWindow::prepareFileMenu()
void FWWindow::prepareToolsMenu()
{
+#ifndef HAVE_LIBSNMP
+ m_mainWindow->SNMPDiscoveryAction->setEnabled(false);
+#endif
}
void FWWindow::prepareWindowsMenu()
diff --git a/src/libgui/snmpNetworkDiscoveryWizard/ND_ProgressPage.cpp b/src/libgui/snmpNetworkDiscoveryWizard/ND_ProgressPage.cpp
index 103303c..a6b27dd 100644
--- a/src/libgui/snmpNetworkDiscoveryWizard/ND_ProgressPage.cpp
+++ b/src/libgui/snmpNetworkDiscoveryWizard/ND_ProgressPage.cpp
@@ -56,7 +56,9 @@ ND_ProgressPage::ND_ProgressPage(QWidget *parent) : QWizardPage(parent)
m_dialog = new Ui::ND_ProgressPage_q;
m_dialog->setupUi(this);
+#ifdef HAVE_LIBSNMP
crawler = NULL;
+#endif
QTextCursor cursor(m_dialog->discoveryLog->textCursor());
normal_format = cursor.charFormat();
@@ -83,6 +85,8 @@ ND_ProgressPage::~ND_ProgressPage()
disconnect(this, SLOT(logLine(QString)));
disconnect(this, SLOT(crawlerFinished()));
+#ifdef HAVE_LIBSNMP
+
if (crawler != NULL && crawler->isRunning())
{
if (fwbdebug_nd)
@@ -95,8 +99,11 @@ ND_ProgressPage::~ND_ProgressPage()
// object is only deleted after snmp crawler has finished and
// thread terminated
}
+#endif
}
+#ifdef HAVE_LIBSNMP
+
bool ND_ProgressPage::validatePage()
{
ObjectDescriptorList *objects =
@@ -122,8 +129,6 @@ void ND_ProgressPage::initializePage()
{
if (fwbdebug_nd) qDebug() << "ND_ProgressPage::initializePage()";
-#ifdef HAVE_LIBSNMP
-
ObjectDescriptorList *objects =
dynamic_cast<SNMPNetworkDiscoveryWizard*>(wizard())->getObjects();
@@ -198,9 +203,6 @@ void ND_ProgressPage::initializePage()
this, SLOT(crawlerFinished()));
crawler->start();
-
-#endif
-
}
void ND_ProgressPage::cleanupPage()
@@ -392,3 +394,4 @@ void ND_ProgressPage::saveLog()
}
}
+#endif
diff --git a/src/libgui/snmpNetworkDiscoveryWizard/ND_ProgressPage.h b/src/libgui/snmpNetworkDiscoveryWizard/ND_ProgressPage.h
index 0394865..ee7dae1 100644
--- a/src/libgui/snmpNetworkDiscoveryWizard/ND_ProgressPage.h
+++ b/src/libgui/snmpNetworkDiscoveryWizard/ND_ProgressPage.h
@@ -39,22 +39,28 @@ class ND_ProgressPage : public QWizardPage
QTextCharFormat normal_format;
QTextCharFormat error_format;
QTextCharFormat warning_format;
- SNMPCrawlerThread *crawler;
-
+
public:
ND_ProgressPage(QWidget *parent);
virtual ~ND_ProgressPage();
+#ifdef HAVE_LIBSNMP
+
+private:
+ SNMPCrawlerThread *crawler;
+
virtual void initializePage();
virtual void cleanupPage();
virtual bool validatePage();
public slots:
+
void stop();
void saveLog();
void logLine(const QString &line);
void crawlerDestroyed(QObject*);
void crawlerFinished();
+#endif
};
diff --git a/src/libgui/snmpNetworkDiscoveryWizard/SNMPCrawlerThread.cpp b/src/libgui/snmpNetworkDiscoveryWizard/SNMPCrawlerThread.cpp
index 7a55e41..1972ecf 100644
--- a/src/libgui/snmpNetworkDiscoveryWizard/SNMPCrawlerThread.cpp
+++ b/src/libgui/snmpNetworkDiscoveryWizard/SNMPCrawlerThread.cpp
@@ -31,6 +31,8 @@
#include "QThreadLogger.h"
#include "SNMPCrawlerThread.h"
+#ifdef HAVE_LIBSNMP
+
// #include snmp.h only after all Qt headers; see #2185
#include "fwbuilder/snmp.h"
@@ -105,3 +107,4 @@ set<InetAddrMask*> SNMPCrawlerThread::getNetworks()
return q->getNetworks();
}
+#endif
diff --git a/src/libgui/snmpNetworkDiscoveryWizard/SNMPCrawlerThread.h b/src/libgui/snmpNetworkDiscoveryWizard/SNMPCrawlerThread.h
index 8719e2d..01007e3 100644
--- a/src/libgui/snmpNetworkDiscoveryWizard/SNMPCrawlerThread.h
+++ b/src/libgui/snmpNetworkDiscoveryWizard/SNMPCrawlerThread.h
@@ -37,6 +37,7 @@
#include "fwbuilder/InetAddrMask.h"
#include "fwbuilder/ThreadTools.h"
+#ifdef HAVE_LIBSNMP
// avoid #include "snmp.h" since it conflicts with Qt, see #2185
namespace libfwbuilder
@@ -77,5 +78,6 @@ signals:
void finished();
};
+#endif
#endif
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
VERSION.h | 2 +-
doc/ChangeLog | 5 +++++
packaging/fwbuilder-static-qt.spec | 2 +-
packaging/fwbuilder.control | 2 +-
packaging/fwbuilder.spec | 2 +-
src/libgui/FWWindow.cpp | 3 +++
.../snmpNetworkDiscoveryWizard/ND_ProgressPage.cpp | 13 ++++++++-----
.../snmpNetworkDiscoveryWizard/ND_ProgressPage.h | 10 ++++++++--
.../SNMPCrawlerThread.cpp | 3 +++
.../snmpNetworkDiscoveryWizard/SNMPCrawlerThread.h | 2 ++
11 files changed, 34 insertions(+), 12 deletions(-)
hooks/post-receive
--
Firewall Builder GUI and Policy Compilers Open Source Code
|