summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2010-05-21 16:01:48 +0000
committerChristian Ruppert <idl0r@gentoo.org>2010-05-21 16:01:48 +0000
commit2f60e8c4d2df97ba8cdbb47e4eb1e1f7671b1bbd (patch)
tree4381b7678df11b2a1d6e9209256fac98681b2ec3 /net-dns
parentamd64 stable, bug 310017 (diff)
downloadhistorical-2f60e8c4d2df97ba8cdbb47e4eb1e1f7671b1bbd.tar.gz
historical-2f60e8c4d2df97ba8cdbb47e4eb1e1f7671b1bbd.tar.bz2
historical-2f60e8c4d2df97ba8cdbb47e4eb1e1f7671b1bbd.zip
Fix geoip patching, bug 320769.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/bind/ChangeLog5
-rw-r--r--net-dns/bind/Manifest10
-rw-r--r--net-dns/bind/bind-9.7.0_p2.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 87d5a9370a8b..a68c6ac388cd 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-dns/bind
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.272 2010/05/20 16:19:58 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.273 2010/05/21 16:01:48 idl0r Exp $
+
+ 21 May 2010; Christian Ruppert <idl0r@gentoo.org> bind-9.7.0_p2.ebuild:
+ Fix geoip patching, bug 320769.
*bind-9.7.0_p2 (20 May 2010)
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 792b504e01a3..c60f2bf3b578 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -25,13 +25,13 @@ DIST bind-sdb-ldap-1.1.0.tar.bz2 5883 RMD160 ec2f684f278e5fa72158486a14dfce3005a
DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
EBUILD bind-9.4.3_p5.ebuild 9208 RMD160 6e7ff13da934a07ba7973e886b0ac03aa7033fb0 SHA1 8320223ec6b82e8988ca23f994457175c25caef0 SHA256 ae0e300cc78a666ef49c7f84432c14f4238b7017e7b579054e54397c28946e3e
EBUILD bind-9.6.1_p3-r1.ebuild 9833 RMD160 9152069d6213e852b990a057c7521181e5a8316b SHA1 7de6d1de13394e66415e321e7c8485d5207acedb SHA256 1359dc52e547955d89232c086cbb7e9cc33e47bf63ff5bb322dfec2a5cfb383e
-EBUILD bind-9.7.0_p2.ebuild 10484 RMD160 235ff4252c889f9ed09a82c45e5d7b4c020c8ade SHA1 9ff2b74e1b81bdca2314f386487f13c5bb7aad0e SHA256 95370ec9128ffb58d3ce9c575541504cf6ade4266019f8037aebaf050a4c9c81
-MISC ChangeLog 44610 RMD160 aff27a944a92509ede47759ec25e36aec775f499 SHA1 0e920d63da8c887a7749abe1caecc51652fbadb7 SHA256 224cdc06fa1061e01ac440fad06536448b038e320225619b6450ee5c04db8d97
+EBUILD bind-9.7.0_p2.ebuild 10484 RMD160 c08c5ab2fb51011c600517d206ebcb193d1327df SHA1 4924c37514258ceb51424f19b3ebad6135197bd9 SHA256 08945706a4b432836008d4f2431f605d96fd6ba49bd38c60045ca6fc25a059dd
+MISC ChangeLog 44719 RMD160 a9253a31acf702d22ce1c98add93d5b12ed12fcf SHA1 5f56a730ae8d801a9a55950c91207a34e7d6bb57 SHA256 d8c7e7f85b785638b83c12453f4dc456c38ded2def0af7bc0740401f01503712
MISC metadata.xml 647 RMD160 63aeb182631d45c774bdc08f11901147028f6d7c SHA1 9aff80992005daa758d373c4e3311ff8c3ae3ef9 SHA256 9417c62e0e5817e26d36ab5efd87f126781dbf445d9a1beb3abb899b8cb4806a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkv1YTkACgkQixe2jn+ufTiHGACeIyEkbtqsAa3GUqEqgiUYz6Ea
-LxIAnA0pKskMHkqA+vUitYFl/XTR0yCk
-=0lFA
+iEYEARECAAYFAkv2rncACgkQixe2jn+ufThRUgCeLsDtzgGqtVi6EarOZ833Tcsi
+nCMAn1opkQmsx03w2KboHx07bQDyzKpB
+=Y7kg
-----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.7.0_p2.ebuild b/net-dns/bind/bind-9.7.0_p2.ebuild
index f60ad88c2173..fc9f05683237 100644
--- a/net-dns/bind/bind-9.7.0_p2.ebuild
+++ b/net-dns/bind/bind-9.7.0_p2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.0_p2.ebuild,v 1.1 2010/05/20 16:19:58 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.0_p2.ebuild,v 1.2 2010/05/21 16:01:48 idl0r Exp $
EAPI="3"
@@ -95,7 +95,7 @@ src_prepare() {
if use geoip; then
cp "${DISTDIR}"/${GEOIP_P}.patch "${S}" || die
- sed -i -e 's/-RELEASEVER=3/-RELEASEVER=1/' \
+ sed -i -e 's/-RELEASEVER=3/-RELEASEVER=2/' \
-e 's/+RELEASEVER=3-geoip-1.3/+RELEASEVER=1-geoip-1.3/' \
${GEOIP_P}.patch || die
epatch ${GEOIP_P}.patch