Version bump.

Package-Manager: portage-2.2.0_alpha195/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 104 insertions, 16 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index c8e4701ded9c..a86a2a748bed 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.293 2013/06/09 23:00:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.294 2013/08/10 04:58:19 radhermit Exp $
+
+*iptables-1.4.20 (10 Aug 2013)
+
+  10 Aug 2013; Tim Harder <radhermit@gentoo.org> +iptables-1.4.20.ebuild:
+  Version bump.
 
   09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index ba20b99c1e2d..2e0dee121e74 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -28,6 +28,7 @@ DIST iptables-1.4.16.3.tar.bz2 536872 SHA256 643ccf34099d53d5b839e1d889c05627745
 DIST iptables-1.4.17.tar.bz2 541137 SHA256 51e7a769469383b6ad308a6a19cdd2bd813cf4593e21a156a543a1cd70554925 SHA512 022f89cbf56408842bdeb1adbe05076addaad007599fdb662f32a1c134d743dade28c26842acc7545d2474903164be5fe3ec7fd1e276cd2c37bd3b33b8a30de1 WHIRLPOOL f2cb85d5f4080fce2c6673a58737ace3d55130f74c66207bc515d0c7b4ecd75bd7ac8540a862e8af133e740d34eee40833d72c9c3236c7ef4dc75cd43816ec41
 DIST iptables-1.4.18.tar.bz2 542308 SHA256 14a99fb8b0ca22027a9ac6eb72fa32c834ceb3073820e0ba79bf251c6a7bcf3c SHA512 fc62916bd90863c0868f70d711fd6716cbcb54402c32bdeebfd0cee05137fa3ff1a137f0a4b5b31ee0bb6492e23e60e7025d51914b26c0e0b233181cbb1cb1b5 WHIRLPOOL 5d89e0f8d2dfad0f25a369f936f86386c799b2c475cef9fb13fb3c8cb9fcb201361c7d134a24f68099b2b5468c97476e1982bc116fa6448a07d776c724fddbd3
 DIST iptables-1.4.19.1.tar.bz2 543785 SHA256 dd51d3b942758a462afc7c8495930d25c93058e5319303247375183ad50164d2 SHA512 a3232ae92b997f67b5895c110f2cb8ec3aecbc383e804a870351c61e49cd83c1d7bf750818768f5560d615090157a17cc5c4ef101bc104905915de67fa022088 WHIRLPOOL 99ec72c45eb5a5721e4228b3ae79ffa2d1a67db362a9c67a09190c8bed54f023e6550b300b41d0d119c518d234559d7bc1182313b26460a2d224768d1f7955b3
+DIST iptables-1.4.20.tar.bz2 546864 SHA256 109b8c7ca90b4536bc5de869ae705f6d5efcc0c08ef3003755aad3ed6d2d49ad SHA512 6c8e1d89db66c0cfd76afd7fa7de8a7d451337f6f15f01d811585714f6d488275621ca9a1f4967a2ae99e90f3890cf0e3c7f7a9a3a98fda902b0a56717d7ffe0 WHIRLPOOL 8146d632ec00c663988d4e82e3adfa8b9fa2df269df2e6cc359dae65727e59f4ef614540eb4f970d020eac558d7423731a88246f9df1265718346ca62e59a8e7
 DIST iptables-1.4.6.tar.bz2 463758 SHA256 6e732798cad62163d6e033aa52e22b771246556a230c0f66cd33fe69e96d72a4 SHA512 0ec1314462a154b5892093b17b997f130760b2ada4fb2b7cdc0f6cb7bb9da9ddaf77400c3fcbe57c4db1400adaec37d38f9debe37f7ed33dabbbe3b58c13e942 WHIRLPOOL 39e1f0f3f46350c81d2fe219b5d40174f4a390180f71ac8c896a634aa29abe98da665c8e93d373465dad351a9604d6c5e36c0f99f7256b85ffbc3615cefa28ae
 EBUILD iptables-1.4.10-r1.ebuild 2224 SHA256 1f18f98ec9949b78b8df8fe8bfe9472b91fd8b235c4cad1e162a99d55dd458b5 SHA512 b0027e43422a8f07f607ce67921420dfc3d56a59b7856f4c4bf70af1c9e8d5731752570ab67d320d71b07276fb4489ca84158686ac7829a23c1e4bf84ded1b66 WHIRLPOOL a8a40bcc3a05b9e5f5dcbcb23c38092732289f3fd3d8962fd0ba3a8b4d7f7d776da68373e028823c8fc04730d05791dd9d45e1fe7baf645ac9d4c006220c1773
 EBUILD iptables-1.4.10.ebuild 1858 SHA256 8933ec2e405043641c48d57a2bc979546a60a242499f26634135f8ccd3256040 SHA512 9fe0e222ccf6a47afc4a609e330bf802b05d88dbf027d7fd58a118a7d9d3a550a1e2725a833aabc0866fe8d30fe611f789a8a34e36459196b0735b2f7c5088d7 WHIRLPOOL 0375aa73a95588a0bd0b50452ca3fe2218cad7f450c221907a1848057d7fd0829cc2c99719fb87ab984305449c0b1f066ec719c04bf0117abb97ba98a1eb42a0
@@ -44,23 +45,18 @@ EBUILD iptables-1.4.16.3.ebuild 2217 SHA256 852a0755aba86918ead04ca8315fbc6ddbbb
 EBUILD iptables-1.4.17.ebuild 2355 SHA256 c7656bc972eb6cf702aa10ba04682ae5457bf2a11eacfb5f3a54de8a607ecbec SHA512 8802734174dabbd3f51144a63e1c21622632ad97727a3bd7eb507ea28b7dd642ac3b081e941c4f55840202d192f4d756d4385743ae2de2a822ffe6fa8a6c531c WHIRLPOOL f050cdec4a7712f155d82646cee9e4ca4a80f253754eb4b94011a9a5406dcbc03a3665e648fd8db1f02bdb32a805cb3ea4481b92d03a55495fab600b8e354274
 EBUILD iptables-1.4.18.ebuild 2424 SHA256 14f273e0d6ac1d3df9d073f666a448d7db68b8fe64e3641dcda8ac28ca082cf6 SHA512 d835d34529a4e6609ac712de9a16eda946e4f35afe6fdbb2161f0c3c9c726f52167c142d0609510040d51273e13f984760f97f9ebdfb4db9ce03592915db01ee WHIRLPOOL 902e9678fe338d190d4a2f21a2b62d342ee322cfd15801bdd0f9d3ceac8c0edb2f34b46d23b9161b3ea4d187371fa4596eb6198fc97cf533171857afdca4a526
 EBUILD iptables-1.4.19.1.ebuild 2272 SHA256 09792d07161882524fcce8bfb58d1528b297209cf5b1882c3cf24d87c08345c3 SHA512 bb1794e7a5f0250e900f90a6f9b156573e86a90eb8cda0194e5cba8da91cea14d16c2e2a8c638fa6ee1ca84549514d2ac4d32c92b00a75c6409b15f92135cad9 WHIRLPOOL 98527eb9faafbe7c59f7578aae9112fb0f094baaf8baf4c842db35701cfc10f6a0b49b6c1daba754d0208388678c3f240f26a5799c07a663508df0aea2a13faa
+EBUILD iptables-1.4.20.ebuild 2270 SHA256 500b446eccec72f71152715e2bd33ee803846b17372cf9ae7d5673571a8469e7 SHA512 f4ed0a18a1c0533c778dffcd466b84d5d05e3433465648ae3cc1e8e418863501a7e791afeef80746401d03a99e3b4c6375c4edabc9a3621a6e5cd956a8efe163 WHIRLPOOL 16d62e09163955617e9bf65dfdbd0022dd9a70a1b08a6f3b66c710ba3d110d913060927b66144f95e915e1e4bb542a9369893f622df46c88a547376e420d1d5f
 EBUILD iptables-1.4.6.ebuild 1443 SHA256 3ca97a6095af334fe9b734329ae8e2a58ac78dd1f7a52e0295b203eec4e5178c SHA512 a30301a6f28cc5b90c97b58f37f04005f01313b66f6cb2b5b65294d0612887147d99a7cc8a73940c48a5e4f7d504e643a1e3f0664383bbf7e2e24017944b4436 WHIRLPOOL 836783d6a1f9b733edb965742996cbcac2869a3f716b9b78af4ae912a051919c61c2beb1ea061262da9f80c647db6892e597981ed75d8d5a94cef813722727a4
-MISC ChangeLog 50557 SHA256 1bb3fcfb2cf78862fc6304add640f7e12351d432f7b515df34a0a41c1b436d30 SHA512 c7adb111507fcd62e731b853ff7f0a62a04c1755f27cc2a1ab069daa8f45be7e2ebbb00b4d633e6ce1a8d6590bcf3aae8d57396a99e6d87382a390ac0046a6dd WHIRLPOOL 7dece46d4637db80b859e2f024c5a4ab8a1d80e4a7cea4810669aef115ff32412ace1c47344253be4201d2d9b524cdb639335225b24db1e37d132e814ced5b6c
+MISC ChangeLog 50683 SHA256 ebfe62977cf5901981eab355acd6cb8f1ed632a542f630d435734a7c7c7fde77 SHA512 0ef8d83178b5336198b37370dad541676dd833bf38bd0467496008b62a1caa78e0ed483868d09c69c8d52ee780e5bc1858a4d15dfb8edfb2d61bdbb7e7b37722 WHIRLPOOL 08c888b2eb20bbe51604397dac1e9cf45a399a21c002b493021cb28414044fd0bb7ac5af20b5770af9c71adca4794eeef0c3255d39d18d2e1c2e6347d1b35159
 MISC metadata.xml 1069 SHA256 91c6679d742c254b368f9a18cb42a3d29f90a9b691dda61967152b629e2abaa2 SHA512 395b2b3b812cc99d31ea812ad2e42fe52e9fc3e5fcd17db18b95b1dba09495bb5124760308ba46a463b47cb089d587819600d5883a313314a865628fa00f6907 WHIRLPOOL 6e1e2717c19802d94f155c6841a0b7cef10ad38cd338e3e5ba8eab671b433c547fbe816a234f8e02ad1a0bfd6f69695ff643f3ca62a99a6d51be8108eb79e9ce
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRtQkLAAoJELEHsLL7fEFWu4kP+gJoN5tJYpKqfApBnbXDWzjG
-IuuGaO2ifJWLniwEH7xQsZXoBrpS5M7KL9d96OIgvEXqKurZ7Ck9jert6koa+knc
-57SfloRYNqZpRqNm7X2DSTx7ntoqXbxnwwjeYn2eDNPEu/0I/x90seOer5h/nfYV
-UiS5FKPfrrcCS5b/Zb82yzm4C6x1SHj3BqKef87YTA4YTa4Ps92uYoTzdvfOhWHt
-xQv+zvZjcKM703FJ7zk1JfUYfTlSnjmr6XXnX2DXbp39vSgPgu7Re3MPbwVPo8sa
-pqcbpf9s9NI7TzymvNU3sDUWQ7HPZGeUAmw2ZQpnOfRSs6wBv2fNaLVl0fULNv8a
-x2ejVrMtPHhK54r+R/D6B6c4WeVRaVKloAZTRzpY8PBjYLgSI/AHvgbq6xYrccPw
-yOH/QNMgZTEdYATQQcFnI+O3zyxVZS8gw4G3uS8gRx7bjWTTqosxoT4bT+X2o7Gz
-uauSiKgbK6ce0YgEs2qVFatPTuvAMRCukaw23BGkpVSuXoOnhgzghUzeewZ7SxaM
-Lxx+iFuBAX1JQl4ww8mWuXP6IxEkDA+q1tuXuXSUSNE4pFOiufHG1p9JjnxXfMha
-0wsUMIHNod4epCrcvyG5jyiFKkrwEhhDs9+Mag1TaSjkBtuTaXuASl39eR0bDDA8
-DjquP8t/Js78F55ueRdr
-=CmXP
+iQEcBAEBCAAGBQJSBch2AAoJEEqz6FtPBkyjYzoH/jkIQhGkiyhnFSObWeB0DvnQ
+YHeiWSKsbaOTIc6phOJX5VqgG4gmb/G0l8sEuRPVdUwvFXUyYF8L9rTTjuVN9uaO
+7GiOwAMvBkEo3fcoEfKzZsE2kK5028nyO+7nNdQoy08inmolPIiHhYYmhS4QyBSI
+laBo8V1Vm8lE/HKo14Y/JUysSHok5DSr7sbcnLlROIBSiDePEepXGna53XmKpSDT
+eFQ5ZSwAEIPnz6oRSExB/TtOng8Oiuge0v9dl1Rr7Q91/+LVSyZPf1foFZU9CYt+
+dp1qnrKUVgykg5zBOjfQRj3t8GD7hkA3HLA1CIOXaEonCZr1h3IZzHYSpsDs4Mc=
+=Rp0Y
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/iptables-1.4.20.ebuild b/net-firewall/iptables/iptables-1.4.20.ebuild
new file mode 100644
index 000000000000..0c20b1588ea7
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.4.20.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.20.ebuild,v 1.1 2013/08/10 04:58:19 radhermit Exp $
+
+EAPI="4"
+
+# Force users doing their own patches to install their own tools
+AUTOTOOLS_AUTO_DEPEND=no
+
+inherit eutils multilib toolchain-funcs autotools
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="http://www.netfilter.org/projects/iptables/"
+SRC_URI="http://www.netfilter.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 static-libs"
+
+RDEPEND="
+	netlink? ( net-libs/libnfnetlink )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# use the saner headers from the kernel
+	rm -f include/linux/{kernel,types}.h
+
+	# Only run autotools if user patched something
+	epatch_user && eautoreconf || elibtoolize
+}
+
+src_configure() {
+	# Some libs use $(AR) rather than libtool to build #444282
+	tc-export AR
+
+	sed -i \
+		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
+		configure || die
+
+	econf \
+		--sbindir="${EPREFIX}/sbin" \
+		--libexecdir="${EPREFIX}/$(get_libdir)" \
+		--enable-devel \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable ipv6)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+	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.13-r1.init iptables
+	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
+	if use ipv6 ; then
+		keepdir /var/lib/ip6tables
+		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
+		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
+	fi
+
+	# Move important libs to /lib
+	gen_usr_ldscript -a ip{4,6}tc iptc xtables
+
+	prune_libtool_files
+}