From fc4f115918c34b082792e62d782929113e6a9a43 Mon Sep 17 00:00:00 2001 From: kwm Date: Fri, 4 Nov 2005 10:27:39 +0000 Subject: Update to 2.9.19 Changelog: http://rtfm.powerdns.com/changelog.html#CHANGELOG-2-9-19 Add extra patch to plug memory hole. PR: 88231 Submitted by: Ralf van der Ende (maintainer) --- dns/powerdns-devel/Makefile | 24 +++++++------ dns/powerdns-devel/distinfo | 4 +-- dns/powerdns-devel/files/configure.powerdns | 23 +++--------- .../files/patch-modules_ldapbackend_utils_hh | 42 ---------------------- .../files/patch-pdns__recursos_cache.cc | 23 ++++++++++++ dns/powerdns-devel/files/pdns.sh.in | 2 +- dns/powerdns-devel/files/pdns_recursor.sh.in | 2 +- dns/powerdns-devel/pkg-plist | 10 +++--- dns/powerdns/Makefile | 24 +++++++------ dns/powerdns/distinfo | 4 +-- dns/powerdns/files/configure.powerdns | 23 +++--------- .../files/patch-modules_ldapbackend_utils_hh | 42 ---------------------- dns/powerdns/files/patch-pdns__recursos_cache.cc | 23 ++++++++++++ dns/powerdns/files/pdns.sh.in | 2 +- dns/powerdns/files/pdns_recursor.sh.in | 2 +- dns/powerdns/pkg-plist | 10 +++--- 16 files changed, 100 insertions(+), 160 deletions(-) delete mode 100644 dns/powerdns-devel/files/patch-modules_ldapbackend_utils_hh create mode 100644 dns/powerdns-devel/files/patch-pdns__recursos_cache.cc delete mode 100644 dns/powerdns/files/patch-modules_ldapbackend_utils_hh create mode 100644 dns/powerdns/files/patch-pdns__recursos_cache.cc (limited to 'dns') diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile index 3556b7544cbb..dad98825b1a4 100644 --- a/dns/powerdns-devel/Makefile +++ b/dns/powerdns-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= powerdns -PORTVERSION= 2.9.18 +PORTVERSION= 2.9.19 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} @@ -14,13 +14,16 @@ DISTNAME= pdns-${PORTVERSION} MAINTAINER= tremere@cainites.net COMMENT= An advanced DNS server with SQL backend -LIB_DEPENDS= boost_regex.2:${PORTSDIR}/devel/boost +BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost USE_GMAKE= YES USE_SUBMAKE= YES USE_REINPLACE= YES -GNU_CONFIGURE= YES -CXXFLAGS+= -I${PREFIX}/include +USE_LIBTOOL_VER=15 +INSTALLS_SHLIB= YES +CXXFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-modules="${CONFIGURE_MODULES} pipe" \ --with-dynmodules="" # --enable-debug @@ -62,27 +65,26 @@ NO_DESCRIBE=yes .if defined(WITH_POSTGRESQL_DRIVER) && !defined(WITHOUT_POSTGRESQL_DRIVER) LIB_DEPENDS+= pq[+][+].4:${PORTSDIR}/databases/postgresql-libpq++ -CONFIGURE_ARGS+= --enable-pgsql +CONFIGURE_ARGS+= --enable-pgsql --with-pgsql-includes=${LOCALBASE}/include CONFIGURE_MODULES+= "gpgsql" -CFLAGS+= -DDLLIMPORT="" +CFLAGS+= -DDLLIMPORT="" .else CONFIGURE_ARGS+= --disable-pgsql .endif .if defined(WITH_MYSQL_DRIVER) USE_MYSQL?= YES -CONFIGURE_ARGS+= --enable-mysql +CONFIGURE_ARGS+= --enable-mysql --with-mysql-includes=${LOCALBASE} CONFIGURE_MODULES+= "gmysql" +PLIST_SUB+= WITHMYSQL="" .else CONFIGURE_ARGS+= --disable-mysql +PLIST_SUB+= WITHMYSQL="@comment " .endif .if defined(WITH_LDAP) USE_OPENLDAP?= YES -USE_LIBTOOL_VER= 15 -INSTALLS_SHLIB= YES CONFIGURE_MODULES+= "ldap" -CXXFLAGS+= -L${LOCALBASE}/lib PLIST_SUB+= WITHLDAP="" .else PLIST_SUB+= WITHLDAP="@comment " @@ -92,8 +94,10 @@ PLIST_SUB+= WITHLDAP="@comment " LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --enable-sqlite CONFIGURE_MODULES+= "gsqlite" +PLIST_SUB+= WITHSQLLITE="" .else CONFIGURE_ARGS+= --disable-sqlite +PLIST_SUB+= WITHSQLLITE="@comment " .endif .if defined(POWERDNS_WITH_RECURSOR) diff --git a/dns/powerdns-devel/distinfo b/dns/powerdns-devel/distinfo index 6e080451ab09..808eb41593a3 100644 --- a/dns/powerdns-devel/distinfo +++ b/dns/powerdns-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (pdns-2.9.18.tar.gz) = bcfb0573311e80dbeff0bb16f2764363 -SIZE (pdns-2.9.18.tar.gz) = 825719 +MD5 (pdns-2.9.19.tar.gz) = 30c96878b56845329cca5b8a351277b4 +SIZE (pdns-2.9.19.tar.gz) = 855801 diff --git a/dns/powerdns-devel/files/configure.powerdns b/dns/powerdns-devel/files/configure.powerdns index 0bf780f4fba6..6efa46c6c648 100644 --- a/dns/powerdns-devel/files/configure.powerdns +++ b/dns/powerdns-devel/files/configure.powerdns @@ -13,11 +13,8 @@ else --checklist "\n\ Please select desired options:" -1 -1 8 \ PostgreSQL "PostgreSQL driver" ON \ -MySQL323 "MySQL 3.23 driver" OFF \ -MySQL40 "MySQL 4.0 driver" OFF \ -MySQL41 "MySQL 4.1 driver" OFF \ -OpenLDAP22 "OpenLDAP 2.2 backend" OFF \ -OpenLDAP23 "OpenLDAP 2.3 backend" OFF \ +MySQL "MySQL driver" OFF \ +OpenLDAP "OpenLDAP backend" OFF \ SQLite "SQLite backend" OFF \ Recursor "Build Recursor" OFF \ 2> /tmp/checklist.tmp.$$ @@ -47,23 +44,11 @@ while [ "$1" ]; do \"PostgreSQL\") echo WITH_POSTGRESQL_DRIVER=YES ;; - \"MySQL323\") + \"MySQL\") echo WITH_MYSQL_DRIVER=YES - echo WITH_MYSQL_VER?=323 ;; - \"MySQL40\") - echo WITH_MYSQL_DRIVER=YES - ;; - \"MySQL41\") - echo WITH_MYSQL_DRIVER=YES - echo WITH_MYSQL_VER?=41 - ;; - \"OpenLDAP22\") - echo WITH_LDAP=YES - ;; - \"OpenLDAP23\") + \"OpenLDAP\") echo WITH_LDAP=YES - echo WANT_OPENLDAP_VER?=23 ;; \"SQLite\") echo WITH_SQLITE=YES diff --git a/dns/powerdns-devel/files/patch-modules_ldapbackend_utils_hh b/dns/powerdns-devel/files/patch-modules_ldapbackend_utils_hh deleted file mode 100644 index 6be2a52534e2..000000000000 --- a/dns/powerdns-devel/files/patch-modules_ldapbackend_utils_hh +++ /dev/null @@ -1,42 +0,0 @@ ---- modules/ldapbackend/utils.hh.orig Sat Apr 23 23:40:15 2005 -+++ modules/ldapbackend/utils.hh Thu Jul 28 09:03:14 2005 -@@ -73,7 +73,7 @@ - } - - --inline string ip2ptr4( string ip ) -+inline string ip2ptr4( const string& ip ) - { - string ptr; - vector parts; -@@ -89,7 +89,7 @@ - } - - --inline string ip2ptr6( string ip ) -+inline string ip2ptr6( const string& ip ) - { - string ptr, part, defstr; - vector parts; -@@ -114,6 +114,21 @@ - } - - return ptr + "ip6.arpa"; -+} -+ -+ -+inline string strbind( const string& search, const string& replace, string subject ) -+{ -+ size_t pos = 0; -+ -+ -+ while( ( pos = subject.find( search, pos ) ) != string::npos ) -+ { -+ subject.replace( pos, search.size(), replace ); -+ pos += replace.size(); -+ } -+ -+ return subject; - } - - #endif diff --git a/dns/powerdns-devel/files/patch-pdns__recursos_cache.cc b/dns/powerdns-devel/files/patch-pdns__recursos_cache.cc new file mode 100644 index 000000000000..61b4e288c4c3 --- /dev/null +++ b/dns/powerdns-devel/files/patch-pdns__recursos_cache.cc @@ -0,0 +1,23 @@ +--- pdns/recursor_cache.cc (revision 533) ++++ pdns/recursor_cache.cc (revision 534) +@@ -61,7 +61,12 @@ + void MemRecursorCache::replace(const string &qname, const QType& qt, const set& content) + { + set& stored=d_cache[toLowerCanonic(qname)+"|"+qt.getName()]; ++ ++ for(set::iterator k=stored.begin();k!=stored.end();++k) ++ k->d_string.prune(); ++ + stored.clear(); ++ + for(set::const_iterator i=content.begin(); i != content.end(); ++i) { + StoredRecord dr; + dr.d_ttd=i->ttl; +@@ -88,7 +93,6 @@ + if(j->second.empty()) { // everything is gone + d_cache.erase(j++); + names++; +- + } + else { + ++j; diff --git a/dns/powerdns-devel/files/pdns.sh.in b/dns/powerdns-devel/files/pdns.sh.in index 372ef7707693..9eae04153346 100644 --- a/dns/powerdns-devel/files/pdns.sh.in +++ b/dns/powerdns-devel/files/pdns.sh.in @@ -8,7 +8,7 @@ # KEYWORD: FreeBSD shutdown # -# Add the following lines to /etc/rc.conf to enable dovecot: +# Add the following lines to /etc/rc.conf to enable powerdns: # #pdns_enable="YES" # diff --git a/dns/powerdns-devel/files/pdns_recursor.sh.in b/dns/powerdns-devel/files/pdns_recursor.sh.in index 006f16e21a12..eb8907e49e60 100644 --- a/dns/powerdns-devel/files/pdns_recursor.sh.in +++ b/dns/powerdns-devel/files/pdns_recursor.sh.in @@ -8,7 +8,7 @@ # KEYWORD: FreeBSD shutdown # -# Add the following lines to /etc/rc.conf to enable dovecot: +# Add the following lines to /etc/rc.conf to enable pdns_recursor: # #pdns_recursor_enable="YES" # diff --git a/dns/powerdns-devel/pkg-plist b/dns/powerdns-devel/pkg-plist index 0493279fc7f6..60bcc32562ef 100644 --- a/dns/powerdns-devel/pkg-plist +++ b/dns/powerdns-devel/pkg-plist @@ -2,15 +2,15 @@ bin/pdns_control bin/zone2ldap bin/zone2sql sbin/pdns_server +%%WITHMYSQL%%lib/libgmysqlbackend.so +%%WITHMYSQL%%lib/libgmysqlbackend.so.0 +%%WITHSQLLITE%%lib/libgsqlitebackend.so +%%WITHSQLLITE%%lib/libgsqlitebackend.so.0 +%%WITHLDAP%%lib/libldapbackend.so %%WITHLDAP%%lib/libldapbackend.so.0 -%%WITHLDAP%%lib/libldapbackend.la %%WITHLDAP%%lib/libldapbackend.a -%%WITHLDAP%%@exec ln -fs libldapbackend.so.0 %D/lib/libldapbackend.so -%%WITHLDAP%%@unexec rm -f %D/lib/libldapbackend.so lib/libpipebackend.so.0 lib/libpipebackend.so -lib/libpipebackend.la -lib/libpipebackend.a %%RECURSOR%%sbin/pdns_recursor @unexec if cmp -s %D/etc/pdns.conf %D/etc/pdns.conf-dist; then rm -f %D/etc/pdns.conf; fi etc/pdns.conf-dist diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile index 3556b7544cbb..dad98825b1a4 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -6,7 +6,7 @@ # PORTNAME= powerdns -PORTVERSION= 2.9.18 +PORTVERSION= 2.9.19 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} @@ -14,13 +14,16 @@ DISTNAME= pdns-${PORTVERSION} MAINTAINER= tremere@cainites.net COMMENT= An advanced DNS server with SQL backend -LIB_DEPENDS= boost_regex.2:${PORTSDIR}/devel/boost +BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost USE_GMAKE= YES USE_SUBMAKE= YES USE_REINPLACE= YES -GNU_CONFIGURE= YES -CXXFLAGS+= -I${PREFIX}/include +USE_LIBTOOL_VER=15 +INSTALLS_SHLIB= YES +CXXFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-modules="${CONFIGURE_MODULES} pipe" \ --with-dynmodules="" # --enable-debug @@ -62,27 +65,26 @@ NO_DESCRIBE=yes .if defined(WITH_POSTGRESQL_DRIVER) && !defined(WITHOUT_POSTGRESQL_DRIVER) LIB_DEPENDS+= pq[+][+].4:${PORTSDIR}/databases/postgresql-libpq++ -CONFIGURE_ARGS+= --enable-pgsql +CONFIGURE_ARGS+= --enable-pgsql --with-pgsql-includes=${LOCALBASE}/include CONFIGURE_MODULES+= "gpgsql" -CFLAGS+= -DDLLIMPORT="" +CFLAGS+= -DDLLIMPORT="" .else CONFIGURE_ARGS+= --disable-pgsql .endif .if defined(WITH_MYSQL_DRIVER) USE_MYSQL?= YES -CONFIGURE_ARGS+= --enable-mysql +CONFIGURE_ARGS+= --enable-mysql --with-mysql-includes=${LOCALBASE} CONFIGURE_MODULES+= "gmysql" +PLIST_SUB+= WITHMYSQL="" .else CONFIGURE_ARGS+= --disable-mysql +PLIST_SUB+= WITHMYSQL="@comment " .endif .if defined(WITH_LDAP) USE_OPENLDAP?= YES -USE_LIBTOOL_VER= 15 -INSTALLS_SHLIB= YES CONFIGURE_MODULES+= "ldap" -CXXFLAGS+= -L${LOCALBASE}/lib PLIST_SUB+= WITHLDAP="" .else PLIST_SUB+= WITHLDAP="@comment " @@ -92,8 +94,10 @@ PLIST_SUB+= WITHLDAP="@comment " LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --enable-sqlite CONFIGURE_MODULES+= "gsqlite" +PLIST_SUB+= WITHSQLLITE="" .else CONFIGURE_ARGS+= --disable-sqlite +PLIST_SUB+= WITHSQLLITE="@comment " .endif .if defined(POWERDNS_WITH_RECURSOR) diff --git a/dns/powerdns/distinfo b/dns/powerdns/distinfo index 6e080451ab09..808eb41593a3 100644 --- a/dns/powerdns/distinfo +++ b/dns/powerdns/distinfo @@ -1,2 +1,2 @@ -MD5 (pdns-2.9.18.tar.gz) = bcfb0573311e80dbeff0bb16f2764363 -SIZE (pdns-2.9.18.tar.gz) = 825719 +MD5 (pdns-2.9.19.tar.gz) = 30c96878b56845329cca5b8a351277b4 +SIZE (pdns-2.9.19.tar.gz) = 855801 diff --git a/dns/powerdns/files/configure.powerdns b/dns/powerdns/files/configure.powerdns index 0bf780f4fba6..6efa46c6c648 100644 --- a/dns/powerdns/files/configure.powerdns +++ b/dns/powerdns/files/configure.powerdns @@ -13,11 +13,8 @@ else --checklist "\n\ Please select desired options:" -1 -1 8 \ PostgreSQL "PostgreSQL driver" ON \ -MySQL323 "MySQL 3.23 driver" OFF \ -MySQL40 "MySQL 4.0 driver" OFF \ -MySQL41 "MySQL 4.1 driver" OFF \ -OpenLDAP22 "OpenLDAP 2.2 backend" OFF \ -OpenLDAP23 "OpenLDAP 2.3 backend" OFF \ +MySQL "MySQL driver" OFF \ +OpenLDAP "OpenLDAP backend" OFF \ SQLite "SQLite backend" OFF \ Recursor "Build Recursor" OFF \ 2> /tmp/checklist.tmp.$$ @@ -47,23 +44,11 @@ while [ "$1" ]; do \"PostgreSQL\") echo WITH_POSTGRESQL_DRIVER=YES ;; - \"MySQL323\") + \"MySQL\") echo WITH_MYSQL_DRIVER=YES - echo WITH_MYSQL_VER?=323 ;; - \"MySQL40\") - echo WITH_MYSQL_DRIVER=YES - ;; - \"MySQL41\") - echo WITH_MYSQL_DRIVER=YES - echo WITH_MYSQL_VER?=41 - ;; - \"OpenLDAP22\") - echo WITH_LDAP=YES - ;; - \"OpenLDAP23\") + \"OpenLDAP\") echo WITH_LDAP=YES - echo WANT_OPENLDAP_VER?=23 ;; \"SQLite\") echo WITH_SQLITE=YES diff --git a/dns/powerdns/files/patch-modules_ldapbackend_utils_hh b/dns/powerdns/files/patch-modules_ldapbackend_utils_hh deleted file mode 100644 index 6be2a52534e2..000000000000 --- a/dns/powerdns/files/patch-modules_ldapbackend_utils_hh +++ /dev/null @@ -1,42 +0,0 @@ ---- modules/ldapbackend/utils.hh.orig Sat Apr 23 23:40:15 2005 -+++ modules/ldapbackend/utils.hh Thu Jul 28 09:03:14 2005 -@@ -73,7 +73,7 @@ - } - - --inline string ip2ptr4( string ip ) -+inline string ip2ptr4( const string& ip ) - { - string ptr; - vector parts; -@@ -89,7 +89,7 @@ - } - - --inline string ip2ptr6( string ip ) -+inline string ip2ptr6( const string& ip ) - { - string ptr, part, defstr; - vector parts; -@@ -114,6 +114,21 @@ - } - - return ptr + "ip6.arpa"; -+} -+ -+ -+inline string strbind( const string& search, const string& replace, string subject ) -+{ -+ size_t pos = 0; -+ -+ -+ while( ( pos = subject.find( search, pos ) ) != string::npos ) -+ { -+ subject.replace( pos, search.size(), replace ); -+ pos += replace.size(); -+ } -+ -+ return subject; - } - - #endif diff --git a/dns/powerdns/files/patch-pdns__recursos_cache.cc b/dns/powerdns/files/patch-pdns__recursos_cache.cc new file mode 100644 index 000000000000..61b4e288c4c3 --- /dev/null +++ b/dns/powerdns/files/patch-pdns__recursos_cache.cc @@ -0,0 +1,23 @@ +--- pdns/recursor_cache.cc (revision 533) ++++ pdns/recursor_cache.cc (revision 534) +@@ -61,7 +61,12 @@ + void MemRecursorCache::replace(const string &qname, const QType& qt, const set& content) + { + set& stored=d_cache[toLowerCanonic(qname)+"|"+qt.getName()]; ++ ++ for(set::iterator k=stored.begin();k!=stored.end();++k) ++ k->d_string.prune(); ++ + stored.clear(); ++ + for(set::const_iterator i=content.begin(); i != content.end(); ++i) { + StoredRecord dr; + dr.d_ttd=i->ttl; +@@ -88,7 +93,6 @@ + if(j->second.empty()) { // everything is gone + d_cache.erase(j++); + names++; +- + } + else { + ++j; diff --git a/dns/powerdns/files/pdns.sh.in b/dns/powerdns/files/pdns.sh.in index 372ef7707693..9eae04153346 100644 --- a/dns/powerdns/files/pdns.sh.in +++ b/dns/powerdns/files/pdns.sh.in @@ -8,7 +8,7 @@ # KEYWORD: FreeBSD shutdown # -# Add the following lines to /etc/rc.conf to enable dovecot: +# Add the following lines to /etc/rc.conf to enable powerdns: # #pdns_enable="YES" # diff --git a/dns/powerdns/files/pdns_recursor.sh.in b/dns/powerdns/files/pdns_recursor.sh.in index 006f16e21a12..eb8907e49e60 100644 --- a/dns/powerdns/files/pdns_recursor.sh.in +++ b/dns/powerdns/files/pdns_recursor.sh.in @@ -8,7 +8,7 @@ # KEYWORD: FreeBSD shutdown # -# Add the following lines to /etc/rc.conf to enable dovecot: +# Add the following lines to /etc/rc.conf to enable pdns_recursor: # #pdns_recursor_enable="YES" # diff --git a/dns/powerdns/pkg-plist b/dns/powerdns/pkg-plist index 0493279fc7f6..60bcc32562ef 100644 --- a/dns/powerdns/pkg-plist +++ b/dns/powerdns/pkg-plist @@ -2,15 +2,15 @@ bin/pdns_control bin/zone2ldap bin/zone2sql sbin/pdns_server +%%WITHMYSQL%%lib/libgmysqlbackend.so +%%WITHMYSQL%%lib/libgmysqlbackend.so.0 +%%WITHSQLLITE%%lib/libgsqlitebackend.so +%%WITHSQLLITE%%lib/libgsqlitebackend.so.0 +%%WITHLDAP%%lib/libldapbackend.so %%WITHLDAP%%lib/libldapbackend.so.0 -%%WITHLDAP%%lib/libldapbackend.la %%WITHLDAP%%lib/libldapbackend.a -%%WITHLDAP%%@exec ln -fs libldapbackend.so.0 %D/lib/libldapbackend.so -%%WITHLDAP%%@unexec rm -f %D/lib/libldapbackend.so lib/libpipebackend.so.0 lib/libpipebackend.so -lib/libpipebackend.la -lib/libpipebackend.a %%RECURSOR%%sbin/pdns_recursor @unexec if cmp -s %D/etc/pdns.conf %D/etc/pdns.conf-dist; then rm -f %D/etc/pdns.conf; fi etc/pdns.conf-dist -- cgit