Version bump.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 159 insertions, 12 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index ab06cd73888c..d58f2ed442a9 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.247 2011/08/28 15:57:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.248 2011/09/03 13:25:06 pva Exp $
+
+*iptables-1.4.12.1 (03 Sep 2011)
+
+  03 Sep 2011; Peter Volkov <pva@gentoo.org> +iptables-1.4.12.1.ebuild,
+  +files/iptables-1.4.12.1-lm.patch:
+  Version bump.
 
   28 Aug 2011; Raúl Porcel <armin76@gentoo.org> iptables-1.4.11.1-r2.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #376881
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 4e2381ef3ef6..c959049017b8 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,26 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ip6tables-1.3.2.confd 293 RMD160 2e5399355a930ab3c804c9cc46fe37763555a97e SHA1 0e82dbe8538f9168bb97939a03b73dd291e82760 SHA256 c93827ac2b8fdd83e2c36788053ee7567ceb13b3cbc5fcf40d186500e05c8104
 AUX iptables-1.3.2.confd 290 RMD160 cb180068f86a608b16d850635ae909ea7b9cc059 SHA1 cb56dba4799eb3998b28e492c61265574c37d522 SHA256 351e123ba9e0ec7db2bcff42849aa627d29a3b2e77a47b82386f5e3a7e21bd30
 AUX iptables-1.3.2.init 2570 RMD160 84d06807fae0455009476cfa63dfcda9fe016dc3 SHA1 da7c4fca4049c4d3f45e32d29403c8bb05047f15 SHA256 1137517483c0d312e3d396d953e9ee197b84f64ed17adfd48f25dbb60e114697
 AUX iptables-1.4.11.1-man-fixes.patch 1165 RMD160 49b29d61a291af0cc7f682c7ddb2d5ac764640e7 SHA1 5e4941364a26c5d75fc43766888d54c84bf21fb3 SHA256 2b89e9ba68334bc45ac7b96ad53565a1cf41805a3659f65888ad495e84f9822e
 AUX iptables-1.4.11.init 2604 RMD160 dccdc3b503a3d89a360cef37d22beec1ab221995 SHA1 bdd2f04f413000eb50de72bb248e7dcd6b8a6fac SHA256 d0a27b011bc7f02d148931b9c2628288d35f521ccbc06b779fd41cef6d7b7f80
+AUX iptables-1.4.12.1-lm.patch 2107 RMD160 8dcb6438a4bb5848af546265ec393325674bd573 SHA1 2a5304c800d7cdc1850dbe2f0ae5c03339964422 SHA256 dfc429b71c6a3d77a6447e4d7c0c13f62cf086187f491968b3361568f9aa09ef
 DIST iptables-1.4.10.tar.bz2 478007 RMD160 f06298fa982ffe5cb5c1885395d375d909512bf6 SHA1 8190b8c9714a3eec825317e8ac1deeb3d11c6d29 SHA256 7544e437d2222078b15e6cd063b521c6f1ec4dac49e6af9ba3bfece2a6a93445
 DIST iptables-1.4.11.1.tar.bz2 486926 RMD160 43d5e267bf630d663785ee4435a89de0bfc6c5d0 SHA1 2aa0d215485133f2817973b0914a132f628d9f3a SHA256 170c294698ca573477b1b2a3815e1563bf9929d182efef6cf0331a6e955c9ade
+DIST iptables-1.4.12.1.tar.bz2 473418 RMD160 286d27b6fc7d47fb1a47f4434d7accdef39f1f1a SHA1 86022c3b5129ad7105f5087ec1349e99cc5a9728 SHA256 77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba
 DIST iptables-1.4.12.tar.bz2 487036 RMD160 643ca8742ca657067161f980159d8f6496e2a6b8 SHA1 6c3f6eceadf5dab570d757d74a7194ef75be3ee3 SHA256 3e07a0beb746b580fbcfb04b3842ef0bd94a2f281786552f586415b26a7e971c
 DIST iptables-1.4.6.tar.bz2 463758 RMD160 05e2e46f71f04e7675ed6f1d9f43b1142bcb14e0 SHA1 3372dca2ba3769e53ffbcae08ee418b53338327a SHA256 6e732798cad62163d6e033aa52e22b771246556a230c0f66cd33fe69e96d72a4
 EBUILD iptables-1.4.10-r1.ebuild 2211 RMD160 08b184f51e106040be081664af0d0571a664229b SHA1 9cd5c0bb8414baae57fa954f60833df8f1c41152 SHA256 9e252a50a818104753102a48216ed3f67c524ab2866ffb752e0fd985ca61434c
 EBUILD iptables-1.4.10.ebuild 1847 RMD160 e6679bf4f78d1fd02e2f804d4c9fb708068927d1 SHA1 b5d309d92fd2ab38755e749994805f599cd7edc9 SHA256 59b3e9be75d0d4c13694692d36fc8e96a2a775e5a4809c300864c63a0b184376
 EBUILD iptables-1.4.11.1-r2.ebuild 2226 RMD160 1164d66cde2b975c35e5f84532a41947bf618d98 SHA1 fc798d54e6ada0e2bc1cec4926329e1faeaa6417 SHA256 7cca07bca62a6bc5f5fd0c78abc237594d6fd1e69d03664deaddad16276e12b2
+EBUILD iptables-1.4.12.1.ebuild 2244 RMD160 b6de1129c94611a18fe8008603c10389c1a1f045 SHA1 8e0a419a24118bc9b651287877b9e819d80ba8ab SHA256 44ac7fc56f29f3ec88f953e3ee3aa3e354c1e76b237f075b7c4af821afd5e519
 EBUILD iptables-1.4.12.ebuild 2181 RMD160 ac5dca50c3fc903d0a9466503f0dea3f65af7635 SHA1 8e7aa3bc786b5c805ac32015d2cd59ecb59feaf1 SHA256 28ddb17b1b0cfaddd290ee8f850075368082df0029f3a6949b5b87505779316b
 EBUILD iptables-1.4.6.ebuild 1433 RMD160 9dbfa44e5cd29a505a7095f122154061cef1d969 SHA1 788fc9f2ad8aa814821b43aa89933a8e281401c3 SHA256 c3808c683e4f286e40989133c80ad898aaa8e00eac635ec115652acb974e302f
-MISC ChangeLog 43809 RMD160 e0789ca5be9600a4e603529779b3eb83b87fa8f1 SHA1 459272e985af47c13a2b2ff479382d2978658ac3 SHA256 c24c45dc0472186c0e90bfb054cd029e08e757d8b73324c459d2cb98ead50b20
+MISC ChangeLog 43965 RMD160 a00cc5d8961b3f7b1a538994b34698cb7afd1ebe SHA1 2f6a18df2f35a45b8e2a77929ba7d0594b80a516 SHA256 e391694d0c9e9ef0c52a0c7490799813911e478cfb7e915b30bfabb8cf0acf29
 MISC metadata.xml 1033 RMD160 e99b7b4ea8b981347a7fcadb549d122e23af4fd7 SHA1 4feab39d5a63d9ead6d389eae639bcbfd7fff197 SHA256 6972ae7bad5c0025564a15429579f046ab4c365929aa175b1e84c1586872bdc9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk5aZXIACgkQuQc30/atMkCvAgCeMFLIKfsSUZzgGMe2lhfovjJ7
-XIMAoLb4LNIWZY0Pto3MnreZnD+lwaXe
-=g37v
------END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/iptables-1.4.12.1-lm.patch b/net-firewall/iptables/files/iptables-1.4.12.1-lm.patch
new file mode 100644
index 000000000000..4d9e1d8ed4dd
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.4.12.1-lm.patch
@@ -0,0 +1,61 @@
+parent 2ca6273c73b42e8c74afd5f8b1fe10c5c93ce363 (v1.4.12-43-g2ca6273)
+commit d4e72dc1c684c2f8361d87e6bde2902cd2ee8efb
+Author: Jan Engelhardt <jengelh@medozas.de>
+Date:   Sat Sep 3 13:34:40 2011 +0200
+
+libxt_statistic: link with -lm
+
+$ ldd -r libxt_statistic.so
+undefined symbol: lround        (./libxt_statistic.so)
+
+References: https://bugs.archlinux.org/task/25358
+Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
+---
+ extensions/GNUmakefile.in |    5 ++++-
+ iptables/Makefile.am      |    9 +++++++--
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
+index 2b48d84..dbf210c 100644
+--- a/extensions/GNUmakefile.in
++++ b/extensions/GNUmakefile.in
+@@ -90,11 +90,14 @@ init%.o: init%.c
+ #	Shared libraries
+ #
+ lib%.so: lib%.oo
+-	${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $<;
++	${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< ${$*_LIBADD};
+ 
+ lib%.oo: ${srcdir}/lib%.c
+ 	${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
+ 
++# Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
++xt_statistic_LIBADD = -lm
++
+ 
+ #
+ #	Static bits
+diff --git a/iptables/Makefile.am b/iptables/Makefile.am
+index addb159..f6db32d 100644
+--- a/iptables/Makefile.am
++++ b/iptables/Makefile.am
+@@ -6,12 +6,17 @@ AM_CPPFLAGS      = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}
+ lib_LTLIBRARIES       = libxtables.la
+ libxtables_la_SOURCES = xtables.c xtoptions.c
+ libxtables_la_LDFLAGS = -version-info ${libxtables_vcurrent}:0:${libxtables_vage}
++libxtables_la_LIBADD  =
++if ENABLE_STATIC
++# With --enable-static, shipped extensions are linked into the main executable,
++# so we need all the LIBADDs here too
++libxtables_la_LIBADD += -lm
++endif
+ if ENABLE_SHARED
+ libxtables_la_CFLAGS  = ${AM_CFLAGS}
+-libxtables_la_LIBADD  = -ldl
++libxtables_la_LIBADD += -ldl
+ else
+ libxtables_la_CFLAGS  = ${AM_CFLAGS} -DNO_SHARED_LIBS=1
+-libxtables_la_LIBADD  =
+ endif
+ 
+ xtables_multi_SOURCES  = xtables-multi.c iptables-xml.c
diff --git a/net-firewall/iptables/iptables-1.4.12.1.ebuild b/net-firewall/iptables/iptables-1.4.12.1.ebuild
new file mode 100644
index 000000000000..ca2bd6d3a661
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.4.12.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1.ebuild,v 1.1 2011/09/03 13:25:06 pva Exp $
+
+EAPI="4"
+
+# Force users doing their own patches to install their own tools
+AUTOTOOLS_AUTO_DEPEND=no
+
+inherit eutils toolchain-funcs autotools
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="http://www.iptables.org/"
+SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6 netlink"
+
+COMMON_DEPEND="
+	netlink? ( net-libs/libnfnetlink )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/os-headers
+	sys-devel/automake
+"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/iptables-1.4.12.1-lm.patch"
+	eautomake
+
+	# Only run autotools if user patched something
+	epatch_user && eautoreconf || elibtoolize
+}
+
+src_configure() {
+	sed -i \
+		-e "/nfnetlink=[01]/s:=[01]:=$(use netlink && echo 1 || echo 0):" \
+		configure || die
+	econf \
+		--sbindir=/sbin \
+		--libexecdir=/$(get_libdir) \
+		--enable-devel \
+		--enable-libipq \
+		--enable-shared \
+		--enable-static \
+		$(use_enable ipv6)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc INCOMPATIBILITIES iptables/iptables.xslt
+
+	# all the iptables binaries are in /sbin, so might as well
+	# put these small files in with them
+	into /
+	dosbin iptables/iptables-apply
+	dosym iptables-apply /sbin/ip6tables-apply
+	doman iptables/iptables-apply.8
+
+	insinto /usr/include
+	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
+	insinto /usr/include/iptables
+	doins include/iptables/internal.h
+
+	keepdir /var/lib/iptables
+	newinitd "${FILESDIR}"/${PN}-1.4.11.init iptables
+	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
+	if use ipv6 ; then
+		keepdir /var/lib/ip6tables
+		newinitd "${FILESDIR}"/iptables-1.4.11.init ip6tables
+		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
+	fi
+
+	# Move important libs to /lib
+	gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
+	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}