[arch-commits] Commit in powerdns/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Thursday, October 16, 2014 @ 14:51:02
  Author: arodseth
Revision: 120811

upgpkg: powerdns 3.4.0-2

Modified:
  powerdns/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-16 12:31:03 UTC (rev 120810)
+++ PKGBUILD	2014-10-16 12:51:02 UTC (rev 120811)
@@ -27,9 +27,28 @@
 
   # Make changes to pdns.conf, while basing it on pdns.conf-dist
   cp "pdns-$pkgver/pdns/pdns.conf-dist" pdns.conf
-  for configoption in 'allow-recursion=127.0.0.1' 'cache-ttl=6' 'chroot=/var/empty' 'config-dir=/etc' 'daemon=yes' 'distributor-threads=3' 'guardian=yes' 'local-port=53' 'loglevel=3' 'module-dir=/usr/lib/pdns' 'negquery-cache-ttl=60' 'setgid=nobody' 'setuid=nobody' 'socket-dir=/var/run' 'webserver=no'; do
-    # Next version of setconf will probably support uncommenting options
-    setconf -a pdns.conf "$configoption"
+
+  # Using setconf for setting the configuration options will make
+  # more sense in the next version of setconf, where uncommenting code
+  # will be supported.
+  for keyvalue in \
+    allow-recursion=127.0.0.1 \
+    cache-ttl=6 \
+    chroot=/var/empty \
+    config-dir=/etc \
+    daemon=yes \
+    distributor-threads=3 \
+    guardian=yes \
+    local-port=53 \
+    loglevel=3 \
+    module-dir=/usr/lib/pdns \
+    negquery-cache-ttl=60 \
+    setgid=nobody \
+    setuid=nobody \
+    socket-dir=/var/run \
+    webserver=no
+  do
+    setconf -a pdns.conf "$keyvalue"
   done
 }
 
@@ -44,7 +63,7 @@
     --mandir=/usr/share/man \
     --with-modules='' \
     --with-dynmodules="ldap pipe gmysql gpgsql gsqlite3 geo" \
-    --disable-static \
+    --docdir=/usr/share/doc/powerdns \
     --sbindir=/usr/bin \
     --bindir=/usr/bin
   make