Fix PIDFILE

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

4 files changed, 67 insertions, 12 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 1011247aad41..a6fc7cbdbbe8 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.488 2014/01/31 21:24:49 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.489 2014/02/14 17:34:48 idl0r Exp $
+
+*bind-9.9.5-r2 (14 Feb 2014)
+
+  14 Feb 2014; Christian Ruppert <idl0r@gentoo.org> -bind-9.9.5-r1.ebuild,
+  +bind-9.9.5-r2.ebuild, +files/named.confd-r7:
+  Fix PIDFILE
 
 *bind-9.9.5-r1 (31 Jan 2014)
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 53f27965189b..5842a2aae528 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -12,6 +12,7 @@ AUX named.conf 31 SHA256 3355e44c498317cfb172177da3d13cef5508f9c1553850240b93ea9
 AUX named.conf-r6 4120 SHA256 6fb9670beeb34a7a2512a608d0ac8d49d7bdba5fd8c67bc0da0291db4fb2f8fc SHA512 ef02d0070faa24f5b55e3c7e0c79c16c2303ece453e9f8849f506b113eb28c64b8fc726c92d73bb7c0087be331ef3b1e04b9999ddf34a2a24f6dc13208fa3e1a WHIRLPOOL 1317b64900bc3324c508cf8f8ca5d4b786623b8fa599946ee9a7fe5d80b267adfef3e0b049a9fdd21a08cf62f234e8e36e53812d51f3b0d0b3e7b28243616a0a
 AUX named.conf-r7 4116 SHA256 4aa2617f7990101d3262d0422636c5d967e78be6ee2582568e31680684dd9948 SHA512 3e1cea45ddb9df92658c35948eb00bd823087af0d48102751edf1c248e7d6c1ae03aa2a1b7d1d0ce3d7837219ff4c2e05cbb7f299caaa97688ca876f2b0af80b WHIRLPOOL e26b4be274f4b072485dbe247f4ba226ce379551e285fc133dd21b2e49179c12d0ff32600fd86b0085cc333283d5c6301758a5d929dce65e41c552d6ab6d01c5
 AUX named.confd-r6 1368 SHA256 704ac6954b2bad5d0bab19281dc703e86d9b4fe94d63dd00be1e525a3e64c492 SHA512 074c37ecfa6d59de4ac70782b4722ffbeb3d66fae7cfa66810a67a06a1915d4e73f03b1f497d6005f125749aff61d11adf2927dcdb5a3d4fc4fb407fafa02dd1 WHIRLPOOL 3347b6887f1c516d3a4b2d40eb42195669b7a2ec01d02df21c7c0d4c27fe8984e1a2985d32f7631c1cd31b16c0f5031e69abfe5fd3d9c9debd156fd04d5c6910
+AUX named.confd-r7 1364 SHA256 3cf1ab72446cb9417de916e4cd732f2056fb74d2c6f03da6741b7bae8c415448 SHA512 68fa7c8963ac59349de3d05972c07aa0123b7bebbe0ba9604463ccfd1b377c2babe01eed4745cbe0f7d3831d1b47c2fa620f8092c67465fb771cae4932b0861a WHIRLPOOL 53ae821e10b8ee9becc265030a1cd7758706c1348ffe857edfde744d3214dbc0d648550d83801f4340fe06884ac8edaddbf2e39b8440d007c36b0895f201609a
 AUX named.init-r12 6095 SHA256 953e066b5d77f59917db59365cd2103c5bec19889775bd3f6437b946c9d6d936 SHA512 7a576816fb3306c2a66227f78f23301b55b5376f587e6a521b33c2c90dc1499290751c83d5e0e5bc4961a1413480d993c909bf3c448a05762bf7928b43bf9559 WHIRLPOOL e0973117385b6d5d3bdc83c1777a90849da682e89ce716bf69de92528959edf93edbff264b25aa13ad7f73803f3eb403e89badad996c2c01245c5a0f97247b7f
 AUX named.init-r13 6083 SHA256 55024fe0e2b491b5cb490a9f575bad3096d446f20f8d52778d778fd26a415d52 SHA512 9d557b1b30989b21d9ae9c3f4e2a886f59de728cd5893a7538be3bc424bf17b249165ed939c87db02f0b760faf46a5503c5bf523386b84ddfe8128e76f79930b WHIRLPOOL 8566abd7dda75fd3be7f3cf21baec149ce280a78ea400709272e6ad419417c14f6b1bc859ae2809a44c24aab382d6e6d10323c8df430884d306243275c35d77d
 AUX named.service 555 SHA256 2716ea68363f57b54d272eae70f418a19f3624687753d9249babd272efe5052e SHA512 b97dfe465ee19d8d896e0c1e248c8d47d6b68b2faeb34cc37d5b3750d921ceb2a1e25637e429f16533f387907f164f84201d7a55e1590bac681a5df546afbfe6 WHIRLPOOL 687203e25eac1e15e29a51a243fe41f6a40456e80a4c51f640b65c22e2bbdaccef5fba8e6164679394365e73f38a3cb8d9b8ce368572665cd49b88d724d12a7b
@@ -31,17 +32,17 @@ DIST rl-9.9.3-P2.patch 104064 SHA256 9aff9d39077160a7a156aa40456f19779b7f5ed2e5b
 EBUILD bind-9.8.6.ebuild 12997 SHA256 468c62d41326a4d8b11c0e95e45e5b52458aab660c436397654cfb1a9e9ca1bc SHA512 912e65d8ec1771b077ffce6c0cc5ca1471de6b8a6314ea2e0f28b34c7bef3d07c27e9bc8ad76b983d162d1bd25339d0eebf9c771f1e674517bbdedb16e3cc612 WHIRLPOOL 5e2d57b1c0ee7fa6b659c5bb383e6962f28e5a7dbaa6e4c8a2ed64af6dd0c5df9075d2a6465dd9c1c3c8bbbc0a06cbefd2646b555f77a85b6f9b7b9e5e31d333
 EBUILD bind-9.9.3_p2.ebuild 13715 SHA256 072961fe58945c3e40d5344542bf013ba276b8dc33ce24d9a073f8fe88588b74 SHA512 4668304a32b14489569cae921de7b01033f99168f54e667aed3a71f93d9378e75a8fc5bb38ac663cabfd852621189576c3f133fa9881540e388531e9571f4412 WHIRLPOOL 37dfa4879e49198fa75073c9eb38b6d6d85d295d742417327757202ee59b559ad5ca6546038f15e513ad3690eb711a9bf657890a8d286543d4c9f144f02b46e4
 EBUILD bind-9.9.4_p2.ebuild 13754 SHA256 15664e078b4db7588f7481d61479fb5ac2366f2135fe004010277d1d00ef5bef SHA512 7b8afe341275a57b617787a74e6bcec0f35ee36a5857d80744b00e4ea302a1b2afa582b0c8f6f64f44186ba5a7a0bae1e86b609966248652f4f289faa76a24b9 WHIRLPOOL 7dd7a5cd422372a8fc5b07219e1da05e7f514eaee1ed4ff4c848070f33182af39ab61d11f1f5f04f6cefff4f2b8b6305e39451e3749bdb4b7c5d2d9af47a1f07
-EBUILD bind-9.9.5-r1.ebuild 13906 SHA256 3851a86949dc66a49acb1527c55d9eaa173df02d696ac01ce312b9c2995b7a2e SHA512 522fc9ea18924fa51c1bac64cb2ed74ebd2cc25038c94ce4915331fa55f5e496e925713ea9076c2d09dc3b86bca2b2750005cf2313fde3eb2aac20a96a4f2876 WHIRLPOOL 0346fb7e111bb125f2c2e95ff64f0cab7886693bd6d06abcbc26d59d1a2ecb4a3d514023224400a137eee3de497e2ff43f18188743796e4c78fb51c00e6f502a
-MISC ChangeLog 78164 SHA256 c6bfc88bdd9f373a00df609fd8f7c833cbe4e7c393f0df576b33769c50d35831 SHA512 e2ba6f102e25d58ecd0af3db9396e0b5f50a015f3e757cd608d0ebbee1d04627ce630825f3123fb3d07c3bd2bc666de6b6b0fe5652e08a9793aa73e204b43b1d WHIRLPOOL 9509b7b2793bd8a70ba75d33eb1203084d386800c3bc94369f9603bf866ccd8adeecd3612d1ca27d4e04e6235983aba4f7c483e0233d36af807ca00e5aab3ebe
+EBUILD bind-9.9.5-r2.ebuild 13906 SHA256 e9fbddd834e0acde5a69202f9150e044d64ab73e9e73694837fa3dfce7334a12 SHA512 33db06ca6f7f5a08a6039953e7b9210c3b341dc3d3fdf08448e023c7062f48c8cf13ba55fec30b1bb4ead69fd3ce1f916da2ccb9a61412ec9651cc456cd4f76a WHIRLPOOL 28f00373538ef8c29573b633da2a32807437ead7f7c601f02485854333b6baf6d6a3319f390b6bcac6f38dd0f937a544edaca53d07c7ab7ce8c4fd4f29a03bb2
+MISC ChangeLog 78332 SHA256 66f73779ea57bdc7ed1612661005152bc12dce7f3deda88522045276c1d8eb43 SHA512 e7d4f3f81c2e4f209a6179b94d61662dcd74c6b98d566301056fdccf7ab57e30b5fb8830249e0968d5382123deb81f315d29a8514a4ba8bf570117445dad5878 WHIRLPOOL 5f953ee125a49b293d81e247454e69c728e1165e763c0b766d5acf1d5bb0fe0262b700c0a9a1964f28430ac2bc3d2523b51426c90967c7d7e8a8a1983d641ed6
 MISC metadata.xml 927 SHA256 d2d095b814e2df50ca39c1493c5d4315ad1d5b4b37aec7b34385771d10ae5d9d SHA512 6ac8c5a70b5cc01d0fac54118066a9ea626d089f9e5a2d45ea4b1b9cedacfafa46e5da60717c2d6f872657f8bc780ea223149afbaa51bdeaa3effef1e01dd218 WHIRLPOOL 7ede42b528d5132c0f0e5d6a3c765154ead764d590975472960cee48fce2f23e6e9687c6fc64f610101758c09b50da61c10f00267582dc708fd57e7f7f984e8f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS7BSiAAoJEMOx0zmdw4Z1SFoH/jEh18/m+d+wRkTtawKEuzfM
-7nn4UjPExervAHcmCrkeZJ3EunWDfEG5/p80vWONA2cmBTX3HDDxhDbAXbtMDERs
-9MlhOxlyNEvk5Xqs2rGzr9Ujv3xso/kGfqhbgLSzdwluexq4eEaf8UTysPgOAZnF
-sSYePOjZc3MRTIascCmkCBalKxByHdcld3hO4VPj129kdAh6WSXchZHm8Uv+Jq36
-+W/6GIB+aoyUfsVJI8ewJtRgwwqkyIXHf3AN2+X2nnmk3QfA6X/IO5S4MhYOcOR1
-yNGkmrtBViQrg6MHfMgQnJZq97IrZjmh0lFWznlBEg7KhjL/UbL4a/rtslBqU7g=
-=oWcL
+iQEcBAEBCAAGBQJS/lO9AAoJEMOx0zmdw4Z1DQcH/iKrpT0UMNpwn1ruY2WH/lcR
+hcinSrZMx1KUlvKl0dH/OWnrUeY2sBHIbf7n3zgqmxwEsIt5Lj/mHTy6AtZo9/Jo
+tdKRRtZ+6SvP/u08F4q/v2Wur4Lk9lScSOEqnq4+VumbVdJYtc/WrzetgZVECwX+
+f+BhbOiaRIkL1Lcbt9/eDuwHvF0d22ACwv3Pjeqhg+BlT75xwZrh/1tQoOqHQFrV
+ErkUIY4eH38w3QHf7zY5twtEOv7WJxFoWQsW8AudMcOvjpRvQSPj6tamQ3G/bSD2
+7sp4Nl6QimvDrMhMAQSoeMlxCWmY9ZefrQvC/fwk5SKJCPgyxXU8+/yJYZRLewE=
+=eyyt
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.9.5-r1.ebuild b/net-dns/bind/bind-9.9.5-r2.ebuild
index a05d2287cf36..f4089b310e01 100644
--- a/net-dns/bind/bind-9.9.5-r1.ebuild
+++ b/net-dns/bind/bind-9.9.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.5-r1.ebuild,v 1.1 2014/01/31 21:24:49 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.5-r2.ebuild,v 1.1 2014/02/14 17:34:48 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -255,7 +255,7 @@ src_install() {
 	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
 
 	newinitd "${FILESDIR}"/named.init-r13 named
-	newconfd "${FILESDIR}"/named.confd-r6 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
 
 	if use gost; then
 		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
diff --git a/net-dns/bind/files/named.confd-r7 b/net-dns/bind/files/named.confd-r7
new file mode 100644
index 000000000000..477a4806151d
--- /dev/null
+++ b/net-dns/bind/files/named.confd-r7
@@ -0,0 +1,48 @@
+# Set various named options here.
+#
+#OPTIONS=""
+
+# Set this to the number of processors you want bind to use.
+# Leave this unchanged if you want bind to automatically detect the number
+#CPU="1"
+
+# If you wish to run bind in a chroot:
+# 1) un-comment the CHROOT= assignment, below. You may use
+#    a different chroot directory but MAKE SURE it's empty.
+# 2) run: emerge --config =<bind-version>
+#
+#CHROOT="/chroot/dns"
+
+# Uncomment to enable binmount of /usr/share/GeoIP
+#CHROOT_GEOIP="1"
+
+# Uncomment the line below to avoid that the init script mounts the needed paths
+# into the chroot directory.
+# You have to copy all needed config files by hand if you say CHROOT_NOMOUNT="1".
+#CHROOT_NOMOUNT="1"
+
+# Uncomment this option if you have setup your own chroot environment and you
+# don't want/need the chroot consistency check
+#CHROOT_NOCHECK=1
+
+# Default pid file location
+PIDFILE="${CHROOT}/run/named/named.pid"
+
+# Scheduling priority: 19 is the lowest and -20 is the highest.
+# Default: 0
+#NAMED_NICELEVEL="0"
+
+# Uncomment rc_named_use/rc_named_after for the database you need.
+# Its necessary to ensure the database backend will be started before named.
+
+# MySQL
+#rc_named_use="mysql"
+#rc_named_after="mysql"
+
+# PostgreSQL
+#rc_named_use="pg_autovacuum postgresql"
+#rc_named_after="pg_autovacuum postgresql"
+
+# LDAP
+#rc_named_use="ldap"
+#rc_named_after="ldap"