SOURCES: iptables-batch.patch - update Makefile for 1.4.3

[areq]

Author: areq                         Date: Mon Mar 23 21:08:54 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update Makefile for 1.4.3

---- Files affected:
SOURCES:
   iptables-batch.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/iptables-batch.patch
diff -u SOURCES/iptables-batch.patch:1.2 SOURCES/iptables-batch.patch:1.3
--- SOURCES/iptables-batch.patch:1.2	Sun Aug 24 11:10:02 2008
+++ SOURCES/iptables-batch.patch	Mon Mar 23 22:08:48 2009
@@ -520,21 +520,20 @@
  
  #endif /* _IPTABLES_MULTI_H */
 diff -urN iptables-1.4.1.1.orig/Makefile.am iptables-1.4.1.1/Makefile.am
---- iptables-1.4.1.1.orig/Makefile.am	2008-06-16 15:12:40.000000000 +0200
-+++ iptables-1.4.1.1/Makefile.am	2008-08-24 10:43:30.000000000 +0200
-@@ -18,8 +18,9 @@
- 
+--- iptables-1.4.3.orig/Makefile.am	2008-06-16 15:12:40.000000000 +0200
++++ iptables-1.4.3/Makefile.am	2008-08-24 10:43:30.000000000 +0200
+@@ -31,8 +31,8 @@
+ iptables_xml_LDADD        = libxtables.la
  iptables_multi_SOURCES    = iptables-multi.c iptables-save.c \
                              iptables-restore.c iptables-xml.c \
--                            iptables-standalone.c iptables.c xtables.c
+-                            iptables-standalone.c iptables.c
 -iptables_multi_CFLAGS     = ${AM_CFLAGS} -DIPTABLES_MULTI
-+                            iptables-standalone.c iptables.c xtables.c \
-+                            iptables-batch.c
++                            iptables-standalone.c iptables.c iptables-batch.c
 +iptables_multi_CFLAGS     = ${AM_CFLAGS} -DIPTABLES_MULTI -DBATCH_IPV4
  iptables_multi_LDFLAGS    = ${iptables_LDFLAGS}
  iptables_multi_LDADD      = ${iptables_LDADD}
  
-@@ -31,9 +32,14 @@
+@@ -44,9 +44,14 @@
  iptables_save_LDFLAGS     = ${iptables_LDFLAGS}
  iptables_save_LDADD       = ${iptables_LDADD}
  
@@ -544,24 +543,24 @@
 +iptables_batch_LDADD      = ${iptables_LDADD}
 +
  # iptables-multi, semi-static
- iptables_static_SOURCES   = ${iptables_multi_SOURCES}
+ iptables_static_SOURCES   = ${iptables_multi_SOURCES} xtables.c
 -iptables_static_CFLAGS    = ${iptables_multi_CFLAGS} -DNO_SHARED_LIBS=1
 +iptables_static_CFLAGS    = ${iptables_multi_CFLAGS} -DNO_SHARED_LIBS=1 -DBATCH_IPV4
- iptables_static_LDADD     = -lm libiptc/libiptc.a extensions/libext4.a
+ iptables_static_LDADD     = -lm libiptc/libiptc.la extensions/libext4.a
  
  iptables_xml_SOURCES      = iptables-xml.c
-@@ -45,8 +51,8 @@
+@@ -58,8 +63,8 @@
  
  ip6tables_multi_SOURCES   = ip6tables-multi.c ip6tables-save.c \
                              ip6tables-restore.c ip6tables-standalone.c \
--                            ip6tables.c xtables.c
+-                            ip6tables.c
 -ip6tables_multi_CFLAGS    = ${AM_CFLAGS} -DIPTABLES_MULTI
-+                            ip6tables.c xtables.c iptables-batch.c
++                            ip6tables.c iptables-batch.c
 +ip6tables_multi_CFLAGS    = ${AM_CFLAGS} -DIPTABLES_MULTI -DBATCH_IPV6
  ip6tables_multi_LDFLAGS   = ${ip6tables_LDFLAGS}
  ip6tables_multi_LDADD     = ${ip6tables_LDADD}
  
-@@ -58,9 +64,14 @@
+@@ -71,9 +76,14 @@
  ip6tables_save_LDFLAGS    = ${ip6tables_LDFLAGS}
  ip6tables_save_LDADD      = ${ip6tables_LDADD}
  
@@ -571,13 +570,13 @@
 +ip6tables_batch_LDADD     = ${ip6tables_LDADD}
 +
  # iptables-multi, semi-static
- ip6tables_static_SOURCES    = ${ip6tables_multi_SOURCES}
+ ip6tables_static_SOURCES    = ${ip6tables_multi_SOURCES} xtables.c
 -ip6tables_static_CFLAGS     = ${ip6tables_multi_CFLAGS} -DNO_SHARED_LIBS=1
 +ip6tables_static_CFLAGS     = ${ip6tables_multi_CFLAGS} -DNO_SHARED_LIBS=1 -DBATCH_IPV6
- ip6tables_static_LDADD      = -lm libiptc/libiptc.a extensions/libext6.a
+ ip6tables_static_LDADD      = -lm libiptc/libiptc.la extensions/libext6.a
  
- noinst_LIBRARIES := libiptc/libiptc.a
-@@ -83,7 +94,8 @@
+ bin_PROGRAMS     = iptables-xml
+@@ -89,7 +99,8 @@
  endif
  if ENABLE_SHARED
  sbin_PROGRAMS += iptables iptables-multi iptables-restore iptables-save \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables-batch.patch?r1=1.2&r2=1.3&f=u