'[Ipcop-svn] SF.net SVN: ipcop:[7088] ipcop/trunk'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[7088] ipcop/trunk
From:       owes () users ! sourceforge ! net
Date:       2013-07-30 21:12:50
Message-ID: E1V4HDy-0006F2-Tb () sfs-ml-2 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 7088
          http://sourceforge.net/p/ipcop/svn/7088
Author:   owes
Date:     2013-07-30 21:12:48 +0000 (Tue, 30 Jul 2013)
Log Message:
-----------
Update iptables to 1.4.19.1. Remove upstream patches.

Modified Paths:
--------------
    ipcop/trunk/lfs/iptables
    ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
    ipcop/trunk/updates/2.1.0/information.xml

Removed Paths:
-------------
    ipcop/trunk/src/patches/iptables-1.4.18-extensions-link.patch
    ipcop/trunk/src/patches/iptables-1.4.18-ipv6-linkage.patch

Modified: ipcop/trunk/lfs/iptables
===================================================================
--- ipcop/trunk/lfs/iptables	2013-07-29 20:16:47 UTC (rev 7087)
+++ ipcop/trunk/lfs/iptables	2013-07-30 21:12:48 UTC (rev 7088)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = iptables
-VER        = 1.4.18
+VER        = 1.4.19.1
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -53,7 +53,7 @@
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a819199d5ec013b82da13a8ffbba857e
+$(DL_FILE)_MD5 = be97ce9007fa42c867901b496c935a0a
 
 install : $(TARGET)
 
@@ -83,9 +83,6 @@
 $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	# Use 2 upstream patches to fix the rpath mess
-	cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)-extensions-link.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)-ipv6-linkage.patch
 
 	cd $(DIR_APP) && ./configure	--prefix=/usr \
 					--exec-prefix= \

Deleted: ipcop/trunk/src/patches/iptables-1.4.18-extensions-link.patch
===================================================================
--- ipcop/trunk/src/patches/iptables-1.4.18-extensions-link.patch	2013-07-29 20:16:47 \
                UTC (rev 7087)
+++ ipcop/trunk/src/patches/iptables-1.4.18-extensions-link.patch	2013-07-30 21:12:48 \
UTC (rev 7088) @@ -1,74 +0,0 @@
-From 37b19d08f3cbc83a653386d76261490e173a874b Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sat, 16 Mar 2013 12:15:30 +0100
-Subject: [PATCH] Revert "build: resolve link failure for ip6t_NETMAP"
-
-This reverts commit 68e77a26111ee6b8f10c735a76891a7de6d57ee6.
-
-The use of libtool was introduced to resolve linking problems
-in NETMAP (IPv6 version), but that resulted in RPATH problems
-reported from distributors and warnings spotted by libtool at
-linking stage.
-
-Since (0ca548b libip6t_NETMAP: Use xtables_ip6mask_to_cidr and
-get rid of libip6tc dependency) fixed the NETMAP issue, let's
-roll back to our previous stage.
-
-A small conflicts in extensions/GNUmakefile.in has been resolved
-in this revert.
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- extensions/GNUmakefile.in | 18 +++++++-----------
- 1 file changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
-index 3db6985..1ae7f74 100644
---- a/extensions/GNUmakefile.in
-+++ b/extensions/GNUmakefile.in
-@@ -33,7 +33,6 @@ AM_VERBOSE_CXX    = @echo "  CXX     " $@;
- AM_VERBOSE_CXXLD  = @echo "  CXXLD   " $@;
- AM_VERBOSE_AR     = @echo "  AR      " $@;
- AM_VERBOSE_GEN    = @echo "  GEN     " $@;
--AM_VERBOSE_NULL   = @
- endif
- 
- #
-@@ -76,7 +75,7 @@ install: ${targets_install}
- 	if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; \
                fi;
- 
- clean:
--	rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c \
                initext6.c;
-+	rm -f *.o *.oo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
- 	rm -f .*.d .*.dd;
- 
- distclean: clean
-@@ -90,19 +89,16 @@ init%.o: init%.c
- #
- #	Shared libraries
- #
--lib%.so: lib%.la
--	${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
-+lib%.so: lib%.oo
-+	${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< \
                -L../libxtables/.libs -lxtables ${$*_LIBADD};
- 
--lib%.la: lib%.lo
--	${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} \
${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} \
                -rpath ${xtlibdir}
--
--lib%.lo: ${srcdir}/lib%.c
--	${AM_VERBOSE_CC} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} \
                ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init \
                ${CFLAGS} -o $@ -c $<
-+lib%.oo: ${srcdir}/lib%.c
-+	${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} \
                -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
- 
- libxt_NOTRACK.so: libxt_CT.so
--	${AM_VERBOSE_GEN} ln -fs $< $@
-+	ln -fs $< $@
- libxt_state.so: libxt_conntrack.so
--	${AM_VERBOSE_GEN} ln -fs $< $@
-+	ln -fs $< $@
- 
- # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
- xt_RATEEST_LIBADD   = -lm
--- 
-1.8.2.1
-

Deleted: ipcop/trunk/src/patches/iptables-1.4.18-ipv6-linkage.patch
===================================================================
--- ipcop/trunk/src/patches/iptables-1.4.18-ipv6-linkage.patch	2013-07-29 20:16:47 \
                UTC (rev 7087)
+++ ipcop/trunk/src/patches/iptables-1.4.18-ipv6-linkage.patch	2013-07-30 21:12:48 \
UTC (rev 7088) @@ -1,88 +0,0 @@
-From cccfff9309743f173c504dd265fae173caa5b47f Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sat, 16 Mar 2013 12:11:07 +0100
-Subject: [PATCH] libip6t_NETMAP: Use xtables_ip6mask_to_cidr and get rid of
- libip6tc dependency
-
-This patch changes the NETMAP target extension (IPv6 side) to use
-the xtables_ip6mask_to_cidr available in libxtables.
-
-As a side effect, we get rid of the libip6tc dependency.
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- extensions/GNUmakefile.in   | 1 -
- extensions/libip6t_NETMAP.c | 2 +-
- include/libiptc/libip6tc.h  | 3 ---
- iptables/ip6tables.c        | 2 +-
- libiptc/libip6tc.c          | 2 +-
- 5 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
-index adad4d6..3db6985 100644
---- a/extensions/GNUmakefile.in
-+++ b/extensions/GNUmakefile.in
-@@ -105,7 +105,6 @@ libxt_state.so: libxt_conntrack.so
- 	${AM_VERBOSE_GEN} ln -fs $< $@
- 
- # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
--ip6t_NETMAP_LIBADD  = ../libiptc/libip6tc.la
- xt_RATEEST_LIBADD   = -lm
- xt_statistic_LIBADD = -lm
- 
-diff --git a/extensions/libip6t_NETMAP.c b/extensions/libip6t_NETMAP.c
-index d14dece..a4df70e 100644
---- a/extensions/libip6t_NETMAP.c
-+++ b/extensions/libip6t_NETMAP.c
-@@ -61,7 +61,7 @@ static void NETMAP_print(const void *ip, const struct \
                xt_entry_target *target,
- 	printf("%s", xtables_ip6addr_to_numeric(&a));
- 	for (i = 0; i < 4; i++)
- 		a.s6_addr32[i] = ~(r->min_addr.ip6[i] ^ r->max_addr.ip6[i]);
--	bits = ipv6_prefix_length(&a);
-+	bits = xtables_ip6mask_to_cidr(&a);
- 	if (bits < 0)
- 		printf("/%s", xtables_ip6addr_to_numeric(&a));
- 	else
-diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h
-index c656bc4..9aed80a 100644
---- a/include/libiptc/libip6tc.h
-+++ b/include/libiptc/libip6tc.h
-@@ -154,9 +154,6 @@ int ip6tc_get_raw_socket(void);
- /* Translates errno numbers into more human-readable form than strerror. */
- const char *ip6tc_strerror(int err);
- 
--/* Return prefix length, or -1 if not contiguous */
--int ipv6_prefix_length(const struct in6_addr *a);
--
- extern void dump_entries6(struct xtc_handle *const);
- 
- extern const struct xtc_ops ip6tc_ops;
-diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c
-index 4cfbea3..7d02cc1 100644
---- a/iptables/ip6tables.c
-+++ b/iptables/ip6tables.c
-@@ -1022,7 +1022,7 @@ static void print_ip(const char *prefix, const struct in6_addr \
                *ip,
- 		     const struct in6_addr *mask, int invert)
- {
- 	char buf[51];
--	int l = ipv6_prefix_length(mask);
-+	int l = xtables_ip6mask_to_cidr(mask);
- 
- 	if (l == 0 && !invert)
- 		return;
-diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c
-index 7128e1c..ca01bcb 100644
---- a/libiptc/libip6tc.c
-+++ b/libiptc/libip6tc.c
-@@ -113,7 +113,7 @@ typedef unsigned int socklen_t;
- #define BIT6(a, l) \
-  ((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
- 
--int
-+static int
- ipv6_prefix_length(const struct in6_addr *a)
- {
- 	int l, i;
--- 
-1.8.2.1
-

Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0	2013-07-29 20:16:47 UTC (rev 7087)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0	2013-07-30 21:12:48 UTC (rev 7088)
@@ -300,7 +300,7 @@
 /sbin/ss
 /sbin/tc
 ##
-## iptables-1.4.18
+## iptables-1.4.19.1
 /lib/iptables/libip6t_DNAT.so
 /lib/iptables/libip6t_DNPT.so
 /lib/iptables/libip6t_HL.so

Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml	2013-07-29 20:16:47 UTC (rev 7087)
+++ ipcop/trunk/updates/2.1.0/information.xml	2013-07-30 21:12:48 UTC (rev 7088)
@@ -13,7 +13,7 @@
             e2fsprogs to 1.42.7, ethtool to 3.6, expat to 2.1.0, freetype to 2.4.12, \
                fontconfig to 2.9,
             gawk to 4.0.2, GD to 2.49, gettext to 0.18.2, glib to 2.30.3, gmp to \
5.0.5, gnupg to 1.4.13, grep to 2.14, gzip to 1.5,  hdparm to 9.43, httpd to 2.2.25,
-            iproute2 to 3.7.0, iptables to 1.4.18, iptstate to 2.2.5, iputils to \
s20121221, iw to 3.8, krb5 to 1.10.5, +            iproute2 to 3.7.0, iptables to \
                1.4.19.1, iptstate to 2.2.5, iputils to s20121221, iw to 3.8, krb5 to \
                1.10.5,
             less to 451, libffi to 3.0.13, libgd to 2.0.36~rc1, libgcrypt to 1.5.2, \
                libnet to 1.1.6,
             libnfnetlink to 1.0.1, libnetfiltercontrack to 1.0.2, libnl to 3.2.16, \
                libpcap to 1.3.0, libpng to 1.5.16,
             libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2 to \
2.9.1, logrotate to 3.8.1, lsof to 4.87,

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent 
caught up. So what steps can you take to put your SQL databases under 
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic