Revision: 6956
http://ipcop.svn.sourceforge.net/ipcop/?rev=6956&view=rev
Author: gespinasse
Date: 2013-03-06 22:14:13 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
Upgrade iptables to 1.4.18
Remove the patch needed with 1.4.17
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/iptables
ipcop/trunk/lfs/iptables
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
ipcop/trunk/updates/2.1.0/setup
Removed Paths:
-------------
ipcop/trunk/src/patches/iptables-1.4.17_link-failure-for-ip6t_NETMAP.patch
Modified: ipcop/trunk/config/rootfiles/common/iptables
===================================================================
--- ipcop/trunk/config/rootfiles/common/iptables 2013-03-06 22:01:52 UTC
(rev 6955)
+++ ipcop/trunk/config/rootfiles/common/iptables 2013-03-06 22:14:13 UTC
(rev 6956)
@@ -119,8 +119,8 @@
lib/libiptc.so.0.0.0
#lib/libxtables.la
#lib/libxtables.so
-lib/libxtables.so.9
-lib/libxtables.so.9.0.0
+lib/libxtables.so.10
+lib/libxtables.so.10.0.0
sbin/ip6tables
#sbin/ip6tables-restore
#sbin/ip6tables-save
Modified: ipcop/trunk/lfs/iptables
===================================================================
--- ipcop/trunk/lfs/iptables 2013-03-06 22:01:52 UTC (rev 6955)
+++ ipcop/trunk/lfs/iptables 2013-03-06 22:14:13 UTC (rev 6956)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = iptables
-VER = 1.4.17
+VER = 1.4.18
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c3fb2ffd5b39d0d54b06ccc4c8660116
+$(DL_FILE)_MD5 = a819199d5ec013b82da13a8ffbba857e
install : $(TARGET)
@@ -81,7 +81,6 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_link-failure-for-ip6t_NETMAP.patch
cd $(DIR_APP) && ./configure --prefix=/usr \
--exec-prefix= \
Deleted:
ipcop/trunk/src/patches/iptables-1.4.17_link-failure-for-ip6t_NETMAP.patch
===================================================================
--- ipcop/trunk/src/patches/iptables-1.4.17_link-failure-for-ip6t_NETMAP.patch
2013-03-06 22:01:52 UTC (rev 6955)
+++ ipcop/trunk/src/patches/iptables-1.4.17_link-failure-for-ip6t_NETMAP.patch
2013-03-06 22:14:13 UTC (rev 6956)
@@ -1,81 +0,0 @@
-From: Jan Engelhardt <[email protected]>
-Date: Tue, 1 Jan 2013 22:47:51 +0000 (+0000)
-Subject: build: resolve link failure for ip6t_NETMAP
-X-Git-Url:
https://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff_plain;h=68e77a26111ee6b8f10c735a76891a7de6d57ee6
-
-build: resolve link failure for ip6t_NETMAP
-
-Link stage of libip6t_NETMAP failed since recently.
-
- CCLD libip6t_NETMAP.so
-/usr/lib64/gcc/x86_64-suse-linux/4.7/../../../../x86_64-suse-linux/bin/ld:
-cannot find -lip6tc
-
-libip6t_NETMAP.c uses the "ipv6_prefix_length" function from
-libip6tc.so; "-lip6tc" is used in the Makefile, but, the directory to
-it is not specified.
-
-Why does the link succeed for some people? Because
-/usr/lib(64)/libip6tc.so satisfies -lip6tc, but not all environments,
-especially those without iptables development files, have that file,
-hence this link error can happen.
-
-By suggestion of Mike Frysinger, this patch uses libtool to produce
-and link the plugins.
-
-Signed-off-by: Jan Engelhardt <[email protected]>
-Acked-by: Mike Frysinger <[email protected]>
-Signed-off-by: Pablo Neira Ayuso <[email protected]>
----
-
-diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
-index e71e3ff..adad4d6 100644
---- a/extensions/GNUmakefile.in
-+++ b/extensions/GNUmakefile.in
-@@ -33,6 +33,7 @@ AM_VERBOSE_CXX = @echo " CXX " $@;
- AM_VERBOSE_CXXLD = @echo " CXXLD " $@;
- AM_VERBOSE_AR = @echo " AR " $@;
- AM_VERBOSE_GEN = @echo " GEN " $@;
-+AM_VERBOSE_NULL = @
- endif
-
- #
-@@ -75,7 +76,7 @@ install: ${targets_install}
- if test -n "${targets_install}"; then install -pm0755 $^
"${DESTDIR}${xtlibdir}/"; fi;
-
- clean:
-- rm -f *.o *.oo *.so *.a {matches,targets}.man initext.c initext4.c
initext6.c;
-+ rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c
initext6.c;
- rm -f .*.d .*.dd;
-
- distclean: clean
-@@ -89,19 +90,22 @@ init%.o: init%.c
- #
- # Shared libraries
- #
--lib%.so: lib%.oo
-- ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $<
-L../libxtables/.libs -lxtables ${$*_LIBADD};
-+lib%.so: lib%.la
-+ ${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
-
--lib%.oo: ${srcdir}/lib%.c
-- ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS}
-D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
-+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 $<
-
- libxt_NOTRACK.so: libxt_CT.so
-- ln -fs $< $@
-+ ${AM_VERBOSE_GEN} ln -fs $< $@
- libxt_state.so: libxt_conntrack.so
-- ln -fs $< $@
-+ ${AM_VERBOSE_GEN} ln -fs $< $@
-
- # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
--ip6t_NETMAP_LIBADD = -lip6tc
-+ip6t_NETMAP_LIBADD = ../libiptc/libip6tc.la
- xt_RATEEST_LIBADD = -lm
- xt_statistic_LIBADD = -lm
-
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-03-06 22:01:52 UTC
(rev 6955)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-03-06 22:14:13 UTC
(rev 6956)
@@ -283,7 +283,7 @@
/sbin/ss
/sbin/tc
##
-## iptables-1.4.17
+## iptables-1.4.18
/lib/iptables/libip6t_DNAT.so
/lib/iptables/libip6t_DNPT.so
/lib/iptables/libip6t_HL.so
@@ -374,8 +374,8 @@
/lib/libip4tc.so.0.1.0
/lib/libip6tc.so.0.1.0
/lib/libiptc.so.0.0.0
-/lib/libxtables.so.9
-/lib/libxtables.so.9.0.0
+/lib/libxtables.so.10
+/lib/libxtables.so.10.0.0
/sbin/nfnl_osf
/sbin/xtables-multi
/usr/share/xtables/pf.os
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2013-03-06 22:01:52 UTC (rev
6955)
+++ ipcop/trunk/updates/2.1.0/information.xml 2013-03-06 22:14:13 UTC (rev
6956)
@@ -11,7 +11,7 @@
conntrack-tools to 1.2.2, coreutils to 8.21, dhcpcd to 5.6.7,
dnsmasq to 2.65,
e2fsprogs to 1.42.7, ethtool to 3.6, expat to 2.1.0, freetype to
2.4.11, fontconfig to 2.9,
gawk to 4.0.2, 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,
- iproute2 to 3.7.0, iptables to 1.4.17, iptstate to 2.2.5, iputils
to s20121221, iw to 3.8,
+ iproute2 to 3.7.0, iptables to 1.4.18, iptstate to 2.2.5, iputils
to s20121221, iw to 3.8,
hdparm to 9.39, httpd to 2.2.24, krb5 to 1.10.3,
less to 451, libffi to 3.0.11, libgd to 2.0.36~rc1, libgcrypt to
1.5.0, 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.14,
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2013-03-06 22:01:52 UTC (rev 6955)
+++ ipcop/trunk/updates/2.1.0/setup 2013-03-06 22:14:13 UTC (rev 6956)
@@ -108,7 +108,7 @@
/bin/rm -f /lib/libprocps.so.0*
/bin/rm -f /lib/libsysfs.so*
/bin/rm -f /lib/libz.so.1.2.6
-/bin/rm -f /lib/libxtables.so.7.0.0
+/bin/rm -f /lib/libxtables.so.{7,8,9}*
/bin/rm -f /usr/lib/libapr-1.so.0.4.5
/bin/rm -f /usr/lib/libbind9.so.80.0.{3,4,5}
/bin/rm -f /usr/lib/libdns.so.81.{3.1,6.0,6.1}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
