Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2e250c80590c84cac80b6c7fa57249d19d70e997
commit 2e250c80590c84cac80b6c7fa57249d19d70e997
Author: Janos Kovacs <[EMAIL PROTECTED]>
Date: Sat Apr 19 14:27:17 2008 +0200
fwbuilder-2.1.18-1-i686
* version bump
* fix gcc4.3 build
* add fix-gcc43.diff
diff --git a/source/xapps-extra/fwbuilder/FrugalBuild
b/source/xapps-extra/fwbuilder/FrugalBuild
index c04b613..96e5c54 100644
--- a/source/xapps-extra/fwbuilder/FrugalBuild
+++ b/source/xapps-extra/fwbuilder/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: AlexExtreme <[EMAIL PROTECTED]>
pkgname=fwbuilder
-pkgver=2.1.17
+pkgver=2.1.18
pkgrel=1
pkgdesc="Firewall Builder firewall configuration system"
Finclude sourceforge
@@ -12,12 +12,15 @@ depends=("libfwbuilder=$pkgver")
groups=('xapps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.fwbuilder.org/archives/cat_release_notes.html |
grep -m1 'Version' | sed 's/Version //g'"
+source=(${source} fix-gcc43.diff)
options=('scriptlet')
-sha1sums=('af1898248826151c21566f5994a2f0506c63f6f5')
+sha1sums=('0595146b81c296301702d71665cb853a4b0bec94' \
+ 'cd6058399ae8289249cbc9ef85c1d46161aa4a94')
build() {
- Fmake
- make INSTALL_ROOT=$Fdestdir install || return 1
+ Fpatchall
+ Fmake --with-templatedir=/usr/lib/fwbuilder
--disable-dependency-tracking
+ Fmakeinstall INSTALL_ROOT=${Fdestdir}
}
# optimization OK
diff --git a/source/xapps-extra/fwbuilder/fix-gcc43.diff
b/source/xapps-extra/fwbuilder/fix-gcc43.diff
new file mode 100644
index 0000000..5c03fcc
--- /dev/null
+++ b/source/xapps-extra/fwbuilder/fix-gcc43.diff
@@ -0,0 +1,55 @@
+diff -uNr fwbuilder-2.1.14-orig/src/antlr/CharScanner.hpp
fwbuilder-2.1.14/src/antlr/CharScanner.hpp
+--- fwbuilder-2.1.14-orig/src/antlr/CharScanner.hpp 2007-06-07
04:33:56.000000000 +0200
++++ fwbuilder-2.1.14/src/antlr/CharScanner.hpp 2008-01-03 16:00:52.000000000
+0100
+@@ -11,6 +11,7 @@
+ #include <antlr/config.hpp>
+
+ #include <map>
++#include <cstring>
+
+ #ifdef HAS_NOT_CCTYPE_H
+ #include <ctype.h>
+diff -uNr fwbuilder-2.1.14-orig/src/ipt/NATCompiler_ipt.cpp
fwbuilder-2.1.14/src/ipt/NATCompiler_ipt.cpp
+--- fwbuilder-2.1.14-orig/src/ipt/NATCompiler_ipt.cpp 2007-01-15
02:21:58.000000000 +0100
++++ fwbuilder-2.1.14/src/ipt/NATCompiler_ipt.cpp 2008-01-03
16:11:36.000000000 +0100
+@@ -53,6 +53,7 @@
+ #include <functional>
+ #include <iomanip>
+ #include <iostream>
++#include <cstring>
+
+ #include <assert.h>
+ #include <ctype.h>
+diff -uNr fwbuilder-2.1.14-orig/src/ipt/PolicyCompiler_PrintRule.cpp
fwbuilder-2.1.14/src/ipt/PolicyCompiler_PrintRule.cpp
+--- fwbuilder-2.1.14-orig/src/ipt/PolicyCompiler_PrintRule.cpp 2007-07-19
03:46:30.000000000 +0200
++++ fwbuilder-2.1.14/src/ipt/PolicyCompiler_PrintRule.cpp 2008-01-03
16:11:18.000000000 +0100
+@@ -60,6 +60,7 @@
+ #include <iomanip>
+ #include <fstream>
+ #include <sstream>
++#include <cstring>
+
+ #include <assert.h>
+
+diff -uNr fwbuilder-2.1.18.orig/src/cisco_lib/PolicyCompiler_cisco.cpp
fwbuilder-2.1.18/src/cisco_lib/PolicyCompiler_cisco.cpp
+--- fwbuilder-2.1.18.orig/src/cisco_lib/PolicyCompiler_cisco.cpp
2008-03-06 07:48:56.000000000 +0100
++++ fwbuilder-2.1.18/src/cisco_lib/PolicyCompiler_cisco.cpp 2008-04-19
14:15:41.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include "fwbuilder/AddressTable.h"
+
+ #include <iostream>
++#include <cstring>
+ #if __GNUC__ > 3 || \
+ (__GNUC__ == 3 && (__GNUC_MINOR__ > 2 || (__GNUC_MINOR__ == 2 ) ) ) || \
+ _MSC_VER
+diff -uNr fwbuilder-2.1.18.orig/src/pix/NATCompiler_pix.cpp
fwbuilder-2.1.18/src/pix/NATCompiler_pix.cpp
+--- fwbuilder-2.1.18.orig/src/pix/NATCompiler_pix.cpp 2008-03-06
07:48:59.000000000 +0100
++++ fwbuilder-2.1.18/src/pix/NATCompiler_pix.cpp 2008-04-19
14:23:22.000000000 +0200
+@@ -44,6 +44,7 @@
+ #include <algorithm>
+ #include <functional>
+ #include <iostream>
++#include <cstring>
+ #include <assert.h>
+
+ using namespace libfwbuilder;
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
