Changeset 3362

Show
Ignore:
Timestamp:
02/05/07 19:01:05 (2 years ago)
Author:
jim
Message:

Fixed IPTables DO_MULTI Patch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/clfs-embedded/BOOK/general.ent

    r3353 r3362  
    33<!ENTITY month "02"> <!-- Use two digits --> 
    44<!ENTITY month_name "January"> 
    5 <!ENTITY day "04"> <!-- Use two digits --> 
     5<!ENTITY day "05"> <!-- Use two digits --> 
    66<!ENTITY year "2007"> <!-- Use four digits --> 
    77 

  • branches/clfs-embedded/BOOK/patches.ent

    r3360 r3362  
    4444 
    4545<!ENTITY iptables-domulti-patch "iptables-&iptables-version;-do_multi-1.patch"> 
    46 <!ENTITY iptables-domulti-patch-md5 "b0c73cb8ae3a7e767b6ae9eedce09436"> 
     46<!ENTITY iptables-domulti-patch-md5 "badcc9ea0dc1097d3a0a4f299eaa9219"> 
    4747<!ENTITY iptables-domulti-patch-size "4 KB"> 
    4848 

  • branches/clfs-embedded/patches/iptables-1.3.7-do_multi-1.patch

    r3360 r3362  
    11Submitted By: Jim Gifford <jciccone@linuxfromscratch.org> 
    2 Date: 2007-02-04 
     2Date: 2007-02-05 
    33Initial Package Version: 1.3.7 
    44Origin: http://lists.netfilter.org/pipermail/netfilter-devel/2006-December/026344.html 
    …… 
    66Description: Fixes Build Issues with DO_MULTI=1 
    77 
     8diff -Naur iptables-1.3.7.orig/Makefile iptables-1.3.7/Makefile 
     9--- iptables-1.3.7.orig/Makefile        2006-12-04 03:16:01.000000000 -0800 
     10+++ iptables-1.3.7/Makefile     2007-02-05 10:57:33.000000000 -0800 
     11@@ -170,7 +170,7 @@ 
     12        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) 
     13  
     14 ifeq ($(DO_MULTI), 1) 
     15-$(DESTDIR)$(BINDIR)/iptables-xml: iptables-xml 
     16+$(DESTDIR)$(BINDIR)/iptables-xml: iptables 
     17        @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) 
     18        ln -sf $< $@ 
     19 else 
    820diff -Naur iptables-1.3.7.orig/iptables-multi.c iptables-1.3.7/iptables-multi.c 
    921--- iptables-1.3.7.orig/iptables-multi.c        2006-12-04 03:15:20.000000000 -0800 
    10 +++ iptables-1.3.7/iptables-multi.c     2007-02-04 20:57:32.000000000 -0800 
     22+++ iptables-1.3.7/iptables-multi.c     2007-02-05 10:55:22.000000000 -0800 
    1123@@ -6,6 +6,7 @@ 
    1224 int iptables_main(int argc, char **argv); 
    …… 
    2840diff -Naur iptables-1.3.7.orig/iptables-xml.c iptables-1.3.7/iptables-xml.c 
    2941--- iptables-1.3.7.orig/iptables-xml.c  2006-12-04 03:15:20.000000000 -0800 
    30 +++ iptables-1.3.7/iptables-xml.c       2007-02-04 20:57:32.000000000 -0800 
     42+++ iptables-1.3.7/iptables-xml.c       2007-02-05 10:55:22.000000000 -0800 
    3143@@ -26,8 +26,9 @@ 
    3244 /* no need to link with iptables.o */