[arch-commits] Commit in powerdns/trunk (PKGBUILD powerdns.install powerdns.service)
Levente Polyak
anthraxx at archlinux.org
Wed Aug 31 14:25:46 UTC 2016
Date: Wednesday, August 31, 2016 @ 14:25:45
Author: anthraxx
Revision: 188133
upgpkg: powerdns 4.0.1-1
Modified:
powerdns/trunk/PKGBUILD
powerdns/trunk/powerdns.install
Deleted:
powerdns/trunk/powerdns.service
------------------+
PKGBUILD | 89 +++++++++++++++++++++++++++++------------------------
powerdns.install | 8 +---
powerdns.service | 12 -------
3 files changed, 52 insertions(+), 57 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-08-31 13:40:47 UTC (rev 188132)
+++ PKGBUILD 2016-08-31 14:25:45 UTC (rev 188133)
@@ -1,62 +1,61 @@
-# $Id: PKGBUILD 101429 2013-11-25 14:11:30Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
# Contributor: Jan de Groot <jgc at archlinux.org>
# Contributor: Kevin Mihelich <kevin at archlinuxarm.org>
+# Contributor: Remi Gacogne <rgacogne[at]archlinux[dot]org>
pkgname=powerdns
-pkgver=3.4.9
-pkgrel=2
+pkgver=4.0.1
+pkgrel=1
pkgdesc='Authoritative DNS server'
-arch=('x86_64' 'i686')
url='http://www.powerdns.com/'
-license=('GPL')
-depends=('boost-libs' 'gcc-libs' 'sqlite' 'lua')
-makedepends=('boost' 'setconf' 'libmariadbclient' 'postgresql-libs' 'lua'
- 'libldap' 'sqlite')
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('boost-libs' 'libsodium' 'libsystemd' 'lua' 'openssl' 'protobuf' 'sqlite')
+makedepends=('boost' 'setconf' 'libmariadbclient' 'postgresql-libs' 'lua' 'libldap'
+ 'sqlite' 'geoip' 'yaml-cpp' 'pkg-config')
optdepends=('libmariadbclient: MariaDB/MySQL backend'
- 'postgresql-libs: PostgreSQL backend' 'libldap: LDAP backend')
-install="$pkgname.install"
+ 'postgresql-libs: PostgreSQL backend'
+ 'libldap: LDAP backend'
+ 'geoip: GeoIP backend'
+ 'yaml-cpp: GeoIP backend')
+provides=('pdns')
+conflicts=('pdns')
backup=('etc/powerdns/pdns.conf')
-source=(http://downloads.powerdns.com/releases/pdns-$pkgver.tar.bz2{,.asc}
- "$pkgname.service")
-sha256sums=('2b1124db2d937ed6666525b9fc60a5dd55cb82f4cae58116cb986de53faa5dff'
- 'SKIP'
- 'b2358a5951ac944feee15ac03d42ffe9c2a72fa6f57746f77ef8997d54a82040')
-validpgpkeys=('FBAE0323821C7706A5CA151BDCF513FA7EED19F3') # Peter van Dijk <peter.van.dijk at powerdns.com>
+install=powerdns.install
+source=(http://downloads.powerdns.com/releases/pdns-${pkgver}.tar.bz2{,.asc})
+sha512sums=('77fce9963a05198afeb569f92fbb0f6a1cb3426c28dd77b0921128189c80d9a72ebdbfc249dfc0b5b89cc7a65a83887a0388d6cc3461453b1e3096e563afdd1e'
+ 'SKIP')
+validpgpkeys=('B76CD4671C0968BAA87DE61C5E50715BF2FFE1A7') # Pieter Lexis <pieter.lexis at powerdns.com>
prepare() {
- touch "pdns-$pkgver/AUTHORS" "pdns-$pkgver/NEWS"
+ cd pdns-${pkgver}
- # Make changes to pdns.conf, while basing it on pdns.conf-dist
- cp "pdns-$pkgver/pdns/pdns.conf-dist" pdns.conf
-
# Default settings
for keyvalue in \
allow-recursion=127.0.0.1 \
- cache-ttl=6 \
chroot=/var/empty \
- config-dir=/etc \
- daemon=yes \
+ config-dir=/etc/powerdns \
+ daemon=no \
distributor-threads=3 \
- guardian=yes \
+ guardian=no \
local-port=53 \
loglevel=3 \
module-dir=/usr/lib/powerdns \
- negquery-cache-ttl=60 \
setgid=nobody \
setuid=nobody \
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"
+ setconf -a pdns.conf "${keyvalue}"
done
+
+ # Using simple so we can bind it to a chroot
+ sed 's|notify|simple|' -i pdns/pdns.service.in
}
build() {
- cd "pdns-$pkgver"
-
+ cd pdns-${pkgver}
./configure \
--prefix=/usr \
--sysconfdir=/etc/powerdns \
@@ -64,20 +63,32 @@
--libdir=/usr/lib \
--mandir=/usr/share/man \
--with-modules='' \
- --with-dynmodules="ldap pipe gmysql gpgsql gsqlite3 geo bind" \
+ --with-dynmodules="bind gmysql geoip gpgsql gsqlite3 ldap lua pipe random remote" \
--docdir=/usr/share/doc/powerdns \
--sbindir=/usr/bin \
- --bindir=/usr/bin
+ --bindir=/usr/bin \
+ --with-sqlite3 \
+ --enable-libsodium \
+ --enable-tools \
+ --disable-dependency-tracking \
+ --disable-silent-rules \
+ --enable-reproducible \
+ --enable-unit-tests
make
}
+check() {
+ make -C pdns-${pkgver} check
+}
+
package() {
- make -C "pdns-$pkgver" DESTDIR="$pkgdir" install
- install -m644 "pdns.conf" "$pkgdir/etc/powerdns/"
- 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"
+ cd pdns-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ # apply defaults to generated pdns.conf
+ mv "${pkgdir}/etc/powerdns/pdns.conf"{-dist,}
+ cat pdns.conf >> "${pkgdir}/etc/powerdns/pdns.conf"
+ # adjust modules dir to match pkgname
+ mv "${pkgdir}/usr/lib/"{pdns,powerdns}
}
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:
Modified: powerdns.install
===================================================================
--- powerdns.install 2016-08-31 13:40:47 UTC (rev 188132)
+++ powerdns.install 2016-08-31 14:25:45 UTC (rev 188133)
@@ -3,12 +3,8 @@
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 'WARNING: powerdns.service has been renamed back to pdns.service.'
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:
+# vim: ts=2 sw=2 et:
Deleted: powerdns.service
===================================================================
--- powerdns.service 2016-08-31 13:40:47 UTC (rev 188132)
+++ powerdns.service 2016-08-31 14:25:45 UTC (rev 188133)
@@ -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
More information about the arch-commits
mailing list