[arch-commits] Commit in bind/trunk (ChangeLog PKGBUILD named)

[Gaetan Bisson]

    Date: Sunday, May 22, 2011 @ 18:52:52
  Author: bisson
Revision: 124551

remove /var/run/* from packages	

Modified:
  bind/trunk/PKGBUILD
  bind/trunk/named
Deleted:
  bind/trunk/ChangeLog

-----------+
 ChangeLog |   15 ---------------
 PKGBUILD  |   26 ++++++++++++--------------
 named     |   12 ++++++++----
 3 files changed, 20 insertions(+), 33 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-05-22 22:43:47 UTC (rev 124550)
+++ ChangeLog	2011-05-22 22:52:52 UTC (rev 124551)
@@ -1,15 +0,0 @@
-
-2010-03-27  kevin  <kevin at archlinux.org>
-
-    * bind 9.7.0.P1-1
-    - Patch addresses excessive query traffic generated when there is a break
-      in the DNSSEC trust chain as a result of a configuration error
-
-2010-01-22  kevin  <kevin at archlinux.org>
-
-    * bind 9.6.1.P3-1
-    - Fix for CVE-2010-0097, VU#360341, BIND 9 DNSSEC validation code could
-      cause bogus NXDOMAIN responses
-    - Updated fix for CVE-2009-4022, VU#418861, BIND 9 Cache Update from
-      Additional Section
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-22 22:43:47 UTC (rev 124550)
+++ PKGBUILD	2011-05-22 22:52:52 UTC (rev 124551)
@@ -8,7 +8,7 @@
 # Use a period and not a hyphen before the patch level for proper versioning.
 pkgver=9.8.0.P1
 _pkgver=9.8.0-P1
-pkgrel=2
+pkgrel=3
 
 pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols'
 arch=('i686' 'x86_64')
@@ -17,12 +17,11 @@
 provides=('dns-server')
 backup=('etc/logrotate.d/named'
         'etc/conf.d/named'
-        'etc/named.conf'
-        'etc/rndc.key')
+        'etc/named.conf')
 depends=('openssl' 'krb5' 'libxml2')
 options=('!makeflags' '!libtool')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz"
-        'ftp://ftp.rs.internic.net/domain/db.cache'
+        'root.hint::ftp://ftp.rs.internic.net/domain/db.cache'
         'so_bsdcompat.patch'
         'notools.patch'
         'named'
@@ -35,7 +34,7 @@
           'ee52947062c1582858187716b776afa3613608fb'
           '2f737f4e81186447ac2ef370fa8dcea0b3abec31'
           '5277cf4d6fbc5728c55b51c77c9347d28393fb7c'
-          '02b0e20a542663d27af4faa4d2e397ae2764276e'
+          '46232e9db243c6c05e170a1781d7a7f413be5d03'
           '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
           '7848edbfb9a848843f57c11c02b0289eefd42d00'
           '9ffb5c3f72390a517aeae557e32349d5d278cb63'
@@ -70,19 +69,18 @@
 
 	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 "${pkgdir}"/usr/share/doc/bind
-	install ./doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/
-
 	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
 	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
 	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 -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
 
-	install -d -m750 -o  0 -g 40 "${pkgdir}"/var/named
-	install -d -m755 -o 40 -g 40 "${pkgdir}"/var/run/named
-	install    -m640 -o  0 -g 40 ../db.cache "${pkgdir}"/var/named/root.hint
-	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/
 }

Modified: named
===================================================================
--- named	2011-05-22 22:43:47 UTC (rev 124550)
+++ named	2011-05-22 22:52:52 UTC (rev 124551)
@@ -1,12 +1,16 @@
 #!/bin/bash
 
-NAMED_ARGS=
-[ -f /etc/conf.d/named ] && . /etc/conf.d/named
-
 . /etc/rc.conf
 . /etc/rc.d/functions
+. /etc/conf.d/named
 
-PID=`pidof -o %PPID /usr/sbin/named`
+[[ -d /var/run/named ]] || mkdir -p /var/run/named
+chown named:named /var/run/named
+
+PIDFILE=/var/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"