Thu Sep 1 23:14:36 UTC 2011

3 files changed, 32 insertions, 18 deletions

diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index 9d34dc6dc..fe39e6a60 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130507 2011-07-07 02:35:18Z bisson $
+# $Id: PKGBUILD 136713 2011-08-31 16:36:47Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
@@ -8,22 +8,18 @@ pkgname=bind
 # Use a period and not a hyphen before the patch level for proper versioning.
 pkgver=9.8.0.P4
 _pkgver=9.8.0-P4
-pkgrel=1
+pkgrel=2
 
-pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols'
-arch=('i686' 'x86_64')
+pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
-provides=('dns-server')
-backup=('etc/logrotate.d/named'
-        'etc/conf.d/named'
-        'etc/named.conf')
+arch=('i686' 'x86_64')
 depends=('openssl' 'krb5' 'libxml2')
 options=('!makeflags' '!libtool')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz"
+source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'root.hint::ftp://ftp.rs.internic.net/domain/db.cache'
         'so_bsdcompat.patch'
-        'notools.patch'
+        'remove-tools.patch'
         'named'
         'named.conf'
         'named.conf.d'
@@ -33,7 +29,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz"
 sha1sums=('969864200c1516a8bea54266de60f316d79182b4'
           'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
           'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb'
-          '17444f9d759a4bde7688bdaa304dac57a138e4c1'
+          '18f477f510df31e6c6f547ee2d5fc46e973479bf'
           '46232e9db243c6c05e170a1781d7a7f413be5d03'
           '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
           '7848edbfb9a848843f57c11c02b0289eefd42d00'
@@ -41,13 +37,18 @@ sha1sums=('969864200c1516a8bea54266de60f316d79182b4'
           '76a0d4cd1b913db177a5a375bebc47e5956866ec'
           '53be0f1437ebe595240d8dbdd819939582b97fb9')
 
+provides=('dns-server')
+
 install=install
+backup=('etc/logrotate.d/named'
+        'etc/conf.d/named'
+        'etc/named.conf')
 
 build() {
-	cd "${srcdir}/${pkgname}-${_pkgver}"
+	cd "${srcdir}/bind-${_pkgver}"
 
+	patch -p1 -i ../remove-tools.patch
 	patch -p1 -i ../so_bsdcompat.patch
-	patch -p1 -i ../notools.patch
 
 	./configure \
 		--prefix=/usr \
@@ -65,14 +66,15 @@ build() {
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${_pkgver}"
+	cd "${srcdir}/bind-${_pkgver}"
+
+	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 	make DESTDIR="${pkgdir}" install
 
 	rmdir "${pkgdir}/var/run"
 	install -d "${pkgdir}"/usr/share/doc/bind
 	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/
-	install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
 	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
diff --git a/extra/bind/install b/extra/bind/install
index e3a1397cb..287d0e05b 100644
--- a/extra/bind/install
+++ b/extra/bind/install
@@ -1,13 +1,13 @@
 post_install() {
-	getent group named  >/dev/null || groupadd -g 40 named
-	getent passwd named >/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
+	getent group named &>/dev/null || groupadd -g 40 named
+	getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
 	passwd -l named &>/dev/null
 
 	touch var/log/named.log
 	chown named:named var/log/named.log
 
 	# create an rndc.key if it doesn't already exist
-	if [ ! -s etc/rndc.key ]; then
+	if [[ ! -s etc/rndc.key ]]; then
 		usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
 		chown root:named etc/rndc.key
 		chmod 640 etc/rndc.key
diff --git a/extra/bind/remove-tools.patch b/extra/bind/remove-tools.patch
new file mode 100644
index 000000000..cbd1c53ad
--- /dev/null
+++ b/extra/bind/remove-tools.patch
@@ -0,0 +1,12 @@
+diff -aur old/bin/Makefile.in new/bin/Makefile.in
+--- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
++++ new/bin/Makefile.in	2011-08-28 19:14:17.025674400 -0700
+@@ -19,7 +19,7 @@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
++SUBDIRS =	named rndc dnssec tests tools nsupdate \
+ 		check confgen @PKCS11_TOOLS@
+ TARGETS =
+