Mon May 13 01:16:27 PDT 2013

7 files changed, 72 insertions, 126 deletions

diff --git a/community/bind/remove-tools.patch b/community/bind/01-remove-tools.patch
index 29b4c9c5f..29b4c9c5f 100644
--- a/community/bind/remove-tools.patch
+++ b/community/bind/01-remove-tools.patch
diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD
index 4cff0b633..72136f2ba 100644
--- a/community/bind/PKGBUILD
+++ b/community/bind/PKGBUILD
@@ -1,85 +1,82 @@
-# $Id: PKGBUILD 89171 2013-04-27 13:07:51Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# $Id: PKGBUILD 90480 2013-05-12 21:56:44Z seblu $
+# Maintainer: Sébastien Luttringer
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
 
 pkgname=bind
 _pkgver=9.9.2-P2
 pkgver=${_pkgver//-/.}
-pkgrel=1
-pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
+pkgrel=3
+pkgdesc='The ISC BIND nameserver'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
 arch=('i686' 'x86_64')
 options=('!makeflags' '!libtool')
 depends=('openssl' 'krb5' 'libxml2')
+provides=('dns-server')
+backup=('etc/logrotate.d/named'
+        'etc/named.conf')
+install=$pkgname.install
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'root.hint::http://www.internic.net/zones/named.root'
-        'remove-tools.patch'
         'tmpfiles.d'
-        'named'
         'named.conf'
-        'named.conf.d'
         'named.service'
         'named.logrotate'
         'localhost.zone'
-        '127.0.0.zone')
+        '127.0.0.zone'
+        '01-remove-tools.patch')
 sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d'
           '029f89c49550c40ec7a95116b6a33f0e5a041094'
-          '14264affa71bcfe7703d0fb7c3556c4c47efaa8b'
           'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
-          '47f9ac4f6f70bc9167c1cf7859a298531197ad20'
           'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
-          '7848edbfb9a848843f57c11c02b0289eefd42d00'
-          '7de92fff4b90c4821b3b133a05affd186fb93951'
+          'cb2e81b4cbf9efafb3e81e3752f0154e779cc7ec'
           '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b'
           '76a0d4cd1b913db177a5a375bebc47e5956866ec'
-          '53be0f1437ebe595240d8dbdd819939582b97fb9')
-provides=('dns-server')
+          '53be0f1437ebe595240d8dbdd819939582b97fb9'
+          '14264affa71bcfe7703d0fb7c3556c4c47efaa8b')
 
-install=install
-backup=('etc/logrotate.d/named'
-        'etc/conf.d/named'
-        'etc/named.conf')
+prepare() {
+  patch -p1 -d bind-$_pkgver < 01-remove-tools.patch
+}
 
 build() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	patch -p1 -i ../remove-tools.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-linux-caps \
-		--with-openssl \
-		--with-libxml2 \
-		--with-libtool \
-
-	make
+  cd bind-$_pkgver
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --sbindir=/usr/bin \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-linux-caps \
+    --with-openssl \
+    --with-libxml2 \
+    --with-libtool
+  make
 }
 
 package() {
-	cd "${srcdir}/bind-${_pkgver}"
+  cd "bind-$_pkgver"
 
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-	make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 
-	rmdir "${pkgdir}/var/run"
-	install -d "${pkgdir}"/usr/share/doc/bind
-	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind
+  rmdir "$pkgdir/var/run"
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  install doc/arm/*.html "$pkgdir/usr/share/doc/$pkgname"
 
-	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
-	install -D -m644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/named.conf
-	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
-	install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service
-	install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
-	install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
+  cd "$srcdir"
+  install -D -m644 tmpfiles.d "$pkgdir/usr/lib/tmpfiles.d/named.conf"
+  install -D -m644 named.service "$pkgdir/usr/lib/systemd/system/named.service"
+  install -D -m600 named.logrotate "$pkgdir/etc/logrotate.d/named"
+  install -D -m640 -o 0 -g 40 named.conf "$pkgdir/etc/named.conf"
 
-	install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named
+  install -d -m750 -o 0 -g 40 "$pkgdir/var/named"
+  install    -m640 -o 0 -g 40 root.hint "$pkgdir/var/named"
+  install    -m640 -o 0 -g 40 127.0.0.zone "$pkgdir/var/named"
+  install    -m640 -o 0 -g 40 localhost.zone "$pkgdir/var/named"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/bind/bind.install b/community/bind/bind.install
new file mode 100644
index 000000000..170042111
--- /dev/null
+++ b/community/bind/bind.install
@@ -0,0 +1,23 @@
+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
+  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
+    rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
+    chown root:named etc/rndc.key
+    chmod 640 etc/rndc.key
+  fi
+}
+
+pre_remove() {
+  getent passwd named &>/dev/null && userdel named >/dev/null
+  getent group named &>/dev/null && groupdel named >/dev/null
+  return 0
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/bind/install b/community/bind/install
deleted file mode 100644
index 287d0e05b..000000000
--- a/community/bind/install
+++ /dev/null
@@ -1,21 +0,0 @@
-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
-	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
-		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
-	fi
-}
-
-pre_remove() {
-	getent passwd named &>/dev/null && userdel named >/dev/null
-	getent group named &>/dev/null && groupdel named >/dev/null
-	return 0
-}
diff --git a/community/bind/named b/community/bind/named
deleted file mode 100755
index 65dd0fe82..000000000
--- a/community/bind/named
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/named
-
-PIDFILE=/run/named/named.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
-
-case "$1" in
-  start)
-    stat_busy "Starting BIND"
-    [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon named
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping BIND"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon named
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  reload)
-    stat_busy "Reloading BIND"
-    [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart}"
-esac
-exit 0
diff --git a/community/bind/named.conf.d b/community/bind/named.conf.d
deleted file mode 100644
index aecbd2307..000000000
--- a/community/bind/named.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to BIND
-#
-NAMED_ARGS="-u named"
diff --git a/community/bind/named.service b/community/bind/named.service
index c21f13f4b..1a7832edc 100644
--- a/community/bind/named.service
+++ b/community/bind/named.service
@@ -3,9 +3,9 @@ Description=Internet domain name server
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/named -f -u named
-ExecReload=/usr/sbin/rndc reload
-ExecStop=/usr/sbin/rndc stop
+ExecStart=/usr/bin/named -f -u named
+ExecReload=/usr/bin/rndc reload
+ExecStop=/usr/bin/rndc stop
 
 [Install]
 WantedBy=multi-user.target