diff options
Diffstat (limited to 'source/n/bind')
-rwxr-xr-x | source/n/bind/bind.SlackBuild | 26 | ||||
-rw-r--r-- | source/n/bind/bind.man.diff | 22 | ||||
-rw-r--r-- | source/n/bind/bind.var.run.named.diff | 14 | ||||
-rw-r--r-- | source/n/bind/caching-example/named.local | 2 | ||||
-rw-r--r-- | source/n/bind/caching-example/named.root | 42 | ||||
-rw-r--r-- | source/n/bind/rc.bind | 54 |
6 files changed, 60 insertions, 100 deletions
diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild index 73b7d2ff2..dc7014a35 100755 --- a/source/n/bind/bind.SlackBuild +++ b/source/n/bind/bind.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,8 @@ PKGNAM=bind -VERSION=${VERSION:-9.4.3-P4} -NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-1} +VERSION=${VERSION:-9.7.3} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -36,11 +35,13 @@ if [ -z "$ARCH" ]; then esac fi +NUMJOBS=${NUMJOBS:-" -j7 "} + CWD=$(pwd) TMP=/bind-$(mcookie) PKG=$TMP/package-${PKGNAM} rm -rf $PKG -mkdir -p $TMP $PKG +mkdir -p $TMP $PKG/etc/default if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -58,19 +59,11 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.gz || exit 1 cd ${PKGNAM}-$VERSION || exit 1 -# Remove use of SO_BSDCOMPAT which has been obsolete since the 2.2.x kernel series, -# and generates warnings under 2.6.x kernels: +# Remove use of SO_BSDCOMPAT which has been obsolete since the 2.2.x kernel +# series, and generates warnings under 2.6.x kernels. This _might_ be fixed +# upstream already, but an explicit #undef SO_BSDCOMPAT does not hurt: zcat $CWD/bind.so_bsdcompat.diff.gz | patch -p1 --verbose || exit -# We want to use /var/run/named/, not just /var/run/. -# This allows changing the ownership of that directory if we want to run -# named as a non-root user. -zcat $CWD/bind.var.run.named.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -# Threads break '-u' on Linux (for now) - -# The man pages should reflect /var/run/named: -zcat $CWD/bind.man.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - # Make sure ownerships and permissions are sane: chown -R root:root . find . \ @@ -87,6 +80,7 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --with-libtool \ + --with-idn=/usr \ --mandir=/usr/man \ --enable-shared \ --disable-static \ diff --git a/source/n/bind/bind.man.diff b/source/n/bind/bind.man.diff deleted file mode 100644 index 6bcf19219..000000000 --- a/source/n/bind/bind.man.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- ./bin/named/named.8.orig 2007-01-29 18:23:44.000000000 -0600 -+++ ./bin/named/named.8 2007-06-07 23:17:33.000000000 -0500 -@@ -202,7 +202,7 @@ - The default configuration file. - .RE - .PP --\fI/var/run/named.pid\fR -+\fI/var/run/named/named.pid\fR - .RS 4 - The default process\-id file. - .RE ---- ./bin/named/lwresd.8.orig 2007-01-29 18:23:44.000000000 -0600 -+++ ./bin/named/lwresd.8 2007-06-07 23:17:18.000000000 -0500 -@@ -155,7 +155,7 @@ - The default configuration file. - .RE - .PP --\fI/var/run/lwresd.pid\fR -+\fI/var/run/named/lwresd.pid\fR - .RS 4 - The default process\-id file. - .RE diff --git a/source/n/bind/bind.var.run.named.diff b/source/n/bind/bind.var.run.named.diff deleted file mode 100644 index 53cc8bd62..000000000 --- a/source/n/bind/bind.var.run.named.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- ./bin/named/include/named/globals.h.orig Sat Nov 24 17:47:59 2001 -+++ ./bin/named/include/named/globals.h Tue Feb 26 18:51:18 2002 -@@ -102,9 +102,9 @@ - EXTERN isc_boolean_t ns_g_logstderr INIT(ISC_FALSE); - - EXTERN const char * ns_g_defaultpidfile INIT(NS_LOCALSTATEDIR -- "/run/named.pid"); -+ "/run/named/named.pid"); - EXTERN const char * lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR -- "/run/lwresd.pid"); -+ "/run/named/lwresd.pid"); - EXTERN const char * ns_g_username INIT(NULL); - - #undef EXTERN diff --git a/source/n/bind/caching-example/named.local b/source/n/bind/caching-example/named.local index 8bfc435fb..8f40bcf36 100644 --- a/source/n/bind/caching-example/named.local +++ b/source/n/bind/caching-example/named.local @@ -1,6 +1,6 @@ $TTL 86400 @ IN SOA localhost. root.localhost. ( - 1997022700 ; Serial + 2011032500 ; Serial 28800 ; Refresh 14400 ; Retry 3600000 ; Expire diff --git a/source/n/bind/caching-example/named.root b/source/n/bind/caching-example/named.root index 902a7047f..d081faaf5 100644 --- a/source/n/bind/caching-example/named.root +++ b/source/n/bind/caching-example/named.root @@ -5,12 +5,12 @@ ; ; This file is made available by InterNIC ; under anonymous FTP as -; file /domain/named.root +; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: Feb 04, 2008 -; related version of root zone: 2008020400 +; last update: Jun 17, 2010 +; related version of root zone: 2010061700 ; ; formerly NS.INTERNIC.NET ; @@ -18,68 +18,70 @@ A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:BA3E::2:30 ; -; formerly NS1.ISI.EDU +; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 ; -; formerly C.PSI.NET +; FORMERLY C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 ; -; formerly TERP.UMD.EDU +; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 128.8.10.90 ; -; formerly NS.NASA.GOV +; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 ; -; formerly NS.ISC.ORG +; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 -F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f +F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2F::F ; -; formerly NS.NIC.DDN.MIL +; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 ; -; formerly AOS.ARL.ARMY.MIL +; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53 -H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803f:235 +H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803F:235 ; -; formerly NIC.NORDU.NET +; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 +I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FE::53 ; -; operated by VeriSign, Inc. +; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:C27::2:30 ; -; operated by RIPE NCC +; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. -K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 -K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 +K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 +K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FD::1 ; -; operated by ICANN +; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 +L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:3::42 ; -; operated by WIDE +; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 -M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35 +M.ROOT-SERVERS.NET. 3600000 AAAA 2001:DC3::35 ; End of File diff --git a/source/n/bind/rc.bind b/source/n/bind/rc.bind index 966670e3b..6d77d73d9 100644 --- a/source/n/bind/rc.bind +++ b/source/n/bind/rc.bind @@ -1,35 +1,35 @@ #!/bin/sh # Start/stop/restart the BIND name server daemon (named). -# Start bind. In the past it was more secure to run BIND -# as a non-root user (for example, with '-u daemon'), but -# the modern version of BIND knows how to use the kernel's -# capability mechanism to drop all root privileges except -# the ability to bind() to a privileged port and set process -# resource limits, so -u should not be needed. If you wish -# to use it anyway, chown the /var/run/named directory to -# the non-root user. -# + +# Start bind. In the past it was more secure to run BIND as a non-root +# user (for example, with '-u daemon'), but the modern version of BIND +# knows how to use the kernel's capability mechanism to drop all root +# privileges except the ability to bind() to a privileged port and set +# process resource limits, so -u should not be needed. If you wish to +# use it anyway, chown the /var/run/named and /var/named directories to +# the non-root user. The command options can be set like this in +# /etc/default/named : +# NAMED_OPTIONS="-u daemon" +# So you will not have to edit this script. # You might also consider running BIND in a "chroot jail", # a discussion of which may be found in # /usr/doc/Linux-HOWTOs/Chroot-BIND-HOWTO. -# One last note: rndc has a lot of other nice features that -# it is not within the scope of this start/stop/restart script -# to support. For more details, see "man rndc" or just type -# "rndc" to see the options. +# One last note: rndc has a lot of other nice features that it is not +# within the scope of this start/stop/restart script to support. +# For more details, see "man rndc" or just type "rndc" to see the options. +# Load command defaults: +if [ -f /etc/default/named ] ; then . /etc/default/named ; fi +if [ -f /etc/default/rndc ] ; then . /etc/default/rndc ; fi -# Sanity check. If either /usr/sbin/named or /etc/named.conf -# aren't ready, it doesn't make much sense to try to run this -# script: +# Sanity check. If /usr/sbin/named is missing then it +# doesn't make much sense to try to run this script: if [ ! -x /usr/sbin/named ]; then echo "/etc/rc.d/rc.bind: no /usr/sbin/named found (or not executable); cannot start." exit 1 -elif [ ! -f /etc/named.conf ]; then - echo "/etc/rc.d/rc.bind: no /etc/named.conf found; cannot start /usr/sbin/named." - exit 1 fi # Start BIND. As many times as you like. ;-) @@ -37,14 +37,14 @@ fi # running or you'll get more than one copy running. bind_start() { if [ -x /usr/sbin/named ]; then - echo "Starting BIND: /usr/sbin/named" - /usr/sbin/named + echo "Starting BIND: /usr/sbin/named $NAMED_OPTIONS" + /usr/sbin/named $NAMED_OPTIONS sleep 1 fi if ! ps axc | grep -q named ; then echo "WARNING: named did not start." - echo "Attempting to start named again: /usr/sbin/named" - /usr/sbin/named + echo "Attempting to start named again: /usr/sbin/named $NAMED_OPTIONS" + /usr/sbin/named $NAMED_OPTIONS sleep 1 if ps axc | grep -q named ; then echo "SUCCESS: named started." @@ -57,8 +57,8 @@ bind_start() { # Stop all running copies of BIND (/usr/sbin/named): bind_stop() { - echo "Stopping BIND: /usr/sbin/rndc stop" - /usr/sbin/rndc stop + echo "Stopping BIND: /usr/sbin/rndc $RDNC_OPTIONS stop" + /usr/sbin/rndc $RDNC_OPTIONS stop # A problem with using "/usr/sbin/rndc stop" is that if you # managed to get multiple copies of named running it will # only stop one of them and then can't stop the others even @@ -76,7 +76,7 @@ bind_stop() { # Reload BIND: bind_reload() { - /usr/sbin/rndc reload + /usr/sbin/rndc $RDNC_OPTIONS reload } # Restart BIND: @@ -87,7 +87,7 @@ bind_restart() { # Get BIND status: bind_status() { - /usr/sbin/rndc status + /usr/sbin/rndc $RDNC_OPTIONS status } case "$1" in |