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

[Alexander Rødseth]

    Date: Wednesday, April 22, 2015 @ 14:45:53
  Author: arodseth
Revision: 131939

upgpkg: powerdns 3.4.3-2

Added:
  powerdns/trunk/powerdns.install
  powerdns/trunk/powerdns.service
    (from rev 131938, powerdns/trunk/pdns.service)
Modified:
  powerdns/trunk/PKGBUILD
Deleted:
  powerdns/trunk/pdns.install
  powerdns/trunk/pdns.service

------------------+
 PKGBUILD         |   23 +++++++++++++----------
 pdns.install     |   11 -----------
 pdns.service     |   12 ------------
 powerdns.install |   14 ++++++++++++++
 powerdns.service |   12 ++++++++++++
 5 files changed, 39 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-22 11:18:28 UTC (rev 131938)
+++ PKGBUILD	2015-04-22 12:45:53 UTC (rev 131939)
@@ -5,18 +5,21 @@
 
 pkgname=powerdns
 pkgver=3.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Authoritative DNS server'
 arch=('x86_64' 'i686')
 url='http://www.powerdns.com/'
 license=('GPL')
-depends=('boost-libs' 'gcc-libs' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'libldap' 'lua')
-makedepends=('boost' 'setconf')
+depends=('boost-libs' 'gcc-libs' 'sqlite' 'lua')
+makedepends=('boost' 'setconf' 'libmariadbclient' 'postgresql-libs' 'lua'
+             'libldap' 'sqlite')
+optdepends=('libmariadbclient: MariaDB/MySQL backend'
+            'postgresql-libs: PostgreSQL backend' 'libldap: LDAP backend')
 options=('!makeflags')
-install='pdns.install'
+install="$pkgname.install"
 backup=('etc/powerdns/pdns.conf')
 source=("http://downloads.powerdns.com/releases/pdns-$pkgver.tar.bz2"
-        'pdns.service')
+        "$pkgname.service")
 sha256sums=('5cd9a087757066427cd0c348f546cb84b4be4bd5e06c7ce969ec2bc21dbb8ce6'
             'b2358a5951ac944feee15ac03d42ffe9c2a72fa6f57746f77ef8997d54a82040')
 
@@ -26,8 +29,7 @@
   # Make changes to pdns.conf, while basing it on pdns.conf-dist
   cp "pdns-$pkgver/pdns/pdns.conf-dist" pdns.conf
 
-  # Setting the default configuration options.
-  # Future versions of setconf may be able to comment out options.
+  # Default settings
   for keyvalue in \
     allow-recursion=127.0.0.1 \
     cache-ttl=6 \
@@ -45,6 +47,7 @@
     socket-dir=/var/run \
     webserver=no
   do
+    # Future versions of setconf may be able to comment out options as well.
     setconf -a pdns.conf "$keyvalue"
   done
 }
@@ -69,10 +72,10 @@
 package() {
   make -C "pdns-$pkgver" DESTDIR="$pkgdir" install
   install -m644 "pdns.conf" "$pkgdir/etc/powerdns/"
-  install -Dm644 "pdns.service" \
-    "$pkgdir/usr/lib/systemd/system/pdns.service"
+  install -Dm644 "$pkgname.service" \
+    "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  mv "$pkgdir/usr/lib/pdns" "$pkgdir/usr/lib/powerdns"
   rm -f "$pkgdir/etc/powerdns/pdns.conf-dist"
-  mv "$pkgdir/usr/lib/pdns" "$pkgdir/usr/lib/powerdns"
 }
 
 # vim:set ts=2 sw=2 et:

Deleted: pdns.install
===================================================================
--- pdns.install	2015-04-22 11:18:28 UTC (rev 131938)
+++ pdns.install	2015-04-22 12:45:53 UTC (rev 131939)
@@ -1,11 +0,0 @@
-post_upgrade() {
-  echo
-  echo 'See http://doc.powerdns.com/md/authoritative/upgrading/ for'
-  echo 'information about changes when upgrading.'
-  echo
-  echo 'If upgrading from an older version, you may also need to:'
-  echo 'setconf /etc/powerdns/pdns.conf module-dir=/usr/lib/powerdns'
-  echo
-}
-
-# vim:set ts=2 sw=2 et:

Deleted: pdns.service
===================================================================
--- pdns.service	2015-04-22 11:18:28 UTC (rev 131938)
+++ pdns.service	2015-04-22 12:45:53 UTC (rev 131939)
@@ -1,12 +0,0 @@
-[Unit]
-Description=PowerDNS Authorative Server
-After=syslog.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/pdns_server --daemon --guardian=yes
-ExecReload=/usr/bin/pdns_control cycle
-ExecStop=/usr/bin/pdns_control quit
-
-[Install]
-WantedBy=multi-user.target

Added: powerdns.install
===================================================================
--- powerdns.install	                        (rev 0)
+++ powerdns.install	2015-04-22 12:45:53 UTC (rev 131939)
@@ -0,0 +1,14 @@
+post_upgrade() {
+  echo
+  echo 'See http://doc.powerdns.com/md/authoritative/upgrading/ for'
+  echo 'information about changes when upgrading.'
+  echo
+  echo 'If upgrading from an older version, you may also need to:'
+  echo 'setconf /etc/powerdns/pdns.conf module-dir=/usr/lib/powerdns'
+  echo
+  echo 'NOTE: pdns.service has been renamed to powerdns.service.'
+  echo '      See FS#44642 for more information.'
+  echo
+}
+
+# vim:set ts=2 sw=2 et:

Copied: powerdns/trunk/powerdns.service (from rev 131938, powerdns/trunk/pdns.service)
===================================================================
--- powerdns.service	                        (rev 0)
+++ powerdns.service	2015-04-22 12:45:53 UTC (rev 131939)
@@ -0,0 +1,12 @@
+[Unit]
+Description=PowerDNS Authorative Server
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/pdns_server --daemon --guardian=yes
+ExecReload=/usr/bin/pdns_control cycle
+ExecStop=/usr/bin/pdns_control quit
+
+[Install]
+WantedBy=multi-user.target