Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0fbace3528b6c65bb66cf05265b15f598c9c61c4
commit 0fbace3528b6c65bb66cf05265b15f598c9c61c4 Author: Krisztian VASAS <[EMAIL PROTECTED]> Date: Sun Apr 13 15:00:36 2008 +0200 pdns-2.9.21-4-i686 - corrected rc script - added gcc4.3 fix (thx crazy) - added default config file diff --git a/source/network-extra/pdns/FrugalBuild b/source/network-extra/pdns/FrugalBuild index d1bed80..f652ad2 100644 --- a/source/network-extra/pdns/FrugalBuild +++ b/source/network-extra/pdns/FrugalBuild @@ -1,25 +1,26 @@ # Compiling Time: 0.37 SBU -# Maintainer: Karoly CZOVEK <[EMAIL PROTECTED]> +# Maintainer: Krisztian VASAS <[EMAIL PROTECTED]> +# Contributor: Karoly CZOVEK <[EMAIL PROTECTED]> # Contributor: Zoltan Kiss <[EMAIL PROTECTED]> pkgname=pdns pkgver=2.9.21 -pkgrel=3 +pkgrel=4 pkgdesc="Power DNS Server and Recursor" url="http://www.powerdns.com/"; -depends=('libstdc++' 'sqlite2' 'libmysqlclient' 'libpq' 'pdns-recursor>=3.1.4-3') +depends=('libstdc++' 'sqlite2' 'libmysqlclient' 'libpq' 'pdns-recursor>=3.1.5-1') makedepends=('mysql' 'postgresql' 'boost>=1.34.1') groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx --dump http://downloads.powerdns.com/releases/?M=D|grep pdns-.*gz$|sed 's/.*-\(.*\)\.t.*/\1/;q'" -source=(http://downloads.powerdns.com/releases/pdns-$pkgver.tar.gz \ - rc.pdns pdns.conf) +source=(http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.gz \ + rc.pdns pdns.conf gcc43.patch) sha1sums=('2b86e4b44ef43db308c62e32b10ed0d5221a45c9' \ - '0bad6efe7476925dd3030708d0bd2065ed8c91d2' \ - 'd545b750c7479f89a9f0410dca02c875f41ca860') + 'a51e9ff119af06e682452b640c47a4732642ee3a' \ + '7c8e2c75ff2d070d2b15a7430285062edf972b59' \ + '2f6d8bf8b3c782aa6adfde1bdf65fda462eb3822') build() { - Fcd pdns-$pkgver Fbuild \ --libdir=/usr/lib/pdns \ --sysconfdir=/etc/powerdns \ @@ -30,7 +31,8 @@ build() --with-dynmodules="mysql gmysql gpgsql gsqlite pipe" Fmkdir /lib/initscripts/messages/hu/LC_MESSAGES msgfmt -o $Fdestdir/lib/initscripts/messages/hu/LC_MESSAGES/$pkgname.mo $startdir/hu.po - Frcd2 pdns + Frcd2 pdns + Ffile /etc/powerdns/pdns.conf } # optimization OK diff --git a/source/network-extra/pdns/gcc43.patch b/source/network-extra/pdns/gcc43.patch new file mode 100644 index 0000000..3472f80 --- /dev/null +++ b/source/network-extra/pdns/gcc43.patch @@ -0,0 +1,53 @@ +diff -Naur pdns-2.9.21/modules/ldapbackend/powerldap.cc pdns-2.9.21-p/modules/ldapbackend/powerldap.cc +--- pdns-2.9.21/modules/ldapbackend/powerldap.cc 2007-04-21 15:56:36.000000000 +0200 ++++ pdns-2.9.21-p/modules/ldapbackend/powerldap.cc 2008-04-13 13:18:07.000000000 +0200 +@@ -1,4 +1,6 @@ + #include "powerldap.hh" ++// for timeval ++#include <sys/time.h> + + + +diff -Naur pdns-2.9.21/pdns/dns.hh pdns-2.9.21-p/pdns/dns.hh +--- pdns-2.9.21/pdns/dns.hh 2007-04-21 15:56:36.000000000 +0200 ++++ pdns-2.9.21-p/pdns/dns.hh 2008-04-13 13:18:07.000000000 +0200 +@@ -115,7 +115,7 @@ + #pragma pack (pop) + #endif + +-typedef enum { ++enum { + ns_t_invalid = 0, /* Cookie. */ + ns_t_a = 1, /* Host address. */ + ns_t_ns = 2, /* Authoritative server. */ +diff -Naur pdns-2.9.21/pdns/dynmessenger.cc pdns-2.9.21-p/pdns/dynmessenger.cc +--- pdns-2.9.21/pdns/dynmessenger.cc 2007-04-21 15:56:36.000000000 +0200 ++++ pdns-2.9.21-p/pdns/dynmessenger.cc 2008-04-13 13:18:07.000000000 +0200 +@@ -18,6 +18,7 @@ + */ + #include "dynmessenger.hh" + #include <cstdio> ++#include <cstdlib> + #include <cstring> + #include <cerrno> + #include <iostream> +diff -Naur pdns-2.9.21/pdns/misc.hh pdns-2.9.21-p/pdns/misc.hh +--- pdns-2.9.21/pdns/misc.hh 2007-04-21 15:56:36.000000000 +0200 ++++ pdns-2.9.21-p/pdns/misc.hh 2008-04-13 13:18:07.000000000 +0200 +@@ -19,6 +19,7 @@ + #ifndef MISC_HH + #define MISC_HH + #include <stdint.h> ++#include <cstring> + + #if 0 + #define RDTSC(qp) \ +@@ -234,7 +235,7 @@ + return c==' ' || c=='\t' || c=='\r' || c=='\n'; + } + +-inline const char dns_tolower(char c) ++inline char dns_tolower(char c) + { + if(c>='A' && c<='Z') + c+='a'-'A'; diff --git a/source/network-extra/pdns/pdns.conf b/source/network-extra/pdns/pdns.conf index 85401ab..29d3a8c 100644 --- a/source/network-extra/pdns/pdns.conf +++ b/source/network-extra/pdns/pdns.conf @@ -142,7 +142,7 @@ launch=bind ################################# # module-dir Default directory for modules # -# module-dir=/usr/local/bin/../lib +# module-dir=/usr/lib/pdns ################################# # negquery-cache-ttl Seconds to store packets in the PacketCache diff --git a/source/network-extra/pdns/rc.pdns b/source/network-extra/pdns/rc.pdns index d562a50..dde7dfa 100644 --- a/source/network-extra/pdns/rc.pdns +++ b/source/network-extra/pdns/rc.pdns @@ -1,11 +1,12 @@ #!/bin/bash -# (c) 2005 Marcus Habermehl <[EMAIL PROTECTED]> # Change me! :) -# rc.skel for Frugalware # Change me! :) +# (c) 2005 Marcus Habermehl <[EMAIL PROTECTED]> +# (c) 2008 Krisztian VASAS <[EMAIL PROTECTED]> +# rc.pdns for Frugalware # distributed under GPL License -# chkconfig: 2345 99 01 # Change me! :) -# description: <Skeleton for init scripts> # Change me! :) +# chkconfig: 2345 99 01 +# description: PowerDNS init script - handles multiple instances source /lib/initscripts/functions TEXTDOMAIN=pdns @@ -16,21 +17,26 @@ exec_prefix=${prefix} BINARYPATH=${exec_prefix}/bin SBINARYPATH=${exec_prefix}/sbin SOCKETPATH=/var/run -pdns_server="$SBINARYPATH/pdns_server $EXTRAOPTS" - -actions=(restart status start stop) # Change me! :) -daemon=$"PDNS Domain Service" # Change me! :) +suffix=`basename $0 | awk -F- '{print $2}'` +if [ $suffix ] ; then + pid="pidof pdns_server-$suffix-instance 2> /dev/null" + EXTRAOPTS=--config-name=$suffix + PROGNAME=pdns-$suffix +else + pid="pidof pdns_server 2> /dev/null" + PROGNAME=pdns +fi +pdns_server="$SBINARYPATH/pdns_server $EXTRAOPTS" -pid="pidof pdns_server 2> /dev/null" # Change me! :) +actions=(restart status start stop) +daemon=$"PDNS Domain Service" doPC() { ret=$($BINARYPATH/pdns_control $EXTRAOPTS $1 $2 2> /dev/null) } - - # Some scripts need the new runlevel which is contained in $2 if [ -z $2 ] ; then rl=4 # If we doesn't have a runlevel, we use our default @@ -39,7 +45,6 @@ else fi # For available functions have a look on /source/base/sysvinit/functions - rc_start() { start_msg @@ -55,11 +60,18 @@ rc_stop() { stop_msg if [[ "$(eval $pid)" != "" ]] ; then - doPC quit + doPC quit ok $? else ok 999 fi } +rc_status() +{ + if [[ "$(eval $pid)" != "" ]] ; then + doPC status + fi +} + rc_exec $1 _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
