[arch-commits] Commit in bind/trunk (5 files)

[Gaetan Bisson]

    Date: Sunday, November 18, 2012 @ 02:57:47
  Author: bisson
Revision: 171499

implement FS#32718, switch from /var/run to /run

Added:
  bind/trunk/tmpfiles.d
Modified:
  bind/trunk/PKGBUILD
  bind/trunk/named
  bind/trunk/named.conf
  bind/trunk/named.logrotate

-----------------+
 PKGBUILD        |   11 +++++++----
 named           |    5 +----
 named.conf      |    2 +-
 named.logrotate |    2 +-
 tmpfiles.d      |    1 +
 5 files changed, 11 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-18 07:36:56 UTC (rev 171498)
+++ PKGBUILD	2012-11-18 07:57:47 UTC (rev 171499)
@@ -6,7 +6,7 @@
 pkgname=bind
 _pkgver=9.9.2
 pkgver=${_pkgver//-/.}
-pkgrel=1
+pkgrel=2
 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
@@ -16,6 +16,7 @@
 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'
@@ -26,11 +27,12 @@
 sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324'
           'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
           '14264affa71bcfe7703d0fb7c3556c4c47efaa8b'
-          '46232e9db243c6c05e170a1781d7a7f413be5d03'
-          '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
+          'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
+          '47f9ac4f6f70bc9167c1cf7859a298531197ad20'
+          'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
           '7848edbfb9a848843f57c11c02b0289eefd42d00'
           '7de92fff4b90c4821b3b133a05affd186fb93951'
-          '9ffb5c3f72390a517aeae557e32349d5d278cb63'
+          '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b'
           '76a0d4cd1b913db177a5a375bebc47e5956866ec'
           '53be0f1437ebe595240d8dbdd819939582b97fb9')
 
@@ -71,6 +73,7 @@
 	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind
 
 	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

Modified: named
===================================================================
--- named	2012-11-18 07:36:56 UTC (rev 171498)
+++ named	2012-11-18 07:57:47 UTC (rev 171499)
@@ -4,10 +4,7 @@
 . /etc/rc.d/functions
 . /etc/conf.d/named
 
-[[ -d /var/run/named ]] || mkdir -p /var/run/named
-chown named:named /var/run/named
-
-PIDFILE=/var/run/named/named.pid
+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; }
 

Modified: named.conf
===================================================================
--- named.conf	2012-11-18 07:36:56 UTC (rev 171498)
+++ named.conf	2012-11-18 07:57:47 UTC (rev 171499)
@@ -4,7 +4,7 @@
 
 options {
 	directory "/var/named";
-	pid-file "/var/run/named/named.pid";
+	pid-file "/run/named/named.pid";
 	auth-nxdomain yes;
 	datasize default;
 // Uncomment these to enable IPv6 connections support

Modified: named.logrotate
===================================================================
--- named.logrotate	2012-11-18 07:36:56 UTC (rev 171498)
+++ named.logrotate	2012-11-18 07:57:47 UTC (rev 171499)
@@ -1,6 +1,6 @@
 /var/log/named.log {
    missingok
    postrotate
-      /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true
+      /bin/kill -HUP `cat /run/named/named.pid 2>/dev/null` 2>/dev/null || true
    endscript
 }

Added: tmpfiles.d
===================================================================
--- tmpfiles.d	                        (rev 0)
+++ tmpfiles.d	2012-11-18 07:57:47 UTC (rev 171499)
@@ -0,0 +1 @@
+d /run/named 0750 named named -