sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 2.9.11

Browse source 
- Fixes overwrite of config file (wrong order in Makefile)
PR:		55935
Submitted by:	tremere@cainites.net
This commit is contained in:
Dirk Meyer 2003-08-27 10:26:10 +00:00
parent 9365f5c298
commit 72f43aee1f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=87776
9 changed files with 54 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
dns/powerdns-devel/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= powerdns
PORTVERSION= 2.9.10
PORTVERSION= 2.9.11
CATEGORIES= net ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${PORTVERSION}
@ -62,17 +62,6 @@ MAN8= pdns_control.8 pdns_server.8 zone2sql.8
pre-everything::
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns
post-install:
.if !exists(${PREFIX}/etc/pdns.conf)
${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
.endif
.if !defined(NOPORTDOCS)
${MKDIR} ${EXAMPLESDIR}
.for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql
${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
.endfor
.endif
post-clean:
@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
@ -86,6 +75,13 @@ describe:
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
CONFIGURE_ARGS+= --enable-recursor
PLIST_SUB+= RECURSOR=""
.else
PLIST_SUB+= RECURSOR="@comment "
.endif
.if ${OSVERSION} >= 500043 && defined(WITH_LDAP)
LIB_DEPENDS+= ldap.2:${PORTSDIR}/${LDAP_PORT}
LIB_DEPENDS+= lber.2:${PORTSDIR}/${LDAP_PORT}
@ -100,11 +96,15 @@ post-patch:
${WRKSRC}/pdns/Makefile.in
.endif
.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
CONFIGURE_ARGS+= --enable-recursor
PLIST_SUB+= RECURSOR=""
.else
PLIST_SUB+= RECURSOR="@comment "
post-install:
.if !exists(${PREFIX}/etc/pdns.conf)
${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
.endif
.if !defined(NOPORTDOCS)
${MKDIR} ${EXAMPLESDIR}
.for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql
${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
.endfor
.endif
.include <bsd.port.post.mk>

2
dns/powerdns-devel/distinfo
View file

@ -1 +1 @@
MD5 (pdns-2.9.10.tar.gz) = a91f15c90f6551fb817cb708e29d5a37
MD5 (pdns-2.9.11.tar.gz) = a8aa0b47b3c4f05468b7e664caacb8d1

48
dns/powerdns-devel/files/patch-pdns_pdns_recursor.cc
View file

@ -1,48 +0,0 @@
--- 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;

34
dns/powerdns/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= powerdns
PORTVERSION= 2.9.10
PORTVERSION= 2.9.11
CATEGORIES= net ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${PORTVERSION}
@ -62,17 +62,6 @@ MAN8= pdns_control.8 pdns_server.8 zone2sql.8
pre-everything::
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns
post-install:
.if !exists(${PREFIX}/etc/pdns.conf)
${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
.endif
.if !defined(NOPORTDOCS)
${MKDIR} ${EXAMPLESDIR}
.for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql
${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
.endfor
.endif
post-clean:
@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
@ -86,6 +75,13 @@ describe:
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
CONFIGURE_ARGS+= --enable-recursor
PLIST_SUB+= RECURSOR=""
.else
PLIST_SUB+= RECURSOR="@comment "
.endif
.if ${OSVERSION} >= 500043 && defined(WITH_LDAP)
LIB_DEPENDS+= ldap.2:${PORTSDIR}/${LDAP_PORT}
LIB_DEPENDS+= lber.2:${PORTSDIR}/${LDAP_PORT}
@ -100,11 +96,15 @@ post-patch:
${WRKSRC}/pdns/Makefile.in
.endif
.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
CONFIGURE_ARGS+= --enable-recursor
PLIST_SUB+= RECURSOR=""
.else
PLIST_SUB+= RECURSOR="@comment "
post-install:
.if !exists(${PREFIX}/etc/pdns.conf)
${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
.endif
.if !defined(NOPORTDOCS)
${MKDIR} ${EXAMPLESDIR}
.for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql
${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
.endfor
.endif
.include <bsd.port.post.mk>

2
dns/powerdns/distinfo
View file

@ -1 +1 @@
MD5 (pdns-2.9.10.tar.gz) = a91f15c90f6551fb817cb708e29d5a37
MD5 (pdns-2.9.11.tar.gz) = a8aa0b47b3c4f05468b7e664caacb8d1

48
dns/powerdns/files/patch-pdns_pdns_recursor.cc
View file

@ -1,48 +0,0 @@
--- 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;

34
net/powerdns/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= powerdns
PORTVERSION= 2.9.10
PORTVERSION= 2.9.11
CATEGORIES= net ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${PORTVERSION}
@ -62,17 +62,6 @@ MAN8= pdns_control.8 pdns_server.8 zone2sql.8
pre-everything::
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns
post-install:
.if !exists(${PREFIX}/etc/pdns.conf)
${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
.endif
.if !defined(NOPORTDOCS)
${MKDIR} ${EXAMPLESDIR}
.for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql
${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
.endfor
.endif
post-clean:
@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
@ -86,6 +75,13 @@ describe:
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
CONFIGURE_ARGS+= --enable-recursor
PLIST_SUB+= RECURSOR=""
.else
PLIST_SUB+= RECURSOR="@comment "
.endif
.if ${OSVERSION} >= 500043 && defined(WITH_LDAP)
LIB_DEPENDS+= ldap.2:${PORTSDIR}/${LDAP_PORT}
LIB_DEPENDS+= lber.2:${PORTSDIR}/${LDAP_PORT}
@ -100,11 +96,15 @@ post-patch:
${WRKSRC}/pdns/Makefile.in
.endif
.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
CONFIGURE_ARGS+= --enable-recursor
PLIST_SUB+= RECURSOR=""
.else
PLIST_SUB+= RECURSOR="@comment "
post-install:
.if !exists(${PREFIX}/etc/pdns.conf)
${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
.endif
.if !defined(NOPORTDOCS)
${MKDIR} ${EXAMPLESDIR}
.for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql
${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
.endfor
.endif
.include <bsd.port.post.mk>

2
net/powerdns/distinfo
View file

@ -1 +1 @@
MD5 (pdns-2.9.10.tar.gz) = a91f15c90f6551fb817cb708e29d5a37
MD5 (pdns-2.9.11.tar.gz) = a8aa0b47b3c4f05468b7e664caacb8d1

48
net/powerdns/files/patch-pdns_pdns_recursor.cc
View file

@ -1,48 +0,0 @@
--- 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;