onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-20 10:17:16 +01:00
Code Issues Releases Wiki Activity

added support for separate data format versioning; set fwbuilder version to 3.0.0

Browse Source
This commit is contained in:
Vadim Kurland 2008-01-16 21:03:42 +00:00
parent d9d0687bfa
commit a4077eb24f
25 changed files with 86 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
VERSION
View File

@ -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
#

16
configure.in
View File

@ -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

20
qmake.inc.in
View File

@ -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

62
src/gui/debugDialog.cpp
View File

@ -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;
}
}

2
src/res/objects_init.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="2.1.99" lastModified="1178590930" id="root">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="4" lastModified="1178590930" id="root">
<Library color="#d4f8ff" comment="Standard objects" id="syslib000" name="Standard" ro="True">
<AnyNetwork comment="Any Network" id="sysid0" name="Any" address="0.0.0.0" netmask="0.0.0.0"/>
<AnyIPService comment="Any IP Service" id="sysid1" name="Any" protocol_num="0"/>

2
src/res/objects_init.xml.in
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="@LIBFWBUILDER_VERSION@" lastModified="1178590930" id="root">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="@FWBUILDER_XML_VERSION@" lastModified="1178590930" id="root">
<Library color="#d4f8ff" comment="Standard objects" id="syslib000" name="Standard" ro="True">
<AnyNetwork comment="Any Network" id="sysid0" name="Any" address="0.0.0.0" netmask="0.0.0.0"/>
<AnyIPService comment="Any IP Service" id="sysid1" name="Any" protocol_num="0"/>

2
src/res/os/freebsd.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="2.1.99">
<FWBuilderResources version="3.0.0">
<Target name="freebsd">
<description>FreeBSD</description>
<family>freebsd</family>

2
src/res/os/fwsm_os.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="2.1.99-1">
<FWBuilderResources version="3.0.0-">
<Target name="pix_os">
<description>Cisco FWSM</description>
<compiler>fwb_pix</compiler>

2
src/res/os/linksys.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="2.1.99">
<FWBuilderResources version="3.0.0">
<Target name="linksys">
<description>Linksys/Sveasoft</description>
<family>linux24</family>

2
src/res/os/linux24.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="2.1.99">
<FWBuilderResources version="3.0.0">
<Target name="linux24">
<description>Linux 2.4/2.6</description>
<family>linux24</family>

2
src/res/os/macosx.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="2.1.99">
<FWBuilderResources version="3.0.0">
<Target name="macosx">
<description>Mac OS X</description>
<family>macosx</family>

2
src/res/os/openbsd.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="2.1.99">
<FWBuilderResources version="3.0.0">
<Target name="openbsd">
<description>OpenBSD</description>
<family>openbsd</family>

2
src/res/os/pix_os.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="2.1.99-1">
<FWBuilderResources version="3.0.0-">
<Target name="pix_os">
<description>Cisco PIX</description>
<compiler>fwb_pix</compiler>

2
src/res/os/solaris.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="2.1.99">
<FWBuilderResources version="3.0.0">
<Target name="solaris">
<description>Solaris</description>
<family>solaris</family>

2
src/res/os/unknown_os.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="2.1.99">
<FWBuilderResources version="3.0.0">
<Target name="unknown_os">
<description>Unknown</description>
<family>unknown</family>

2
src/res/platform/fwsm.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<FWBuilderResources version="2.1.99-1">
<FWBuilderResources version="3.0.0-">
<Target name="FWSM">
<description>FWSM</description>
<compiler>fwb_pix</compiler>

2
src/res/platform/ipf.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<FWBuilderResources version="2.1.99">
<FWBuilderResources version="3.0.0">
<Target name="ipf">
<description>ipfilter</description>
<compiler>fwb_ipf</compiler>

2
src/res/platform/ipfw.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<FWBuilderResources version="2.1.99">
<FWBuilderResources version="3.0.0">
<Target name="ipfw">
<description>ipfw</description>
<compiler>fwb_ipfw</compiler>

2
src/res/platform/iptables.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<FWBuilderResources version="2.1.99">
<FWBuilderResources version="3.0.0">
<Target name="iptables">
<description>iptables</description>
<compiler>fwb_ipt</compiler>

2
src/res/platform/pf.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<FWBuilderResources version="2.1.99">
<FWBuilderResources version="3.0.0">
<Target name="pf">
<description>PF</description>
<compiler>fwb_pf</compiler>

2
src/res/platform/pix.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<FWBuilderResources version="2.1.99-1">
<FWBuilderResources version="3.0.0-">
<Target name="pix">
<description>PIX</description>
<compiler>fwb_pix</compiler>

2
src/res/platform/unknown.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<FWBuilderResources version="2.1.99">
<FWBuilderResources version="3.0.0">
<Target name="unknown">
<description>Unknown</description>
<compiler></compiler>

2
src/res/resources.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<FWBuilderResources version="2.1.99">
<FWBuilderResources version="3.0.0">
<Paths>
<Icndir>@PACKAGE_PIXMAPS_DIR@</Icndir>
</Paths>

2
src/res/templates.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="2.1.99" lastModified="1184450093" id="root">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="4" lastModified="1184450093" id="root">
<Library color="#d4f8ff" comment="Standard objects" id="syslib000" name="Standard" ro="False">
<AnyNetwork comment="Any Network" id="sysid0" name="Any" address="0.0.0.0" netmask="0.0.0.0"/>
<AnyIPService comment="Any IP Service" id="sysid1" name="Any" protocol_num="0"/>

2
src/res/templates.xml.in
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="@LIBFWBUILDER_VERSION@" lastModified="1184450093" id="root">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="@FWBUILDER_XML_VERSION@" lastModified="1184450093" id="root">
<Library color="#d4f8ff" comment="Standard objects" id="syslib000" name="Standard" ro="False">
<AnyNetwork comment="Any Network" id="sysid0" name="Any" address="0.0.0.0" netmask="0.0.0.0"/>
<AnyIPService comment="Any IP Service" id="sysid1" name="Any" protocol_num="0"/>