Improve pkg_config, bug 321457, thanks to Duncan <1i5t5.duncan@cox.net>. Remove some...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index d65d30c6581f396bf620c206d37a7b7ccda291f4..2fca3ebd56751d9f1942c38f8af40c3f0666b909 100644 (file)
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,11 @@
 # 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.275 2010/05/23 20:44:50 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.276 2010/06/03 16:57:17 idl0r Exp $
+
+  03 Jun 2010; Christian Ruppert <idl0r@gentoo.org> bind-9.6.2_p2.ebuild,
+  bind-9.7.0_p2-r1.ebuild:
+  Improve pkg_config, bug 321457, thanks to Duncan <1i5t5.duncan@cox.net>.
+  Remove some old einfo's
 
 *bind-9.7.0_p2-r1 (23 May 2010)
 *bind-9.6.2_p2 (23 May 2010)

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index f90cdb3508bcfe90958befc051a95fb67afc153a..387790d367529570c0d6790173e57c92eb041c6f 100644 (file)
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -24,14 +24,14 @@ DIST bind-geoip-1.3.patch 54070 RMD160 5d01a20104b572588507aea4b8f6cbf66f68a973
 DIST bind-sdb-ldap-1.1.0.tar.bz2 5883 RMD160 ec2f684f278e5fa72158486a14dfce3005a62602 SHA1 fae539a29615fda56a2dcb55a1e01d335835b980 SHA256 afe9cc6a99c20f1dc1929b0a30ff815b0aac509a6c12f8df432853c856d35754
 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.2_p2.ebuild 10445 RMD160 94542ddf486c55583118ab66dab35310c1348779 SHA1 94fd3d4ed4e88377b4900203d397035327b95f52 SHA256 86fa0987147d8303700e7d875ba9e2d40a632257ea3efb797a0992d591372baf
-EBUILD bind-9.7.0_p2-r1.ebuild 10470 RMD160 8e4722e32cbdf51268b979b5d7d1d19e3bdb2cc5 SHA1 0d3671675b02cfffb970036571f2d04f8a27a621 SHA256 053ec0d42f7f8825c0f2d19ef63b4f8d0576cc63619f6eb5cf7cdbd792833551
-MISC ChangeLog 45234 RMD160 187d7be09f0e4c20a40848b53a15426716297826 SHA1 0ddda693e9c327d2945cd451086b41e1f093f01b SHA256 fe4a09de78a96c3d396b042b8ab556768ba566077db5c1c0e1062fd46e428183
+EBUILD bind-9.6.2_p2.ebuild 9746 RMD160 0870821cce663cd792f55d843b4bb6c002312d13 SHA1 119eb3bd0f742592e88f68ce9164a6f8821e8c88 SHA256 cda63fa1b2907323723e03736c87d1da7f7cfd2e1421ffe2710425521d4d1ecf
+EBUILD bind-9.7.0_p2-r1.ebuild 9771 RMD160 5b3fdf1a2b8bb52c8ebd56b1f58b03c9616d1916 SHA1 c9b0771df8199c606ad7320593e640be5a257e8f SHA256 3592591a9052f136775527f72598793cd913942be9057e94779fe2c5d103125f
+MISC ChangeLog 45437 RMD160 d49318a7f118b82192e0943e4ca34242f78f6304 SHA1 a9ae32157c76cdac9792228e018a13fd6b9baa58 SHA256 37e025aa26b90a89c870687f0f47a0b0c86af435b5f69e15eadec7418d139050
 MISC metadata.xml 737 RMD160 0cbffb033579ba6f469d170bb62ba69f0563cae5 SHA1 6e94367e2ae674bf79564ea9cf2e1ed0a3a6bd5b SHA256 3ab38734eb17c86f947d58737ec5d85031ac5d2a18fc489dd1f925b128e4c738
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv+zLYACgkQixe2jn+ufTjG8QCggqFQmi9RkiV/dF+yHox0hk1n
-A+wAnAt7fBZ54jNdhUfp3vvoxzBfmeOk
-=9ajN
+iEYEARECAAYFAkwH3vcACgkQixe2jn+ufTjbQgCghw+61qhE+BY214BIxbol9Ooe
+UDUAnj5+nT8RGqFTLc/fHMmlvmHFQtIc
+=vJST
 -----END PGP SIGNATURE-----

diff --git a/net-dns/bind/bind-9.6.2_p2.ebuild b/net-dns/bind/bind-9.6.2_p2.ebuild
index 56dafb598643ef18c94a59c4e01cc285b559ce06..bfacc43c73d90fb9f5879bad44253b0c4167d737 100644 (file)
--- a/net-dns/bind/bind-9.6.2_p2.ebuild
+++ b/net-dns/bind/bind-9.6.2_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.6.2_p2.ebuild,v 1.1 2010/05/23 20:44:50 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.2_p2.ebuild,v 1.2 2010/06/03 16:57:18 idl0r Exp $
 
 EAPI="3"
 
@@ -268,30 +268,21 @@ pkg_postinst() {
        einfo "Before running the above command you might want to change the chroot"
        einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
        einfo
-       einfo "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-       einfo "zones making all .com and .net domains appear to be registered"
-       einfo "This causes many problems such as breaking important anti-spam checks"
-       einfo "which verify source domains exist. ISC released a patch for BIND which"
-       einfo "adds 'delegation-only' zones to allow admins to return the .com and .net"
-       einfo "domain resolution to their normal function."
-       einfo
-       einfo "There is no need to create a com or net data file. Just the"
-       einfo "entries to the named.conf file is enough."
-       einfo
-       einfo " zone "com" IN { type delegation-only; };"
-       einfo " zone "net" IN { type delegation-only; };"
 
-       CHROOT=$(sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null)
+       CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
        if [[ -n ${CHROOT} && -d ${CHROOT} ]]; then
                ewarn "NOTE: as of 'bind-9.6.1' the chroot part of the init-script got some major changes."
        fi
 }
 
 pkg_config() {
-       CHROOT=$(sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null)
+       CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
 
-       if [ -z "${CHROOT}" ]; then
-               CHROOT="/chroot/dns"
+       if [[ -z "${CHROOT}" ]]; then
+               eerror "This config script is designed to automate setting up"
+               eerror "a chrooted bind/named. To do so, please first uncomment"
+               eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+               die "Unset CHROOT"
        fi
        if [[ -d "${CHROOT}" ]]; then
                ewarn "NOTE: As of 'bind-9.6.1' the chroot part of the init-script got some major changes."
@@ -327,9 +318,4 @@ pkg_config() {
 
        elog "You may need to add the following line to your syslog-ng.conf:"
        elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-
-       grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-       if [ $RETVAL = 0 ]; then
-               sed -i 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named 2>/dev/null
-       fi
 }

diff --git a/net-dns/bind/bind-9.7.0_p2-r1.ebuild b/net-dns/bind/bind-9.7.0_p2-r1.ebuild
index d9ac1fade18e794dfba7e3e1979f983725964abf..255760bf39aa2985e6072976b82a7db02728a45c 100644 (file)
--- a/net-dns/bind/bind-9.7.0_p2-r1.ebuild
+++ b/net-dns/bind/bind-9.7.0_p2-r1.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-r1.ebuild,v 1.1 2010/05/23 20:44:50 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.0_p2-r1.ebuild,v 1.2 2010/06/03 16:57:17 idl0r Exp $
 
 EAPI="3"
 
@@ -268,30 +268,21 @@ pkg_postinst() {
        einfo "Before running the above command you might want to change the chroot"
        einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
        einfo
-       einfo "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-       einfo "zones making all .com and .net domains appear to be registered"
-       einfo "This causes many problems such as breaking important anti-spam checks"
-       einfo "which verify source domains exist. ISC released a patch for BIND which"
-       einfo "adds 'delegation-only' zones to allow admins to return the .com and .net"
-       einfo "domain resolution to their normal function."
-       einfo
-       einfo "There is no need to create a com or net data file. Just the"
-       einfo "entries to the named.conf file is enough."
-       einfo
-       einfo " zone "com" IN { type delegation-only; };"
-       einfo " zone "net" IN { type delegation-only; };"
 
-       CHROOT=$(sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null)
+       CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
        if [[ -n ${CHROOT} && -d ${CHROOT} ]]; then
                ewarn "NOTE: as of 'bind-9.6.1' the chroot part of the init-script got some major changes."
        fi
 }
 
 pkg_config() {
-       CHROOT=$(sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null)
+       CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
 
-       if [ -z "${CHROOT}" ]; then
-               CHROOT="/chroot/dns"
+       if [[ -z "${CHROOT}" ]]; then
+               eerror "This config script is designed to automate setting up"
+               eerror "a chrooted bind/named. To do so, please first uncomment"
+               eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+               die "Unset CHROOT"
        fi
        if [[ -d "${CHROOT}" ]]; then
                ewarn "NOTE: As of 'bind-9.6.1' the chroot part of the init-script got some major changes."
@@ -327,9 +318,4 @@ pkg_config() {
 
        elog "You may need to add the following line to your syslog-ng.conf:"
        elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-
-       grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-       if [ $RETVAL = 0 ]; then
-               sed -i 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named 2>/dev/null
-       fi
 }