Source Mage code commit list

[Remko van der Vossen <scm AT sourcemage.org>]

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

 http/w3m/HISTORY     |    3 +++
 http/w3m/PRE_BUILD   |    3 ++-
 http/w3m/gc72.patch  |   13 +++++++++++++
 net/iptables/DETAILS |    2 +-
 net/iptables/HISTORY |    3 +++
 5 files changed, 22 insertions(+), 2 deletions(-)

New commits:
commit b4d0922ce7a232b54384a95a758cd0e4e53ac4eb
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

    iptables: 1.4.19.1

commit 0c0ebde842c485264435ba80d626c060ab38dab6
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

    w3m: fix build failure with recent libgc

diff --git a/http/w3m/HISTORY b/http/w3m/HISTORY
index 355de29..af9dab5 100644
--- a/http/w3m/HISTORY
+++ b/http/w3m/HISTORY
@@ -1,3 +1,6 @@
+2013-06-24 Remko van der Vossen <wich AT sourcemage.org>
+       * PRE_BUILD: fix build failure with recent libgc
+
 2013-01-30 Remko van der Vossen <wich AT sourcemage.org>
        * PRE_BUILD: fix build failure with recent glibc
 
diff --git a/http/w3m/PRE_BUILD b/http/w3m/PRE_BUILD
index dc36f5b..9ecd88a 100755
--- a/http/w3m/PRE_BUILD
+++ b/http/w3m/PRE_BUILD
@@ -9,4 +9,5 @@ sedit "s:CFLAGS=\$(OPTS):CFLAGS =:g" w3mimg/x11/Makefile.in   
&&
 sedit 's/file_handle/&_w3m/' istream.h                        &&
 sedit 's/file_handle/&_w3m/' istream.c                        &&
 
-patch -p0 < "$SCRIPT_DIRECTORY"/fb_imlib2.c.patch
+patch -p0 < "$SPELL_DIRECTORY/fb_imlib2.c.patch"              &&
+patch -p1 < "$SPELL_DIRECTORY/gc72.patch"
diff --git a/http/w3m/gc72.patch b/http/w3m/gc72.patch
new file mode 100644
index 0000000..47bd4c8
--- /dev/null
+++ b/http/w3m/gc72.patch
@@ -0,0 +1,13 @@
+diff -Naur old/main.c new/main.c
+--- old/main.c 2011-01-04 20:42:19.000000000 +1100
++++ new/main.c 2012-07-04 21:49:10.136212236 +1000
+@@ -833,7 +833,8 @@
+     mySignal(SIGPIPE, SigPipe);
+ #endif
+ 
+-    orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
++    orig_GC_warn_proc = GC_get_warn_proc();
++    GC_set_warn_proc(wrap_GC_warn_proc);
+     err_msg = Strnew();
+     if (load_argc == 0) {
+       /* no URL specified */
diff --git a/net/iptables/DETAILS b/net/iptables/DETAILS
index 2b7d4eb..26a92ab 100755
--- a/net/iptables/DETAILS
+++ b/net/iptables/DETAILS
@@ -1,5 +1,5 @@
            SPELL=iptables
-         VERSION=1.4.17
+         VERSION=1.4.19.1
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
    SOURCE_URL[0]=http://www.iptables.org/projects/$SPELL/files/$SOURCE
diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY
index abf89d5..732d3f1 100644
--- a/net/iptables/HISTORY
+++ b/net/iptables/HISTORY
@@ -1,3 +1,6 @@
+2013-06-21 Remko van der Vossen <wich AT sourcemage.org>
+       * DETAILS: 1.4.19.1
+
 2012-12-26 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.4.17