Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.30 grimoire by Arwed von Merkatz (f272b344ef6c1c319aa58d0158b16a767a357f1f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.30 grimoire by Arwed von Merkatz (f272b344ef6c1c319aa58d0158b16a767a357f1f)
  • Date: Wed, 11 Mar 2009 13:51:16 -0500

GIT changes to stable-0.30 grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

VERSION | 2 +-
net/iptables/HISTORY | 6 ++++++
net/iptables/PRE_BUILD | 3 +--
net/iptables/iptables-xtables-compile-fix.patch | 11 +++++++++++
4 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit f272b344ef6c1c319aa58d0158b16a767a357f1f
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

VERSION: 0.30-3

commit 047dff8b45afd7a59a654a5752f01ca3edbb453d
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

pan: +x DETAILS. Bug 15017
(cherry picked from commit 59f00e2d98333477c56223ea6af8a0be5ad12eca)

commit ef4216e080b33d20adad2df26b75267f23c60d85
Author: Remko van der Vossen <wich AT yuugen.jp>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

iptables: xtables compile fix, fixes bug 15015.
(cherry picked from commit d2887a34132c0d803f0255f30a7fcb660c914fda)

diff --git a/VERSION b/VERSION
index 49d38a3..0d08882 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.30-2
+0.30-3
diff --git a/gnome2-apps/pan/DETAILS b/gnome2-apps/pan/DETAILS
old mode 100644
new mode 100755
diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY
index c87cd93..4135211 100644
--- a/net/iptables/HISTORY
+++ b/net/iptables/HISTORY
@@ -1,3 +1,9 @@
+2009-03-07 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD, iptables-xtables-compile-fix.patch: fixed compilation,
+ patch in include for netinet/in.h which defines the proper
+ identifiers, makeing the #ifndefs work as intended, taken from the
+ iptables git repo. Fixes bug 15015.
+
2008-10-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.2; renewed desc
* PRE_BUILD: fixed compilation (SCTP is already defined in the
headers)
diff --git a/net/iptables/PRE_BUILD b/net/iptables/PRE_BUILD
index 7e6ab59..823807b 100755
--- a/net/iptables/PRE_BUILD
+++ b/net/iptables/PRE_BUILD
@@ -1,5 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-# fixed compilation with SCTP (check in next release)
-sed -i "11,13d" include/xtables.h.in
+patch -p1 < "$SPELL_DIRECTORY/iptables-xtables-compile-fix.patch"
diff --git a/net/iptables/iptables-xtables-compile-fix.patch
b/net/iptables/iptables-xtables-compile-fix.patch
new file mode 100644
index 0000000..4c775ce
--- /dev/null
+++ b/net/iptables/iptables-xtables-compile-fix.patch
@@ -0,0 +1,11 @@
+diff -Naur iptables-1.4.2.orig/include/xtables.h.in
iptables-1.4.2/include/xtables.h.in
+--- iptables-1.4.2.orig/include/xtables.h.in 2008-10-08 18:31:58.000000000
+0200
++++ iptables-1.4.2/include/xtables.h.in 2009-03-07 15:37:49.000000000
+0100
+@@ -4,6 +4,7 @@
+ #include <sys/socket.h> /* PF_* */
+ #include <sys/types.h>
+ #include <stdbool.h>
++#include <netinet/in.h>
+ #include <net/if.h>
+ #include <linux/types.h>
+ #include <linux/netfilter/x_tables.h>



  • [SM-Commit] GIT changes to stable-0.30 grimoire by Arwed von Merkatz (f272b344ef6c1c319aa58d0158b16a767a357f1f), Arwed von Merkatz, 03/11/2009

Archive powered by MHonArc 2.6.24.

Top of Page