[arch-commits] Commit in pdns-recursor/repos (3 files)

[Jan de Groot]

    Date: Saturday, April 26, 2008 @ 08:41:48
  Author: jgc
Revision: 1006

Resolve conflict

Modified:
  pdns-recursor/repos/extra-x86_64/	(properties)
  pdns-recursor/repos/extra-x86_64/PKGBUILD
Deleted:
  pdns-recursor/repos/extra-x86_64/recursor.conf

---------------+
 PKGBUILD      |   30 +++++------
 recursor.conf |  152 --------------------------------------------------------
 2 files changed, 14 insertions(+), 168 deletions(-)


Property changes on: pdns-recursor/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /pdns-recursor/trunk:1
   + /pdns-recursor/trunk:1-1005

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-04-26 12:32:56 UTC (rev 1005)
+++ extra-x86_64/PKGBUILD	2008-04-26 12:41:48 UTC (rev 1006)
@@ -1,29 +1,27 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=pdns-recursor
-pkgver=3.0.1
+pkgver=3.1.5
 pkgrel=1
 pkgdesc="PowerDNS recursor"
-arch=(i686 x86_64)
 url="http://www.powerdns.com"
-license=(GPL)
-depends=(gcc)
-makedepends=(boost)
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('gcc-libs>=4.3.0')
+makedepends=('boost')
 backup=('etc/powerdns/recursor.conf')
 source=(http://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.bz2
-        pdns-recursor.rc
-        recursor.conf)
-md5sums=(367b2c091791dc7f49002a6d8fedf011 5b3aa3c8ed2edf55821af16cfb7ef252 
-         a625e47f09a82c1989fd678ecee6ebf0)
+        pdns-recursor.rc)
+md5sums=('682529d59c80076f986003ed5f47e26f'
+         '5b3aa3c8ed2edf55821af16cfb7ef252')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  mkdir -p ${startdir}/pkg/etc/rc.d
-  mkdir -p ${startdir}/pkg/etc/powerdns
-  rm -f ${startdir}/pkg/etc/powerdns/recursor.conf-dist
-  install -m644 ${startdir}/src/recursor.conf ${startdir}/pkg/etc/powerdns/
-  install -m755 ${startdir}/src/pdns-recursor.rc ${startdir}/pkg/etc/rc.d/pdns-recursor
+  make DESTDIR=${pkgdir} install || return 1
+  install -d -m755 ${pkgdir}/etc/rc.d
+  mv ${pkgdir}/etc/powerdns/recursor.conf-dist ${pkgdir}/etc/powerdns/recursor.conf || return 1
+  install -m755 ${srcdir}/pdns-recursor.rc ${pkgdir}/etc/rc.d/pdns-recursor || return 1
+  rm -rf ${pkgdir}/etc/init.d
 }

Deleted: extra-x86_64/recursor.conf
===================================================================
--- extra-x86_64/recursor.conf	2008-04-26 12:32:56 UTC (rev 1005)
+++ extra-x86_64/recursor.conf	2008-04-26 12:41:48 UTC (rev 1006)
@@ -1,152 +0,0 @@
-# Autogenerated configuration file template
-#################################
-# aaaa-additional-processing	turn on to do AAAA additional processing (slow)
-#
-# aaaa-additional-processing=off
-
-#################################
-# allow-from	If set, only allow these comma separated netmasks to recurse
-#
-# allow-from=127.0.0.0/8, 10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12
-
-#################################
-# chroot	switch to chroot jail
-#
-# chroot=
-
-#################################
-# client-tcp-timeout	Timeout in seconds when talking to TCP clients
-#
-# client-tcp-timeout=2
-
-#################################
-# config-dir	Location of configuration directory (recursor.conf)
-#
-# config-dir=/etc/powerdns/
-
-#################################
-# daemon	Operate as a daemon
-#
-daemon=yes
-
-#################################
-# delegation-only	Which domains we only accept delegations from
-#
-delegation-only=com,net
-
-#################################
-# fork	If set, fork the daemon for possible double performance
-#
-# fork=no
-
-#################################
-# hint-file	If set, load root hints from this file
-#
-# hint-file=
-
-#################################
-# local-address	IP addresses to listen on, separated by spaces or commas
-#
-local-address=127.0.0.1
-
-#################################
-# local-port	port to listen on
-#
-local-port=53
-
-#################################
-# log-common-errors	If we should log rather common errors
-#
-# log-common-errors=yes
-
-#################################
-# max-cache-entries	If set, maximum number of entries in the main cache
-#
-# max-cache-entries=0
-
-#################################
-# max-negative-ttl	maximum number of seconds to keep a negative cached entry in memory
-#
-# max-negative-ttl=3600
-
-#################################
-# max-tcp-clients	Maximum number of simultaneous TCP clients
-#
-# max-tcp-clients=128
-
-#################################
-# max-tcp-per-client	If set, maximum number of TCP sessions per client (IP address)
-#
-# max-tcp-per-client=0
-
-#################################
-# no-shuffle	Don't change
-#
-# no-shuffle=off
-
-#################################
-# query-local-address	Source IP address for sending queries
-#
-# query-local-address=0.0.0.0
-
-#################################
-# quiet	Suppress logging of questions and answers
-#
-quiet=yes
-
-#################################
-# remotes-ringbuffer-entries	maximum number of packets to store statistics for
-#
-# remotes-ringbuffer-entries=0
-
-#################################
-# server-id	Returned when queried for 'server.id' TXT, defaults to hostname
-#
-# server-id=
-
-#################################
-# setgid	If set, change group id to this gid for more security
-#
-# setgid=
-
-#################################
-# setuid	If set, change user id to this uid for more security
-#
-# setuid=
-
-#################################
-# single-socket	If set, only use a single socket for outgoing queries
-#
-# single-socket=off
-
-#################################
-# soa-minimum-ttl	Don't change
-#
-# soa-minimum-ttl=0
-
-#################################
-# soa-serial-offset	Don't change
-#
-# soa-serial-offset=0
-
-#################################
-# socket-dir	Where the controlsocket will live
-#
-# socket-dir=/var/run/
-
-#################################
-# spoof-nearmiss-max	If non-zero, assume spoofing after this many near misses
-#
-# spoof-nearmiss-max=20
-
-#################################
-# trace	if we should output heaps of logging
-#
-# trace=off
-
-#################################
-# version-string	string reported on version.pdns or version.bind
-#
-# version-string=PowerDNS Recursor 3.0.1 $Id: recursor.conf,v 1.1 2006/05/05 10:33:38 jgc Exp $
-
-