aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dns/powerdns-devel/Makefile5
-rw-r--r--dns/powerdns-devel/distinfo2
-rw-r--r--dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc12
-rw-r--r--dns/powerdns-devel/files/patch-pdns_pdns_recursor.cc48
-rw-r--r--dns/powerdns/Makefile5
-rw-r--r--dns/powerdns/distinfo2
-rw-r--r--dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc12
-rw-r--r--dns/powerdns/files/patch-pdns_pdns_recursor.cc48
-rw-r--r--net/powerdns/Makefile5
-rw-r--r--net/powerdns/distinfo2
-rw-r--r--net/powerdns/files/patch-modules_ldapbackend_powerldap.cc12
-rw-r--r--net/powerdns/files/patch-pdns_pdns_recursor.cc48
12 files changed, 153 insertions, 48 deletions
diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index 398e412ac37e..5686f3260821 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= powerdns
-PORTVERSION= 2.9.8
-PORTREVISION= 1
+PORTVERSION= 2.9.10
CATEGORIES= net ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${PORTVERSION}
@@ -100,7 +99,7 @@ post-patch:
${WRKSRC}/pdns/Makefile.in
.endif
-.if defined(POWERDNS_WITH_RECURSOR)
+.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
CONFIGURE_ARGS+= --enable-recursor
PLIST_SUB+= RECURSOR=""
.else
diff --git a/dns/powerdns-devel/distinfo b/dns/powerdns-devel/distinfo
index 3f877859d87c..d49def71561d 100644
--- a/dns/powerdns-devel/distinfo
+++ b/dns/powerdns-devel/distinfo
@@ -1 +1 @@
-MD5 (pdns-2.9.8.tar.gz) = fdd443276f50520efbe2e2b608499a11
+MD5 (pdns-2.9.10.tar.gz) = a91f15c90f6551fb817cb708e29d5a37
diff --git a/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc b/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc
deleted file mode 100644
index 27faef6f3c45..000000000000
--- a/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-*** modules/ldapbackend/powerldap.cc.orig Thu Mar 13 20:49:23 2003
---- modules/ldapbackend/powerldap.cc Thu Mar 13 20:49:46 2003
-***************
-*** 3,9 ****
-
- #include <map>
- #include <vector>
-- // #include <crypt.h>
- #include <exception>
- #include <stdexcept>
- #include <string>
---- 3,8 ----
diff --git a/dns/powerdns-devel/files/patch-pdns_pdns_recursor.cc b/dns/powerdns-devel/files/patch-pdns_pdns_recursor.cc
new file mode 100644
index 000000000000..9457ac61f8a8
--- /dev/null
+++ b/dns/powerdns-devel/files/patch-pdns_pdns_recursor.cc
@@ -0,0 +1,48 @@
+--- pdns/pdns_recursor.cc.orig Thu Jul 3 10:30:03 2003
++++ pdns/pdns_recursor.cc Thu Jul 10 16:45:27 2003
+@@ -35,6 +35,10 @@
+ #include "statbag.hh"
+ #include "arguments.hh"
+ #include "syncres.hh"
++#include <fcntl.h>
++#include <fstream>
++
++string s_programname="pdns_recursor";
+
+ #ifndef WIN32
+ extern "C" {
+@@ -129,6 +133,17 @@
+ cache[toLower(qname)+"|"+qt.getName()]=content;
+ }
+
++static void writePid(void)
++{
++ string fname=arg()["socket-dir"]+"/"+s_programname+".pid";
++ ofstream of(fname.c_str());
++ if(of)
++ of<<getpid()<<endl;
++ else
++ L<<Logger::Error<<"Requested to write pid for "<<getpid()<<" to "<<fname<<"
++failed: "<<strerror(errno)<<endl;
++}
++
+ void init(void)
+ {
+ // prime root cache
+@@ -394,6 +409,7 @@
+ arg().set("daemon","Operate as a daemon")="yes";
+ arg().set("quiet","Suppress logging of questions and answers")="off";
+ arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
++ arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
+ arg().setCmd("help","Provide a helpful message");
+ L.toConsole(Logger::Warning);
+ arg().laxParse(argc,argv); // do a lax parse
+@@ -433,6 +449,8 @@
+ daemonize();
+ }
+ signal(SIGUSR1,usr1Handler);
++
++ writePid();
+ #endif
+
+ vector<TCPConnection> tcpconnections;
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index 398e412ac37e..5686f3260821 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= powerdns
-PORTVERSION= 2.9.8
-PORTREVISION= 1
+PORTVERSION= 2.9.10
CATEGORIES= net ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${PORTVERSION}
@@ -100,7 +99,7 @@ post-patch:
${WRKSRC}/pdns/Makefile.in
.endif
-.if defined(POWERDNS_WITH_RECURSOR)
+.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
CONFIGURE_ARGS+= --enable-recursor
PLIST_SUB+= RECURSOR=""
.else
diff --git a/dns/powerdns/distinfo b/dns/powerdns/distinfo
index 3f877859d87c..d49def71561d 100644
--- a/dns/powerdns/distinfo
+++ b/dns/powerdns/distinfo
@@ -1 +1 @@
-MD5 (pdns-2.9.8.tar.gz) = fdd443276f50520efbe2e2b608499a11
+MD5 (pdns-2.9.10.tar.gz) = a91f15c90f6551fb817cb708e29d5a37
diff --git a/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc b/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc
deleted file mode 100644
index 27faef6f3c45..000000000000
--- a/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-*** modules/ldapbackend/powerldap.cc.orig Thu Mar 13 20:49:23 2003
---- modules/ldapbackend/powerldap.cc Thu Mar 13 20:49:46 2003
-***************
-*** 3,9 ****
-
- #include <map>
- #include <vector>
-- // #include <crypt.h>
- #include <exception>
- #include <stdexcept>
- #include <string>
---- 3,8 ----
diff --git a/dns/powerdns/files/patch-pdns_pdns_recursor.cc b/dns/powerdns/files/patch-pdns_pdns_recursor.cc
new file mode 100644
index 000000000000..9457ac61f8a8
--- /dev/null
+++ b/dns/powerdns/files/patch-pdns_pdns_recursor.cc
@@ -0,0 +1,48 @@
+--- pdns/pdns_recursor.cc.orig Thu Jul 3 10:30:03 2003
++++ pdns/pdns_recursor.cc Thu Jul 10 16:45:27 2003
+@@ -35,6 +35,10 @@
+ #include "statbag.hh"
+ #include "arguments.hh"
+ #include "syncres.hh"
++#include <fcntl.h>
++#include <fstream>
++
++string s_programname="pdns_recursor";
+
+ #ifndef WIN32
+ extern "C" {
+@@ -129,6 +133,17 @@
+ cache[toLower(qname)+"|"+qt.getName()]=content;
+ }
+
++static void writePid(void)
++{
++ string fname=arg()["socket-dir"]+"/"+s_programname+".pid";
++ ofstream of(fname.c_str());
++ if(of)
++ of<<getpid()<<endl;
++ else
++ L<<Logger::Error<<"Requested to write pid for "<<getpid()<<" to "<<fname<<"
++failed: "<<strerror(errno)<<endl;
++}
++
+ void init(void)
+ {
+ // prime root cache
+@@ -394,6 +409,7 @@
+ arg().set("daemon","Operate as a daemon")="yes";
+ arg().set("quiet","Suppress logging of questions and answers")="off";
+ arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
++ arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
+ arg().setCmd("help","Provide a helpful message");
+ L.toConsole(Logger::Warning);
+ arg().laxParse(argc,argv); // do a lax parse
+@@ -433,6 +449,8 @@
+ daemonize();
+ }
+ signal(SIGUSR1,usr1Handler);
++
++ writePid();
+ #endif
+
+ vector<TCPConnection> tcpconnections;
diff --git a/net/powerdns/Makefile b/net/powerdns/Makefile
index 398e412ac37e..5686f3260821 100644
--- a/net/powerdns/Makefile
+++ b/net/powerdns/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= powerdns
-PORTVERSION= 2.9.8
-PORTREVISION= 1
+PORTVERSION= 2.9.10
CATEGORIES= net ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${PORTVERSION}
@@ -100,7 +99,7 @@ post-patch:
${WRKSRC}/pdns/Makefile.in
.endif
-.if defined(POWERDNS_WITH_RECURSOR)
+.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
CONFIGURE_ARGS+= --enable-recursor
PLIST_SUB+= RECURSOR=""
.else
diff --git a/net/powerdns/distinfo b/net/powerdns/distinfo
index 3f877859d87c..d49def71561d 100644
--- a/net/powerdns/distinfo
+++ b/net/powerdns/distinfo
@@ -1 +1 @@
-MD5 (pdns-2.9.8.tar.gz) = fdd443276f50520efbe2e2b608499a11
+MD5 (pdns-2.9.10.tar.gz) = a91f15c90f6551fb817cb708e29d5a37
diff --git a/net/powerdns/files/patch-modules_ldapbackend_powerldap.cc b/net/powerdns/files/patch-modules_ldapbackend_powerldap.cc
deleted file mode 100644
index 27faef6f3c45..000000000000
--- a/net/powerdns/files/patch-modules_ldapbackend_powerldap.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-*** modules/ldapbackend/powerldap.cc.orig Thu Mar 13 20:49:23 2003
---- modules/ldapbackend/powerldap.cc Thu Mar 13 20:49:46 2003
-***************
-*** 3,9 ****
-
- #include <map>
- #include <vector>
-- // #include <crypt.h>
- #include <exception>
- #include <stdexcept>
- #include <string>
---- 3,8 ----
diff --git a/net/powerdns/files/patch-pdns_pdns_recursor.cc b/net/powerdns/files/patch-pdns_pdns_recursor.cc
new file mode 100644
index 000000000000..9457ac61f8a8
--- /dev/null
+++ b/net/powerdns/files/patch-pdns_pdns_recursor.cc
@@ -0,0 +1,48 @@
+--- pdns/pdns_recursor.cc.orig Thu Jul 3 10:30:03 2003
++++ pdns/pdns_recursor.cc Thu Jul 10 16:45:27 2003
+@@ -35,6 +35,10 @@
+ #include "statbag.hh"
+ #include "arguments.hh"
+ #include "syncres.hh"
++#include <fcntl.h>
++#include <fstream>
++
++string s_programname="pdns_recursor";
+
+ #ifndef WIN32
+ extern "C" {
+@@ -129,6 +133,17 @@
+ cache[toLower(qname)+"|"+qt.getName()]=content;
+ }
+
++static void writePid(void)
++{
++ string fname=arg()["socket-dir"]+"/"+s_programname+".pid";
++ ofstream of(fname.c_str());
++ if(of)
++ of<<getpid()<<endl;
++ else
++ L<<Logger::Error<<"Requested to write pid for "<<getpid()<<" to "<<fname<<"
++failed: "<<strerror(errno)<<endl;
++}
++
+ void init(void)
+ {
+ // prime root cache
+@@ -394,6 +409,7 @@
+ arg().set("daemon","Operate as a daemon")="yes";
+ arg().set("quiet","Suppress logging of questions and answers")="off";
+ arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
++ arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
+ arg().setCmd("help","Provide a helpful message");
+ L.toConsole(Logger::Warning);
+ arg().laxParse(argc,argv); // do a lax parse
+@@ -433,6 +449,8 @@
+ daemonize();
+ }
+ signal(SIGUSR1,usr1Handler);
++
++ writePid();
+ #endif
+
+ vector<TCPConnection> tcpconnections;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 18:40:57 +0000