Fix dlz linking, bug 382269, thanks to Todd Goodman <tsg@bonedaddy.net>.

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

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index bf3b8d1343031846eefafa880541d959e6390d4c..dae4f31ef8e1c14ec3af5ef6f6953de9c6affe14 100644 (file)
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,10 @@
 # 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.352 2011/09/10 09:17:02 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.353 2011/09/10 12:38:06 idl0r Exp $
+
+  10 Sep 2011; Christian Ruppert <idl0r@gentoo.org> bind-9.8.1.ebuild,
+  +files/bind-9.8.1-sdlz_helper.patch:
+  Fix dlz linking, bug 382269, thanks to Todd Goodman <tsg@bonedaddy.net>.
 
 *bind-9.7.4 (10 Sep 2011)
 

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 814da9945da0e35eacf4c7a69b1fdc44ca35577a..caf6e59277958873901953bc8480dded7faaeb70 100644 (file)
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX 10bind.env 27 RMD160 872245707b4f72a212cda162c59495744d77a6e3 SHA1 7b8c1abd5910bb7a07c6b7c820c2b34a534b2593 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650
 AUX 127.zone-r1 533 RMD160 2795c6c27912a73ac45582f33de3182382db3a5d SHA1 87fcb2b96db4cef99d25fa87759dd32ea2ac5559 SHA256 0fa4c294640d4191710647d1b18a2099f22ff674b3a35e6e81ff929f921da626
 AUX bind-9.7.3-odbc-dlz-detect.patch 517 RMD160 2103729c77088500c9640206b4aa0fd3888e0555 SHA1 28ab80dfe8f9d65d52fbf3f8b33a7522388d526a SHA256 69797543bf723e3e3e7405f0130d14754ad26830d45977efebdd35848b7b03aa
+AUX bind-9.8.1-sdlz_helper.patch 565 RMD160 3151d8bcb62bbe7dc1de715af979023ef47cdd6f SHA1 744f475f18e841ac594bc5448d9404c5a333db66 SHA256 861f111725a5a42c663a8e0bbcb7a6f8ecd77017c5441458fc3c3896fec802c7
 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
@@ -21,17 +22,17 @@ DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 RMD160 eb7507dc4b1da0064516d9e75dbc
 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
 EBUILD bind-9.7.3_p3.ebuild 11547 RMD160 6e1ab2efcb184db200a53190b016a7d763499898 SHA1 dc534b640bb4ca05d7e3b700bc1c8a75b0d58ed9 SHA256 2e64fbe000308956c75c1edd324073f9cd377af1ad7320343a581ef03a719e27
 EBUILD bind-9.7.4.ebuild 11558 RMD160 85cd5fd33caabba8f60616e852a02318bf379282 SHA1 befc8aff7a07142a09809d45dc36695b0b21f45d SHA256 ff2b2094e3007cfce211f50253ebac91d1e9c0c1bcdfa38537920312a69b3bff
-EBUILD bind-9.8.1.ebuild 11944 RMD160 a6d456ebc70488241783f94ec9adf90970ea2ecb SHA1 bd834930d2ff1dcac61cf1cf051d2fab16edf70d SHA256 dfa1b4a99991afc64f06daa665bccfce2e056bfe085694d680f05fda7d564d2b
-MISC ChangeLog 59995 RMD160 c70af4b1b4a1d5334ea1420ce29c740dd840cd32 SHA1 2710f900646a6b4073f5e4dd38e0f6c751ff5576 SHA256 3d36806909e07e63be003d19f1b3783cdc79988309add58e45474dbf429765b8
+EBUILD bind-9.8.1.ebuild 12006 RMD160 9d906a36f09a5aaf94e0b0f6b72b13b5258b9798 SHA1 18531bb8830130a4b8c5843a9f6e6569ea19d7c8 SHA256 06b2fd0993b51886c5d24dfe8009f9d837de6a339196dd8e9b99110465c797f4
+MISC ChangeLog 60181 RMD160 0e7b0a219fc7c5a9052980378c2068bf402dc263 SHA1 6c77227cc55072cb55f14203aa922b3103bba5bc SHA256 12d2deca8f2d0e7ad249913cc0945394cd4ad52737995bf7313f786b1cd0f6bd
 MISC metadata.xml 887 RMD160 3c0fdcaacc812fc3e558afbbdb91dd6efbf377f9 SHA1 73e55d5772ca66d165643bf389847234c32593d7 SHA256 c0a53163775c42b68ed319c68f18234d8e6d908b318066a0d533bf7bcd40ce7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJOaysTAAoJEMOx0zmdw4Z1tpMH/AgfhP17QeCNY19XZ44TuSmE
-kXAvKBMxPsndxM2GrsFELZXrWzXBhOQONaoWIoXI1SZRKbWY1f8lr5JJJMfuthjC
-nWzyZT5qeKGPRAyE8N/tNejWGRSOxVpA79k3UoJRuB/3lTRXmWO6JDVws8IXNjTS
-lyvupt76qvOdr8bYW/r0JDQ+iM3+zqcXs+rM6cwukHORjYKFNEuGMjlNpcOJXHCb
-XxrvbspJBM9prIUqyrSmnG73d47AURUN2JAB7f83j8PjxP47sXMiSgzeWDeoGe4k
-Pm+LjqWEBPBJnovyQwPu73qlpMPIsZSXPc6U//TQjeEg7ZMpQCBZg5tNHuKhoUw=
-=dmUc
+iQEcBAEBCAAGBQJOa1ozAAoJEMOx0zmdw4Z1uGUH/iFAXaU9v1rqgL5TZlzKfE+O
+BDMXi7VUg4E8oN3gYrLbB7uQceMkRY14a28oeiSVgI0P8Ne83pJs6mx7oYzoITQm
+TzI2hxPwKSFGanjUkiIg0Y1l7tZJ8sWNsCbRy0aKYR3Au34w43g6R/YRAuoUQSGe
+4tCFkCVb17USYDXfL0suA8e5s8Ik5+Kdz0lY236wrNHBWyqHLr0Wf4lDAJ2ZUbXT
+Qgfdec+Egg7bMPgXMthg/lHXrscJlNONWwOpx7P8+ikrCQWnMZr+i71IkQfVj5BW
+8hGc03Ayfdq6xq9ij+XGe3NPTDfOUnbzWoqPSLhUlq40jA04EECn8eEKN24hURQ=
+=eUB4
 -----END PGP SIGNATURE-----

diff --git a/net-dns/bind/bind-9.8.1.ebuild b/net-dns/bind/bind-9.8.1.ebuild
index 34f09e829740295f7ed2320b43c98dcb96efc0ab..c98043aeac1832e32df22ca2c8e92e7db7f4080a 100644 (file)
--- a/net-dns/bind/bind-9.8.1.ebuild
+++ b/net-dns/bind/bind-9.8.1.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.8.1.ebuild,v 1.3 2011/09/02 16:07:24 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.1.ebuild,v 1.4 2011/09/10 12:38:06 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -96,6 +96,9 @@ src_prepare() {
        done
 
        if use dlz; then
+               # bug 382269
+               epatch "${FILESDIR}/${P}-sdlz_helper.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

diff --git a/net-dns/bind/files/bind-9.8.1-sdlz_helper.patch b/net-dns/bind/files/bind-9.8.1-sdlz_helper.patch
new file mode 100644 (file)
index 0000000..7ee1d15
--- /dev/null
+++ b/net-dns/bind/files/bind-9.8.1-sdlz_helper.patch
@@ -0,0 +1,22 @@
+Index: contrib/dlz/drivers/sdlz_helper.c
+===================================================================
+RCS file: /proj/cvs/prod/bind9/contrib/dlz/drivers/sdlz_helper.c,v
+retrieving revision 1.3
+diff -u -r1.3 sdlz_helper.c
+--- contrib/dlz/drivers/sdlz_helper.c  14 May 2010 06:29:37 -0000      1.3
++++ contrib/dlz/drivers/sdlz_helper.c  5 Sep 2011 17:31:30 -0000
+@@ -50,8 +50,6 @@
+  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+
+-#ifdef DLZ
+-
+ #include <config.h>
+
+ #include <dns/log.h>
+@@ -527,5 +525,3 @@
+
+       return isc_mem_strdup(mctx, value);
+ }
+-
+-#endif