Version bump

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

3 files changed, 35 insertions, 30 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 237d11fefc6f..291ce9c3f232 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.428 2012/11/04 20:20:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.429 2012/12/04 19:52:03 idl0r Exp $
+
+*bind-9.9.2_p1 (04 Dec 2012)
+
+  04 Dec 2012; Christian Ruppert <idl0r@gentoo.org> -bind-9.9.2.ebuild,
+  +bind-9.9.2_p1.ebuild:
+  Version bump
 
   04 Nov 2012; Ulrich Müller <ulm@gentoo.org> bind-9.9.1_p4.ebuild,
   bind-9.9.2.ebuild:
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index d4f95dc3cd11..06cdcc7d6631 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -13,30 +13,25 @@ AUX named.confd-r6 1368 SHA256 704ac6954b2bad5d0bab19281dc703e86d9b4fe94d63dd00b
 AUX named.init-r12 6095 SHA256 953e066b5d77f59917db59365cd2103c5bec19889775bd3f6437b946c9d6d936 SHA512 7a576816fb3306c2a66227f78f23301b55b5376f587e6a521b33c2c90dc1499290751c83d5e0e5bc4961a1413480d993c909bf3c448a05762bf7928b43bf9559 WHIRLPOOL e0973117385b6d5d3bdc83c1777a90849da682e89ce716bf69de92528959edf93edbff264b25aa13ad7f73803f3eb403e89badad996c2c01245c5a0f97247b7f
 DIST bind-9.9.1-P4-geoip-1.3.patch 54332 SHA256 32e539377037cb4295b97acf7a24ae9814a4e25989ee3a539e06cc3a0f37d526 SHA512 b7117568710a322f46e7393f3f78cacec2cd29a9bb86ad352c74e301b6bd394b52b57725eae503d500ebd4b3f702dbf866f6aec5024e97b053e097a9a3c98e8f WHIRLPOOL a41d549bffc23945ed723d8338f9db0107dd23fb9379cfdbd10da18e48f7a8b89ed22664cbad86517910bd413e005ff0649eeaaf3b983dd190b29f6907149048
 DIST bind-9.9.1-P4.tar.gz 7227655 SHA256 18f90727fd9566da037e71569d9b3a4834c96b04d9e75f9899eba0bc88c0868a SHA512 b40236c48ea05f52c637165c1a4cc528698542253d1268c571be0362d25457590c04202e70646d463d7ef7a2eea7ba7bb0a0d4e12bd1b36400dedbebeb776379 WHIRLPOOL 577f76fc6cc4ba02930e8c82dee94aed218acbd1f2a39fbd6d19901fba2409eed2bb62270317d53d3c701f4615de3febf7d85daa8ca84bbec6111de91abd1647
+DIST bind-9.9.2-P1.tar.gz 7277498 SHA256 4bce7c020402623333b655be5167ae8c52f30a6bfe9750caa3ab70da7d90219c SHA512 38bc2d878c7c75056d75c86d44a17815863064d3d69eb2eccaf9c3e1a4686045dc825352052ec1937d670bcb9a9b6ce6ddb6f87af56a2f1350dced55fa53ec15 WHIRLPOOL 4dc9ca276a5d955cef3c51129e44b3a8e092bbfcefc66c0088f4a1ee3987ec6ef8400f6a74e67a469a4f73bb788f4b25f3e54f8e6354969395731ed3ca597361
 DIST bind-9.9.2-geoip-1.3.patch 54328 SHA256 0d87a1b547b42c775ffb591bc8104f92c18e99ebe2ab3a97e8c5bc5731be6fba SHA512 7673b3001bc7d64e80ee548c63ab083141affdd76edf6704da6980c26de341be7341d7566dd9bc8d3b02a0a08934ccd513bd61d2a426f61b3b47959ec14d21ae WHIRLPOOL f561baae427ff4141022b94ca557e2c3fba58434531f45c28b153ada537cadec2388694689b30c1a5b5db9c10e9cbaaad6c7a42797effc7c429c4403c6516404
-DIST bind-9.9.2.tar.gz 7285050 SHA256 7e6530b198d512e27a856bbd7426b1a3c47fd55d06d667adb66f760259009b48 SHA512 a64eec10ba69d1bc97524bdf003a3fc3721b0879e128b58fe1e8e181165cd613e7f9492f9a1dfab7a4e689adf743db70e85ec2bce4220ce8203e5fdb478e92f4 WHIRLPOOL cffc59ab3a0cc1113183e85d9b543f4b1d183b181d9b5ab5caea6698645adf919fc84a3b8820cd6d54ef3cb98a008f950e7599f685adbf516da17deb043d9ad8
 DIST bind-geoip-1.3-readme.txt 10040 SHA256 380ce89f1a614f46571ad59bddf0f268275691aa2d7a7a7bf1c2a3ef4d26e845 SHA512 463b9c5178cd00b8c3626fafc32e2c4db5005b9442c364525a22a3bd20b6f3ff99fab32e9103355d08546b349398499e221109a96d8d073d1fbe9a1f3d385ae9 WHIRLPOOL a00f0e5564f37b434f84d152e797c249640913e13ab7f109e2ff0abc45c519a28ad24e4f6173fa587c4774653f4c9381f9b8ab33c5697f47b30fa139eed48569
 DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 SHA256 fe043a573ba187dcc8b0f7313d4408236e6916ec246b0443b7e71b33c8303ae9 SHA512 62690ef3471055e4ae3d8dcedd296c0a5c3a75a3be237c76fdea07aa879f2bb1df4c56b8ca1e3ed9b488a980d16f9c9a3a12a53ef3208607472d18c225916ac5 WHIRLPOOL da3683f815509c5adf0ef819cf1165b64ba35efc6c588fd46b1c6b3d0374766442acb02ecf19dd90bbad5afb174dd27fd3e0894166ea8e78901e95ae870f9f5e
 DIST dyndns-samples.tbz2 22866 SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac WHIRLPOOL 08d4e6a817f1d02597631e18152dbd55ea1bc4c82174be150cc77efc9e1f0f03b6471d1cefbe4229cd3161de752ef232a43ca274a07b78e9c974ceb04cfe99a2
 DIST rl-9.9.1-P2.patch 80440 SHA256 99efd951582ce790e274082e0bedaea698b9b7f49cf1de387752583993cf2115 SHA512 7a6a7b588de68f2dc2ed4f19b55adc1d5083a80c672889c823016c92195b4b6f215cdb6328af5127c62ff616451f5991c11dcef5e54d9ca7d58e391c4db8823b WHIRLPOOL 896744688dac120bf93c0a340f04fed1fa6a67ec91fa10580bf3fab803805f87f1f279c87a52b7381f239941c40e9bfed84a771831a7ba42ae338796b4faa95b
+DIST rl-9.9.2.patch 91993 SHA256 0bf1935ce77cfbc7cf6fa9bdb3798545c612d6fa30f6bb097ad23258ea83ac2d SHA512 9e1ace18b4dc41bf2f2e292eb0b56ee1d12a256ac2714bd8aebe9f8b249254aea450571009e2c95f96d6fa478f0508e89fc1273000ce1e09e58298578b53cd0c WHIRLPOOL 8cdd514f98241a055ed8bdcf8bc808a95c022e0c54af3c953e3d7372b1410f3b62bc39ee81a6a72ba568ba7b7ee41d7082465f29bbbbe063982cd0cff3428523
 EBUILD bind-9.9.1_p4.ebuild 12847 SHA256 5107c5b164c1508f9dd5d03bcfb48de0513d62f139c6fee199ebfaaac3358be5 SHA512 ad7b572d2a562ce72495045e3b0545dfc07b17b1f782c656110cb484379b4e4a4034837aa928173455b38881fcab4d7a0c107b0f9b482c5f6745a93ef6ca96a6 WHIRLPOOL 4a4c5fd556d78f69225f85208cc9a592fa36670b215ae69c76b15c422af211bad4ec3223d2194e27aaa4a80503c36f99c44fb853cb864720e1e26ddaf86fe64d
-EBUILD bind-9.9.2.ebuild 13379 SHA256 3f75f7c5af791a284a3f4e2bd0b26f2fc8bcd1b4676dfa56d9c14fa1fd6db8d3 SHA512 e8fc255392f65d20c503c195bdde4b13e52c2a2a08452a687290eb0aaea7ed37b7d0146b00344139350a4f11385598b339f2ee5e64880afb9abbb58043be2ddd WHIRLPOOL 12a8d03a809931d3d28a5d0f4465fca797f6864e57f468635b58904a683abd2d59c7443b82bcf5d1efcac52bf379c280c0997509e389b3323d5bfa0c766fb7c9
-MISC ChangeLog 70458 SHA256 6deb0ce0825b47fc0273a1ca110e9b43f6bb09a77f3c4931af9bfb3c038ca5fd SHA512 468ac5cf43a1dc0419c8fcb49f554bca564d3fafcaf243eb66922763a7194bf7a032818e971842534698eadc1148e64026571fb16c591f56013eeb0aaf94e7a8 WHIRLPOOL f4b1cab89931233b367a7c5d74e8e8337f626a7581e9b1af412bf1c5f9ee9b198a96c6dbbef1e88ffcc2e1e63db24dcbb757be36b4c5b663894201a306d091ef
+EBUILD bind-9.9.2_p1.ebuild 13486 SHA256 95aca7ab0c7d3bbc9e76f67c7ee26eea566a8ac11785fdf40b2ea2fd1775aec3 SHA512 bcad45a5923623da59214c5619c7fd4493be6c8eca582b150c187e0a1bab7898f09117534127440ed0def2ac12ec8eb8de7d352fee134f2a2517d3798fbcc042 WHIRLPOOL 563194ae3f5ff67e6262556cd86899dd1ec8f8f2620be6ffaa32765ec994dfd105175c063f06cab1a711bfca96b23b6659f8853b3dececdfb0039568811727aa
+MISC ChangeLog 70603 SHA256 c15d75bbc391730b00c01edddb3fdefefc3662a907c5aee6705cb7851264d1ec SHA512 ef1bf424fb01ebe6a8a6a55dbea82161ac4373105cd6ed3a1e9ba8c3b780bc3d6881a48eaf775ea395d4761aa6055959d6fe3d0ef64e54e130b018cc19ccccf7 WHIRLPOOL c13104c4a79011ce6939aeb0eb01dde10d756135ecaf5fe5de94039a1a23e4f3ccbc47856180d50eb8ac85b973bf20dd44114bd94a9219bf2402f01a680c66ca
 MISC metadata.xml 860 SHA256 0fce4fc0233c67076d886f2103083172217f79d36af3d651c3435cad719762ae SHA512 df24c1a19401a50681d32370dfed6b5735b591b9db828b290c39cf1701ce5697f7cad83b4f5410eb063482fecbb1694cc6508ded74d3dcd7bf2cc7f3c6d0db94 WHIRLPOOL 4b04fd631b0c3dc03f06599f81d113bcc7f36d9d54d54fb49c49a741c539248d37ec5c2df24f6f994ddf0bcb55c9b12fa80fe4bec16855a48a53bdf07d813039
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQls4kAAoJEDxpGckxwJCBE3kQALlvcwt7HvK64TOh1thFwlMH
-dLhdBBYureh/uaBLZxmNfQsLfHOmSFcjauaUYiHpNMow5G7InOdL2gQN0lKPN07A
-vj/PI/jeLmWj2b6FIOFRDv2OoA7HByfU528gEffNi7FJoGu9H+VlukFZDTN03FbI
-wkJM1Hq1pe/1Xs25qyajUXxJDDYtiqbGtro4SSB6twDpkwhQrTO6T/RXa1WDlC/o
-hrhS7CkJ6XGPj1XBKOTtS9oj82tOoBgBUdRWu5cTTqwMepfJ1VkEmAEJ8Sg32B1c
-ZmcJomMm9QIuu2/5ZkYj/rCN1C+kJgr71cfzakI0+mKkmGWPFbRIfHe1eQ/ZMNK2
-st5ZmOX74ynw71gPvRAOY4VvjdnTHzj0MIb2iX4A5kimxzhmvgLCVx4gOtskrenD
-SvjompieqYRPN2A7IKImcuiK+tI+nggaflFVBmKZbJm7lBn1KWFtDA53jpmgYykD
-mYfFmzyGpTjjLPJckyeMrE43V92Ei1ruZ7uM2SWj1Fyd8Sv0CqS/ZmqrhSUUFq+5
-bzkuQILp+azJrXn3goftujaLYhITPhQ2qaLrysbWxc8NbEwpmV53CJa9jifISi4x
-O0oAYflaotfF0Sb1oKZUATwETWJeaxPFIegaD8T/S+GgNutvVlw4ZH5YtXEUCXci
-/4WU/E5sMaxRRhMRhmnf
-=t1Dp
+iQEcBAEBCAAGBQJQvlRnAAoJEMOx0zmdw4Z1tLMH/3shC4WGymSffolzzcUMtMfb
+z1p7AjtTmVjoE+4ZGiskGbGnn8jBmqsJUxiDAs6j+k5Eh2jRea7soV67wk5TTYav
+B4rBUY6OpXQtNVcE99EdkTSF49xKBsrh4Qjehm/4bwycwBZrIYdCw95FLXEu+sw2
+Z+3eEIz9XO+nIqICoexZ78Svs1mt+f91a5+8aDLm//dYITKDSqw9m2sB6Tt4rpaH
+sjf3CHGRwxa3MbRbV85ang0HxOgnj06wStAjWV9I+PyUL+PYhI2V57YySUEJhV7X
+MJmjwPCYKVNJ8fPF34WJDX0QIWI6vdh6zIIhkr+HykHOkMcB98Q1999o08WQBsE=
+=hUzk
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.9.2.ebuild b/net-dns/bind/bind-9.9.2_p1.ebuild
index 30852d0c7fc3..aeb19f3d80f2 100644
--- a/net-dns/bind/bind-9.9.2.ebuild
+++ b/net-dns/bind/bind-9.9.2_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.2.ebuild,v 1.7 2012/11/04 20:20:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.2_p1.ebuild,v 1.1 2012/12/04 19:52:03 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -33,7 +33,7 @@ GEOIP_PATCH_A="${GEOIP_P}.patch"
 GEOIP_DOC_A="bind-geoip-1.3-readme.txt"
 GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/"
 
-RRL_PV="9.9.1-P2"
+RRL_PV="9.9.2"
 
 # GeoIP: http://bind-geoip.googlecode.com/
 # DNS RRL: http://www.redbarn.org/dns/ratelimits/
@@ -47,16 +47,15 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 			 ${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} )
 	sdb-ldap? (
 		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-	)"
-#	rrl? ( http://ss.vix.com/~vixie/rl-${RRL_PV}.patch )"
+	)
+	rrl? ( http://ss.vix.com/~vixie/rl-${RRL_PV}.patch )"
 
 LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc
-postgres python rpz sdb-ldap selinux ssl static-libs threads urandom xml"
+postgres python rpz rrl sdb-ldap selinux ssl static-libs threads urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-# The rrl Patch does not apply against 9.9.2 yet
 
 REQUIRED_USE="postgres? ( dlz )
 	berkdb? ( dlz )
@@ -135,17 +134,22 @@ src_prepare() {
 
 	if use geoip; then
 		cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
-#		sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \
-#			-e 's:RELEASEVER=:RELEASEVER=1:' \
-#			${GEOIP_PATCH_A} || die
+		sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \
+			-e 's:RELEASEVER=:RELEASEVER=1:' \
+			${GEOIP_PATCH_A} || die
 #		sed -i -e 's:RELEASEVER=2:RELEASEVER=3:' ${GEOIP_PATCH_A} || die
 		epatch ${GEOIP_PATCH_A}
 	fi
 
-#	if use rrl; then
-#		# Response Rate Limiting (DNS RRL) - bug 434650
-#		epatch "${DISTDIR}/rl-${RRL_PV}.patch"
-#	fi
+	if use rrl; then
+		cp "${DISTDIR}"/rl-${RRL_PV}.patch "${S}" || die
+		sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \
+			-e 's:^ RELEASEVER=: RELEASEVER=1:' \
+			rl-${RRL_PV}.patch || die
+
+		# Response Rate Limiting (DNS RRL) - bug 434650
+		epatch rl-${RRL_PV}.patch
+	fi
 
 	# Disable tests for now, bug 406399
 	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die