Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/linux-tools/PKGBUILD
	community/pdns-recursor/PKGBUILD
	extra/gstreamer0.10/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/tcpdump/PKGBUILD
	libre/linux-libre-tools/PKGBUILD

2 files changed, 11 insertions, 49 deletions

diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD
index 2e7c4248c..f5a42a386 100644
--- a/community/pdns-recursor/PKGBUILD
+++ b/community/pdns-recursor/PKGBUILD
@@ -1,39 +1,36 @@
-# $Id: PKGBUILD 81192 2012-12-12 22:04:27Z arodseth $
+# $Id: PKGBUILD 89549 2013-04-29 23:06:17Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Jan Steffens <heftig@archlinux.org>
 
 pkgname=pdns-recursor
-pkgver=3.3
-pkgrel=6
+pkgver=3.5
+pkgrel=1
 pkgdesc='PowerDNS recursor'
-url='http://www.powerdns.com'
+url='https://www.powerdns.com/'
 license=('GPL')
 arch=('x86_64' 'i686' 'mips64el')
-depends=('gcc-libs') # 'lua')
+depends=('gcc-libs' 'lua51')
 makedepends=('boost')
 backup=('etc/powerdns/recursor.conf')
 source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2"
-        'pdns-recursor.rc'
-	'pdns-recursor.service')
-sha256sums=('7b62d97f2bb02bb0ba366dabb5e504338b949a572b9062ec2198012fc3b525bc'
-            '7ff45a2da128e82da409f123f8346cc085b57337d6d44a9fd76d17024898b1ca'
+        'pdns-recursor.service')
+sha256sums=('02ea398aa0e95ef4c9caf478eb3836598eabcd5c99ccb7e2e7c265d716089549'
             'c5849127cb42b578ff4c38ee6ad39e109bb749ce8b0147ac3619af90803b6875')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Disabled Lua while waiting for upstream support for lua 5.2
-  #LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua make
-  LUA=0 make
+  make LUA=1 \
+    LUA_CPPFLAGS_CONFIG="$(pkg-config --cflags lua5.1)" \
+    LUA_LIBS_CONFIG="$(pkg-config --libs lua5.1)"
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  install -d -m755 "$pkgdir/etc/rc.d"
   mv "$pkgdir/etc/powerdns/recursor.conf-dist" "$pkgdir/etc/powerdns/recursor.conf"
-  install -m755 "$srcdir/pdns-recursor.rc" "$pkgdir/etc/rc.d/pdns-recursor"
   rm -r "$pkgdir/etc/init.d"
   install -Dm644 "$srcdir/pdns-recursor.service" \
     "$pkgdir/usr/lib/systemd/system/pdns-recursor.service"
diff --git a/community/pdns-recursor/pdns-recursor.rc b/community/pdns-recursor/pdns-recursor.rc
deleted file mode 100644
index 992f0b086..000000000
--- a/community/pdns-recursor/pdns-recursor.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting PowerDNS recursor"
-    ! /usr/sbin/rec_control ping > /dev/null 2>&1 && /usr/sbin/pdns_recursor --daemon
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pdns-recursor
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PowerDNS recursor"
-    rec_control quit > /dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pdns-recursor
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0