diff options
Diffstat (limited to 'dns')
34 files changed, 0 insertions, 2877 deletions
diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile deleted file mode 100644 index 0299ef54979e..000000000000 --- a/dns/bind95/Makefile +++ /dev/null @@ -1,143 +0,0 @@ -# New ports collection makefile for: BIND 9.4.x -# Date created: 28 January 2007 -# Whom: dougb -# -# $FreeBSD$ -# - -# I stay very aware of developments with BIND in general, and with -# BIND 9 in particular. I frequently delay updating this port from -# a known-stable version due to concerns about stability of a newer -# version. If you are concerned about using the most recent ISC -# release you can generally build it cleanly from the source - Doug - -PORTNAME= bind94 -PORTVERSION= 9.4.0.rc2 -CATEGORIES= dns net ipv6 -MASTER_SITES= ${MASTER_SITE_ISC} \ - http://dougbarton.us/Downloads/%SUBDIR%/ -MASTER_SITE_SUBDIR= bind9/${ISCVERSION} -DISTNAME= bind-${ISCVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= dougb@FreeBSD.org -COMMENT= The BIND DNS suite with updated DNSSEC and threads - -# ISC releases things like 9.4.0b3, which our versioning doesn't like -ISCVERSION= 9.4.0rc2 - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ - --with-randomdev=/dev/random - -USE_OPENSSL= yes - -CONFLICTS= bind-8.* bind84-8.* bind9-9.3.* bind9-dlz-* bind9-sdb-mysql-* host-* zh-bind-8.* - -OPTIONS= REPLACE_BASE "Replace base BIND with this version" off \ - LARGE_FILE "64-bit file support" off \ - IPV6 "IPv6 Support (autodetected by default)" off \ - THREADS "Compile with thread support" on - -.include <bsd.port.pre.mk> - -.if defined(WITH_OPENSSL_PORT) -CONFIGURE_ARGS+= --with-openssl=${LOCALBASE} -.else -CONFIGURE_ARGS+= --with-openssl -.endif - -.if defined(WITH_LARGE_FILE) -CONFIGURE_ARGS+= --enable-largefile -.endif - -.if defined(WITH_IPV6) -CONFIGURE_ARGS+= --enable-ipv6 -.endif - -.if !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --enable-threads -.else -CONFIGURE_ARGS+= --disable-threads -.endif - -.if defined(WITH_REPLACE_BASE) -PKGNAMESUFFIX= -base -PREFIX= /usr -BIND_DESTETC= /etc/namedb -CONFIGURE_ARGS+= --prefix=${PREFIX} \ - --sysconfdir=${BIND_DESTETC} \ - --mandir=${MANPREFIX}/man -.else -BIND_DESTETC= ${PREFIX}/etc -.endif - -PLIST_SUB= BIND_DESTETC="${BIND_DESTETC}" - -MAN1= dig.1 host.1 nslookup.1 -MAN3= lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \ - lwres_buffer_back.3 lwres_buffer_clear.3 lwres_buffer_first.3 \ - lwres_buffer_forward.3 lwres_buffer_getmem.3 lwres_buffer_getuint16.3 \ - lwres_buffer_getuint32.3 lwres_buffer_getuint8.3 lwres_buffer_init.3 \ - lwres_buffer_invalidate.3 lwres_buffer_putmem.3 \ - lwres_buffer_putuint16.3 lwres_buffer_putuint32.3 \ - lwres_buffer_putuint8.3 lwres_buffer_subtract.3 lwres_conf_clear.3 \ - lwres_conf_get.3 lwres_conf_init.3 lwres_conf_parse.3 \ - lwres_conf_print.3 lwres_config.3 lwres_context.3 \ - lwres_context_allocmem.3 lwres_context_create.3 \ - lwres_context_destroy.3 lwres_context_freemem.3 \ - lwres_context_initserial.3 lwres_context_nextserial.3 \ - lwres_context_sendrecv.3 lwres_endhostent.3 lwres_endhostent_r.3 \ - lwres_freeaddrinfo.3 lwres_freehostent.3 lwres_gabn.3 \ - lwres_gabnrequest_free.3 lwres_gabnrequest_parse.3 \ - lwres_gabnrequest_render.3 lwres_gabnresponse_free.3 \ - lwres_gabnresponse_parse.3 lwres_gabnresponse_render.3 \ - lwres_gai_strerror.3 lwres_getaddrinfo.3 lwres_getaddrsbyname.3 \ - lwres_gethostbyaddr.3 lwres_gethostbyaddr_r.3 lwres_gethostbyname.3 \ - lwres_gethostbyname2.3 lwres_gethostbyname_r.3 lwres_gethostent.3 \ - lwres_gethostent_r.3 lwres_getipnode.3 lwres_getipnodebyaddr.3 \ - lwres_getipnodebyname.3 lwres_getnamebyaddr.3 lwres_getnameinfo.3 \ - lwres_getrrsetbyname.3 lwres_gnba.3 lwres_gnbarequest_free.3 \ - lwres_gnbarequest_parse.3 lwres_gnbarequest_render.3 \ - lwres_gnbaresponse_free.3 lwres_gnbaresponse_parse.3 \ - lwres_gnbaresponse_render.3 lwres_herror.3 lwres_hstrerror.3 \ - lwres_inetntop.3 lwres_lwpacket_parseheader.3 \ - lwres_lwpacket_renderheader.3 lwres_net_ntop.3 lwres_noop.3 \ - lwres_nooprequest_free.3 lwres_nooprequest_parse.3 \ - lwres_nooprequest_render.3 lwres_noopresponse_free.3 \ - lwres_noopresponse_parse.3 lwres_noopresponse_render.3 \ - lwres_packet.3 lwres_resutil.3 lwres_sethostent.3 \ - lwres_sethostent_r.3 lwres_string_parse.3 -MAN5= named.conf.5 rndc.conf.5 -MAN8= dnssec-keygen.8 dnssec-signzone.8 lwresd.8 named-checkconf.8 \ - named-checkzone.8 named.8 nsupdate.8 rndc-confgen.8 rndc.8 -MLINKS= named-checkzone.8 named-compilezone.8 - -verify: checksum - gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc - -post-patch: -.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.8 \ - rndc/rndc.8 - @${MV} ${WRKSRC}/bin/${FILE} ${WRKSRC}/bin/${FILE}.Dist - @${SED} -e 's#/etc/named.conf#${BIND_DESTETC}/named.conf#g' \ - -e 's#/etc/rndc.conf#${BIND_DESTETC}/rndc.conf#g' \ - ${WRKSRC}/bin/${FILE}.Dist > ${WRKSRC}/bin/${FILE} -.endfor - -post-install: - ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ - ${BIND_DESTETC}/rndc.conf.sample -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR}/arm ${DOCSDIR}/misc - ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DOCSDIR}/arm - ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/doc/misc/[a-z]* ${DOCSDIR}/misc - ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ - ${WRKSRC}/README ${DOCSDIR}/ -.endif - - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/dns/bind95/distinfo b/dns/bind95/distinfo deleted file mode 100644 index 01f281f51ce7..000000000000 --- a/dns/bind95/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (bind-9.4.0rc2.tar.gz) = 95daa3e6f70c979d8a64282011bb3419 -SHA256 (bind-9.4.0rc2.tar.gz) = ab269867dd2c74cf6b20241457892960a8f106b873d34b80bcce126f3cf6ea23 -SIZE (bind-9.4.0rc2.tar.gz) = 6328614 -MD5 (bind-9.4.0rc2.tar.gz.asc) = bbc61939f0295b1f9dcf58bccb50127a -SHA256 (bind-9.4.0rc2.tar.gz.asc) = e32db66998be81fb922bc14fc74f721d4369b88e99e1be97201598595d435d6e -SIZE (bind-9.4.0rc2.tar.gz.asc) = 479 diff --git a/dns/bind95/pkg-descr b/dns/bind95/pkg-descr deleted file mode 100644 index b0233dd7eb19..000000000000 --- a/dns/bind95/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -BIND version 9 is a major rewrite of nearly all aspects of the underlying BIND -architecture. Some of the important features of BIND 9 are: - -DNS Security - DNSSEC (signed zones) - TSIG (signed DNS requests) -IP version 6 - Answers DNS queries on IPv6 sockets - IPv6 resource records (AAAA) - Experimental IPv6 Resolver Library -DNS Protocol Enhancements - IXFR, DDNS, Notify, EDNS0 - Improved standards conformance -Views - One server process can provide multiple "views" of - the DNS namespace, e.g. an "inside" view to certain - clients, and an "outside" view to others. - -Multiprocessor Support, including working threads in this version - -WWW: http://www.isc.org/index.pl?/sw/bind/bind9.4-beta.php - -- Doug Barton -DougB@FreeBSD.org diff --git a/dns/bind95/pkg-message b/dns/bind95/pkg-message deleted file mode 100644 index 8dd5f7e54f92..000000000000 --- a/dns/bind95/pkg-message +++ /dev/null @@ -1,22 +0,0 @@ -************************************************************************* -* _ _____ _____ _____ _ _ _____ ___ ___ _ _ * -* / \|_ _|_ _| ____| \ | |_ _|_ _/ _ \| \ | | * -* / _ \ | | | | | _| | \| | | | | | | | | \| | * -* / ___ \| | | | | |___| |\ | | | | | |_| | |\ | * -* /_/ \_\_| |_| |_____|_| \_| |_| |___\___/|_| \_| * -* * -* BIND 9 requires a good source of randomness to operate. * -* It also requires configuration of rndc, including a * -* "secret" key. If you are using FreeBSD 4.x, visit * -* http://people.freebsd.org/~dougb/randomness.html for * -* information on how to set up entropy gathering. Users * -* of FreeBSD 5.x or later do not need to do this step. If * -* you are running BIND 9 in a chroot environment, make * -* sure that there is a /dev/random device in the chroot. * -* * -* The easiest, and most secure way to configure rndc is * -* to run 'rndc-confgen -a' which will generate the proper * -* conf file, with a new random key, and appropriate file * -* permissions. * -* * -************************************************************************* diff --git a/dns/bind95/pkg-plist b/dns/bind95/pkg-plist deleted file mode 100644 index aba77800d8a3..000000000000 --- a/dns/bind95/pkg-plist +++ /dev/null @@ -1,242 +0,0 @@ -bin/dig -bin/host -bin/isc-config.sh -bin/nslookup -bin/nsupdate -include/bind9/check.h -include/bind9/getaddresses.h -include/bind9/version.h -include/dns/acl.h -include/dns/adb.h -include/dns/byaddr.h -include/dns/cache.h -include/dns/callbacks.h -include/dns/cert.h -include/dns/compress.h -include/dns/db.h -include/dns/dbiterator.h -include/dns/dbtable.h -include/dns/diff.h -include/dns/dispatch.h -include/dns/dnssec.h -include/dns/ds.h -include/dns/enumclass.h -include/dns/enumtype.h -include/dns/events.h -include/dns/fixedname.h -include/dns/journal.h -include/dns/keyflags.h -include/dns/keytable.h -include/dns/keyvalues.h -include/dns/lib.h -include/dns/log.h -include/dns/master.h -include/dns/masterdump.h -include/dns/message.h -include/dns/name.h -include/dns/ncache.h -include/dns/nsec.h -include/dns/peer.h -include/dns/portlist.h -include/dns/rbt.h -include/dns/rcode.h -include/dns/rdata.h -include/dns/rdataclass.h -include/dns/rdatalist.h -include/dns/rdataset.h -include/dns/rdatasetiter.h -include/dns/rdataslab.h -include/dns/rdatastruct.h -include/dns/rdatatype.h -include/dns/request.h -include/dns/resolver.h -include/dns/result.h -include/dns/rootns.h -include/dns/sdb.h -include/dns/secalg.h -include/dns/secproto.h -include/dns/soa.h -include/dns/ssu.h -include/dns/tcpmsg.h -include/dns/time.h -include/dns/tkey.h -include/dns/tsig.h -include/dns/ttl.h -include/dns/types.h -include/dns/validator.h -include/dns/version.h -include/dns/view.h -include/dns/xfrin.h -include/dns/zone.h -include/dns/zonekey.h -include/dns/zt.h -include/dst/dst.h -include/dst/lib.h -include/dst/result.h -include/isc/app.h -include/isc/assertions.h -include/isc/base64.h -include/isc/bitstring.h -include/isc/boolean.h -include/isc/buffer.h -include/isc/bufferlist.h -include/isc/commandline.h -include/isc/condition.h -include/isc/dir.h -include/isc/entropy.h -include/isc/error.h -include/isc/event.h -include/isc/eventclass.h -include/isc/file.h -include/isc/formatcheck.h -include/isc/fsaccess.h -include/isc/hash.h -include/isc/heap.h -include/isc/hex.h -include/isc/hmacmd5.h -include/isc/int.h -include/isc/interfaceiter.h -include/isc/lang.h -include/isc/lex.h -include/isc/lfsr.h -include/isc/lib.h -include/isc/list.h -include/isc/log.h -include/isc/magic.h -include/isc/md5.h -include/isc/mem.h -include/isc/msgcat.h -include/isc/msgs.h -include/isc/mutex.h -include/isc/mutexblock.h -include/isc/net.h -include/isc/netaddr.h -include/isc/netdb.h -include/isc/offset.h -include/isc/once.h -include/isc/ondestroy.h -include/isc/os.h -include/isc/parseint.h -include/isc/platform.h -include/isc/print.h -include/isc/quota.h -include/isc/random.h -include/isc/ratelimiter.h -include/isc/refcount.h -include/isc/region.h -include/isc/resource.h -include/isc/result.h -include/isc/resultclass.h -include/isc/rwlock.h -include/isc/serial.h -include/isc/sha1.h -include/isc/sha2.h -include/isc/sockaddr.h -include/isc/socket.h -include/isc/stdio.h -include/isc/stdlib.h -include/isc/stdtime.h -include/isc/string.h -include/isc/symtab.h -include/isc/syslog.h -include/isc/task.h -include/isc/taskpool.h -include/isc/thread.h -include/isc/time.h -include/isc/timer.h -include/isc/types.h -include/isc/util.h -include/isc/version.h -include/isccc/alist.h -include/isccc/base64.h -include/isccc/cc.h -include/isccc/ccmsg.h -include/isccc/events.h -include/isccc/lib.h -include/isccc/result.h -include/isccc/sexpr.h -include/isccc/symtab.h -include/isccc/symtype.h -include/isccc/types.h -include/isccc/util.h -include/isccc/version.h -include/isccfg/aclconf.h -include/isccfg/cfg.h -include/isccfg/grammar.h -include/isccfg/log.h -include/isccfg/namedconf.h -include/isccfg/version.h -include/lwres/context.h -include/lwres/int.h -include/lwres/ipv6.h -include/lwres/lang.h -include/lwres/list.h -include/lwres/lwbuffer.h -include/lwres/lwpacket.h -include/lwres/lwres.h -include/lwres/net.h -include/lwres/netdb.h -include/lwres/platform.h -include/lwres/result.h -include/lwres/version.h -lib/libbind9.a -lib/libdns.a -lib/libisc.a -lib/libisccc.a -lib/libisccfg.a -lib/liblwres.a -sbin/dnssec-keygen -sbin/dnssec-signzone -sbin/lwresd -sbin/named -sbin/named-checkconf -sbin/named-checkzone -sbin/named-compilezone -sbin/rndc -sbin/rndc-confgen -%%PORTDOCS%%%%DOCSDIR%%/Bv9ARM.pdf -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch01.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch02.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch03.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch04.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch05.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch06.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch07.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch08.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch09.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch10.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.dig.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.dnssec-keygen.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.dnssec-signzone.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.host.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.named-checkconf.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.named-checkzone.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.named.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.rndc-confgen.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.rndc.conf.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.rndc.html -%%PORTDOCS%%%%DOCSDIR%%/misc/dnssec -%%PORTDOCS%%%%DOCSDIR%%/misc/format-options.pl -%%PORTDOCS%%%%DOCSDIR%%/misc/ipv6 -%%PORTDOCS%%%%DOCSDIR%%/misc/migration -%%PORTDOCS%%%%DOCSDIR%%/misc/migration-4to9 -%%PORTDOCS%%%%DOCSDIR%%/misc/options -%%PORTDOCS%%%%DOCSDIR%%/misc/rfc-compliance -%%PORTDOCS%%%%DOCSDIR%%/misc/roadmap -%%PORTDOCS%%%%DOCSDIR%%/misc/sdb -%%PORTDOCS%%@dirrm %%DOCSDIR%%/arm -%%PORTDOCS%%@dirrm %%DOCSDIR%%/misc -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample -@dirrm include/bind9 -@dirrm include/dns -@dirrm include/dst -@dirrmtry include/isc -@dirrm include/isccc -@dirrm include/isccfg -@dirrm include/lwres diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile deleted file mode 100644 index 0299ef54979e..000000000000 --- a/dns/bind96/Makefile +++ /dev/null @@ -1,143 +0,0 @@ -# New ports collection makefile for: BIND 9.4.x -# Date created: 28 January 2007 -# Whom: dougb -# -# $FreeBSD$ -# - -# I stay very aware of developments with BIND in general, and with -# BIND 9 in particular. I frequently delay updating this port from -# a known-stable version due to concerns about stability of a newer -# version. If you are concerned about using the most recent ISC -# release you can generally build it cleanly from the source - Doug - -PORTNAME= bind94 -PORTVERSION= 9.4.0.rc2 -CATEGORIES= dns net ipv6 -MASTER_SITES= ${MASTER_SITE_ISC} \ - http://dougbarton.us/Downloads/%SUBDIR%/ -MASTER_SITE_SUBDIR= bind9/${ISCVERSION} -DISTNAME= bind-${ISCVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= dougb@FreeBSD.org -COMMENT= The BIND DNS suite with updated DNSSEC and threads - -# ISC releases things like 9.4.0b3, which our versioning doesn't like -ISCVERSION= 9.4.0rc2 - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ - --with-randomdev=/dev/random - -USE_OPENSSL= yes - -CONFLICTS= bind-8.* bind84-8.* bind9-9.3.* bind9-dlz-* bind9-sdb-mysql-* host-* zh-bind-8.* - -OPTIONS= REPLACE_BASE "Replace base BIND with this version" off \ - LARGE_FILE "64-bit file support" off \ - IPV6 "IPv6 Support (autodetected by default)" off \ - THREADS "Compile with thread support" on - -.include <bsd.port.pre.mk> - -.if defined(WITH_OPENSSL_PORT) -CONFIGURE_ARGS+= --with-openssl=${LOCALBASE} -.else -CONFIGURE_ARGS+= --with-openssl -.endif - -.if defined(WITH_LARGE_FILE) -CONFIGURE_ARGS+= --enable-largefile -.endif - -.if defined(WITH_IPV6) -CONFIGURE_ARGS+= --enable-ipv6 -.endif - -.if !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --enable-threads -.else -CONFIGURE_ARGS+= --disable-threads -.endif - -.if defined(WITH_REPLACE_BASE) -PKGNAMESUFFIX= -base -PREFIX= /usr -BIND_DESTETC= /etc/namedb -CONFIGURE_ARGS+= --prefix=${PREFIX} \ - --sysconfdir=${BIND_DESTETC} \ - --mandir=${MANPREFIX}/man -.else -BIND_DESTETC= ${PREFIX}/etc -.endif - -PLIST_SUB= BIND_DESTETC="${BIND_DESTETC}" - -MAN1= dig.1 host.1 nslookup.1 -MAN3= lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \ - lwres_buffer_back.3 lwres_buffer_clear.3 lwres_buffer_first.3 \ - lwres_buffer_forward.3 lwres_buffer_getmem.3 lwres_buffer_getuint16.3 \ - lwres_buffer_getuint32.3 lwres_buffer_getuint8.3 lwres_buffer_init.3 \ - lwres_buffer_invalidate.3 lwres_buffer_putmem.3 \ - lwres_buffer_putuint16.3 lwres_buffer_putuint32.3 \ - lwres_buffer_putuint8.3 lwres_buffer_subtract.3 lwres_conf_clear.3 \ - lwres_conf_get.3 lwres_conf_init.3 lwres_conf_parse.3 \ - lwres_conf_print.3 lwres_config.3 lwres_context.3 \ - lwres_context_allocmem.3 lwres_context_create.3 \ - lwres_context_destroy.3 lwres_context_freemem.3 \ - lwres_context_initserial.3 lwres_context_nextserial.3 \ - lwres_context_sendrecv.3 lwres_endhostent.3 lwres_endhostent_r.3 \ - lwres_freeaddrinfo.3 lwres_freehostent.3 lwres_gabn.3 \ - lwres_gabnrequest_free.3 lwres_gabnrequest_parse.3 \ - lwres_gabnrequest_render.3 lwres_gabnresponse_free.3 \ - lwres_gabnresponse_parse.3 lwres_gabnresponse_render.3 \ - lwres_gai_strerror.3 lwres_getaddrinfo.3 lwres_getaddrsbyname.3 \ - lwres_gethostbyaddr.3 lwres_gethostbyaddr_r.3 lwres_gethostbyname.3 \ - lwres_gethostbyname2.3 lwres_gethostbyname_r.3 lwres_gethostent.3 \ - lwres_gethostent_r.3 lwres_getipnode.3 lwres_getipnodebyaddr.3 \ - lwres_getipnodebyname.3 lwres_getnamebyaddr.3 lwres_getnameinfo.3 \ - lwres_getrrsetbyname.3 lwres_gnba.3 lwres_gnbarequest_free.3 \ - lwres_gnbarequest_parse.3 lwres_gnbarequest_render.3 \ - lwres_gnbaresponse_free.3 lwres_gnbaresponse_parse.3 \ - lwres_gnbaresponse_render.3 lwres_herror.3 lwres_hstrerror.3 \ - lwres_inetntop.3 lwres_lwpacket_parseheader.3 \ - lwres_lwpacket_renderheader.3 lwres_net_ntop.3 lwres_noop.3 \ - lwres_nooprequest_free.3 lwres_nooprequest_parse.3 \ - lwres_nooprequest_render.3 lwres_noopresponse_free.3 \ - lwres_noopresponse_parse.3 lwres_noopresponse_render.3 \ - lwres_packet.3 lwres_resutil.3 lwres_sethostent.3 \ - lwres_sethostent_r.3 lwres_string_parse.3 -MAN5= named.conf.5 rndc.conf.5 -MAN8= dnssec-keygen.8 dnssec-signzone.8 lwresd.8 named-checkconf.8 \ - named-checkzone.8 named.8 nsupdate.8 rndc-confgen.8 rndc.8 -MLINKS= named-checkzone.8 named-compilezone.8 - -verify: checksum - gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc - -post-patch: -.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.8 \ - rndc/rndc.8 - @${MV} ${WRKSRC}/bin/${FILE} ${WRKSRC}/bin/${FILE}.Dist - @${SED} -e 's#/etc/named.conf#${BIND_DESTETC}/named.conf#g' \ - -e 's#/etc/rndc.conf#${BIND_DESTETC}/rndc.conf#g' \ - ${WRKSRC}/bin/${FILE}.Dist > ${WRKSRC}/bin/${FILE} -.endfor - -post-install: - ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ - ${BIND_DESTETC}/rndc.conf.sample -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR}/arm ${DOCSDIR}/misc - ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DOCSDIR}/arm - ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/doc/misc/[a-z]* ${DOCSDIR}/misc - ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ - ${WRKSRC}/README ${DOCSDIR}/ -.endif - - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/dns/bind96/distinfo b/dns/bind96/distinfo deleted file mode 100644 index 01f281f51ce7..000000000000 --- a/dns/bind96/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (bind-9.4.0rc2.tar.gz) = 95daa3e6f70c979d8a64282011bb3419 -SHA256 (bind-9.4.0rc2.tar.gz) = ab269867dd2c74cf6b20241457892960a8f106b873d34b80bcce126f3cf6ea23 -SIZE (bind-9.4.0rc2.tar.gz) = 6328614 -MD5 (bind-9.4.0rc2.tar.gz.asc) = bbc61939f0295b1f9dcf58bccb50127a -SHA256 (bind-9.4.0rc2.tar.gz.asc) = e32db66998be81fb922bc14fc74f721d4369b88e99e1be97201598595d435d6e -SIZE (bind-9.4.0rc2.tar.gz.asc) = 479 diff --git a/dns/bind96/pkg-descr b/dns/bind96/pkg-descr deleted file mode 100644 index b0233dd7eb19..000000000000 --- a/dns/bind96/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -BIND version 9 is a major rewrite of nearly all aspects of the underlying BIND -architecture. Some of the important features of BIND 9 are: - -DNS Security - DNSSEC (signed zones) - TSIG (signed DNS requests) -IP version 6 - Answers DNS queries on IPv6 sockets - IPv6 resource records (AAAA) - Experimental IPv6 Resolver Library -DNS Protocol Enhancements - IXFR, DDNS, Notify, EDNS0 - Improved standards conformance -Views - One server process can provide multiple "views" of - the DNS namespace, e.g. an "inside" view to certain - clients, and an "outside" view to others. - -Multiprocessor Support, including working threads in this version - -WWW: http://www.isc.org/index.pl?/sw/bind/bind9.4-beta.php - -- Doug Barton -DougB@FreeBSD.org diff --git a/dns/bind96/pkg-message b/dns/bind96/pkg-message deleted file mode 100644 index 8dd5f7e54f92..000000000000 --- a/dns/bind96/pkg-message +++ /dev/null @@ -1,22 +0,0 @@ -************************************************************************* -* _ _____ _____ _____ _ _ _____ ___ ___ _ _ * -* / \|_ _|_ _| ____| \ | |_ _|_ _/ _ \| \ | | * -* / _ \ | | | | | _| | \| | | | | | | | | \| | * -* / ___ \| | | | | |___| |\ | | | | | |_| | |\ | * -* /_/ \_\_| |_| |_____|_| \_| |_| |___\___/|_| \_| * -* * -* BIND 9 requires a good source of randomness to operate. * -* It also requires configuration of rndc, including a * -* "secret" key. If you are using FreeBSD 4.x, visit * -* http://people.freebsd.org/~dougb/randomness.html for * -* information on how to set up entropy gathering. Users * -* of FreeBSD 5.x or later do not need to do this step. If * -* you are running BIND 9 in a chroot environment, make * -* sure that there is a /dev/random device in the chroot. * -* * -* The easiest, and most secure way to configure rndc is * -* to run 'rndc-confgen -a' which will generate the proper * -* conf file, with a new random key, and appropriate file * -* permissions. * -* * -************************************************************************* diff --git a/dns/bind96/pkg-plist b/dns/bind96/pkg-plist deleted file mode 100644 index aba77800d8a3..000000000000 --- a/dns/bind96/pkg-plist +++ /dev/null @@ -1,242 +0,0 @@ -bin/dig -bin/host -bin/isc-config.sh -bin/nslookup -bin/nsupdate -include/bind9/check.h -include/bind9/getaddresses.h -include/bind9/version.h -include/dns/acl.h -include/dns/adb.h -include/dns/byaddr.h -include/dns/cache.h -include/dns/callbacks.h -include/dns/cert.h -include/dns/compress.h -include/dns/db.h -include/dns/dbiterator.h -include/dns/dbtable.h -include/dns/diff.h -include/dns/dispatch.h -include/dns/dnssec.h -include/dns/ds.h -include/dns/enumclass.h -include/dns/enumtype.h -include/dns/events.h -include/dns/fixedname.h -include/dns/journal.h -include/dns/keyflags.h -include/dns/keytable.h -include/dns/keyvalues.h -include/dns/lib.h -include/dns/log.h -include/dns/master.h -include/dns/masterdump.h -include/dns/message.h -include/dns/name.h -include/dns/ncache.h -include/dns/nsec.h -include/dns/peer.h -include/dns/portlist.h -include/dns/rbt.h -include/dns/rcode.h -include/dns/rdata.h -include/dns/rdataclass.h -include/dns/rdatalist.h -include/dns/rdataset.h -include/dns/rdatasetiter.h -include/dns/rdataslab.h -include/dns/rdatastruct.h -include/dns/rdatatype.h -include/dns/request.h -include/dns/resolver.h -include/dns/result.h -include/dns/rootns.h -include/dns/sdb.h -include/dns/secalg.h -include/dns/secproto.h -include/dns/soa.h -include/dns/ssu.h -include/dns/tcpmsg.h -include/dns/time.h -include/dns/tkey.h -include/dns/tsig.h -include/dns/ttl.h -include/dns/types.h -include/dns/validator.h -include/dns/version.h -include/dns/view.h -include/dns/xfrin.h -include/dns/zone.h -include/dns/zonekey.h -include/dns/zt.h -include/dst/dst.h -include/dst/lib.h -include/dst/result.h -include/isc/app.h -include/isc/assertions.h -include/isc/base64.h -include/isc/bitstring.h -include/isc/boolean.h -include/isc/buffer.h -include/isc/bufferlist.h -include/isc/commandline.h -include/isc/condition.h -include/isc/dir.h -include/isc/entropy.h -include/isc/error.h -include/isc/event.h -include/isc/eventclass.h -include/isc/file.h -include/isc/formatcheck.h -include/isc/fsaccess.h -include/isc/hash.h -include/isc/heap.h -include/isc/hex.h -include/isc/hmacmd5.h -include/isc/int.h -include/isc/interfaceiter.h -include/isc/lang.h -include/isc/lex.h -include/isc/lfsr.h -include/isc/lib.h -include/isc/list.h -include/isc/log.h -include/isc/magic.h -include/isc/md5.h -include/isc/mem.h -include/isc/msgcat.h -include/isc/msgs.h -include/isc/mutex.h -include/isc/mutexblock.h -include/isc/net.h -include/isc/netaddr.h -include/isc/netdb.h -include/isc/offset.h -include/isc/once.h -include/isc/ondestroy.h -include/isc/os.h -include/isc/parseint.h -include/isc/platform.h -include/isc/print.h -include/isc/quota.h -include/isc/random.h -include/isc/ratelimiter.h -include/isc/refcount.h -include/isc/region.h -include/isc/resource.h -include/isc/result.h -include/isc/resultclass.h -include/isc/rwlock.h -include/isc/serial.h -include/isc/sha1.h -include/isc/sha2.h -include/isc/sockaddr.h -include/isc/socket.h -include/isc/stdio.h -include/isc/stdlib.h -include/isc/stdtime.h -include/isc/string.h -include/isc/symtab.h -include/isc/syslog.h -include/isc/task.h -include/isc/taskpool.h -include/isc/thread.h -include/isc/time.h -include/isc/timer.h -include/isc/types.h -include/isc/util.h -include/isc/version.h -include/isccc/alist.h -include/isccc/base64.h -include/isccc/cc.h -include/isccc/ccmsg.h -include/isccc/events.h -include/isccc/lib.h -include/isccc/result.h -include/isccc/sexpr.h -include/isccc/symtab.h -include/isccc/symtype.h -include/isccc/types.h -include/isccc/util.h -include/isccc/version.h -include/isccfg/aclconf.h -include/isccfg/cfg.h -include/isccfg/grammar.h -include/isccfg/log.h -include/isccfg/namedconf.h -include/isccfg/version.h -include/lwres/context.h -include/lwres/int.h -include/lwres/ipv6.h -include/lwres/lang.h -include/lwres/list.h -include/lwres/lwbuffer.h -include/lwres/lwpacket.h -include/lwres/lwres.h -include/lwres/net.h -include/lwres/netdb.h -include/lwres/platform.h -include/lwres/result.h -include/lwres/version.h -lib/libbind9.a -lib/libdns.a -lib/libisc.a -lib/libisccc.a -lib/libisccfg.a -lib/liblwres.a -sbin/dnssec-keygen -sbin/dnssec-signzone -sbin/lwresd -sbin/named -sbin/named-checkconf -sbin/named-checkzone -sbin/named-compilezone -sbin/rndc -sbin/rndc-confgen -%%PORTDOCS%%%%DOCSDIR%%/Bv9ARM.pdf -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch01.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch02.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch03.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch04.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch05.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch06.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch07.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch08.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch09.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch10.html -%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.dig.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.dnssec-keygen.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.dnssec-signzone.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.host.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.named-checkconf.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.named-checkzone.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.named.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.rndc-confgen.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.rndc.conf.html -%%PORTDOCS%%%%DOCSDIR%%/arm/man.rndc.html -%%PORTDOCS%%%%DOCSDIR%%/misc/dnssec -%%PORTDOCS%%%%DOCSDIR%%/misc/format-options.pl -%%PORTDOCS%%%%DOCSDIR%%/misc/ipv6 -%%PORTDOCS%%%%DOCSDIR%%/misc/migration -%%PORTDOCS%%%%DOCSDIR%%/misc/migration-4to9 -%%PORTDOCS%%%%DOCSDIR%%/misc/options -%%PORTDOCS%%%%DOCSDIR%%/misc/rfc-compliance -%%PORTDOCS%%%%DOCSDIR%%/misc/roadmap -%%PORTDOCS%%%%DOCSDIR%%/misc/sdb -%%PORTDOCS%%@dirrm %%DOCSDIR%%/arm -%%PORTDOCS%%@dirrm %%DOCSDIR%%/misc -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample -@dirrm include/bind9 -@dirrm include/dns -@dirrm include/dst -@dirrmtry include/isc -@dirrm include/isccc -@dirrm include/isccfg -@dirrm include/lwres diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile deleted file mode 100644 index 95e77a3cc8c2..000000000000 --- a/dns/mydns-ng/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -# New ports collection makefile for: mydns -# Date created: 23 July 2002 -# Whom: Simon Dick <simond@irrelevant.org> -# -# $FreeBSD$ -# - -PORTNAME= mydns -PORTVERSION= 1.1.0 -PORTREVISION= 1 -CATEGORIES= dns databases -MASTER_SITES= http://mydns.bboy.net/download/ - -MAINTAINER= ale@FreeBSD.org -COMMENT= DNS server designed to utilize the MySQL database - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc -USE_ICONV= yes -USE_BZIP2= yes - -USE_RC_SUBR= mydns.sh - -SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message - -INFO= mydns -MAN5= mydns.conf.5 -MAN8= mydns.8 mydnscheck.8 mydnsexport.8 mydnsimport.8 mydnsptrconvert.8 mydns-conf.8 - -DOCS= AUTHORS COPYING ChangeLog NEWS QUICKSTART.mysql QUICKSTART.postgres README TODO - -.if defined(WITH_ALIAS) -CONFIGURE_ARGS+=--enable-alias -.endif - -.if defined(WITH_OPENSSL) -USE_OPENSSL= yes -CONFIGURE_ARGS+=--with-openssl \ - --with-openssl-include=${OPENSSLINC} \ - --with-openssl-lib=${OPENSSLLIB} -.endif - -.if defined(WITH_PGSQL) -USE_PGSQL= yes -CONFIGURE_ARGS+=--without-mysql \ - --with-pgsql-include=${LOCALBASE}/include \ - --with-pgsql-lib=${LOCALBASE}/lib -PKGNAMESUFFIX= -pg -.else -CONFIGURE_ARGS+=--without-pgsql \ - --with-mysql-include=${LOCALBASE}/include/mysql \ - --with-mysql-lib=${LOCALBASE}/lib/mysql -PKGNAMESUFFIX= -mysql -USE_MYSQL= yes -.endif - -.if !defined(WITHOUT_NLS) -USE_GETTEXT= yes -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -pre-fetch: - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} "" - @${ECHO} " WITH_PGSQL=yes Build with PostgreSQL support" - @${ECHO} " WITH_ALIAS=yes Enable server side aliases" - @${ECHO} " WITH_OPENSSL=yes Enable OpenSSL (needed if MySQL is linked with OpenSSL)" - @${ECHO} "" - -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/contrib -.for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ -.endfor - @${INSTALL_DATA} ${WRKSRC}/contrib/*.php ${DOCSDIR}/contrib/ - @${INSTALL_DATA} ${WRKSRC}/contrib/*.pl ${DOCSDIR}/contrib/ - @${INSTALL_DATA} ${WRKSRC}/contrib/*.pm ${DOCSDIR}/contrib/ - @${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/ -.endif - @${PREFIX}/sbin/mydns --dump-config >${PREFIX}/etc/mydns.conf.sample - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.mk> diff --git a/dns/mydns-ng/distinfo b/dns/mydns-ng/distinfo deleted file mode 100644 index 77788d9f1ab2..000000000000 --- a/dns/mydns-ng/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (mydns-1.1.0.tar.bz2) = c613a14686f08486d444cee2d68f9c87 -SHA256 (mydns-1.1.0.tar.bz2) = ecfcc8bb8fd9f707d2e7af808317cdcc3a4d701375265840944c4e0ff0d66bf6 -SIZE (mydns-1.1.0.tar.bz2) = 573261 diff --git a/dns/mydns-ng/files/mydns.sh.in b/dns/mydns-ng/files/mydns.sh.in deleted file mode 100644 index c4332e643140..000000000000 --- a/dns/mydns-ng/files/mydns.sh.in +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: mydns -# REQUIRE: DAEMON mysql postgresql -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable mydns: -# mydns_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MyDNS. -# - -. %%RC_SUBR%% - -name="mydns" -rcvar=`set_rcvar` - -load_rc_config $name - -: ${mydns_enable="NO"} - -command="%%PREFIX%%/sbin/mydns" -command_args="-b" -pidfile="/var/run/mydns.pid" -required_files="%%PREFIX%%/etc/mydns.conf" - -run_rc_command "$1" diff --git a/dns/mydns-ng/files/patch-Makefile.in b/dns/mydns-ng/files/patch-Makefile.in deleted file mode 100644 index 0148045df6db..000000000000 --- a/dns/mydns-ng/files/patch-Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig Wed Dec 18 15:16:33 2002 -+++ Makefile.in Wed Dec 18 15:16:43 2002 -@@ -529,7 +529,6 @@ - - install-data-am: - @$(NORMAL_INSTALL) -- $(MAKE) $(AM_MAKEFLAGS) install-data-hook - - install-exec-am: - diff --git a/dns/mydns-ng/files/pkg-message.in b/dns/mydns-ng/files/pkg-message.in deleted file mode 100644 index a4840bb5b715..000000000000 --- a/dns/mydns-ng/files/pkg-message.in +++ /dev/null @@ -1,14 +0,0 @@ -********************************************************************** -To get MyDNS working you will need to do some configuration, first you -will need to create %%PREFIX%%/etc/mydns.conf based on the -installed sample file. Following that you will need to setup your -database tables, you can use the output of - - %%PREFIX%%/sbin/mydns --create-tables - -as a template. Finally enable MyDNS by adding - - mydns_enable="YES" - -into your rc.conf. -********************************************************************* diff --git a/dns/mydns-ng/pkg-descr b/dns/mydns-ng/pkg-descr deleted file mode 100644 index 42ed867b0baf..000000000000 --- a/dns/mydns-ng/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -MyDNS is a free DNS server for UNIX implemented from scratch and -designed to utilize the MySQL database for data storage. - -Its primary objectives are stability, security, interoperability, -and speed, though not necessarily in that order. - -MyDNS does not include recursive name service, nor a resolver library. -It is primarily designed for organizations with many zones and/or -resource records who desire the ability to perform real-time dynamic -updates on their DNS data via MySQL. - -WWW: http://mydns.bboy.net/ - -- Alex Dupre -ale@FreeBSD.org diff --git a/dns/mydns-ng/pkg-plist b/dns/mydns-ng/pkg-plist deleted file mode 100644 index fb79abe9eddf..000000000000 --- a/dns/mydns-ng/pkg-plist +++ /dev/null @@ -1,25 +0,0 @@ -bin/mydns-conf -bin/mydnscheck -bin/mydnsexport -bin/mydnsimport -bin/mydnsptrconvert -etc/mydns.conf.sample -sbin/mydns -%%NLS%%share/locale/es/LC_MESSAGES/mydns.mo -%%NLS%%share/locale/fr/LC_MESSAGES/mydns.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/mydns.mo -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART.mysql -%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART.postgres -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/contrib/MyDNS.pm -%%PORTDOCS%%%%DOCSDIR%%/contrib/README -%%PORTDOCS%%%%DOCSDIR%%/contrib/admin.php -%%PORTDOCS%%%%DOCSDIR%%/contrib/create_domain.pl -%%PORTDOCS%%%%DOCSDIR%%/contrib/stats.php -%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile deleted file mode 100644 index 0fdfc7628786..000000000000 --- a/dns/powerdns-devel/Makefile +++ /dev/null @@ -1,144 +0,0 @@ -# New ports collection makefile for: powerdns -# Date Created: 14.Jan 2003 -# Whom: dirk.meyer@dinoex.sub.org -# -# $FreeBSD$ -# - -PORTNAME= powerdns -PORTVERSION= 2.9.20 -PORTREVISION= 2 -CATEGORIES= dns ipv6 -MASTER_SITES= http://downloads.powerdns.com/releases/ \ - http://mirrors.evolva.ro/powerdns.com/releases/ -DISTNAME= pdns-${PORTVERSION} - -MAINTAINER= tremere@cainites.net -COMMENT= An advanced DNS server with multiple backends including SQL - -BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost - -USE_GMAKE= YES -USE_SUBMAKE= YES -USE_AUTOTOOLS= libtool:15 -USE_LDCONFIG= YES -CXXFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --with-modules="pipe" \ - --with-dynmodules="${CONFIGURE_MODULES}" \ - --sysconfdir="${PREFIX}/etc/pdns" -# --enable-debug -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - CURDIR2="${.CURDIR}" \ - MKDIR="${MKDIR}" \ - DISTNAME="${DISTNAME}" \ - POWERDNS_OPTIONS="${POWERDNS_OPTIONS}" -MAN8= pdns_control.8 pdns_server.8 zone2sql.8 - -SUB_FILES= pkg-message - -OPTIONS= PGSQL "PostgreSQL backend" on \ - MYSQL "MySQL backend" off \ - SQLITE "SQLite 2 backend" off \ - SQLITE3 "SQLite 3 backend" off \ - OPENDBX "OpenDBX backend" off \ - OPENLDAP "OpenLDAP backend" off \ - GEO "Geo backend" off - -.include <bsd.port.pre.mk> - -USE_RC_SUBR+= pdns - -.if defined(WITH_GEO) -CONFIGURE_MODULES+= "geo" -PLIST_SUB+= WITHGEO="" -.else -PLIST_SUB+= WITHGEO="@comment " -.endif - -.if defined(WITH_SQLITE) && defined(WITH_SQLITE3) -BROKEN= choose only one SQLite backend version -.endif - -.if defined(WITH_PGSQL) -USE_PGSQL?= YES -CONFIGURE_MODULES+= "gpgsql" -PLIST_SUB+= WITHPGSQL="" -.else -CONFIGURE_ARGS+= --disable-pgsql -PLIST_SUB+= WITHPGSQL="@comment " -.endif - -.if defined(WITH_MYSQL) -USE_MYSQL?= YES -CONFIGURE_MODULES+= "gmysql" -CXXFLAGS+= -I${LOCALBASE}/include/mysql -LDFLAGS+= -L${LOCALBASE}/lib/mysql -PLIST_SUB+= WITHMYSQL="" -.else -CONFIGURE_ARGS+= --disable-mysql -PLIST_SUB+= WITHMYSQL="@comment " -.endif - -.if defined(WITH_OPENLDAP) -USE_OPENLDAP?= YES -CONFIGURE_MODULES+= "ldap" -CXXFLAGS+= -L${LOCALBASE}/lib -DLDAP_DEPRECATED=1 -PLIST_SUB+= WITHOPENLDAP="" -.else -PLIST_SUB+= WITHOPENLDAP="@comment " -.endif - -.if defined(WITH_SQLITE) -USE_SQLITE?= 2 -CONFIGURE_MODULES+= "gsqlite" -PLIST_SUB+= WITHSQLITE="" -.else -PLIST_SUB+= WITHSQLITE="@comment " -.endif - -.if defined(WITH_SQLITE3) -USE_SQLITE?= 3 -CONFIGURE_MODULES+= "gsqlite" -PLIST_SUB+= WITHSQLITE3="" -.else -PLIST_SUB+= WITHSQLITE3="@comment " -.endif - -.if defined(WITH_OPENDBX) -LIB_DEPENDS+= opendbx.1:${PORTSDIR}/databases/opendbx -CONFIGURE_MODULES+= "opendbx" -PLIST_SUB+= WITHOPENDBX="" -CXXFLAGS+= -L${LOCALBASE}/lib -.else -PLIST_SUB+= WITHOPENDBX="@comment " -.endif - -.if ${OSVERSION} < 500039 -USE_GCC=3.4 -.endif - -.if defined(WITH_OPENLDAP) -post-patch: - ${REINPLACE_CMD} -e 's;-I. ;-I. -I${LOCALBASE}/include ;' \ - -e 's;la_LDFLAGS =;la_LDFLAGS = -L${LOCALBASE}/lib;' \ - ${WRKSRC}/modules/ldapbackend/Makefile.in - ${REINPLACE_CMD} -e 's;@LIBDL@;@LIBDL@ -L${LOCALBASE}/lib;' \ - -e 's;@modulelibs@;@modulelibs@ -llber;' \ - ${WRKSRC}/pdns/Makefile.in -.endif - -post-install: -.if !exists(${PREFIX}/etc/pdns/pdns.conf) - ${INSTALL_DATA} ${PREFIX}/etc/pdns/pdns.conf-dist ${PREFIX}/etc/pdns/pdns.conf -.endif -.if !defined(NOPORTDOCS) - ${MKDIR} ${EXAMPLESDIR} -.for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql pdns_sqlite.sql - ${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/ -.endfor -.endif - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/dns/powerdns-devel/Makefile.inc b/dns/powerdns-devel/Makefile.inc deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/dns/powerdns-devel/Makefile.inc +++ /dev/null diff --git a/dns/powerdns-devel/distinfo b/dns/powerdns-devel/distinfo deleted file mode 100644 index 8d9a4a9444cf..000000000000 --- a/dns/powerdns-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (pdns-2.9.20.tar.gz) = 33b20ef1b767f93297101f2aa09e99ed -SHA256 (pdns-2.9.20.tar.gz) = 28984207c78bc5d40542d40366d74f6695a9cf3a7ec4f431d908966d4fc35e3d -SIZE (pdns-2.9.20.tar.gz) = 867520 diff --git a/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in b/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in deleted file mode 100644 index 29b0dab57327..000000000000 --- a/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in +++ /dev/null @@ -1,28 +0,0 @@ ---- modules/gpgsqlbackend/Makefile.in.orig Sat Jul 16 13:24:53 2005 -+++ modules/gpgsqlbackend/Makefile.in Mon Jul 18 14:22:07 2005 -@@ -203,14 +203,14 @@ - target_alias = @target_alias@ - lib_LTLIBRARIES = libgpgsqlbackend.la - EXTRA_DIST = OBJECTFILES OBJECTLIBS --INCLUDES = -I@PGSQL_incdir@ -+INCLUDES = -I@includedir@ -I@PGSQL_incdir@ - libgpgsqlbackend_la_SOURCES = gpgsqlbackend.cc gpgsqlbackend.hh \ - spgsql.hh spgsql.cc - - libgpgsqlbackend_la_LDFLAGS = @PGSQL_lib@ -Wl,-Bstatic -lpq \ - -Wl,-Bdynamic - --libgpgsqlbackend_la_LIBADD = -lssl -lcrypt -lcrypto -+libgpgsqlbackend_la_LIBADD = -lssl -lcrypto - all: all-am - - .SUFFIXES: -@@ -272,7 +272,7 @@ - rm -f "$${dir}/so_locations"; \ - done - libgpgsqlbackend.la: $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(libdir) $(libgpgsqlbackend_la_LDFLAGS) $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_LIBADD) $(LIBS) -+# $(CXXLINK) -rpath $(libdir) $(libgpgsqlbackend_la_LDFLAGS) $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) diff --git a/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_OBJECTLIBS b/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_OBJECTLIBS deleted file mode 100644 index dd7c21f02974..000000000000 --- a/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_OBJECTLIBS +++ /dev/null @@ -1,7 +0,0 @@ ---- modules/gpgsqlbackend/OBJECTLIBS.orig Sat Apr 23 23:40:15 2005 -+++ modules/gpgsqlbackend/OBJECTLIBS Mon Jul 18 14:21:17 2005 -@@ -1,3 +1,3 @@ ---lpq -lssl -lcrypto -lcrypt -lresolv -lnsl -+-lpq -lssl -lcrypto - - diff --git a/dns/powerdns-devel/files/patch-opendbx b/dns/powerdns-devel/files/patch-opendbx deleted file mode 100644 index 3f24a01e82b4..000000000000 --- a/dns/powerdns-devel/files/patch-opendbx +++ /dev/null @@ -1,1038 +0,0 @@ ---- modules/opendbxbackend/odbxbackend.hh 2006-03-15 19:29:39.000000000 +0100 -+++ modules/opendbxbackend/odbxbackend.hh 2006-09-03 11:34:13.000000000 +0200 -@@ -1,11 +1,10 @@ - /* - * PowerDNS OpenDBX Backend -- * Copyright (C) 2005 Norbert Sendetzky <norbert@linuxnetworks.de> -+ * Copyright (C) 2005-2006 Norbert Sendetzky <norbert@linuxnetworks.de> - * - * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -- * any later version. -+ * it under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of -@@ -14,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -@@ -32,7 +31,6 @@ - #include <pdns/arguments.hh> - #include <pdns/logger.hh> - #include <odbx.h> --#include "modules/ldapbackend/utils.hh" - - - #ifndef ODBXBACKEND_HH -@@ -53,19 +51,23 @@ - - class OdbxBackend : public DNSBackend - { -+ enum QueryType { READ, WRITE }; -+ - string m_myname; - string m_qname; - int m_default_ttl; - bool m_qlog; -- odbx_t* m_handle; -+ odbx_t* m_handle[2]; - odbx_result_t* m_result; - char m_escbuf[BUFLEN]; - char m_buffer[2*BUFLEN]; -+ vector<string> m_hosts[2]; - -- bool getRecord(); -- void execStmt( const char* stmt, unsigned long length, bool select ); -- void getDomainList( const string& query, vector<DomainInfo>* list, bool (*check_fcn)(u_int32_t,u_int32_t,SOAData*,DomainInfo*) ); -- string escape( const string& str ); -+ string escape( const string& str, QueryType type ); -+ bool connectTo( const vector<string>& host, QueryType type ); -+ bool getDomainList( const string& query, vector<DomainInfo>* list, bool (*check_fcn)(u_int32_t,u_int32_t,SOAData*,DomainInfo*) ); -+ bool execStmt( const char* stmt, unsigned long length, QueryType type ); -+ bool getRecord( QueryType type ); - - - public: -@@ -107,37 +109,40 @@ - void declareArguments( const string &suffix="" ) - { - declare( suffix, "backend", "OpenDBX backend","mysql" ); -- declare( suffix, "host", "Name or address of one or more DBMS server","127.0.0.1" ); -- declare( suffix, "port", "Port the DBMS server is listening to","" ); -+ declare( suffix, "host-read", "Name or address of one or more DBMS server to read from","127.0.0.1" ); -+ declare( suffix, "host-write", "Name or address of one or more DBMS server used for updates","127.0.0.1" ); -+ declare( suffix, "port", "Port the DBMS server are listening to","" ); - declare( suffix, "database", "Database name containing the DNS records","powerdns" ); - declare( suffix, "username","User for connecting to the DBMS","powerdns"); - declare( suffix, "password","Password for connecting to the DBMS",""); - -- declare( suffix, "sql-list", "AXFR query", "SELECT domain_id, name, type, ttl, prio, content FROM records WHERE domain_id=':id'" ); -+ declare( suffix, "sql-list", "AXFR query", "SELECT domain_id, name, type, ttl, prio, content FROM records WHERE domain_id=:id" ); - - declare( suffix, "sql-lookup", "Lookup query","SELECT domain_id, name, type, ttl, prio, content FROM records WHERE name=':name'" ); -- declare( suffix, "sql-lookupid", "Lookup query with id","SELECT domain_id, name, type, ttl, prio, content FROM records WHERE domain_id=':id' AND name=':name'" ); -+ declare( suffix, "sql-lookupid", "Lookup query with id","SELECT domain_id, name, type, ttl, prio, content FROM records WHERE domain_id=:id AND name=':name'" ); - declare( suffix, "sql-lookuptype", "Lookup query with type","SELECT domain_id, name, type, ttl, prio, content FROM records WHERE name=':name' AND type=':type'" ); -- declare( suffix, "sql-lookuptypeid", "Lookup query with type and id","SELECT domain_id, name, type, ttl, prio, content FROM records WHERE domain_id=':id' AND name=':name' AND type=':type'" ); -+ declare( suffix, "sql-lookuptypeid", "Lookup query with type and id","SELECT domain_id, name, type, ttl, prio, content FROM records WHERE domain_id=:id AND name=':name' AND type=':type'" ); - -- declare( suffix, "sql-zonedelete","Delete all records for this zone","DELETE FROM records WHERE domain_id=':id'" ); -- declare( suffix, "sql-zoneinfo","Get domain info","SELECT d.id, d.name, d.type, d.master, d.last_check, r.content FROM domains AS d LEFT JOIN records AS r ON d.id=r.domain_id WHERE ( d.name=':name' AND r.type='SOA' ) OR ( d.name=':name' AND r.domain_id IS NULL )" ); -+ declare( suffix, "sql-zonedelete","Delete all records for this zone","DELETE FROM records WHERE domain_id=:id" ); -+ declare( suffix, "sql-zoneinfo","Get domain info","SELECT d.id, d.name, d.type, d.master, d.last_check, r.content FROM domains d LEFT JOIN records r ON ( d.id=r.domain_id AND r.type='SOA' ) WHERE d.name=':name' AND d.status='A'" ); - - declare( suffix, "sql-transactbegin", "Start transaction", "BEGIN" ); - declare( suffix, "sql-transactend", "Finish transaction", "COMMIT" ); - declare( suffix, "sql-transactabort", "Abort transaction", "ROLLBACK" ); - - declare( suffix, "sql-insert-slave","Add slave domain", "INSERT INTO domains ( name, type, master, account ) VALUES ( '%s', 'SLAVE', '%s', '%s' )" ); -- declare( suffix, "sql-insert-record","Feed record into table", "INSERT INTO records ( domain_id, name, type, ttl, prio, content ) VALUES ( '%d', '%s', '%s', '%d', '%d', '%s' )" ); -+ declare( suffix, "sql-insert-record","Feed record into table", "INSERT INTO records ( domain_id, name, type, ttl, prio, content ) VALUES ( %d, '%s', '%s', %d, %d, '%s' )" ); - -- declare( suffix, "sql-update-serial", "Set zone to notified", "UPDATE domains SET notified_serial='%d' WHERE id='%d'" ); -- declare( suffix, "sql-update-lastcheck", "Set time of last check", "UPDATE domains SET last_check='%d' WHERE id='%d'" ); -+ declare( suffix, "sql-update-serial", "Set zone to notified", "UPDATE domains SET notified_serial=%d WHERE id=%d" ); -+ declare( suffix, "sql-update-lastcheck", "Set time of last check", "UPDATE domains SET last_check=%d WHERE id=%d" ); - -- declare( suffix, "sql-master", "Get master record for zone", "SELECT master FROM domains WHERE name=':name' AND type='SLAVE'" ); -+ declare( suffix, "sql-master", "Get master record for zone", "SELECT master FROM domains WHERE name=':name' AND status='A' AND type='SLAVE'" ); - declare( suffix, "sql-supermaster","Get supermaster info", "SELECT account FROM supermasters WHERE ip=':ip' AND nameserver=':ns'" ); - -- declare( suffix, "sql-infoslaves", "Get all unfresh slaves", "SELECT d.id, d.name, d.master, d.notified_serial, d.last_check, r.change_date, r.content FROM domains AS d LEFT JOIN records AS r ON d.id=r.domain_id WHERE ( d.type='SLAVE' AND r.type='SOA' ) OR ( d.type='SLAVE' AND r.domain_id IS NULL )" ); -- declare( suffix, "sql-infomasters", "Get all updated masters", "SELECT d.id, d.name, d.master, d.notified_serial, d.last_check, r.change_date, r.content FROM domains AS d, records AS r WHERE d.type='MASTER' AND d.id=r.domain_id AND r.type='SOA'" ); -+ declare( suffix, "sql-infoslaves", "Get all unfresh slaves", "SELECT d.id, d.name, d.master, d.notified_serial, d.last_check, r.change_date, r.content FROM domains d LEFT JOIN records r ON ( d.id=r.domain_id AND r.type='SOA' ) WHERE d.status='A' AND d.type='SLAVE'" ); -+ declare( suffix, "sql-infomasters", "Get all updated masters", "SELECT d.id, d.name, d.master, d.notified_serial, d.last_check, r.change_date, r.content FROM domains d JOIN records r ON d.id=r.domain_id WHERE d.status='A' AND d.type='MASTER' AND r.type='SOA'" ); -+ -+ declare( suffix, "host", "depricated, use host-read and host-write instead","" ); - } - - ---- modules/opendbxbackend/odbxbackend.cc 2006-03-15 19:29:39.000000000 +0100 -+++ modules/opendbxbackend/odbxbackend.cc 2006-06-17 11:39:04.000000000 +0200 -@@ -2,62 +2,80 @@ - - - --unsigned int odbx_host_index = 0; -+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; -+} -+ -+ -+ -+inline string& toLowerByRef( string& str ) -+{ -+ for( unsigned int i = 0; i < str.length(); i++ ) -+ { -+ str[i] = dns_tolower( str[i] ); -+ } -+ -+ return str; -+} - - - - OdbxBackend::OdbxBackend( const string& suffix ) - { -- int err = -1; -- unsigned int idx, i, h; - vector<string> hosts; - - - try - { - m_result = NULL; -+ m_handle[READ] = NULL; -+ m_handle[WRITE] = NULL; - m_myname = "[OpendbxBackend]"; - m_default_ttl = arg().asNum( "default-ttl" ); - m_qlog = arg().mustDo( "query-logging" ); - - setArgPrefix( "opendbx" + suffix ); -- stringtok( hosts, getArg( "host" ), ", " ); - -- idx = odbx_host_index++ % hosts.size(); -- -- for( i = 0; i < hosts.size(); i++ ) -+ if( getArg( "host" ).size() > 0 ) - { -- h = ( idx + i ) % hosts.size(); -- if( !( err = odbx_init( &m_handle, getArg( "backend" ).c_str(), hosts[h].c_str(), getArg( "port" ).c_str() ) ) ) { break; } -+ L.log( m_myname + " WARNING: Using depricated opendbx-host parameter", Logger::Warning ); -+ stringtok( m_hosts[READ], getArg( "host" ), ", " ); -+ m_hosts[WRITE] = m_hosts[READ]; - } -- -- if( err < 0 ) -+ else - { -- L.log( m_myname + " OdbxBackend: Unable to connect to server - " + string( odbx_error( m_handle, err ) ), Logger::Error ); -- throw( AhuException( "Fatal: odbx_init() failed" ) ); -+ stringtok( m_hosts[READ], getArg( "host-read" ), ", " ); -+ stringtok( m_hosts[WRITE], getArg( "host-write" ), ", " ); - } - -- if( ( err = odbx_bind_simple( m_handle, getArg( "database" ).c_str(), getArg( "username" ).c_str(), getArg( "password" ).c_str() ) ) < 0 ) -- { -- L.log( m_myname + " OdbxBackend: Unable to bind to database - " + string( odbx_error( m_handle, err ) ), Logger::Error ); -- throw( AhuException( "Fatal: odbx_bind_simple() failed" ) ); -- } -+ if( !connectTo( m_hosts[READ], READ ) ) { throw( AhuException( "Fatal: Connecting to server for reading failed" ) ); } -+ if( !connectTo( m_hosts[WRITE], WRITE ) ) { throw( AhuException( "Fatal: Connecting to server for writing failed" ) ); } - } - catch( exception& e ) - { -- L.log( m_myname + " OdbxBackend: Caught STL exception - " + e.what(), Logger::Error ); -- throw( DBException( "Fatal: STL exception" ) ); -+ L.log( m_myname + " OdbxBackend(): Caught STL exception - " + e.what(), Logger::Error ); -+ throw( AhuException( "Fatal: STL exception" ) ); - } -- -- L.log( m_myname + " Connection succeeded", Logger::Notice ); - } - - - - OdbxBackend::~OdbxBackend() - { -- odbx_unbind( m_handle ); -- odbx_finish( m_handle ); -+ odbx_unbind( m_handle[WRITE] ); -+ odbx_unbind( m_handle[READ] ); -+ -+ odbx_finish( m_handle[WRITE] ); -+ odbx_finish( m_handle[READ] ); - } - - -@@ -65,17 +83,17 @@ - bool OdbxBackend::getDomainInfo( const string& domain, DomainInfo& di ) - { - const char* tmp; -- string stmt; - - - try - { - DLOG( L.log( m_myname + " getDomainInfo()", Logger::Debug ) ); - -- stmt = strbind( ":name", escape( toLower( domain ) ), getArg( "sql-zoneinfo" ) ); -- execStmt( stmt.c_str(), stmt.size(), true ); -+ string stmt = getArg( "sql-zoneinfo" ); -+ string& stmtref = strbind( ":name", escape( toLower( domain ), READ ), stmt ); - -- if( !getRecord() ) { return false; } -+ if( !execStmt( stmtref.c_str(), stmtref.size(), READ ) ) { return false; } -+ if( !getRecord( READ ) ) { return false; } - - do - { -@@ -95,7 +113,7 @@ - - if( ( tmp = odbx_field_value( m_result, 1 ) ) != NULL ) - { -- di.zone = string( tmp ); -+ di.zone = string( tmp, odbx_field_length( m_result, 1 ) ); - } - - if( ( tmp = odbx_field_value( m_result, 2 ) ) != NULL ) -@@ -112,7 +130,7 @@ - - if( ( tmp = odbx_field_value( m_result, 3 ) ) != NULL ) - { -- di.master = string( tmp ); -+ di.master = string( tmp, odbx_field_length( m_result, 3 ) ); - } - - if( ( tmp = odbx_field_value( m_result, 5 ) ) != NULL ) -@@ -125,16 +143,16 @@ - SOAData sd; - - sd.serial = 0; -- DNSPacket::fillSOAData( string( tmp ), sd ); -+ DNSPacket::fillSOAData( string( tmp, odbx_field_length( m_result, 6 ) ), sd ); - di.serial = sd.serial; - } - } -- while( getRecord() ); -+ while( getRecord( READ ) ); - } - catch( exception& e ) - { - L.log( m_myname + " getDomainInfo: Caught STL exception - " + e.what(), Logger::Error ); -- throw( DBException( "Error: STL exception" ) ); -+ return false; - } - - return true; -@@ -144,11 +162,6 @@ - - bool OdbxBackend::list( const string& target, int zoneid ) - { -- string stmt; -- size_t len; -- -- -- - try - { - DLOG( L.log( m_myname + " list()", Logger::Debug ) ); -@@ -156,22 +169,29 @@ - m_qname = ""; - m_result = NULL; - -- len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid ); -+ size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid ); - -- if( len < 0 || len > sizeof( m_buffer ) - 1 ) -+ if( len < 0 ) - { -- L.log( m_myname + " list: Unable to convert zone id to string", Logger::Error ); -- throw( DBException( "Error: Libc error" ) ); -+ L.log( m_myname + " list: Unable to convert zone id to string - format error", Logger::Error ); -+ return false; - } - -- stmt = strbind( ":id", string( m_buffer, len ), getArg( "sql-list" ) ); -+ if( len > sizeof( m_buffer ) - 1 ) -+ { -+ L.log( m_myname + " list: Unable to convert zone id to string - insufficient buffer space", Logger::Error ); -+ return false; -+ } -+ -+ string stmt = getArg( "sql-list" ); -+ string& stmtref = strbind( ":id", string( m_buffer, len ), stmt ); - -- execStmt( stmt.c_str(), stmt.size(), true ); -+ if( !execStmt( stmtref.c_str(), stmtref.size(), READ ) ) { return false; } - } - catch( exception& e ) - { - L.log( m_myname + " list: Caught STL exception - " + e.what(), Logger::Error ); -- throw( DBException( "Error: STL exception" ) ); -+ return false; - } - - return true; -@@ -181,23 +201,24 @@ - - void OdbxBackend::lookup( const QType& qtype, const string& qname, DNSPacket* dnspkt, int zoneid ) - { -- string stmt; -- -- - try - { - DLOG( L.log( m_myname + " lookup()", Logger::Debug ) ); - -+ string stmt; -+ string& stmtref = stmt; -+ - m_result = NULL; - m_qname = qname; -- -+ - if( zoneid < 0 ) - { - if( qtype.getCode() == QType::ANY ) - { - stmt = getArg( "sql-lookup" ); - } else { -- stmt = strbind( ":type", qtype.getName(), getArg( "sql-lookuptype" ) ); -+ stmt = getArg( "sql-lookuptype" ); -+ stmtref = strbind( ":type", qtype.getName(), stmt ); - } - } - else -@@ -206,22 +227,34 @@ - { - stmt = getArg( "sql-lookupid" ); - } else { -- stmt = strbind( ":type", qtype.getName(), getArg( "sql-lookuptypeid" ) ); -+ stmt = getArg( "sql-lookuptypeid" ); -+ stmtref = strbind( ":type", qtype.getName(), stmt ); - } -- -+ - size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid ); - -- if( len < 0 || len > sizeof( m_buffer ) - 1 ) -+ if( len < 0 ) - { -- L.log( m_myname + " lookup: Unable to convert zone id to string", Logger::Error ); -+ L.log( m_myname + " lookup: Unable to convert zone id to string - format error", Logger::Error ); - throw( DBException( "Error: Libc error" ) ); - } - -- stmt = strbind( ":id", string( m_buffer, len ), stmt ); -+ if( len > sizeof( m_buffer ) - 1 ) -+ { -+ L.log( m_myname + " lookup: Unable to convert zone id to string - insufficient buffer space", Logger::Error ); -+ throw( DBException( "Error: Libc error" ) ); -+ } -+ -+ stmtref = strbind( ":id", string( m_buffer, len ), stmtref ); - } - -- stmt = strbind( ":name", escape( toLower( qname ) ), stmt ); -- execStmt( stmt.c_str(), stmt.size(), true ); -+ string tmp = qname; -+ stmtref = strbind( ":name", escape( toLowerByRef( tmp ), READ ), stmtref ); -+ -+ if( !execStmt( stmtref.c_str(), stmtref.size(), READ ) ) -+ { -+ throw( DBException( "Error: DB statement failed" ) ); -+ } - } - catch( exception& e ) - { -@@ -241,7 +274,7 @@ - { - DLOG( L.log( m_myname + " get()", Logger::Debug ) ); - -- if( getRecord() ) -+ if( getRecord( READ ) ) - { - rr.content = ""; - rr.priority = 0; -@@ -257,7 +290,7 @@ - - if( m_qname.empty() && ( tmp = odbx_field_value( m_result, 1 ) ) != NULL ) - { -- rr.qname = string( tmp ); -+ rr.qname = string( tmp, odbx_field_length( m_result, 1 ) ); - } - - if( ( tmp = odbx_field_value( m_result, 2 ) ) != NULL ) -@@ -277,7 +310,7 @@ - - if( ( tmp = odbx_field_value( m_result, 5 ) ) != NULL ) - { -- rr.content = string( tmp ); -+ rr.content = string( tmp, odbx_field_length( m_result, 5 ) ); - } - - return true; -@@ -286,7 +319,7 @@ - catch( exception& e ) - { - L.log( m_myname + " get: Caught STL exception - " + e.what(), Logger::Error ); -- throw( DBException( "Error: STL exception" ) ); -+ return false; - } - - return false; -@@ -302,15 +335,30 @@ - { - DLOG( L.log( m_myname + " setFresh()", Logger::Debug ) ); - -+ if( !m_handle[WRITE] && !connectTo( m_hosts[WRITE], WRITE ) ) -+ { -+ L.log( m_myname + " setFresh: Master server is unreachable", Logger::Error ); -+ throw( DBException( "Error: Server unreachable" ) ); -+ } -+ - len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-update-lastcheck" ).c_str(), time( 0 ), domain_id ); - -- if( len < 0 || len > sizeof( m_buffer ) - 1 ) -+ if( len < 0 ) -+ { -+ L.log( m_myname + " setFresh: Unable to insert values into statement '" + getArg( "sql-update-lastcheck" ) + "' - format error", Logger::Error ); -+ throw( DBException( "Error: Libc error" ) ); -+ } -+ -+ if( len > sizeof( m_buffer ) - 1 ) - { -- L.log( m_myname + " setFresh: Unable to insert values into statement '" + getArg( "sql-update-lastcheck" ) + "'", Logger::Error ); -+ L.log( m_myname + " setFresh: Unable to insert values into statement '" + getArg( "sql-update-lastcheck" ) + "' - insufficient buffer space", Logger::Error ); - throw( DBException( "Error: Libc error" ) ); - } - -- execStmt( m_buffer, len, false ); -+ if( !execStmt( m_buffer, len, WRITE ) ) -+ { -+ throw( DBException( "Error: DB statement failed" ) ); -+ } - } - catch ( exception& e ) - { -@@ -323,22 +371,34 @@ - - void OdbxBackend::setNotified( u_int32_t domain_id, u_int32_t serial ) - { -- size_t len; -- -- - try - { - DLOG( L.log( m_myname + " setNotified()", Logger::Debug ) ); - -- len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-update-serial" ).c_str(), serial, domain_id ); -+ if( !m_handle[WRITE] && !connectTo( m_hosts[WRITE], WRITE ) ) -+ { -+ L.log( m_myname + " setFresh: Master server is unreachable", Logger::Error ); -+ throw( DBException( "Error: Server unreachable" ) ); -+ } - -- if( len < 0 || len > sizeof( m_buffer ) - 1 ) -+ size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-update-serial" ).c_str(), serial, domain_id ); -+ -+ if( len < 0 ) - { -- L.log( m_myname + " setNotified: Unable to insert values into statement '" + getArg( "sql-update-serial" ) + "'", Logger::Error ); -+ L.log( m_myname + " setNotified: Unable to insert values into statement '" + getArg( "sql-update-serial" ) + "' - format error", Logger::Error ); - throw( DBException( "Error: Libc error" ) ); - } - -- execStmt( m_buffer, len, false ); -+ if( len > sizeof( m_buffer ) - 1 ) -+ { -+ L.log( m_myname + " setNotified: Unable to insert values into statement '" + getArg( "sql-update-serial" ) + "' - insufficient buffer space", Logger::Error ); -+ throw( DBException( "Error: Libc error" ) ); -+ } -+ -+ if( !execStmt( m_buffer, len, WRITE ) ) -+ { -+ throw( DBException( "Error: DB statement failed" ) ); -+ } - } - catch ( exception& e ) - { -@@ -351,17 +411,15 @@ - - bool OdbxBackend::isMaster( const string& domain, const string& ip ) - { -- string stmt; -- -- - try - { - DLOG( L.log( m_myname + " isMaster()", Logger::Debug ) ); - -- stmt = strbind( ":name", escape( toLower( domain ) ), getArg( "sql-master" ) ); -- execStmt( stmt.c_str(), stmt.size(), true ); -+ string stmt = getArg( "sql-master" ); -+ string& stmtref = strbind( ":name", escape( toLower( domain ), READ ), stmt ); - -- if( !getRecord() ) { return false; } -+ if( !execStmt( stmtref.c_str(), stmtref.size(), READ ) ) { return false; } -+ if( !getRecord( READ ) ) { return false; } - - do - { -@@ -369,16 +427,17 @@ - { - if( !strcmp( odbx_field_value( m_result, 0 ), ip.c_str() ) ) - { -+ while( getRecord( READ ) ); - return true; - } - } - } -- while( getRecord() ); -+ while( getRecord( READ ) ); - } - catch ( exception& e ) - { - L.log( m_myname + " isMaster: Caught STL exception - " + e.what(), Logger::Error ); -- throw( DBException( "Error: STL exception" ) ); -+ return false; - } - - return false; -@@ -392,15 +451,17 @@ - { - DLOG( L.log( m_myname + " getUnfreshSlaveInfos()", Logger::Debug ) ); - -- if( unfresh != NULL ) -+ if( unfresh == NULL ) - { -- getDomainList( getArg( "sql-infoslaves" ), unfresh, &checkSlave ); -+ L.log( m_myname + " getUnfreshSlaveInfos: invalid parameter - NULL pointer", Logger::Error ); -+ return; - } -+ -+ getDomainList( getArg( "sql-infoslaves" ), unfresh, &checkSlave ); - } - catch ( exception& e ) - { - L.log( m_myname + " getUnfreshSlaveInfo: Caught STL exception - " + e.what(), Logger::Error ); -- throw( DBException( "Error: STL exception" ) ); - } - } - -@@ -412,15 +473,17 @@ - { - DLOG( L.log( m_myname + " getUpdatedMasters()", Logger::Debug ) ); - -- if( updated != NULL ) -+ if( updated == NULL ) - { -- getDomainList( getArg( "sql-infomasters" ), updated, &checkMaster ); -+ L.log( m_myname + " getUpdatedMasters: invalid parameter - NULL pointer", Logger::Error ); -+ return; - } -+ -+ getDomainList( getArg( "sql-infomasters" ), updated, &checkMaster ); - } - catch ( exception& e ) - { - L.log( m_myname + " getUpdatedMasters: Caught STL exception - " + e.what(), Logger::Error ); -- throw( DBException( "Error: STL exception" ) ); - } - } - -@@ -428,43 +491,41 @@ - - bool OdbxBackend::superMasterBackend( const string& ip, const string& domain, const vector<DNSResourceRecord>& set, string* account, DNSBackend** ddb ) - { -- string stmt; -- vector<DNSResourceRecord>::const_iterator i; -- -- - try - { - DLOG( L.log( m_myname + " superMasterBackend()", Logger::Debug ) ); - - if( account != NULL && ddb != NULL ) - { -+ vector<DNSResourceRecord>::const_iterator i; -+ - for( i = set.begin(); i != set.end(); i++ ) - { -- stmt = strbind( ":ip", escape( ip ), getArg( "sql-supermaster" ) ); -- stmt = strbind( ":ns", escape( i->content ), stmt ); -- -- execStmt( stmt.c_str(), stmt.size(), true ); -+ string stmt = getArg( "sql-supermaster" ); -+ string& stmtref = strbind( ":ip", escape( ip, READ ), stmt ); -+ stmtref = strbind( ":ns", escape( i->content, READ ), stmtref ); - -- if( !getRecord() ) { return false; } -+ if( !execStmt( stmtref.c_str(), stmtref.size(), READ ) ) { return false; } - -- do -+ if( getRecord( READ ) ) - { - if( odbx_field_value( m_result, 0 ) != NULL ) - { - *account = string( odbx_field_value( m_result, 0 ), odbx_field_length( m_result, 0 ) ); - } -- } -- while( getRecord() ); - -- *ddb=this; -- return true; -+ while( getRecord( READ ) ); -+ -+ *ddb=this; -+ return true; -+ } - } - } - } - catch ( exception& e ) - { - L.log( m_myname + " superMasterBackend: Caught STL exception - " + e.what(), Logger::Error ); -- throw( DBException( "Error: STL exception" ) ); -+ return false; - } - - return false; -@@ -474,28 +535,38 @@ - - bool OdbxBackend::createSlaveDomain( const string& ip, const string& domain, const string& account ) - { -- size_t len; -- -- - try - { - DLOG( L.log( m_myname + " createSlaveDomain()", Logger::Debug ) ); - -- len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-insert-slave" ).c_str(), escape( toLower( domain ) ).c_str(), -- escape( ip ).c_str(), escape( account ).c_str() ); -+ if( !m_handle[WRITE] && !connectTo( m_hosts[WRITE], WRITE ) ) -+ { -+ L.log( m_myname + " createSlaveDomain: Master server is unreachable", Logger::Error ); -+ return false; -+ } - -- if( len < 0 || len > sizeof( m_buffer ) - 1 ) -+ string tmp = domain; -+ size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-insert-slave" ).c_str(), escape( toLowerByRef( tmp ), WRITE ).c_str(), -+ escape( ip, WRITE ).c_str(), escape( account, WRITE ).c_str() ); -+ -+ if( len < 0 ) - { -- L.log( m_myname + " createSlaveDomain: Unable to insert values in statement '" + getArg( "sql-insert-slave" ) + "'", Logger::Error ); -- throw( DBException( "Error: Libc error" ) ); -+ L.log( m_myname + " createSlaveDomain: Unable to insert values in statement '" + getArg( "sql-insert-slave" ) + "' - format error", Logger::Error ); -+ return false; -+ } -+ -+ if( len > sizeof( m_buffer ) - 1 ) -+ { -+ L.log( m_myname + " createSlaveDomain: Unable to insert values in statement '" + getArg( "sql-insert-slave" ) + "' - insufficient buffer space", Logger::Error ); -+ return false; - } - -- execStmt( m_buffer, len, false ); -+ if( !execStmt( m_buffer, len, WRITE ) ) { return false; } - } - catch ( exception& e ) - { - L.log( m_myname + " createSlaveDomain: Caught STL exception - " + e.what(), Logger::Error ); -- throw( DBException( "Error: STL exception" ) ); -+ return false; - } - - return true; -@@ -505,28 +576,39 @@ - - bool OdbxBackend::feedRecord( const DNSResourceRecord& rr ) - { -- size_t len; -- -- - try - { - DLOG( L.log( m_myname + " feedRecord()", Logger::Debug ) ); - -- len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-insert-record" ).c_str(), rr.domain_id, -- escape( toLower( rr.qname ) ).c_str(), rr.qtype.getName().c_str(), rr.ttl, rr.priority, escape( rr.content ).c_str() ); -+ if( !m_handle[WRITE] && !connectTo( m_hosts[WRITE], WRITE ) ) -+ { -+ L.log( m_myname + " feedRecord: Master server is unreachable", Logger::Error ); -+ return false; -+ } - -- if( len < 0 || len > sizeof( m_buffer ) - 1 ) -+ string tmp = rr.qname; -+ size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-insert-record" ).c_str(), rr.domain_id, -+ escape( toLowerByRef( tmp ), WRITE ).c_str(), rr.qtype.getName().c_str(), rr.ttl, rr.priority, -+ escape( rr.content, WRITE ).c_str() ); -+ -+ if( len < 0 ) - { -- L.log( m_myname + " feedRecord: Unable to insert values in statement '" + getArg( "sql-insert-record" ) + "'", Logger::Error ); -- throw( DBException( "Error: Libc error" ) ); -+ L.log( m_myname + " feedRecord: Unable to insert values in statement '" + getArg( "sql-insert-record" ) + "' - format error", Logger::Error ); -+ return false; - } - -- execStmt( m_buffer, len, false ); -+ if( len > sizeof( m_buffer ) - 1 ) -+ { -+ L.log( m_myname + " feedRecord: Unable to insert values in statement '" + getArg( "sql-insert-record" ) + "' - insufficient buffer space", Logger::Error ); -+ return false; -+ } -+ -+ if( !execStmt( m_buffer, len, WRITE ) ) { return false; } - } - catch ( exception& e ) - { - L.log( m_myname + " feedRecord: Caught STL exception - " + e.what(), Logger::Error ); -- throw( DBException( "Error: STL exception" ) ); -+ return false; - } - - return true; -@@ -536,33 +618,41 @@ - - bool OdbxBackend::startTransaction( const string& domain, int zoneid ) - { -- size_t len; -- string stmt; -- -- - try - { - DLOG( L.log( m_myname + " startTransaction()", Logger::Debug ) ); - -- stmt = getArg( "sql-transactbegin" ); -- execStmt( stmt.c_str(), stmt.size(), false ); -+ if( !m_handle[WRITE] && !connectTo( m_hosts[WRITE], WRITE ) ) -+ { -+ L.log( m_myname + " startTransaction: Master server is unreachable", Logger::Error ); -+ return false; -+ } - -- len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid ); -+ string& stmtref = const_cast<string&>( getArg( "sql-transactbegin" ) ); -+ if( !execStmt( stmtref.c_str(), stmtref.size(), WRITE ) ) { return false; } - -- if( len < 0 || len > sizeof( m_buffer ) - 1 ) -+ size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid ); -+ -+ if( len < 0 ) - { -- L.log( m_myname + " lookup: Unable to convert zone id to string", Logger::Error ); -- throw( DBException( "Error: Libc error" ) ); -+ L.log( m_myname + " startTransaction: Unable to convert zone id to string - format error", Logger::Error ); -+ return false; - } - -- stmt = strbind( ":id", string( m_buffer, len ), getArg( "sql-zonedelete" ) ); -+ if( len > sizeof( m_buffer ) - 1 ) -+ { -+ L.log( m_myname + " startTransaction: Unable to convert zone id to string - insufficient buffer space", Logger::Error ); -+ return false; -+ } - -- execStmt( stmt.c_str(), stmt.size(), false ); -+ string stmt = getArg( "sql-zonedelete" ); -+ stmtref = strbind( ":id", string( m_buffer, len ), stmt ); -+ if( !execStmt( stmtref.c_str(), stmtref.size(), WRITE ) ) { return false; } - } - catch ( exception& e ) - { - L.log( m_myname + " startTransaction: Caught STL exception - " + e.what(), Logger::Error ); -- throw( DBException( "Error: STL exception" ) ); -+ return false; - } - - return true; -@@ -576,12 +666,19 @@ - { - DLOG( L.log( m_myname + " commitTransaction()", Logger::Debug ) ); - -- execStmt( getArg( "sql-transactend" ).c_str(), getArg( "sql-transactend" ).size(), false ); -+ if( !m_handle[WRITE] && !connectTo( m_hosts[WRITE], WRITE ) ) -+ { -+ L.log( m_myname + " commitTransaction: Master server is unreachable", Logger::Error ); -+ return false; -+ } -+ -+ const string& stmt = getArg( "sql-transactend" ); -+ if( !execStmt( stmt.c_str(), stmt.size(), WRITE ) ) { return false; } - } - catch ( exception& e ) - { - L.log( m_myname + " commitTransaction: Caught STL exception - " + e.what(), Logger::Error ); -- throw( DBException( "Error: STL exception" ) ); -+ return false; - } - - return true; -@@ -595,12 +692,19 @@ - { - DLOG( L.log( m_myname + " abortTransaction()", Logger::Debug ) ); - -- execStmt( getArg( "sql-transactabort" ).c_str(), getArg( "sql-transabort" ).size(), false ); -+ if( !m_handle[WRITE] && !connectTo( m_hosts[WRITE], WRITE ) ) -+ { -+ L.log( m_myname + " abortTransaction: Master server is unreachable", Logger::Error ); -+ return false; -+ } -+ -+ const string& stmt = getArg( "sql-transactabort" ); -+ if( !execStmt( stmt.c_str(), stmt.size(), WRITE ) ) { return false; } - } - catch ( exception& e ) - { - L.log( m_myname + " abortTransaction: Caught STL exception - " + e.what(), Logger::Error ); -- throw( DBException( "Error: STL exception" ) ); -+ return false; - } - - return true; ---- modules/opendbxbackend/odbxprivate.cc 2006-03-15 19:29:39.000000000 +0100 -+++ modules/opendbxbackend/odbxprivate.cc 2006-09-02 01:02:36.000000000 +0200 -@@ -2,7 +2,50 @@ - - - --void OdbxBackend::execStmt( const char* stmt, unsigned long length, bool select ) -+unsigned int odbx_host_index[2] = { 0, 0 }; -+ -+ -+ -+bool OdbxBackend::connectTo( const vector<string>& hosts, QueryType type ) -+{ -+ int err; -+ unsigned int h, i; -+ int idx = odbx_host_index[type]++ % hosts.size(); -+ -+ -+ if( m_handle[type] ) -+ { -+ odbx_unbind( m_handle[type] ); -+ odbx_finish( m_handle[type] ); -+ m_handle[type] = NULL; -+ } -+ -+ for( i = 0; i < hosts.size(); i++ ) -+ { -+ h = ( idx + i ) % hosts.size(); -+ -+ if( ( err = odbx_init( &(m_handle[type]), getArg( "backend" ).c_str(), hosts[h].c_str(), getArg( "port" ).c_str() ) ) == ODBX_ERR_SUCCESS ) -+ { -+ if( ( err = odbx_bind_simple( m_handle[type], getArg( "database" ).c_str(), getArg( "username" ).c_str(), getArg( "password" ).c_str() ) ) == ODBX_ERR_SUCCESS ) -+ { -+ L.log( m_myname + " Database connection (" + (type ? "write" : "read") + ") to '" + hosts[h] + "' succeeded", Logger::Notice ); -+ return true; -+ } -+ -+ L.log( m_myname + " Unable to bind to database on host " + hosts[h] + " - " + string( odbx_error( m_handle[type], err ) ), Logger::Error ); -+ continue; -+ } -+ -+ L.log( m_myname + " Unable to connect to server on host " + hosts[h] + " - " + string( odbx_error( m_handle[type], err ) ), Logger::Error ); -+ } -+ -+ m_handle[type] = NULL; -+ return false; -+} -+ -+ -+ -+bool OdbxBackend::execStmt( const char* stmt, unsigned long length, QueryType type ) - { - int err; - -@@ -11,18 +54,21 @@ - - if( m_qlog ) { L.log( m_myname + " Query: " + stmt, Logger::Info ); } - -- if( ( err = odbx_query( m_handle, stmt, length ) ) < 0 ) -+ if( ( err = odbx_query( m_handle[type], stmt, length ) ) < 0 ) - { -- L.log( m_myname + " execStmt: Unable to execute query - " + string( odbx_error( m_handle, err ) ), Logger::Error ); -- throw( AhuException( "Error: odbx_query() failed" ) ); -+ L.log( m_myname + " execStmt: Unable to execute query - " + string( odbx_error( m_handle[type], err ) ), Logger::Error ); -+ connectTo( m_hosts[type], type ); -+ return false; - } - -- if( !select ) { while( getRecord() ); } -+ if( type == WRITE ) { while( getRecord( type ) ); } -+ -+ return true; - } - - - --bool OdbxBackend::getRecord() -+bool OdbxBackend::getRecord( QueryType type ) - { - int err = 3; - -@@ -31,13 +77,19 @@ - - do - { -+ if( err < 0 ) -+ { -+ L.log( m_myname + " getRecord: Unable to get next result - " + string( odbx_error( m_handle[type], err ) ), Logger::Error ); -+ throw( AhuException( "Error: odbx_result() failed" ) ); -+ } -+ - if( m_result != NULL ) - { - if( err == 3 ) - { - if( ( err = odbx_row_fetch( m_result ) ) < 0 ) - { -- L.log( m_myname + " getRecord: Unable to get next row - " + string( odbx_error( m_handle, err ) ), Logger::Error ); -+ L.log( m_myname + " getRecord: Unable to get next row - " + string( odbx_error( m_handle[type], err ) ), Logger::Error ); - throw( AhuException( "Error: odbx_row_fetch() failed" ) ); - } - -@@ -72,13 +124,7 @@ - m_result = NULL; - } - } -- while( ( err = odbx_result( m_handle, &m_result, NULL, 0 ) ) > 0 ); -- -- if( err < 0 ) -- { -- L.log( m_myname + " getRecord: Unable to get next result - " + string( odbx_error( m_handle, err ) ), Logger::Error ); -- throw( AhuException( "Error: odbx_result() failed" ) ); -- } -+ while( ( err = odbx_result( m_handle[type], &m_result, NULL, 0 ) ) != 0 ); - - m_result = NULL; - return false; -@@ -86,18 +132,18 @@ - - - --string OdbxBackend::escape( const string& str ) -+string OdbxBackend::escape( const string& str, QueryType type ) - { - int err; - unsigned long len = sizeof( m_escbuf ); - - -- DLOG( L.log( m_myname + " escape()", Logger::Debug ) ); -+ DLOG( L.log( m_myname + " escape(string)", Logger::Debug ) ); - -- if( ( err = odbx_escape( m_handle, str.c_str(), str.size(), m_escbuf, &len ) ) < 0 ) -+ if( ( err = odbx_escape( m_handle[type], str.c_str(), str.size(), m_escbuf, &len ) ) < 0 ) - { -- L.log( m_myname + " escape: Unable to escape string - " + string( odbx_error( m_handle, err ) ), Logger::Error ); -- throw( AhuException( "Error: odbx_escape() failed" ) ); -+ L.log( m_myname + " escape(string): Unable to escape string - " + string( odbx_error( m_handle[type], err ) ), Logger::Error ); -+ throw( runtime_error( "odbx_escape() failed" ) ); - } - - return string( m_escbuf, len ); -@@ -105,7 +151,7 @@ - - - --void OdbxBackend::getDomainList( const string& stmt, vector<DomainInfo>* list, bool (*check_fcn)(u_int32_t,u_int32_t,SOAData*,DomainInfo*) ) -+bool OdbxBackend::getDomainList( const string& stmt, vector<DomainInfo>* list, bool (*check_fcn)(u_int32_t,u_int32_t,SOAData*,DomainInfo*) ) - { - const char* tmp; - u_int32_t nlast, nserial; -@@ -115,9 +161,8 @@ - - DLOG( L.log( m_myname + " getDomainList()", Logger::Debug ) ); - -- execStmt( stmt.c_str(), stmt.size(), true ); -- -- if( !getRecord() ) { return; } -+ if( !execStmt( stmt.c_str(), stmt.size(), READ ) ) { return false; } -+ if( !getRecord( READ ) ) { return false; } - - do - { -@@ -128,7 +173,7 @@ - - if( ( tmp = odbx_field_value( m_result, 6 ) ) != NULL ) - { -- DNSPacket::fillSOAData( string( tmp ), sd ); -+ DNSPacket::fillSOAData( string( tmp, odbx_field_length( m_result, 6 ) ), sd ); - } - - if( !sd.serial && ( tmp = odbx_field_value( m_result, 5 ) ) != NULL ) -@@ -171,7 +216,9 @@ - list->push_back( di ); - } - } -- while( getRecord() ); -+ while( getRecord( READ ) ); -+ -+ return true; - } - - diff --git a/dns/powerdns-devel/files/patch-pdns_nameserver.cc b/dns/powerdns-devel/files/patch-pdns_nameserver.cc deleted file mode 100644 index fc7334537c61..000000000000 --- a/dns/powerdns-devel/files/patch-pdns_nameserver.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- pdns/nameserver.cc.orig Sun Nov 19 16:09:10 2006 -+++ pdns/nameserver.cc Sun Nov 19 16:10:28 2006 -@@ -145,9 +145,9 @@ - } - - sockaddr_in6 locala; -- locala.sin6_port=ntohs(arg().asNum("local-port")); -+ memset(&locala, 0, sizeof(locala)); -+ locala.sin6_port=htons(arg().asNum("local-port")); - locala.sin6_family=AF_INET6; -- locala.sin6_flowinfo=0; - - if(!inet_pton(AF_INET6, localname.c_str(), (void *)&locala.sin6_addr)) { - addrinfo *addrinfos; diff --git a/dns/powerdns-devel/files/patch-pdns_tcpreceiver.cc b/dns/powerdns-devel/files/patch-pdns_tcpreceiver.cc deleted file mode 100644 index 7d7baba77fdc..000000000000 --- a/dns/powerdns-devel/files/patch-pdns_tcpreceiver.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- pdns/tcpreceiver.cc.orig Sun Nov 19 16:11:25 2006 -+++ pdns/tcpreceiver.cc Sun Nov 19 16:13:27 2006 -@@ -480,10 +480,9 @@ - throw AhuException("Unable to acquire TCPv6 socket: "+stringerror()); - - sockaddr_in6 locala; -- locala.sin6_port=ntohs(arg().asNum("local-port")); -+ memset(&locala, 0, sizeof(locala)); -+ locala.sin6_port=htons(arg().asNum("local-port")); - locala.sin6_family=AF_INET6; -- locala.sin6_flowinfo=0; -- - - if(!inet_pton(AF_INET6, laddr->c_str(), (void *)&locala.sin6_addr)) { - addrinfo *addrinfos; diff --git a/dns/powerdns-devel/files/pdns.conf b/dns/powerdns-devel/files/pdns.conf deleted file mode 100644 index 2df98c574b3a..000000000000 --- a/dns/powerdns-devel/files/pdns.conf +++ /dev/null @@ -1,326 +0,0 @@ -# MySQL -#launch=gmysql -#gmysql-host=127.0.0.1 -#gmysql-dbname=pdns -#gmysql-user=pdns -#gmysql-password=pdns - -# PostgreSQL -#launch=gpgsql -#gpgsql-host=127.0.0.1 -#gpgsql-dbname=pdns -#gpgsql-user=pdns -#gpgsql-password=pdns - -# SQLite -#launch=gsqlite -#gsqlite-database=<path to your SQLite database> - -# OpenDBX -#launch=opendbx -#opendbx-backend=mysql -#opendbx-host=127.0.0.1 -#opendbx-database=pdns -#opendbx-username=pdns -#opendbx-password=pdns - -# Autogenerated configuration file template -################################# -# allow-axfr-ips If disabled, DO allow zonetransfers from these IP addresses -# -# allow-axfr-ips= - -################################# -# allow-recursion List of netmasks that are allowed to recurse -# -# allow-recursion= - -################################# -# cache-ttl Seconds to store packets in the PacketCache -# -# cache-ttl=20 - -################################# -# chroot If set, chroot to this directory for more security -# -# chroot= - -################################# -# config-dir Location of configuration directory (pdns.conf) -# -# config-dir=/usr/local/etc - -################################# -# config-name Name of this virtual configuration - will rename the binary image -# -# config-name= - -################################# -# control-console Debugging switch - don't use -# -# control-console=no - -################################# -# daemon Operate as a daemon -# -# daemon=no - -################################# -# default-soa-name name to insert in the SOA record if none set in the backend -# -# default-soa-name=a.misconfigured.powerdns.server - -################################# -# disable-axfr Disable zonetransfers but do allow TCP queries -# -# disable-axfr=no - -################################# -# disable-tcp Do not listen to TCP queries -# -# disable-tcp=no - -################################# -# distributor-threads Default number of Distributor (backend) threads to start -# -# distributor-threads=3 - -################################# -# fancy-records Process URL and MBOXFW records -# -# fancy-records=no - -################################# -# guardian Run within a guardian process -# -# guardian=no - -################################# -# launch Which backends to launch and order to query them in -# -# launch= - -################################# -# lazy-recursion Only recurse if question cannot be answered locally -# -# lazy-recursion=yes - -################################# -# load-modules Load this module - supply absolute or relative path -# -# load-modules= - -################################# -# local-address Local IP address to which we bind -# -# local-address=0.0.0.0 - -################################# -# local-ipv6 Local IP address to which we bind -# -# local-ipv6= - -################################# -# local-port The port on which we listen -# -# local-port=53 - -################################# -# log-dns-details If PDNS should log failed update requests -# -# log-dns-details= - -################################# -# log-failed-updates If PDNS should log failed update requests -# -# log-failed-updates= - -################################# -# logfile Logfile to use -# -# logfile=pdns.log - -################################# -# logging-facility Log under a specific facility -# -# logging-facility= - -################################# -# loglevel Amount of logging. Higher is more. Do not set below 3 -# -# loglevel=4 - -################################# -# master Act as a master -# -# master=no - -################################# -# max-queue-length Maximum queuelength before considering situation lost -# -# max-queue-length=5000 - -################################# -# max-tcp-connections Maximum number of TCP connections -# -# max-tcp-connections=10 - -################################# -# module-dir Default directory for modules -# -# module-dir=/usr/local/bin/../lib - -################################# -# negquery-cache-ttl Seconds to store packets in the PacketCache -# -# negquery-cache-ttl=60 - -################################# -# only-soa Make sure that no SOA serial is less than this number -# -# only-soa=org - -################################# -# out-of-zone-additional-processing Do out of zone additional processing -# -# out-of-zone-additional-processing=no - -################################# -# query-cache-ttl Seconds to store packets in the PacketCache -# -# query-cache-ttl=20 - -################################# -# query-logging Hint backends that queries should be logged -# -# query-logging=no - -################################# -# queue-limit Maximum number of milliseconds to queue a query -# -# queue-limit=1500 - -################################# -# receiver-threads Number of receiver threads to launch -# -# receiver-threads=1 - -################################# -# recursive-cache-ttl Seconds to store packets in the PacketCache -# -# recursive-cache-ttl=10 - -################################# -# recursor If recursion is desired, IP address of a recursing nameserver -# -# recursor=no - -################################# -# setgid If set, change group id to this gid for more security -# -# setgid= - -################################# -# setuid If set, change user id to this uid for more security -# -# setuid= - -################################# -# skip-cname Do not perform CNAME indirection for each query -# -# skip-cname=no - -################################# -# slave Act as a slave -# -# slave=no - -################################# -# slave-cycle-interval Reschedule failed SOA serial checks once every .. seconds -# -# slave-cycle-interval=60 - -################################# -# smtpredirector Our smtpredir MX host -# -# smtpredirector=a.misconfigured.powerdns.smtp.server - -################################# -# soa-minimum-ttl Default SOA mininum ttl -# -# soa-minimum-ttl=3600 - -################################# -# soa-refresh-default Default SOA refresh -# -# soa-refresh-default=10800 - -################################# -# soa-retry-default Default SOA retry -# -# soa-retry-default=3600 - -################################# -# soa-expire-default Default SOA expire -# -# soa-expire-default=604800 - -################################# -# soa-serial-offset Make sure that no SOA serial is less than this number -# -# soa-serial-offset=0 - -################################# -# socket-dir Where the controlsocket will live -# -# socket-dir=/var/run - -################################# -# strict-rfc-axfrs Perform strictly rfc compliant axfrs (very slow) -# -# strict-rfc-axfrs=no - -################################# -# urlredirector Where we send hosts to that need to be url redirected -# -# urlredirector=127.0.0.1 - -################################# -# use-logfile Use a log file -# -# use-logfile=no - -################################# -# webserver Start a webserver for monitoring -# -# webserver=no - -################################# -# webserver-address IP Address of webserver to listen on -# -# webserver-address=127.0.0.1 - -################################# -# webserver-password Password required for accessing the webserver -# -# webserver-password= - -################################# -# webserver-port Port of webserver to listen on -# -# webserver-port=8081 - -################################# -# webserver-print-arguments If the webserver should print arguments -# -# webserver-print-arguments=no - -################################# -# wildcard-url Process URL and MBOXFW records -# -# wildcard-url=no - -################################# -# wildcards Honor wildcards in the database -# -# wildcards= diff --git a/dns/powerdns-devel/files/pdns.in b/dns/powerdns-devel/files/pdns.in deleted file mode 100644 index 7894f49fef83..000000000000 --- a/dns/powerdns-devel/files/pdns.in +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/dns/powerdns-devel/files/Attic/pdns.in,v 1.3 2007-01-12 23:49:04 gabor Exp $ -# - -# PROVIDE: pdns_server -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable powerdns: -# -#pdns_enable="YES" -# -# See pdns_server(8) for flags. -# - -. %%RC_SUBR%% - -name=pdns -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/pdns_server - -# set defaults - -pdns_enable=${pdns_enable:-"NO"} -pdns_conf=${pdns_conf:-"%%PREFIX%%/etc/pdns.conf"} -pdns_flags=${pdns_flags:-""} - -load_rc_config ${name} - -required_files=${pdns_conf} - -monitor_cmd="${command} --daemon=no --guardian=no --control-console --loglevel=9" -extra_commands="monitor" - -run_rc_command "$1" diff --git a/dns/powerdns-devel/files/pdns_mysql.sql b/dns/powerdns-devel/files/pdns_mysql.sql deleted file mode 100644 index 0db1b8665734..000000000000 --- a/dns/powerdns-devel/files/pdns_mysql.sql +++ /dev/null @@ -1,50 +0,0 @@ -CREATE TABLE domains ( - id INT auto_increment, - name VARCHAR(255) NOT NULL, - type VARCHAR(6) NOT NULL, - master VARCHAR(40) DEFAULT NULL, - account VARCHAR(40) DEFAULT NULL, - notified_serial INT DEFAULT NULL, - last_check INT DEFAULT NULL, -CONSTRAINT pk_id - PRIMARY KEY (id), -CONSTRAINT unq_name - UNIQUE (name) -) type=InnoDB; - - -CREATE TABLE records ( - id INT auto_increment, - domain_id INT DEFAULT NULL, - name VARCHAR(255) DEFAULT NULL, - type VARCHAR(6) DEFAULT NULL, - ttl INT DEFAULT NULL, - prio INT DEFAULT NULL, - content VARCHAR(255) DEFAULT NULL, - change_date INT DEFAULT NULL, -CONSTRAINT pk_id - PRIMARY KEY (id), -CONSTRAINT fk_domainid - FOREIGN KEY (domain_id) - REFERENCES domains(id) - ON UPDATE CASCADE - ON DELETE CASCADE -) type=InnoDB; - -CREATE INDEX idx_rdomainid ON records(domain_id); -CREATE INDEX idx_rname ON records(name); -CREATE INDEX idx_rname_rtype ON records(name,type); - - -CREATE TABLE supermasters ( - ip VARCHAR(40) NOT NULL, - nameserver VARCHAR(255) NOT NULL, - account VARCHAR(40) DEFAULT NULL -); - -CREATE INDEX idx_smip_smns ON supermasters(ip,nameserver); - - -GRANT SELECT ON supermasters TO powerdns; -GRANT ALL ON domains TO powerdns; -GRANT ALL ON records TO powerdns; diff --git a/dns/powerdns-devel/files/pdns_postgresql.sql b/dns/powerdns-devel/files/pdns_postgresql.sql deleted file mode 100644 index 481cc98b21b6..000000000000 --- a/dns/powerdns-devel/files/pdns_postgresql.sql +++ /dev/null @@ -1,52 +0,0 @@ -CREATE TABLE domains ( - id SERIAL, - name VARCHAR(255) NOT NULL, - type VARCHAR(6) NOT NULL, - master VARCHAR(40) DEFAULT NULL, - account VARCHAR(40) DEFAULT NULL - notified_serial INT DEFAULT NULL, - last_check INT DEFAULT NULL, -CONSTRAINT pk_id - PRIMARY KEY (id), -CONSTRAINT unq_name - UNIQUE (name) -); - - -CREATE TABLE records ( - id SERIAL, - domain_id INT DEFAULT NULL, - name VARCHAR(255) DEFAULT NULL, - type VARCHAR(6) DEFAULT NULL, - ttl INT DEFAULT NULL, - prio INT DEFAULT NULL, - content VARCHAR(255) DEFAULT NULL, - change_date INT DEFAULT NULL, -CONSTRAINT pk_id - PRIMARY KEY (id), -CONSTRAINT fk_domainid - FOREIGN KEY (domain_id) - REFERENCES domains(id) - ON UPDATE CASCADE - ON DELETE CASCADE -); - -CREATE INDEX idx_rdomainid ON records(domain_id); -CREATE INDEX idx_rname ON records(name); -CREATE INDEX idx_rname_rtype ON records(name,type); - - -CREATE TABLE supermasters ( - ip VARCHAR(40) NOT NULL, - nameserver VARCHAR(255) NOT NULL, - account VARCHAR(40) DEFAULT NULL -); - -CREATE INDEX idx_smip_smns ON supermasters(ip,nameserver); - - -GRANT SELECT ON supermasters TO powerdns; -GRANT ALL ON domains TO powerdns; -GRANT ALL ON domains_id_seq TO powerdns; -GRANT ALL ON records TO powerdns; -GRANT ALL ON records_id_seq TO powerdns; diff --git a/dns/powerdns-devel/files/pdns_sqlite.sql b/dns/powerdns-devel/files/pdns_sqlite.sql deleted file mode 100644 index a7f8be90470a..000000000000 --- a/dns/powerdns-devel/files/pdns_sqlite.sql +++ /dev/null @@ -1,45 +0,0 @@ -CREATE TABLE domains ( - id INT AUTOINCREMENT, - name VARCHAR(255) NOT NULL, - type VARCHAR(6) NOT NULL, - master VARCHAR(40) DEFAULT NULL, - account VARCHAR(40) DEFAULT NULL, - notified_serial INT DEFAULT NULL, - last_check INT DEFAULT NULL, -CONSTRAINT pk_id - PRIMARY KEY (id), -CONSTRAINT unq_name - UNIQUE (name) -); - - -CREATE TABLE records ( - id INT AUTOINCREMENT, - domain_id INT DEFAULT NULL, - name VARCHAR(255) DEFAULT NULL, - type VARCHAR(6) DEFAULT NULL, - ttl INT DEFAULT NULL, - prio INT DEFAULT NULL, - content VARCHAR(255) DEFAULT NULL, - change_date INT DEFAULT NULL, -CONSTRAINT pk_id - PRIMARY KEY (id), -CONSTRAINT fk_domainid - FOREIGN KEY (domain_id) - REFERENCES domains(id) - ON UPDATE CASCADE - ON DELETE CASCADE -); - -CREATE INDEX idx_rdomainid ON records(domain_id); -CREATE INDEX idx_rname ON records(name); -CREATE INDEX idx_rname_rtype ON records(name,type); - - -CREATE TABLE supermasters ( - ip VARCHAR(40) NOT NULL, - nameserver VARCHAR(255) NOT NULL, - account VARCHAR(40) DEFAULT NULL -); - -CREATE INDEX idx_smip_smns ON supermasters(ip,nameserver); diff --git a/dns/powerdns-devel/files/pkg-message.in b/dns/powerdns-devel/files/pkg-message.in deleted file mode 100644 index b0b0983b2e15..000000000000 --- a/dns/powerdns-devel/files/pkg-message.in +++ /dev/null @@ -1,10 +0,0 @@ - -******************************************************************* - Enable powerdns in /etc/rc.conf with the following line: - - pdns_enable="YES" - - Configuration templates are available in %%PREFIX%%/etc/pdns - as pdns.conf-dist. -******************************************************************* - diff --git a/dns/powerdns-devel/pkg-descr b/dns/powerdns-devel/pkg-descr deleted file mode 100644 index 9e1d2d6dbb2d..000000000000 --- a/dns/powerdns-devel/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -PowerDNS is an advanced DNS server, which allows for several different -backends. Current backends include MySQL, PostgreSQL, bind, etc. - -License: GPL V2 - -WWW: http://www.powerdns.com/ diff --git a/dns/powerdns-devel/pkg-plist b/dns/powerdns-devel/pkg-plist deleted file mode 100644 index 923d58226d22..000000000000 --- a/dns/powerdns-devel/pkg-plist +++ /dev/null @@ -1,41 +0,0 @@ -bin/pdns_control -bin/zone2ldap -bin/zone2sql -sbin/pdns_server -%%WITHMYSQL%%lib/libgmysqlbackend.a -%%WITHMYSQL%%lib/libgmysqlbackend.la -%%WITHMYSQL%%lib/libgmysqlbackend.so -%%WITHMYSQL%%lib/libgmysqlbackend.so.0 -%%WITHSQLITE%%lib/libgsqlitebackend.a -%%WITHSQLITE%%lib/libgsqlitebackend.la -%%WITHSQLITE%%lib/libgsqlitebackend.so -%%WITHSQLITE%%lib/libgsqlitebackend.so.0 -%%WITHSQLITE3%%lib/libgsqlitebackend.a -%%WITHSQLITE3%%lib/libgsqlitebackend.la -%%WITHSQLITE3%%lib/libgsqlitebackend.so -%%WITHSQLITE3%%lib/libgsqlitebackend.so.0 -%%WITHOPENLDAP%%lib/libldapbackend.a -%%WITHOPENLDAP%%lib/libldapbackend.la -%%WITHOPENLDAP%%lib/libldapbackend.so -%%WITHOPENLDAP%%lib/libldapbackend.so.0 -%%WITHOPENDBX%%lib/libopendbxbackend.a -%%WITHOPENDBX%%lib/libopendbxbackend.la -%%WITHOPENDBX%%lib/libopendbxbackend.so -%%WITHOPENDBX%%lib/libopendbxbackend.so.0 -%%WITHGEO%%lib/libgeobackend.a -%%WITHGEO%%lib/libgeobackend.la -%%WITHGEO%%lib/libgeobackend.so -%%WITHGEO%%lib/libgeobackend.so.0 -lib/libpipebackend.a -lib/libpipebackend.la -lib/libpipebackend.so -lib/libpipebackend.so.0 -@unexec if cmp -s %D/etc/pdns/pdns.conf %D/etc/pdns/pdns.conf-dist; then rm -f %D/etc/pdns/pdns.conf; fi -etc/pdns/pdns.conf-dist -@exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf -%%PORTDOCS%%share/examples/powerdns/pdns.conf -%%PORTDOCS%%share/examples/powerdns/pdns_mysql.sql -%%PORTDOCS%%share/examples/powerdns/pdns_postgresql.sql -%%PORTDOCS%%share/examples/powerdns/pdns_sqlite.sql -%%PORTDOCS%%@dirrm share/examples/powerdns -@dirrmtry etc/pdns diff --git a/dns/powerdns/Makefile.inc b/dns/powerdns/Makefile.inc deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/dns/powerdns/Makefile.inc +++ /dev/null |