ports/59385: added some patches from the pdns-dev mailing-list
Ralf van der Enden
tremere at cainites.net
Mon Nov 17 21:20:28 UTC 2003
>Number: 59385
>Category: ports
>Synopsis: added some patches from the pdns-dev mailing-list
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 17 13:20:20 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Ralf van der Enden
>Release: FreeBSD 5.1-RELEASE-p10 i386
>Organization:
N/A
>Environment:
System: FreeBSD lan.cainites.net 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #0: Mon Oct 6 16:38:36 CEST 2003 root at lan.cainites.net:/usr/obj/usr/src/sys/HELLKERNEL i386
>Description:
- Added some patches to fix a memory leak in the bind backend
- Added a patch to fix a problem with the allow-axfr-ips option (host/32 netmask didn't work)
- Added an option to the configure dialog to compile the recursor
- Bumped PORTREVISION
>How-To-Repeat:
>Fix:
--- pdns-2.9.12_1.diff begins here ---
diff -ruN powerdns.orig/Makefile powerdns/Makefile
--- powerdns.orig/Makefile Tue Nov 11 10:29:48 2003
+++ powerdns/Makefile Mon Nov 17 20:02:12 2003
@@ -7,6 +7,7 @@
PORTNAME= powerdns
PORTVERSION= 2.9.12
+PORTREVISION= 1
CATEGORIES= dns ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${PORTVERSION}
diff -ruN powerdns.orig/Makefile.inc powerdns/Makefile.inc
--- powerdns.orig/Makefile.inc Wed Nov 12 04:16:29 2003
+++ powerdns/Makefile.inc Thu Jan 1 01:00:00 1970
@@ -1 +0,0 @@
-WITH_POSTGRESQL_DRIVER=YES
diff -ruN powerdns.orig/files/configure.powerdns powerdns/files/configure.powerdns
--- powerdns.orig/files/configure.powerdns Tue Nov 11 10:29:48 2003
+++ powerdns/files/configure.powerdns Mon Nov 17 20:33:05 2003
@@ -11,7 +11,7 @@
else
dialog --title "configuration options" --clear \
--checklist "\n\
-Please select desired options:" -1 -1 7 \
+Please select desired options:" -1 -1 8 \
PostgreSQL "PostgreSQL driver" ON \
MySQL323 "MySQL 3.23 driver" OFF \
MySQL40 "MySQL 4.0 driver" OFF \
@@ -19,6 +19,7 @@
OpenLDAP20 "OpenLDAP 2.0 backend" OFF \
OpenLDAP21 "OpenLDAP 2.1 backend" OFF \
OpenLDAP22 "OpenLDAP 2.2 backend" OFF \
+Recursor "Recursor (FBSD 5.x+ only)" OFF \
2> /tmp/checklist.tmp.$$
retval=$?
@@ -69,6 +70,9 @@
\"OpenLDAP22\")
echo WITH_LDAP=YES
echo LDAP_PORT?=net/openldap22-client
+ ;;
+ \"Recursor\")
+ echo POWERDNS_WITH_RECURSOR=YES
;;
\"nothing\"|true)
;;
diff -ruN powerdns.orig/files/patch-pdns_backends_bind_bindbackend2_cc powerdns/files/patch-pdns_backends_bind_bindbackend2_cc
--- powerdns.orig/files/patch-pdns_backends_bind_bindbackend2_cc Thu Jan 1 01:00:00 1970
+++ powerdns/files/patch-pdns_backends_bind_bindbackend2_cc Mon Nov 17 21:10:59 2003
@@ -0,0 +1,16 @@
+--- pdns/backends/bind/bindbackend2.cc.orig Sat Oct 4 16:15:46 2003
++++ pdns/backends/bind/bindbackend2.cc Mon Nov 17 20:54:19 2003
+@@ -61,11 +61,10 @@
+ d_loaded=false;
+ d_last_check=0;
+ d_checknow=false;
+- d_rwlock=new pthread_rwlock_t;
+ d_status="Seen in bind configuration";
+ d_confcount=0;
+- // cout<<"Generated a new bbdomaininfo: "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
+- pthread_rwlock_init(d_rwlock,0);
++ // cout<<"Generated a new bbdomaininfo: "<<d_rwlock<<"/"<<getpid()<<endl;
++ pthread_rwlock_init(&d_rwlock,0);
+ }
+
+ void BB2DomainInfo::setCheckInterval(time_t seconds)
diff -ruN powerdns.orig/files/patch-pdns_backends_bind_bindbackend2_hh powerdns/files/patch-pdns_backends_bind_bindbackend2_hh
--- powerdns.orig/files/patch-pdns_backends_bind_bindbackend2_hh Thu Jan 1 01:00:00 1970
+++ powerdns/files/patch-pdns_backends_bind_bindbackend2_hh Mon Nov 17 21:11:22 2003
@@ -0,0 +1,39 @@
+--- pdns/backends/bind/bindbackend2.hh.orig Sun Sep 28 20:20:03 2003
++++ pdns/backends/bind/bindbackend2.hh Mon Nov 17 20:54:19 2003
+@@ -58,21 +58,20 @@
+
+ bool tryRLock()
+ {
+- // cout<<"[trylock!] "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
+- return pthread_rwlock_tryrdlock(d_rwlock)!=EBUSY;
++ // cout<<"[trylock!] "<<d_rwlock<<"/"<<getpid()<<endl;
++ return pthread_rwlock_tryrdlock(&d_rwlock)!=EBUSY;
+ }
+
+ void unlock()
+ {
+- // cout<<"[unlock] "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
+- pthread_rwlock_unlock(d_rwlock);
++ // cout<<"[unlock] "<<d_rwlock<<"/"<<getpid()<<endl;
++ pthread_rwlock_unlock(&d_rwlock);
+ }
+
+ void lock()
+ {
+- //cout<<"[writelock!] "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
+-
+- pthread_rwlock_wrlock(d_rwlock);
++ // cout<<"[writelock!] "<<d_rwlock<<"/"<<getpid()<<endl;
++ pthread_rwlock_wrlock(&d_rwlock);
+ }
+
+ void setCheckInterval(time_t seconds);
+@@ -81,7 +80,7 @@
+ time_t getCtime();
+ time_t d_checkinterval;
+ time_t d_lastcheck;
+- pthread_rwlock_t *d_rwlock;
++ pthread_rwlock_t d_rwlock;
+ };
+
+
diff -ruN powerdns.orig/files/patch-pdns_backends_bind_bindbackend_cc powerdns/files/patch-pdns_backends_bind_bindbackend_cc
--- powerdns.orig/files/patch-pdns_backends_bind_bindbackend_cc Thu Jan 1 01:00:00 1970
+++ powerdns/files/patch-pdns_backends_bind_bindbackend_cc Mon Nov 17 21:12:03 2003
@@ -0,0 +1,16 @@
+--- pdns/backends/bind/bindbackend.cc.orig Sat Aug 23 16:35:35 2003
++++ pdns/backends/bind/bindbackend.cc Mon Nov 17 20:54:19 2003
+@@ -58,11 +58,10 @@
+ d_loaded=false;
+ d_last_check=0;
+ d_checknow=false;
+- d_rwlock=new pthread_rwlock_t;
+ d_status="Seen in bind configuration";
+ d_confcount=0;
+- //cout<<"Generated a new bbdomaininfo: "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
+- pthread_rwlock_init(d_rwlock,0);
++ //cout<<"Generated a new bbdomaininfo: "<<d_rwlock<<"/"<<getpid()<<endl;
++ pthread_rwlock_init(&d_rwlock,0);
+ }
+
+ void BBDomainInfo::setCheckInterval(time_t seconds)
diff -ruN powerdns.orig/files/patch-pdns_backends_bind_bindbackend_hh powerdns/files/patch-pdns_backends_bind_bindbackend_hh
--- powerdns.orig/files/patch-pdns_backends_bind_bindbackend_hh Thu Jan 1 01:00:00 1970
+++ powerdns/files/patch-pdns_backends_bind_bindbackend_hh Mon Nov 17 21:12:21 2003
@@ -0,0 +1,39 @@
+--- pdns/backends/bind/bindbackend.hh.orig Sat Aug 23 16:35:35 2003
++++ pdns/backends/bind/bindbackend.hh Mon Nov 17 20:54:19 2003
+@@ -58,21 +58,20 @@
+
+ bool tryRLock()
+ {
+- // cout<<"[trylock!] "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
+- return pthread_rwlock_tryrdlock(d_rwlock)!=EBUSY;
++ // cout<<"[trylock!] "<<d_rwlock<<"/"<<getpid()<<endl;
++ return pthread_rwlock_tryrdlock(&d_rwlock)!=EBUSY;
+ }
+
+ void unlock()
+ {
+- // cout<<"[unlock] "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
+- pthread_rwlock_unlock(d_rwlock);
++ // cout<<"[unlock] "<<d_rwlock<<"/"<<getpid()<<endl;
++ pthread_rwlock_unlock(&d_rwlock);
+ }
+
+ void lock()
+ {
+- //cout<<"[writelock!] "<<(void*)d_rwlock<<"/"<<getpid()<<endl;
+-
+- pthread_rwlock_wrlock(d_rwlock);
++ // cout<<"[writelock!] "<<d_rwlock<<"/"<<getpid()<<endl;
++ pthread_rwlock_wrlock(&d_rwlock);
+ }
+
+ void setCheckInterval(time_t seconds);
+@@ -80,7 +79,7 @@
+ time_t getCtime();
+ time_t d_checkinterval;
+ time_t d_lastcheck;
+- pthread_rwlock_t *d_rwlock;
++ pthread_rwlock_t d_rwlock;
+ };
+
+
diff -ruN powerdns.orig/files/patch-pdns_iputils_hh powerdns/files/patch-pdns_iputils_hh
--- powerdns.orig/files/patch-pdns_iputils_hh Thu Jan 1 01:00:00 1970
+++ powerdns/files/patch-pdns_iputils_hh Tue Nov 11 10:37:12 2003
@@ -0,0 +1,18 @@
+--- pdns/iputils.hh.orig Sat Aug 30 16:27:48 2003
++++ pdns/iputils.hh Mon Nov 10 17:27:02 2003
+@@ -51,10 +51,13 @@
+ Netmask(const string &mask)
+ {
+ char *p;
+- char bits=32;
++ u_int8_t bits=32;
++ d_mask=0xFFFFFFFF;
++
+ if((p=strchr(mask.c_str(),'/')))
+- bits=atoi(p+1);
++ bits = (u_int8_t) atoi(p+1);
+
++ if( bits < 32 )
+ d_mask=~(0xFFFFFFFF>>bits);
+
+ struct in_addr a;
--- pdns-2.9.12_1.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list