diff options
| -rw-r--r-- | net-dns/bind/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dns/bind/Manifest | 19 | ||||
| -rw-r--r-- | net-dns/bind/files/named.conf-r4 | 216 | ||||
| -rw-r--r-- | net-dns/bind/files/named.confd-r3 | 26 | ||||
| -rw-r--r-- | net-dns/bind/files/named.init-r7 | 164 |
5 files changed, 13 insertions, 418 deletions
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index f6746a255ba1..f73238d2b480 100644 --- 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.314 2011/02/23 20:52:26 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.315 2011/02/23 21:07:43 idl0r Exp $ + + 23 Feb 2011; Christian Ruppert <idl0r@gentoo.org> -files/named.conf-r4, + -files/named.confd-r3, -files/named.init-r7: + Remove unused files 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: diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index 9121d54998d5..29c68c40e761 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -12,14 +12,11 @@ AUX bind-dlzmysql5-reconnect.patch 1842 RMD160 687f6128b6511dbeecdfc81b197520b1a AUX localhost.zone-r3 426 RMD160 b2dfe76923695e6eac49234b7e7f90fef4d1838e SHA1 b84babc535466cacc7001e4c6eb21e22ae11b22d SHA256 3f39e9b5be72435e961cd6f5acdfe396b05640bf370969acf918a939575122bc AUX named.cache 2941 RMD160 c29f47291496e67e72c129db488d07172fe244e6 SHA1 b1575428e8b5f513469a90a32cf163e8db46cab5 SHA256 35f7fcf2b177678cf362af7ac942f7f1a1c102c045dc3844991a411fc4c5d277 AUX named.conf-r3 1317 RMD160 dace9861fb15a7ad415b23f2452fca5eb3ef2604 SHA1 02385c388d4ca99f68354c83f9e4cae2c2bcb034 SHA256 f431592c2441a27205e1112dcff7b9b07655007c460a309b7968c97688c8e7f4 -AUX named.conf-r4 5288 RMD160 d5b56d46370b0e54e42aefbe41e1ff290df30439 SHA1 945ee47a99d37c2160829b2fdfd9ffbd3293b333 SHA256 852fc5f2100c94834b59ee64566b7414f0ec12b17751900bb572ab2375c8ca50 AUX named.conf-r5 3952 RMD160 e4554204786565b08eefb9d129c7b8e0b3a55454 SHA1 cd5c48aa966760343a807c107839c82ba5b575a0 SHA256 fd1e2cbb7d2b3d00ae658a431c747a2adb35227bf6bc6996db1fe705cf2da943 AUX named.confd-r2 479 RMD160 0a0452bf9bb6f18d4628ee72abe82a52d484a2cb SHA1 d0b0e2f5d72d43862c5aaff9a226fd8599992323 SHA256 bae05257852ecbc7f66bd30e452162f15b6f6e8c3fc170fb6dfdfa7d22361915 -AUX named.confd-r3 719 RMD160 813e82a611c24a0aa3aca0400f499b68727cc8ef SHA1 d4bc0d753e9ec52fa9091b10eca10aee4462b83c SHA256 b37c19dccf3af6e313b09720c12ef7de107a297d2434c78b7101cd67ba0798f6 AUX named.confd-r4 1295 RMD160 aa3a3da754405df0362b7ba67a730b5ed4f7da33 SHA1 23ce37d133bd46561b82874709fe784b4470e243 SHA256 061c6c2ffb72859b46c9e8ad8922000cf397c3f91a3681a8b1bf21493ec13491 AUX named.confd-r5 1224 RMD160 b353a2bd8c73cbc1f967d04339d4f07db840a5ee SHA1 181a57e1b2c0371ad2704bb61f621498e2bfddff SHA256 00f06f96dc0cc7855bd15d31449b492e3a2502938e8038081c9f09e0d0ce7a08 AUX named.init-r5 1798 RMD160 a4cf8a2d19c79c40f7121559a5b0252204ede75b SHA1 0a131aa6b42050c6173c144d26a927f2fe5d3a1b SHA256 71153fce5461d4d85853218371599f5c909c625bacd9894b8a0ff16636773e05 -AUX named.init-r7 3622 RMD160 4ed3c76403bf5ddc545b0d681b176fbe5f7f8484 SHA1 dfe2e1a0925b23584581f8dd243bc15a9833bbe0 SHA256 9999609ce9ecb7fcafac50174713e72c2af80137f2c7c06fc5cfee26620a3e7e AUX named.init-r8 4417 RMD160 6aac0609b04e8cb3a1a91bf0532506be151a0e01 SHA1 5754951e9163cb0e7cfc2323c8d759c404ac8a27 SHA256 720880c274f14df595370e3fab257e32f08a0df0f3495a212cff86b6933b83d3 AUX named.init-r9 4946 RMD160 48cce5a99a8da1eff3492c4896fbae4c1343a675 SHA1 944ed08d22e70ba93625814695535f58feed2083 SHA256 77fd6b4ecb0f7f4baa872d1be1b18d2ea9a913a15f30f63ab904a62ad4325748 DIST bind-9.4.3-P5.tar.gz 6447497 RMD160 680146e4120aaa89f2899d4205c17fee5e9e4aa9 SHA1 9b7f0bd84be0f91fe1085cedc91c7c14f1e0f97a SHA256 7ca93553d1f488af1b21ab26f0297be5c7b7b5920d29ad9743382bf3623b2939 @@ -38,16 +35,16 @@ EBUILD bind-9.6.2_p3-r2.ebuild 11408 RMD160 d78a8d99555fc1b8fa2a2ef88f1f86b025b7 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 11383 RMD160 7777057b2f89fd116ea5c6405f773316e3da417a SHA1 485e544c4162c4017ab261313d2b28baee064d4c SHA256 83d407e9dd8709acda2ca2f86d94e89354fcc4f6e46611baf48ac68f608c255d -MISC ChangeLog 53681 RMD160 d13b71c1f6d63167e1d832425abe9df7e83c8b92 SHA1 92c6d2af85e0540fa31424cb6719028d886d0710 SHA256 29b996986156490487fd0c7efb480cdd7665bf1aea38df8054586115bb48aac3 +MISC ChangeLog 53825 RMD160 1781aceee243ffaa64a1fe737b417a313cd20cab SHA1 b21cc9f3810bf51b278698c5a9204ac5cc598610 SHA256 525be4d3a6abe9e39854d8814c9463f5fc4e24779ead0e5a9d174ca279daaf70 MISC metadata.xml 693 RMD160 dc012ae590711b0544b57c296eae7c64c495ad4d SHA1 b1e13cbad61d627c228e5f59fdcb5ce9b1c9204c SHA256 a5822f1606216c03322c777390583db64d9cd119dde9b848f1a151f0e5caf464 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBCAAGBQJNZXQqAAoJEMOx0zmdw4Z1+dsH+QFsVWZ/BSgnqY+Kw2+84Crw -4Se7RGUb+0Qu+V03mg5O3TztVSTDSTu6+Gav9T+b2KhpgW0aGH5cQoiJPQ+tSEY7 -Mqa3dzNKlnCBk9UoHT3EuOPPbmvd504N/2xTBnGVEOYS2WMM1rpDNu4JAwnS88eD -d+arOCHXLitbn8n5H+yB+X5N7cMimVy9jw95d9yMuGdCznq+B/yNN/xdfJv+HRcn -mgh9MSOYXbKrpwqulZOyo0ren6U4fbZ2uwHL8kz8hyqmEhmBgmw6FMWn2tEl4RdE -vTmfwGRlUFvdgVQW+vOXIcVtnnhPrdrt3nX/R/uaUrv5czCsAAFGEbLUWrrRq2M= -=4LK0 +iQEcBAEBCAAGBQJNZXclAAoJEMOx0zmdw4Z1SxwH/RV/N0OcP4xkOKY5kgCd7IWh +vW9V0RKCM7Y0OQQlT/dsNkt0xlpKN6PeVtAhSZ0Ag5si24KdPV4eWP1icnPcxg30 +qwYZSLYPq8ikLQftCI6A9Azu+JpOsmtm3FMUvu+3B8TEeh6z3IyujnEvavP6RH5n +9Na/FJ+2C7nS5WgIg7B3XQUo4pyBPLpMJMT4WacDQw5D5cLZzSbWfaKdWuyOHVhx +GeLfJZ/73gFsWuFWNjtBTz0jSdaxtUEsPRc0Q/V0eXMRqZdwuLBZsbByK2aO0jqZ +CN4cQmKoF+/qdZ+Fe4mIGQ0RrKWRN3xDsgqgXpifzFdHGrdafox5ErhePKXOOiE= +=EE0K -----END PGP SIGNATURE----- diff --git a/net-dns/bind/files/named.conf-r4 b/net-dns/bind/files/named.conf-r4 deleted file mode 100644 index 35ee3644ea91..000000000000 --- a/net-dns/bind/files/named.conf-r4 +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Refer to the named.conf(5) and named(8) man pages, and the documentation - * in /usr/share/doc/bind-9 for more details. - * Online versions of the documentation can be found here: - * http://www.isc.org/software/bind/documentation - * - * If you are going to set up an authoritative server, make sure you - * understand the hairy details of how DNS works. Even with simple mistakes, - * you can break connectivity for affected parties, or cause huge amounts of - * useless Internet traffic. - */ - -acl "xfer" { - /* Allow no transfers. If we have other name servers, place them here. */ - //127.0.0.1/32; - //::1/128; - "none"; -}; - -/* - * You might put in here some ips which are allowed to use the cache or - * recursive queries - */ -acl "trusted" { - 127.0.0.0/8; - ::1/128; -}; - -options { - directory "/var/bind"; - pid-file "/var/run/named/named.pid"; - - /* https://www.isc.org/solutions/dlv >=bind-9.7.x only */ - // bindkeys-file "/etc/bind/bind.keys"; - - listen-on-v6 { ::1; }; - listen-on { 127.0.0.1; }; - - allow-query { - /* - * Accept queries from our "trusted" ACL. We will - * allow anyone to query our master zones below. - * This prevents us from becoming a free DNS server - * to the masses. - */ - trusted; - }; - - allow-query-cache { - /* Use the cache for the "trusted" ACL. */ - trusted; - }; - - allow-transfer { - /* - * Zone tranfers limited to members of the - * "xfer" ACL (e.g. secondary nameserver). - */ - xfer; - }; - -/* - * If you've got a DNS server around at your upstream provider, enter its - * IP address here, and enable the line below. This will make you benefit - * from its cache, thus reduce overall DNS traffic in the Internet. - * - * Uncomment the following lines to turn on DNS forwarding, and change - * and/or update the forwarding ip address(es): - */ -/* - forward first; - forwarders { - // 123.123.123.123; // Your ISP NS - // 124.124.124.124; // Your ISP NS - 4.2.2.1; // Level3 Public DNS - 4.2.2.2; // Level3 Public DNS - 8.8.8.8; // Google Open DNS - 8.8.4.4; // Google Open DNS - }; - -*/ - - // dnssec-enable yes; - // dnssec-validation yes; - - /* if you have problems and are behind a firewall: */ - //query-source address * port 53; -}; - -logging { - channel default_log { - file "/var/log/named/named.log" versions 5 size 50M; - print-time yes; - print-severity yes; - print-category yes; - }; - - category default { default_log; }; - category general { default_log; }; -}; - -include "/etc/bind/rndc.key"; -controls { - inet 127.0.0.1 port 953 allow { 127.0.0.1/32; ::1/128; } keys { "rndc-key"; }; -}; - - -view "internal" in { - /* - * Our internal (trusted) view. We permit the internal networks - * to freely access this view. We perform recursion for our - * internal hosts, and retrieve data from the cache for them. - */ - - match-clients { trusted; }; - recursion yes; - additional-from-auth yes; - additional-from-cache yes; - - zone "." in { - type hint; - file "/var/bind/root.cache"; - }; - - zone "localhost" IN { - type master; - file "pri/localhost.zone"; - allow-update { none; }; - notify no; - allow-query { any; }; - allow-transfer { none; }; - }; - - zone "127.in-addr.arpa" IN { - type master; - file "pri/127.zone"; - allow-update { none; }; - notify no; - allow-query { any; }; - allow-transfer { none; }; - }; - - /* - * NOTE: All zone blocks for "public" view should be listed here in "internal" - * too! Otherwise you'll have trouble to resolv the public zones properly. - * That affects all hosts from the "trusted" ACL. - * A separate config, which contains all zone blocks, might be better in - * this case. Then you can simply add: - * include "/etc/bind/zones.cfg"; - * for "internal" and "public" view. - */ - - /* - * Briefly, a zone which has been declared delegation-only will be effectively - * limited to containing NS RRs for subdomains, but no actual data beyond its - * own apex (for example, its SOA RR and apex NS RRset). This can be used to - * filter out "wildcard" or "synthesized" data from NAT boxes or from - * authoritative name servers whose undelegated (in-zone) data is of no - * interest. - * See http://www.isc.org/software/bind/delegation-only for more info - */ - - //zone "COM" { type delegation-only; }; - //zone "NET" { type delegation-only; }; -}; - -view "public" in { - /* - * Our external (untrusted) view. We permit any client to access - * portions of this view. We do not perform recursion or cache - * access for hosts using this view. - */ - - match-clients { any; }; - recursion no; - additional-from-auth no; - additional-from-cache no; - - zone "." in { - type hint; - file "/var/bind/root.cache"; - }; - - //zone "YOUR-DOMAIN.TLD" { - // type master; - // file "/var/bind/pri/YOUR-DOMAIN.TLD.zone"; - // allow-query { any; }; - // allow-transfer { xfer; }; - //}; - - //zone "YOUR-SLAVE.TLD" { - // type slave; - // file "/var/bind/sec/YOUR-SLAVE.TLD.zone"; - // masters { <MASTER>; }; - - // /* Anybody is allowed to query but transfer should be controlled by the master. */ - // allow-query { any; }; - // allow-transfer { none; }; - - // /* The master should be the only one who notifies the slaves, shouldn't it? */ - // allow-notify { <MASTER>; }; - // notify no; - //}; -}; - -/* Hide the bind version */ -/* -view "chaos" chaos { - match-clients { any; }; - allow-query { none; }; - zone "." { - type hint; - file "/dev/null"; // or any empty file - }; -}; -*/ diff --git a/net-dns/bind/files/named.confd-r3 b/net-dns/bind/files/named.confd-r3 deleted file mode 100644 index aa295b33fa8c..000000000000 --- a/net-dns/bind/files/named.confd-r3 +++ /dev/null @@ -1,26 +0,0 @@ -# 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" - -# RNDC needs to be told what server we're using sometimes. -#SERVER="-s 127.0.0.1" -# rndc key to use -RNDC_KEY="${CHROOT}/etc/bind/rndc.key" - -# Default pid file location -PIDFILE="${CHROOT}/var/run/named/named.pid" - -# Scheduling priority: 19 is the lowest and -20 is the highest. -# -NAMED_NICELEVEL="0" diff --git a/net-dns/bind/files/named.init-r7 b/net-dns/bind/files/named.init-r7 deleted file mode 100644 index 454b10158b3f..000000000000 --- a/net-dns/bind/files/named.init-r7 +++ /dev/null @@ -1,164 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.6 2010/09/03 17:52:01 idl0r Exp $ - -opts="start stop reload restart" - -depend() { - need net - use logger - after pg_autovacuum postgresql mysql ldap - provide dns -} - -_mount() { - local from - local to - local opts - - if [[ $# -lt 3 ]]; - then - eerror "_mount(): to few arguments" - return 1 - fi - - from=$1 - to=$2 - shift 2 - - opts="${*}" - shift $# - - if [[ -z $(grep "${to}" /proc/mounts) ]]; - then - einfo "mounting ${from} to ${to}" - mount ${from} ${to} ${opts} || return 1 - fi -} - -_umount() { - local dir=$1 - - if [[ -n $(grep "${dir}" /proc/mounts) ]]; - then - einfo "umount ${dir}" - umount ${dir} - fi -} - -check_chroot() { - if [[ -n ${CHROOT} ]]; then - [[ ! -d ${CHROOT} ]] && return 1 - [[ ! -d ${CHROOT}/dev || ! -d ${CHROOT}/etc || ! -d ${CHROOT}/var ]] && return 1 - [[ ! -d ${CHROOT}/var/run || ! -d ${CHROOT}/var/log ]] && return 1 - [[ ! -d ${CHROOT}/etc/bind || ! -d ${CHROOT}/var/bind ]] && return 1 - [[ ! -d ${CHROOT}/var/log/named ]] && return 1 - [[ ! -e ${CHROOT}/etc/localtime ]] && return 1 - [[ ! -c ${CHROOT}/dev/null || ! -c ${CHROOT}/dev/zero ]] && return 1 - [[ ! -c ${CHROOT}/dev/random && ! -c ${CHROOT}/dev/urandom ]] && return 1 - fi - - # create piddir (usually /var/run/named) if necessary - local piddir="${PIDFILE%/*}" - if [ ! -d "${piddir}" ] ; then - checkpath -q -d -o root:named -m 0770 "${piddir}" || return 1 - fi - - return 0 -} - -checkconfig() { - if [ ! -f ${CHROOT}/etc/bind/named.conf ] ; then - eerror "No ${CHROOT}/etc/bind/named.conf file exists!" - fi - - # In case someone have $CPU set in /etc/conf.d/named - if [ ${CPU} ] ; then - CPU="-n ${CPU}" - fi - - # as suggested in bug #107724 - [ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\ - egrep -v \ - "^([[:cntrl:] ]+(#|//|/\*)|(#|//|/\*))" \ - ${CHROOT}/etc/bind/named.conf \ - | egrep -o -m1 "pid\-file +\".+\" *;" \ - | cut -d\" -f2 - ) -} - -start() { - ebegin "Starting ${CHROOT:+chrooted }named" - - if [[ -n ${CHROOT} ]]; - then - check_chroot || { - eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first" - return 1 - } - einfo "Mounting chroot dirs" - _mount /etc/bind ${CHROOT}/etc/bind -o bind - _mount /var/bind ${CHROOT}/var/bind -o bind - _mount /var/log/named ${CHROOT}/var/log/named -o bind - fi - - checkconfig || return 1 - - start-stop-daemon --start --quiet --pidfile ${PIDFILE} \ - --nicelevel ${NAMED_NICELEVEL:-0} \ - --exec /usr/sbin/named \ - -- -u named ${CPU} ${OPTIONS} ${CHROOT:+-t} ${CHROOT} - eend $? -} - -stop() { - local reported=0 - - ebegin "Stopping ${CHROOT:+chrooted }named" - checkconfig || return 2 - if [[ -n "${RNDC_KEY}" && -f "${RNDC_KEY}" ]] ; then - rndc $SERVER -k $RNDC_KEY stop &>/dev/null - else - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - --exec /usr/sbin/named - fi - - if [[ -n ${CHROOT} ]]; - then - einfo "Umounting chroot dirs" - - # just to be sure everything gets clean - while [[ -n $(fuser ${CHROOT} 2>&1) ]] - do - if [[ ${reported} -eq 0 ]]; - then - einfo "Waiting until all named processes are stopped" - reported=1 - fi - sleep 1 - done - - _umount ${CHROOT}/etc/bind - _umount ${CHROOT}/var/log/named - _umount ${CHROOT}/var/bind - fi - - eend $? -} - -reload() { - checkconfig || return 3 - if [ ! -f $PIDFILE ] ; then - /etc/init.d/named start &>/dev/null - exit - fi - - if [ -f $RNDC_KEY ] ; then - ebegin "Reloading named.conf and zone files" - rndc $SERVER -k $RNDC_KEY reload &>/dev/null - eend $? - else - /etc/init.d/named restart &>/dev/null - fi -} |