onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-18 09:18:23 +01:00
Code Issues Releases Wiki Activity

refs #1876 build number is now part of the long version number

Browse Source
This commit is contained in:
Vadim Kurland 2010-12-29 12:00:15 -08:00
parent 2114d36e48
commit 18377b1ff2
27 changed files with 65 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
VERSION
View File

@ -1,15 +1,24 @@
#-*- mode: shell-script; tab-width: 4; -*-
FWB_MAJOR_VERSION=4
FWB_MINOR_VERSION=1
FWB_MICRO_VERSION=4
FWB_MINOR_VERSION=2
FWB_MICRO_VERSION=0
# build number is like "nano" version number. Complete version is
# composed like this:
# $FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM
#
# I am incrementing build number during development cycle
#
BUILD_NUM="3425"
# VERSION must be a string rather than $var because of the build scripts
VERSION="4.1.4"
SHORTVERSION="414"
# VERSION="4.2.0"
# SHORTVERSION="420"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
SHORTVERSION="${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}${FWB_MICRO_VERSION}"
# RELEASE="1"
RELEASE="b@BUILD_NUM@"
BETA="no"

2
VERSION.h
View File

@ -1 +1 @@
#define VERSION "4.1.4"
#define VERSION "4.2.0.3425"

8
configure.in
View File

@ -18,14 +18,6 @@ dnl all version numbers are defined in the file VERSION
dnl
. ./VERSION
# RELEASE number (== build number) is taken from the file build_num if
# it exists If the file is not there, we construct it from git branch
# and commit
test -f build_num && {
. build_num
} || {
BUILD_NUM="999999"
}
RELEASE_NUM=$BUILD_NUM
AC_DEFINE_UNQUOTED(BUILD_NUM, "$BUILD_NUM")

18
doc/ChangeLog
View File

@ -1,3 +1,21 @@
2010-12-29 vadim <vadim@netcitadel.com>
* VERSION (VERSION): started 4.2.0
This version is the first one to merge libfwbuilder and fwbuilder
packages. Libfwbuilder is now in the src/libfwbuilder subtree inside
fwbuilder code tree.
RPM .spec files and DEB .control files are now located in the packaging
directory inside fwbuilder code tree.
Changes in the versioning format: I am going to use build number
as a "nano" version number, composing complete version as
"4.2.0.3425". The "-N" suffix in rpm and deb package names will
be used for package release number and most of the time will be
"-1". This suffix should reflect minor differences in the package
that do not affect code at all.
2010-12-16 Vadim Kurland <vadim@netcitadel.com>
* ActionsDialog.cpp (fillInterfaces): fixed #1872: "vlan interface

8
packaging/fwbuilder-static-qt.spec
View File

@ -3,8 +3,8 @@
%define name fwbuilder
%define version 4.1.4
%define release 999999
%define version 4.2.0.3425
%define release 1
%if "%_vendor" == "MandrakeSoft"
%define guigroup System/Configuration/Networking
@ -27,11 +27,9 @@ Packager: Vadim Kurland <vadim@fwbuilder.org>
Buildroot: %{_tmppath}/%{name}-%{version}-root
Requires: libfwbuilder = @REQUIRED_LIBFWBUILDER_VERSION@
BuildRequires: libfwbuilder-devel = @REQUIRED_LIBFWBUILDER_VERSION@
BuildRequires: libxml2-devel, libxslt-devel, openssl-devel
Obsoletes: fwbuilder-ipt, fwbuilder-pf, fwbuilder-ipf, fwbuilder-ipfw, fwbuilder-pix, fwbuilder-iosacl, fwbuilder-cisco
Obsoletes: fwbuilder-ipt, fwbuilder-pf, fwbuilder-ipf, fwbuilder-ipfw, fwbuilder-pix, fwbuilder-iosacl, fwbuilder-cisco, libfwbuilder, libfwbuilder-devel
Docdir: /usr/share/doc

6
packaging/fwbuilder-static-qt.spec.in
View File

@ -4,7 +4,7 @@
%define name fwbuilder
%define version @VERSION@
%define release @RELEASE_NUM@
%define release 1
%if "%_vendor" == "MandrakeSoft"
%define guigroup System/Configuration/Networking
@ -27,11 +27,9 @@ Packager: Vadim Kurland <vadim@fwbuilder.org>
Buildroot: %{_tmppath}/%{name}-%{version}-root
Requires: libfwbuilder = @REQUIRED_LIBFWBUILDER_VERSION@
BuildRequires: libfwbuilder-devel = @REQUIRED_LIBFWBUILDER_VERSION@
BuildRequires: libxml2-devel, libxslt-devel, openssl-devel
Obsoletes: fwbuilder-ipt, fwbuilder-pf, fwbuilder-ipf, fwbuilder-ipfw, fwbuilder-pix, fwbuilder-iosacl, fwbuilder-cisco
Obsoletes: fwbuilder-ipt, fwbuilder-pf, fwbuilder-ipf, fwbuilder-ipfw, fwbuilder-pix, fwbuilder-iosacl, fwbuilder-cisco, libfwbuilder, libfwbuilder-devel
Docdir: /usr/share/doc

8
packaging/fwbuilder.control
View File

@ -1,9 +1,9 @@
Package: fwbuilder
Conflicts: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linux, fwbuilder-doc
Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linux, fwbuilder-doc
Conflicts: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linux, fwbuilder-doc, libfwbuilder
Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linux, fwbuilder-doc, libfwbuilder
Priority: extra
Section: checkinstall
Maintainer: vadim@fwbuilder.org
Version: 4.1.4-999999
Depends: libfwbuilder, libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Version: 4.2.0.3425-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers

8
packaging/fwbuilder.control.in
View File

@ -1,9 +1,9 @@
Package: fwbuilder
Conflicts: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linux, fwbuilder-doc
Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linux, fwbuilder-doc
Conflicts: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linux, fwbuilder-doc, libfwbuilder
Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linux, fwbuilder-doc, libfwbuilder
Priority: extra
Section: checkinstall
Maintainer: vadim@fwbuilder.org
Version: @VERSION@-@RELEASE_NUM@
Depends: libfwbuilder, libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Version: @VERSION@-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers

8
packaging/fwbuilder.spec
View File

@ -1,7 +1,7 @@
%define name fwbuilder
%define version 4.1.4
%define release 999999
%define version 4.2.0.3425
%define release 1
%if "%_vendor" == "MandrakeSoft"
%define guigroup System/Configuration/Networking
@ -24,8 +24,6 @@ Packager: Vadim Kurland <vadim@fwbuilder.org>
Buildroot: %{_tmppath}/%{name}-%{version}-root
Requires: libfwbuilder = @REQUIRED_LIBFWBUILDER_VERSION@-%{release}
BuildRequires: libfwbuilder-devel = @REQUIRED_LIBFWBUILDER_VERSION@-%{release}
BuildRequires: libxml2-devel, libxslt-devel, openssl-devel
%if "%_vendor" == "suse"
BuildRequires: qt-devel
@ -33,7 +31,7 @@ BuildRequires: qt-devel
BuildRequires: qt4-devel
%endif
Obsoletes: fwbuilder-ipt, fwbuilder-pf, fwbuilder-ipf, fwbuilder-ipfw, fwbuilder-pix, fwbuilder-iosacl, fwbuilder-cisco
Obsoletes: fwbuilder-ipt, fwbuilder-pf, fwbuilder-ipf, fwbuilder-ipfw, fwbuilder-pix, fwbuilder-iosacl, fwbuilder-cisco, libfwbuilder, libfwbuilder-devel
Docdir: /usr/share/doc

6
packaging/fwbuilder.spec.in
View File

@ -1,7 +1,7 @@
%define name fwbuilder
%define version @VERSION@
%define release @RELEASE_NUM@
%define release 1
%if "%_vendor" == "MandrakeSoft"
%define guigroup System/Configuration/Networking
@ -24,8 +24,6 @@ Packager: Vadim Kurland <vadim@fwbuilder.org>
Buildroot: %{_tmppath}/%{name}-%{version}-root
Requires: libfwbuilder = @REQUIRED_LIBFWBUILDER_VERSION@-%{release}
BuildRequires: libfwbuilder-devel = @REQUIRED_LIBFWBUILDER_VERSION@-%{release}
BuildRequires: libxml2-devel, libxslt-devel, openssl-devel
%if "%_vendor" == "suse"
BuildRequires: qt-devel
@ -33,7 +31,7 @@ BuildRequires: qt-devel
BuildRequires: qt4-devel
%endif
Obsoletes: fwbuilder-ipt, fwbuilder-pf, fwbuilder-ipf, fwbuilder-ipfw, fwbuilder-pix, fwbuilder-iosacl, fwbuilder-cisco
Obsoletes: fwbuilder-ipt, fwbuilder-pf, fwbuilder-ipf, fwbuilder-ipfw, fwbuilder-pix, fwbuilder-iosacl, fwbuilder-cisco, libfwbuilder, libfwbuilder-devel
Docdir: /usr/share/doc

5
src/common/init.cpp
View File

@ -26,14 +26,9 @@ std::string tempfname;
std::string argv0;
std::string ee;
#define Str(x) #x
#define Xstr(x) Str(x)
QString build_num = Xstr(BUILD_NUM);
QString user_name;
#if defined(Q_OS_WIN32) || defined(Q_OS_MACX)
extern void init_win();
void init(char * const*)

2
src/compiler_lib/CompilerDriver_generators.cpp
View File

@ -47,7 +47,6 @@ using namespace std;
using namespace libfwbuilder;
using namespace fwcompiler;
extern QString build_num;
extern QString user_name;
@ -106,7 +105,6 @@ void CompilerDriver::assembleFwScriptInternal(Cluster *cluster,
script_skeleton->setVariable("firewall_dir", firewall_dir.c_str());
top_comment->setVariable("version", VERSION);
top_comment->setVariable("build", build_num);
top_comment->setVariable("timestamp", timestr);
top_comment->setVariable("tz", tzname[stm->tm_isdst]);

2
src/fwbedit/fwbedit.cpp
View File

@ -122,7 +122,7 @@ void usage()
{
cout << "Firewall Builder: general purpose object tree editing tool"
<< endl;
cout << "Version " << VERSION << "-" << build_num.toStdString() << endl;
cout << "Version " << VERSION << endl;
cout << endl;
cout << "Usage: fwbedit command [options]" << endl;
cout << endl;

2
src/iosacl/iosacl.cpp
View File

@ -82,7 +82,7 @@ void usage(const char *name)
{
cout << "Firewall Builder: policy compiler for Cisco IOS ACL" << endl;
cout << "Copyright 2007-2009 NetCitadel, LLC" << endl;
cout << "Version " << VERSION << "-" << build_num.toStdString() << endl;
cout << "Version " << VERSION << endl;
cout << "Usage: " << name << " [-tvV] [-f filename.xml] [-d destdir] [-o output.fw] firewall_object_name" << endl;
}

2
src/ipf/ipf.cpp
View File

@ -90,7 +90,7 @@ class UpgradePredicate: public XMLTools::UpgradePredicate
void usage(const char *name)
{
cout << "Firewall Builder: policy compiler for ipfilter" << endl;
cout << "Version " << VERSION << "-" << build_num.toStdString() << endl;
cout << "Version " << VERSION << endl;
cout << "Usage: " << name
<< " [-x] [-v] [-V] [-f filename.xml] [-o output.fw] [-d destdir] [-m] firewall_object_name" << endl;
}

2
src/ipfw/ipfw.cpp
View File

@ -87,7 +87,7 @@ class UpgradePredicate: public XMLTools::UpgradePredicate
void usage(const char *name)
{
cout << "Firewall Builder: policy compiler for ipfw" << endl;
cout << "Version " << VERSION << "-" << build_num.toStdString() << endl;
cout << "Version " << VERSION << endl;
cout << "Usage: " << name << " [-x] [-v] [-V] [-f filename.xml] [-o output.fw] [-d destdir] [-m] firewall_object_name" << endl;
}

2
src/ipt/ipt.cpp
View File

@ -65,7 +65,7 @@ void usage(const char *name)
{
cout << "Firewall Builder: policy compiler for "
"Linux 2.4.x and 2.6.x iptables" << endl;
cout << "Version " << VERSION << "-" << build_num.toStdString() << endl;
cout << "Version " << VERSION << endl;
cout << "Usage: " << name
<< " [-x level] [-v] [-V] [-q] [-f filename.xml] [-d destdir] "
"[-m] [-4|-6] firewall_object_name" << endl;

2
src/iptlib/CompilerDriver_ipt_run.cpp
View File

@ -80,7 +80,6 @@ using namespace std;
using namespace libfwbuilder;
using namespace fwcompiler;
extern QString build_num;
extern QString user_name;
/*
@ -674,7 +673,6 @@ QString CompilerDriver_ipt::run(const std::string &cluster_id,
Configlet top_comment(fw, "linux24", "top_comment");
top_comment.setVariable("version", VERSION);
top_comment.setVariable("build", build_num);
top_comment.setVariable("timestamp", timestr);
top_comment.setVariable("tz", tzname[stm->tm_isdst]);
top_comment.setVariable("user", user_name);

6
src/libgui/FWBAboutDialog.cpp
View File

@ -37,10 +37,8 @@ FWBAboutDialog::FWBAboutDialog(QWidget *parent): QDialog(parent)
m_aboutDialog->setupUi(this);
m_aboutDialog->titleLbl->setText(
QString("Firewall Builder v%1").arg(VERSION) );
m_aboutDialog->revLbl->setText(tr("Build: %1").arg(build_num));
m_aboutDialog->apiLbl->setText(
tr("Using Firewall Builder API %1").arg(
libfwbuilder::Constants::getLibraryVersion().c_str() ) );
m_aboutDialog->revLbl->setText("");
m_aboutDialog->apiLbl->setText("");
ABOUT_DLG_BLANKS;

4
src/libgui/HttpGet.cpp
View File

@ -118,8 +118,8 @@ bool HttpGet::get(const QUrl &_url)
if (getRegistrationStatus()==2) reg = "r";
#endif
QString agent = QString("fwbuilder/%1 (%2; %3; b:%4; s:%5; %6)")
.arg(VERSION).arg(os).arg(locale).arg(build_num).arg(sig).arg(reg);
QString agent = QString("fwbuilder/%1 (%2; %3; b:999999; s:%5; %6)")
.arg(VERSION).arg(os).arg(locale).arg(sig).arg(reg);
hdr.setValue("User-Agent", agent);
request_id = http.request(hdr, NULL, &strm);

8
src/libgui/debugDialog.cpp
View File

@ -92,16 +92,10 @@ debugDialog::debugDialog(QWidget *parent) : QDialog(parent)
.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(" Build %2").arg(build_num));
m_dialog->debugText->append( QString(" Using libfwbuilder %1")
.arg( libfwbuilder::Constants::getLibraryVersion().c_str() ) );
m_dialog->debugText->append( QString(" Firewall Builder %1").arg(VERSION));
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")

1
src/libgui/global.h
View File

@ -52,7 +52,6 @@ extern std::string tempfname;
extern std::string argv0;
extern std::string ee;
extern int fwbdebug;
extern QString build_num;
extern QString user_name;
extern int sig;

2
src/pf/pf.cpp
View File

@ -66,7 +66,7 @@ class UpgradePredicate: public XMLTools::UpgradePredicate
void usage(const char *name)
{
cout << "Firewall Builder: policy compiler for OpenBSD PF" << endl;
cout << "Version " << VERSION << "-" << build_num.toStdString() << endl;
cout << "Version " << VERSION << endl;
cout << "Usage: " << name << " [-x] [-v] [-V] [-f filename.xml] [-o output.fw] [-d destdir] [-m] [-4|-6] firewall_object_name" << endl;
}

2
src/pflib/CompilerDriver_ipf_run.cpp
View File

@ -78,8 +78,6 @@ using namespace std;
using namespace libfwbuilder;
using namespace fwcompiler;
extern QString build_num;
QString CompilerDriver_ipf::composeActivationCommand(libfwbuilder::Firewall *fw,
bool filter,

2
src/pix/pix.cpp
View File

@ -84,7 +84,7 @@ void usage(const char *name)
{
cout << "Firewall Builder: policy compiler for Cisco PIX firewall (with support for FWSM)" << endl;
cout << "Copyright 2002-2009 NetCitadel, LLC" << endl;
cout << "Version " << VERSION << "-" << build_num.toStdString() << endl;
cout << "Version " << VERSION << endl;
cout << "Usage: " << name << " [-tvV] [-f filename.xml] [-d destdir] [-o output.fw] firewall_object_name" << endl;
}

2
src/procurve_acl/procurve_acl.cpp
View File

@ -82,7 +82,7 @@ void usage(const char *name)
{
cout << "Firewall Builder: policy compiler for HP ProCurve ACL" << endl;
cout << "Copyright 2010 NetCitadel, LLC" << endl;
cout << "Version " << VERSION << "-" << build_num.toStdString() << endl;
cout << "Version " << VERSION << endl;
cout << "Usage: " << name << " [-tvV] [-f filename.xml] [-d destdir] [-o output.fw] firewall_object_name" << endl;
}

1
src/unit_tests/compilerLibTest/tests_main.cpp
View File

@ -32,7 +32,6 @@
#include <cppunit/CompilerOutputter.h>
#include <string>
//int build_num = 0;
//std::string respath;
//QString user_name;