Fix ODBC detection when using dlz & odbc, bug 347621 comment #8, thanks to Agostino Sarubbo <ago@autistici.org>. Remove useless patches from 9.6.3, already applied by upstream.

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

5 files changed, 47 insertions, 19 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 85115a597c66..f6746a255ba1 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.313 2011/02/22 21:39:25 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.314 2011/02/23 20:52:26 idl0r Exp $
+
+  23 Feb 2011; Christian Ruppert <idl0r@gentoo.org> bind-9.6.3.ebuild,
+  bind-9.7.3.ebuild, +files/bind-9.7.3-odbc-dlz-detect.patch:
+  Fix ODBC detection when using dlz & odbc, bug 347621 comment #8, thanks to
+  Agostino Sarubbo <ago@autistici.org>. Remove useless patches from 9.6.3,
+  already applied by upstream.
 
   22 Feb 2011; Christian Ruppert <idl0r@gentoo.org> -bind-9.6.2_p2.ebuild,
   -bind-9.7.2_p3-r2.ebuild, -bind-9.7.2_p3-r3.ebuild:
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 5dd9d399aa87..b156b4add1d7 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -7,6 +7,7 @@ AUX bind-9.4.0-dlzbdb-close_cursor.patch 338 RMD160 3c92206a6c77ac8e9ea854dfc22f
 AUX bind-9.6.1-dlz-patch-dollar2.patch 3563 RMD160 d51fc7711d18b323fe2dca647832ed2b1d73070b SHA1 8de64d8899103591cccc6b956708330ef9f41ac1 SHA256 92a8d51397306d000f4c234ef8b468e250be73113523f3f6aa272121d1a7efdf
 AUX bind-9.6.1-dlz-patch-ldap-url.patch 533 RMD160 b799e51cca0db1d34fff8bcb3efe6dc060cf74f4 SHA1 6a0a6e7bbad2fc4c9605b3e9bbec0ef7c65b79dc SHA256 e284125c4d288e76e4749177915d5a36b60219dbee87fc13fef981943b49bdfa
 AUX bind-9.6.1-parallel.patch 386 RMD160 a48bdcf7fe020e55c64a692852b6ca71849d6a1c SHA1 cfbf5b9b9bf24cb564eef60716cfa19a89c05c9a SHA256 bc4d39f01190e890590a9841ae682bc68062a1202f67e649a90712ab19f89428
+AUX bind-9.7.3-odbc-dlz-detect.patch 517 RMD160 2103729c77088500c9640206b4aa0fd3888e0555 SHA1 28ab80dfe8f9d65d52fbf3f8b33a7522388d526a SHA256 69797543bf723e3e3e7405f0130d14754ad26830d45977efebdd35848b7b03aa
 AUX bind-dlzmysql5-reconnect.patch 1842 RMD160 687f6128b6511dbeecdfc81b197520b1afd74005 SHA1 7b9b8e1b85f1344e4b5d8566ab868fcb1e87a049 SHA256 7376ac37c2d3fbcf5d8e886008639bdbe642f44c9021f435af370bddd3f03bd4
 AUX localhost.zone-r3 426 RMD160 b2dfe76923695e6eac49234b7e7f90fef4d1838e SHA1 b84babc535466cacc7001e4c6eb21e22ae11b22d SHA256 3f39e9b5be72435e961cd6f5acdfe396b05640bf370969acf918a939575122bc
 AUX named.cache 2941 RMD160 c29f47291496e67e72c129db488d07172fe244e6 SHA1 b1575428e8b5f513469a90a32cf163e8db46cab5 SHA256 35f7fcf2b177678cf362af7ac942f7f1a1c102c045dc3844991a411fc4c5d277
@@ -34,19 +35,19 @@ EBUILD bind-9.4.3_p5-r3.ebuild 10438 RMD160 a63e2a2abd08b386dc5aef45b5cd01b2ed94
 EBUILD bind-9.4.3_p5.ebuild 9208 RMD160 6e7ff13da934a07ba7973e886b0ac03aa7033fb0 SHA1 8320223ec6b82e8988ca23f994457175c25caef0 SHA256 ae0e300cc78a666ef49c7f84432c14f4238b7017e7b579054e54397c28946e3e
 EBUILD bind-9.6.2_p3-r1.ebuild 11245 RMD160 75ed995ef7ce1c0e4be97ec7427910e5ee659740 SHA1 8a8481eca684003116fd8731248a71c278afbe42 SHA256 255ee3db81dec2b56109d64e9e0156f687c97a74a57c94ffff4cc51c6332c326
 EBUILD bind-9.6.2_p3-r2.ebuild 11408 RMD160 d78a8d99555fc1b8fa2a2ef88f1f86b025b777c2 SHA1 55d5e7013ada8e73b4fb7abef9349717010da068 SHA256 775f42ad36fae282e5f0f54d47c761baf9f9c2bb8b686f15a30f1f73024d8f32
-EBUILD bind-9.6.3.ebuild 11399 RMD160 88169547fb05d1cffcb1a837369fc4443796b9e5 SHA1 9442fdd86833924b4cc5b0b3eb7c1cbfaf1bf9b7 SHA256 2b60468dd99f91bc025c08cc58721059b6e3ce8f9387cda668c6cd7ec723d6d9
+EBUILD bind-9.6.3.ebuild 11264 RMD160 4b533d44aa49ba0bf5d048a6a0e731c5d303d043 SHA1 c3a496d9df020977ab3c6acb766713c60040e59d SHA256 ef05ad37cc22cfcdb38a7306cd220d15552da55b3f06ba01656f0081b2d6965d
 EBUILD bind-9.7.2_p3-r1.ebuild 10969 RMD160 a80cb89c3b138e74c83a82e8b8d82b4461fa94b3 SHA1 679457e210079aa16884947706d91d2f7621cdb7 SHA256 29f1ad6a46bd6a746e42920c752535888b2fb4707d3fef6695593e60e791ed0c
-EBUILD bind-9.7.3.ebuild 11306 RMD160 070bf0f9772a9189db1e33852f3dfed942112cba SHA1 4811a99d4a74c2441dd280da2a94621df262a6db SHA256 c9f6c7fefd289348f33c381390a85c4ff995be77ab0b0afb0fd9ada0f6a8e647
-MISC ChangeLog 53364 RMD160 ee7c73e192508a32460f4c9b2c59f8a751841aca SHA1 e8d1dc4db4c1f349b74cb2b02e95852cabc220f3 SHA256 b25e2bf4a8ffaaeda729bd183f5f25755141bdc454cc70c94b45fd826551075f
+EBUILD bind-9.7.3.ebuild 11383 RMD160 7777057b2f89fd116ea5c6405f773316e3da417a SHA1 485e544c4162c4017ab261313d2b28baee064d4c SHA256 83d407e9dd8709acda2ca2f86d94e89354fcc4f6e46611baf48ac68f608c255d
+MISC ChangeLog 53681 RMD160 d13b71c1f6d63167e1d832425abe9df7e83c8b92 SHA1 92c6d2af85e0540fa31424cb6719028d886d0710 SHA256 29b996986156490487fd0c7efb480cdd7665bf1aea38df8054586115bb48aac3
 MISC metadata.xml 687 RMD160 5fd264ad649f713cca1786a3bbeabf2f45acc05b SHA1 b0f68a06a898ef80202d3827f2ecb3f1df33b27a SHA256 3c72d140cb8dc2f418ab79b1a939c192a5fee691e97db425b489a0feb1f99263
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJNZC1iAAoJEMOx0zmdw4Z1eRQIALCUwVRQzheOR2eK2mQ7S6Yq
-R82EO0ayWqgpeWKKxEpj8DtGahA3m3Y8VKd1WGF9bRiOVJwGa3gK6FDI4ZmmilKw
-6tAf/lPQedhxWI5yW4BBKfXDDe0jmK9MDtwYfkVgGvFDbOWkgffoiml1/Q/4BTMQ
-mjQtcZ/RKm/X2U3EmhkZa8Y0LtwrTdLa3DYaJUU40dRh6pJ4bSI47pWx/9kNLAMT
-2tk9BcXTZcJHp9Z2hs2X0iHWNt7fu8VLj4RLK+Nldowlk+kiCZPd2FOUPx+wW7ag
-FiIfUtgoWhvRC0faRhMf21BGAVkEGP1o+QwlghrfJc3dPP/roKOPOzMWiuyuwnI=
-=XcTQ
+iQEcBAEBCAAGBQJNZXOQAAoJEMOx0zmdw4Z1mJkIALugSD8DvNEIiqa3xxJzW9/h
+UP1YUQz8j8vj6eiNyWpPdIkvZzloXIGor9ew1r9Qg4Ji5RwdtG7DL/UfEPzl6dPq
+5n5nE5v0BDRpvcIsPcJqqfqa9O6WbzUUNbAlrW0U1BMMl5z6YFWAjkOGd1/n8JAN
+lULhHEbXW59Q8FD4o3y2bYU0iBLyg5diYlznAasKaZAo2weK/z3cVt56+zq6pl8Q
+mLSu3pDqJCbaNcOrifNi3Rq7Bv4trzG0X8V4Ap/iC1Aso7EeDhtYs4SyTTlHoB1y
+mRag0eqiNCdTJ3cxjnppChAmQZTwsSEcCO/i7p12i+JPPXCW1MzJ/bHllT6W0uE=
+=0smC
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.6.3.ebuild b/net-dns/bind/bind-9.6.3.ebuild
index b97de0abdcd4..fac333575590 100644
--- a/net-dns/bind/bind-9.6.3.ebuild
+++ b/net-dns/bind/bind-9.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.3.ebuild,v 1.1 2011/02/05 13:38:45 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.3.ebuild,v 1.2 2011/02/23 20:52:26 idl0r Exp $
 
 EAPI="3"
 
@@ -73,18 +73,14 @@ src_prepare() {
 	done
 
 	if use dlz; then
-		epatch "${FILESDIR}"/${PN}-9.4.0-dlzbdb-close_cursor.patch
-
 		# bind fails to reconnect to MySQL5 databases, bug #180720, patch by Nicolas Brousse
 		# (http://www.shell-tips.com/2007/09/04/bind-950-patch-dlz-mysql-5-for-auto-reconnect/)
 		if use mysql && has_version ">=dev-db/mysql-5"; then
 			epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
 		fi
 
-		if use ldap; then
-			# bug 238681
-			epatch "${FILESDIR}/bind-9.6.1-dlz-patch-ldap-url.patch" \
-				"${FILESDIR}/bind-9.6.1-dlz-patch-dollar2.patch"
+		if use odbc; then
+			epatch "${FILESDIR}/${PN}-9.7.3-odbc-dlz-detect.patch"
 		fi
 	fi
 
diff --git a/net-dns/bind/bind-9.7.3.ebuild b/net-dns/bind/bind-9.7.3.ebuild
index ecf39749f5eb..5f0280ac1241 100644
--- a/net-dns/bind/bind-9.7.3.ebuild
+++ b/net-dns/bind/bind-9.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.3.ebuild,v 1.1 2011/02/15 18:17:31 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.3.ebuild,v 1.2 2011/02/23 20:52:26 idl0r Exp $
 
 EAPI="3"
 
@@ -82,6 +82,10 @@ src_prepare() {
 		if use mysql && has_version ">=dev-db/mysql-5"; then
 			epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
 		fi
+
+		if use odbc; then
+			epatch "${FILESDIR}/${P}-odbc-dlz-detect.patch"
+		fi
 	fi
 
 	# should be installed by bind-tools
diff --git a/net-dns/bind/files/bind-9.7.3-odbc-dlz-detect.patch b/net-dns/bind/files/bind-9.7.3-odbc-dlz-detect.patch
new file mode 100644
index 000000000000..1577d578ddd4
--- /dev/null
+++ b/net-dns/bind/files/bind-9.7.3-odbc-dlz-detect.patch
@@ -0,0 +1,21 @@
+diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in
+index ff3783a..bd7a700 100644
+--- a/contrib/dlz/config.dlz.in
++++ b/contrib/dlz/config.dlz.in
+@@ -407,10 +407,13 @@ then
+ 	odbcdirs="/usr /usr/local /usr/pkg"
+ 	for d in $odbcdirs
+ 	do
+-		if test -f $d/include/sql.h -a -f $d/lib/libodbc.a
++		if test -f $d/include/sql.h
+ 		then
+-			use_dlz_odbc=$d
+-			break
++			if test -f $d/lib/libodbc.a -o -f $d/lib/libodbc.la -o $d/lib/libodbc.so
++			then
++				use_dlz_odbc=$d
++				break
++			fi
+ 		fi
+ 	done
+ fi