summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-firewall/fwbuilder/files')
-rw-r--r--net-firewall/fwbuilder/files/3.0.7-secure-mktemp.patch15
-rw-r--r--net-firewall/fwbuilder/files/4.x-qmake-use-LDFLAGS.patch11
-rw-r--r--net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch11
3 files changed, 11 insertions, 26 deletions
diff --git a/net-firewall/fwbuilder/files/3.0.7-secure-mktemp.patch b/net-firewall/fwbuilder/files/3.0.7-secure-mktemp.patch
deleted file mode 100644
index 1074e58f3b95..000000000000
--- a/net-firewall/fwbuilder/files/3.0.7-secure-mktemp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur fwbuilder-3.0.7.orig/src/ipt/RoutingCompiler_ipt_writers.cpp fwbuilder-3.0.7/src/ipt/RoutingCompiler_ipt_writers.cpp
---- fwbuilder-3.0.7.orig/src/ipt/RoutingCompiler_ipt_writers.cpp 2009-11-12 09:54:55.913414002 +0100
-+++ fwbuilder-3.0.7/src/ipt/RoutingCompiler_ipt_writers.cpp 2009-11-12 10:06:38.086706330 +0100
-@@ -147,9 +147,9 @@
- << "#\n#\n# ============== ROUTING RULES ============== \n#"
- << endl;
-
-- compiler->output << "TMPDIRNAME=\"/tmp/.fwbuilder.tempdir.$$\"" << endl;
-+ compiler->output << "TMPDIRNAME=\"$(umask 077 && mktemp --tmpdir=/tmp -d .fwbuilder.tempdir.XXXXXXXXXX)\"" << endl;
-+ compiler->output << "[ $? != 0 ] && exit 1" << endl;
- compiler->output << "TMPFILENAME=\"$TMPDIRNAME/.fwbuilder.out\"" << endl;
-- compiler->output << "(umask 077 && mkdir $TMPDIRNAME) || exit 1" << endl;
- compiler->output << endl;
-
- compiler->output << "# This function stops stdout redirection"
diff --git a/net-firewall/fwbuilder/files/4.x-qmake-use-LDFLAGS.patch b/net-firewall/fwbuilder/files/4.x-qmake-use-LDFLAGS.patch
deleted file mode 100644
index c585890f2af2..000000000000
--- a/net-firewall/fwbuilder/files/4.x-qmake-use-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naurp fwbuilder-4.1.1.orig//qmake.inc.in fwbuilder-4.1.1//qmake.inc.in
---- fwbuilder-4.1.1.orig//qmake.inc.in 2010-07-21 00:42:00.000000000 -0400
-+++ fwbuilder-4.1.1//qmake.inc.in 2010-09-12 15:47:10.189648845 -0400
-@@ -67,6 +67,7 @@ unix {
- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
-+ QMAKE_LFLAGS = @LDFLAGS@
-
- }
- }
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
new file mode 100644
index 000000000000..d9df8429d390
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
@@ -0,0 +1,11 @@
+diff -Naurp fwbuilder-5.0.0.3568.orig//qmake.inc.in fwbuilder-5.0.0.3568//qmake.inc.in
+--- fwbuilder-5.0.0.3568.orig//qmake.inc.in 2011-07-25 19:27:44.000000000 -0400
++++ fwbuilder-5.0.0.3568//qmake.inc.in 2011-08-19 17:00:41.259985388 -0400
+@@ -39,6 +39,7 @@ unix {
+ QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+ QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
+ QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
++ QMAKE_LFLAGS = @LDFLAGS@
+
+ !macx {
+