diff --git a/VERSION b/VERSION index ae791be1f..fadc0dc8b 100644 --- a/VERSION +++ b/VERSION @@ -2,9 +2,9 @@ # $Id: VERSION,v 1.47 2007/07/21 23:44:19 vkurland Exp $ -FWB_MAJOR_VERSION=2 -FWB_MINOR_VERSION=1 -FWB_MICRO_VERSION=99 +FWB_MAJOR_VERSION=3 +FWB_MINOR_VERSION=0 +FWB_MICRO_VERSION=0 VERSION=$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION # RELEASE="1" @@ -12,7 +12,7 @@ RELEASE="b@BUILD_NUM@" BETA="no" -REQUIRED_LIBFWBUILDER_VERSION="2.1.99" +REQUIRED_LIBFWBUILDER_VERSION="3.0.0" # current (or major) version number of the library so file # diff --git a/configure.in b/configure.in index 1ace72c6b..0896f92d9 100644 --- a/configure.in +++ b/configure.in @@ -194,7 +194,7 @@ AC_DEFINE_UNQUOTED(CI_FILE_NAME, ["$CI_FILE_NAME"], [ci_file_name]) AC_DEFINE_UNQUOTED(CO_FILE_NAME, ["$CO_FILE_NAME"], [co_file_name]) -AC_PATH_PROG(LIBFWBUILDER_CONFIG, libfwbuilder-config-${FWB_MAJOR_VERSION}.${FWB_MINOR_VERSION}, ,[$EXTENDED_PATH]) +AC_PATH_PROG(LIBFWBUILDER_CONFIG, libfwbuilder-config-${FWB_MAJOR_VERSION}, ,[$EXTENDED_PATH]) if test x$LIBFWBUILDER_CONFIG = x ; then AC_MSG_ERROR([*** libfwbuilder not installed, or libfwbuilder-config-2 is not in path]) @@ -209,6 +209,7 @@ else LIBFWBUILDER_LIBS_FWBD="`$LIBFWBUILDER_CONFIG --libs fwbd`" LIBFWBUILDER_STATICLIBS="`$LIBFWBUILDER_CONFIG --staticlibs`" LIBFWBUILDER_VERSION="`$LIBFWBUILDER_CONFIG --version`" + FWBUILDER_XML_VERSION="`$LIBFWBUILDER_CONFIG --xml_version`" AC_MSG_CHECKING(libfwbuilder version) if test x${LIBFWBUILDER_VERSION} != x${REQUIRED_LIBFWBUILDER_VERSION} ; then @@ -224,6 +225,7 @@ else AC_SUBST(LIBFWBUILDER_INCLUDEPATH) AC_SUBST(LIBFWBUILDER_STATICLIBS) AC_SUBST(LIBFWBUILDER_VERSION) + AC_SUBST(FWBUILDER_XML_VERSION) fi @@ -302,7 +304,7 @@ case ${host} in OS_SOLARIS=1 MANDIR="${PREFIX}/share/man/" AC_MSG_RESULT(Solaris) - DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}" + DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}" ;; *-*-freebsd*) @@ -310,7 +312,7 @@ case ${host} in OS_FREEBSD=1 MANDIR="${PREFIX}/man/" AC_MSG_RESULT(FreeBSD) - DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}" + DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}" ;; *-*-openbsd*) @@ -318,7 +320,7 @@ case ${host} in OS_OPENBSD=1 MANDIR="${PREFIX}/man/" AC_MSG_RESULT(OpenBSD) - DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}" + DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}" ;; *-*-kfreebsd*) @@ -331,11 +333,11 @@ case ${host} in fi MANDIR="${PREFIX}/share/man/" AC_MSG_RESULT($DISTRO GNU/kFreeBSD) - DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}" + DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}" ;; *-*-linux*) - DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}" + DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}" OS=Linux OS_LINUX=1 if test -f /etc/debian_version ; then @@ -365,7 +367,7 @@ case ${host} in DISTRO=Unknown MANDIR="${PREFIX}/share/man/" AC_MSG_RESULT(Unknown) - DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}" + DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}" ;; esac diff --git a/qmake.inc.in b/qmake.inc.in index f447ca53b..176941685 100644 --- a/qmake.inc.in +++ b/qmake.inc.in @@ -35,8 +35,8 @@ unix { exec_prefix = @EXEC_PREFIX@ DESTDIR = - LIBS_FWCOMPILER = @LIBFWBUILDER_LIBS_FWCOMPILER@ - LIBS_FWBUILDER = @LIBFWBUILDER_LIBS_FWBUILDER@ + LIBS_FWCOMPILER = @LIBFWBUILDER_LIBS_FWCOMPILER@ + LIBS_FWBUILDER = @LIBFWBUILDER_LIBS_FWBUILDER@ target.path = $$PREFIX/bin dtd.path = @TEMPLATE_DIR@/ @@ -47,20 +47,20 @@ unix { # unix:target.path = $$PREFIX/share/fwbuilder/ # macx:target.path = $$PREFIX/ - res.files = src/res/objects_init.xml src/res/templates.xml src/res/resources.xml - res.path = @RES_DIR@ - res_os.files = src/res/os/*.xml + res.files = src/res/objects_init.xml src/res/templates.xml src/res/resources.xml + res.path = @RES_DIR@ + res_os.files = src/res/os/*.xml res_os.path = @RES_DIR@/os/ - res_platform.files = src/res/platform/*.xml + res_platform.files = src/res/platform/*.xml res_platform.path = @RES_DIR@/platform/ - INSTALLS += res - INSTALLS += res_os - INSTALLS += res_platform + INSTALLS += res + INSTALLS += res_os + INSTALLS += res_platform # INSTALLS += icns LIBS += $$LIBS_FWBUILDER @LIBS@ - PKGLOCALEDIR = $$res.path/locale + PKGLOCALEDIR = $$res.path/locale CONFIG += warn_on debug QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter diff --git a/src/gui/debugDialog.cpp b/src/gui/debugDialog.cpp index 7831c17b0..62d28f847 100644 --- a/src/gui/debugDialog.cpp +++ b/src/gui/debugDialog.cpp @@ -58,18 +58,28 @@ debugDialog::debugDialog(QWidget *parent) : QDialog(parent) * send me a screenshot of the "about" dialog and get the idea about * their environment etc.) */ - m_dialog->debugText->append( QString("Path to executable: %1").arg(argv0.c_str()) ); - m_dialog->debugText->append( QString("Path to resources: %1").arg(respath.c_str()) ); - m_dialog->debugText->append( QString("Path to locale: %1").arg(localepath.c_str()) ); - m_dialog->debugText->append( QString("Path to lib resources: %1").arg(librespath.c_str()) ); - m_dialog->debugText->append( QString("appRootDir: %1").arg(appRootDir.c_str()) ); + m_dialog->debugText->append( QString("Path to executable: %1") + .arg(argv0.c_str()) ); + m_dialog->debugText->append( QString("Path to resources: %1") + .arg(respath.c_str()) ); + m_dialog->debugText->append( QString("Path to locale: %1") + .arg(localepath.c_str()) ); + m_dialog->debugText->append( QString("Path to lib resources: %1") + .arg(librespath.c_str()) ); + m_dialog->debugText->append( QString("appRootDir: %1") + .arg(appRootDir.c_str()) ); m_dialog->debugText->append( "\n" ); - m_dialog->debugText->append( QString("sysfname: %1").arg(sysfname.c_str()) ); - m_dialog->debugText->append( QString("tempfname: %1").arg(tempfname.c_str()) ); + m_dialog->debugText->append( QString("sysfname: %1") + .arg(sysfname.c_str()) ); + m_dialog->debugText->append( QString("tempfname: %1") + .arg(tempfname.c_str()) ); m_dialog->debugText->append( "\n" ); - m_dialog->debugText->append( QString("Path to rcs: %1").arg(RCS_FILE_NAME) ); - m_dialog->debugText->append( QString("Path to rcsdiff: %1").arg(RCSDIFF_FILE_NAME) ); - m_dialog->debugText->append( QString("Path to rlog: %1").arg(RLOG_FILE_NAME) ); + m_dialog->debugText->append( QString("Path to rcs: %1") + .arg(RCS_FILE_NAME) ); + m_dialog->debugText->append( QString("Path to rcsdiff: %1") + .arg(RCSDIFF_FILE_NAME) ); + m_dialog->debugText->append( QString("Path to rlog: %1") + .arg(RLOG_FILE_NAME) ); m_dialog->debugText->append( QString("Path to ci: %1").arg(CI_FILE_NAME) ); m_dialog->debugText->append( QString("Path to co: %1").arg(CO_FILE_NAME) ); m_dialog->debugText->append( "\n" ); @@ -81,22 +91,33 @@ debugDialog::debugDialog(QWidget *parent) : QDialog(parent) m_dialog->debugText->append( RCS::getEnv()->join("\n").toAscii() ); m_dialog->debugText->append( "\n" ); - m_dialog->debugText->append( QString("Current locale: %1").arg(QLocale::system().name()) ); + m_dialog->debugText->append( QString("Current locale: %1") + .arg(QLocale::system().name()) ); m_dialog->debugText->append( "\n" ); m_dialog->debugText->append( QString("Versions:") ); - m_dialog->debugText->append( QString(" Firewall Builder %1").arg(VERSION) ); - m_dialog->debugText->append( QString(" Release %1 Build %2").arg(RELEASE_NUM).arg(BUILD_NUM) ); + m_dialog->debugText->append( QString(" Firewall Builder %1") + .arg(VERSION) ); + m_dialog->debugText->append( QString(" Release %1 Build %2") + .arg(RELEASE_NUM).arg(BUILD_NUM) ); m_dialog->debugText->append( QString(" Using libfwbuilder %1") - .arg( libfwbuilder::Constants::getLibraryVersion().c_str() ) ); - m_dialog->debugText->append( QString(" Built with QT %1").arg(QT_VERSION_STR) ); + .arg( libfwbuilder::Constants::getLibraryVersion().c_str() ) ); + + m_dialog->debugText->append( QString(" Data format version %1") + .arg(libfwbuilder::Constants::getDataFormatVersion().c_str() ) ); + + + m_dialog->debugText->append( QString(" Built with QT %1") + .arg(QT_VERSION_STR) ); m_dialog->debugText->append( QString(" Using QT %1").arg( qVersion() ) ); - m_dialog->debugText->append( QString(" Built with libxml2 %1").arg(LIBXML_DOTTED_VERSION) ); + m_dialog->debugText->append( QString(" Built with libxml2 %1") + .arg(LIBXML_DOTTED_VERSION) ); #if !defined(Q_OS_MACX) - m_dialog->debugText->append( QString(" Using libxml2 %1").arg(xmlParserVersion) ); + m_dialog->debugText->append( QString(" Using libxml2 %1") + .arg(xmlParserVersion) ); #endif m_dialog->debugText->append( "\n" ); - m_dialog->debugText->append( QString("FWObjectDatabase index statistics:") ); + m_dialog->debugText->append( QString("FWObjectDatabase index statistics:")); int s,h,m; mw->db()->getIndexStats(s,h,m); @@ -105,10 +126,11 @@ debugDialog::debugDialog(QWidget *parent) : QDialog(parent) m_dialog->debugText->append( QString(" misses: %1").arg(m) ); m_dialog->debugText->append( "\n" ); - m_dialog->debugText->append( QString("QPixmapCache limit: %1 kb").arg(QPixmapCache::cacheLimit())); + m_dialog->debugText->append( QString("QPixmapCache limit: %1 kb") + .arg(QPixmapCache::cacheLimit())); } debugDialog::~debugDialog() { delete m_dialog; -} \ No newline at end of file +} diff --git a/src/res/objects_init.xml b/src/res/objects_init.xml index 6e0aeb932..de8f4bd08 100644 --- a/src/res/objects_init.xml +++ b/src/res/objects_init.xml @@ -1,6 +1,6 @@ - + diff --git a/src/res/objects_init.xml.in b/src/res/objects_init.xml.in index 1e8917276..58734ccb0 100644 --- a/src/res/objects_init.xml.in +++ b/src/res/objects_init.xml.in @@ -1,6 +1,6 @@ - + diff --git a/src/res/os/freebsd.xml b/src/res/os/freebsd.xml index 95fe75b0a..9548c5f8d 100644 --- a/src/res/os/freebsd.xml +++ b/src/res/os/freebsd.xml @@ -1,5 +1,5 @@ - + FreeBSD freebsd diff --git a/src/res/os/fwsm_os.xml b/src/res/os/fwsm_os.xml index c3938c937..64c329048 100644 --- a/src/res/os/fwsm_os.xml +++ b/src/res/os/fwsm_os.xml @@ -1,5 +1,5 @@ - + Cisco FWSM fwb_pix diff --git a/src/res/os/linksys.xml b/src/res/os/linksys.xml index 1cf377c1a..2493c2825 100644 --- a/src/res/os/linksys.xml +++ b/src/res/os/linksys.xml @@ -1,5 +1,5 @@ - + Linksys/Sveasoft linux24 diff --git a/src/res/os/linux24.xml b/src/res/os/linux24.xml index 0756ab0b3..7dc4c45ed 100644 --- a/src/res/os/linux24.xml +++ b/src/res/os/linux24.xml @@ -1,5 +1,5 @@ - + Linux 2.4/2.6 linux24 diff --git a/src/res/os/macosx.xml b/src/res/os/macosx.xml index fa2c5a359..2e4e7333c 100644 --- a/src/res/os/macosx.xml +++ b/src/res/os/macosx.xml @@ -1,5 +1,5 @@ - + Mac OS X macosx diff --git a/src/res/os/openbsd.xml b/src/res/os/openbsd.xml index 85e9d0946..736747479 100644 --- a/src/res/os/openbsd.xml +++ b/src/res/os/openbsd.xml @@ -1,5 +1,5 @@ - + OpenBSD openbsd diff --git a/src/res/os/pix_os.xml b/src/res/os/pix_os.xml index a09855774..fe9dc697e 100644 --- a/src/res/os/pix_os.xml +++ b/src/res/os/pix_os.xml @@ -1,5 +1,5 @@ - + Cisco PIX fwb_pix diff --git a/src/res/os/solaris.xml b/src/res/os/solaris.xml index 18786414d..fe1e2b26f 100644 --- a/src/res/os/solaris.xml +++ b/src/res/os/solaris.xml @@ -1,5 +1,5 @@ - + Solaris solaris diff --git a/src/res/os/unknown_os.xml b/src/res/os/unknown_os.xml index 4da2403cc..13f019686 100644 --- a/src/res/os/unknown_os.xml +++ b/src/res/os/unknown_os.xml @@ -1,5 +1,5 @@ - + Unknown unknown diff --git a/src/res/platform/fwsm.xml b/src/res/platform/fwsm.xml index 987efaf07..30685896d 100644 --- a/src/res/platform/fwsm.xml +++ b/src/res/platform/fwsm.xml @@ -1,5 +1,5 @@ - + FWSM fwb_pix diff --git a/src/res/platform/ipf.xml b/src/res/platform/ipf.xml index 0c96bddf0..bb5056dc4 100644 --- a/src/res/platform/ipf.xml +++ b/src/res/platform/ipf.xml @@ -1,5 +1,5 @@ - + ipfilter fwb_ipf diff --git a/src/res/platform/ipfw.xml b/src/res/platform/ipfw.xml index 65525baba..c2258b157 100644 --- a/src/res/platform/ipfw.xml +++ b/src/res/platform/ipfw.xml @@ -1,5 +1,5 @@ - + ipfw fwb_ipfw diff --git a/src/res/platform/iptables.xml b/src/res/platform/iptables.xml index 910c91a58..57076da31 100644 --- a/src/res/platform/iptables.xml +++ b/src/res/platform/iptables.xml @@ -1,5 +1,5 @@ - + iptables fwb_ipt diff --git a/src/res/platform/pf.xml b/src/res/platform/pf.xml index 54997f160..f196aead8 100644 --- a/src/res/platform/pf.xml +++ b/src/res/platform/pf.xml @@ -1,5 +1,5 @@ - + PF fwb_pf diff --git a/src/res/platform/pix.xml b/src/res/platform/pix.xml index 41c446c6e..df5e3995b 100644 --- a/src/res/platform/pix.xml +++ b/src/res/platform/pix.xml @@ -1,5 +1,5 @@ - + PIX fwb_pix diff --git a/src/res/platform/unknown.xml b/src/res/platform/unknown.xml index e59c1f3d3..580ca29ad 100644 --- a/src/res/platform/unknown.xml +++ b/src/res/platform/unknown.xml @@ -1,5 +1,5 @@ - + Unknown diff --git a/src/res/resources.xml b/src/res/resources.xml index 8b29451bb..64ef26a9c 100644 --- a/src/res/resources.xml +++ b/src/res/resources.xml @@ -1,5 +1,5 @@ - + @PACKAGE_PIXMAPS_DIR@ diff --git a/src/res/templates.xml b/src/res/templates.xml index 03fd8a23c..f228346f6 100644 --- a/src/res/templates.xml +++ b/src/res/templates.xml @@ -1,6 +1,6 @@ - + diff --git a/src/res/templates.xml.in b/src/res/templates.xml.in index bef380389..37387929b 100644 --- a/src/res/templates.xml.in +++ b/src/res/templates.xml.in @@ -1,6 +1,6 @@ - +