Date: Thu, 11 May 2006 09:20:19 GMT From: "Ralf van der Enden" <tremere@cainites.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/96891: [patch] port dns/powerdns does not have option for compiling geo backend Message-ID: <200605110920.k4B9KJGx015390@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/96891; it has been noted by GNATS. From: "Ralf van der Enden" <tremere@cainites.net> To: <bug-followup@FreeBSD.org> Cc: Subject: Re: ports/96891: [patch] port dns/powerdns does not have option for compiling geo backend Date: Thu, 11 May 2006 11:19:46 +0200 This is a multi-part message in MIME format. ------=_NextPart_000_008F_01C674EC.CF346860 Content-Type: text/plain; format=flowed; charset="Windows-1252"; reply-type=original Content-Transfer-Encoding: 7bit I'm very very sorry, but I must have been on crack last night. This really is the latest working patch which replaces all previous ones. Best regards, Ralf ----- Original Message ----- From: "Edwin Groothuis" <edwin@FreeBSD.org> To: <tremere@cainites.net> Sent: Sunday, May 07, 2006 12:24 AM Subject: Re: ports/96891: [patch] port dns/powerdns does not have option for compiling geo backend > Maintainer of dns/powerdns, > > Please note that PR ports/96891 has just been submitted. > > If it contains a patch for an upgrade, an enhancement or a bug fix > you agree on, reply to this email stating that you approve the patch > and a committer will take care of it. > > The full text of the PR can be found at: > http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/96891 > > -- > Edwin Groothuis > edwin@FreeBSD.org > ------=_NextPart_000_008F_01C674EC.CF346860 Content-Type: application/octet-stream; name="pdns-2.9.20_1.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="pdns-2.9.20_1.diff" diff -ruN powerdns.org/Makefile powerdns/Makefile=0A= --- powerdns.org/Makefile Thu May 11 11:15:47 2006=0A= +++ powerdns/Makefile Thu May 11 11:16:45 2006=0A= @@ -7,6 +7,7 @@=0A= =0A= PORTNAME=3D powerdns=0A= PORTVERSION=3D 2.9.20=0A= +PORTREVISION=3D 1=0A= CATEGORIES=3D dns ipv6=0A= MASTER_SITES=3D http://downloads.powerdns.com/releases/ \=0A= http://mirrors.evolva.ro/powerdns.com/releases/=0A= @@ -24,8 +25,8 @@=0A= CXXFLAGS+=3D -I${LOCALBASE}/include=0A= LDFLAGS+=3D -L${LOCALBASE}/lib=0A= CONFIGURE_TARGET=3D --build=3D${MACHINE_ARCH}-portbld-freebsd${OSREL}=0A= -CONFIGURE_ARGS+=3D --with-modules=3D"${CONFIGURE_MODULES} pipe" \=0A= - --with-dynmodules=3D""=0A= +CONFIGURE_ARGS+=3D --with-modules=3D"pipe" \=0A= + --with-dynmodules=3D"${CONFIGURE_MODULES}"=0A= # --enable-debug=0A= SCRIPTS_ENV=3D WRKDIRPREFIX=3D"${WRKDIRPREFIX}" \=0A= CURDIR2=3D"${.CURDIR}" \=0A= @@ -36,62 +37,80 @@=0A= =0A= SUB_FILES=3D pkg-message=0A= =0A= +OPTIONS=3D PGSQL "PostgreSQL backend" on \=0A= + MYSQL "MySQL backend" off \=0A= + SQLITE "SQLite 2 backend" off \=0A= + SQLITE3 "SQLite 3 backend" off \=0A= + OPENDBX "OpenDBX backend" off \=0A= + OPENLDAP "OpenLDAP backend" off \=0A= + GEO "Geo backend" off \=0A= + RECURSOR "Build Recursor" off=0A= +=0A= .include <bsd.port.pre.mk>=0A= =0A= USE_RC_SUBR+=3D pdns=0A= =0A= -# use user config if possible=0A= -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)=0A= -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"=0A= +.if defined(WITH_GEO)=0A= +CONFIGURE_MODULES+=3D "geo"=0A= +PLIST_SUB+=3D WITHGEO=3D""=0A= .else=0A= -.if defined(BATCH)=0A= -# default package, can be configured in /etc/make.conf=0A= -POWERDNS_OPTIONS?=3D \"PostgreSQL\"=0A= -.endif=0A= -# make INDEX match=0A= -NO_DESCRIBE=3Dyes=0A= +PLIST_SUB+=3D WITHGEO=3D"@comment "=0A= .endif=0A= =0A= -.if defined(WITH_POSTGRESQL_DRIVER) && = !defined(WITHOUT_POSTGRESQL_DRIVER)=0A= -LIB_DEPENDS+=3D pq[+][+].4:${PORTSDIR}/databases/postgresql-libpq++=0A= -CONFIGURE_ARGS+=3D --enable-pgsql = --with-pgsql-includes=3D${LOCALBASE}/include=0A= -CONFIGURE_MODULES+=3D "gpgsql"=0A= -CFLAGS+=3D -DDLLIMPORT=3D""=0A= +.if defined(WITH_PGSQL)=0A= +USE_PGSQL?=3D YES=0A= +CONFIGURE_MODULES+=3D "pgsql"=0A= +PLIST_SUB+=3D WITHPGSQL=3D""=0A= .else=0A= -CONFIGURE_ARGS+=3D --disable-pgsql=0A= +PLIST_SUB+=3D WITHPGSQL=3D"@comment "=0A= .endif=0A= =0A= -.if defined(WITH_MYSQL_DRIVER)=0A= -USE_MYSQL?=3D YES=0A= -CONFIGURE_ARGS+=3D --enable-mysql --with-mysql-includes=3D${LOCALBASE}=0A= -CONFIGURE_MODULES+=3D "gmysql"=0A= -PLIST_SUB+=3D WITHMYSQL=3D""=0A= +.if defined(WITH_MYSQL)=0A= +USE_MYSQL?=3D YES=0A= +CONFIGURE_MODULES+=3D "mysql"=0A= +CXXFLAGS+=3D -I${LOCALBASE}/include/mysql=0A= +LDFLAGS+=3D -L${LOCALBASE}/lib/mysql=0A= +PLIST_SUB+=3D WITHMYSQL=3D""=0A= .else=0A= -CONFIGURE_ARGS+=3D --disable-mysql=0A= -PLIST_SUB+=3D WITHMYSQL=3D"@comment "=0A= +PLIST_SUB+=3D WITHMYSQL=3D"@comment "=0A= .endif=0A= =0A= -.if defined(WITH_LDAP)=0A= +.if defined(WITH_OPENLDAP)=0A= USE_OPENLDAP?=3D YES=0A= CONFIGURE_MODULES+=3D "ldap"=0A= -PLIST_SUB+=3D WITHLDAP=3D""=0A= CXXFLAGS+=3D -L${LOCALBASE}/lib=0A= +PLIST_SUB+=3D WITHLDAP=3D""=0A= .else=0A= PLIST_SUB+=3D WITHLDAP=3D"@comment "=0A= .endif=0A= =0A= .if defined(WITH_SQLITE)=0A= -LIB_DEPENDS+=3D sqlite.2:${PORTSDIR}/databases/sqlite2=0A= -CONFIGURE_ARGS+=3D --enable-sqlite=0A= -CONFIGURE_MODULES+=3D "gsqlite"=0A= -PLIST_SUB+=3D WITHSQLLITE=3D""=0A= +USE_SQLITE?=3D 2=0A= +CONFIGURE_MODULES+=3D "sqlite"=0A= +PLIST_SUB+=3D WITHSQLITE=3D""=0A= .else=0A= -CONFIGURE_ARGS+=3D --disable-sqlite=0A= -PLIST_SUB+=3D WITHSQLLITE=3D"@comment "=0A= +PLIST_SUB+=3D WITHSQLITE=3D"@comment "=0A= .endif=0A= =0A= -.if defined(POWERDNS_WITH_RECURSOR)=0A= -USE_RC_SUBR+=3D pdns_recursor=0A= +.if defined(WITH_SQLITE3)=0A= +USE_SQLITE?=3D 3=0A= +CONFIGURE_MODULES+=3D "sqlite3"=0A= +PLIST_SUB+=3D WITHSQLITE3=3D""=0A= +.else=0A= +PLIST_SUB+=3D WITHSQLITE3=3D"@comment "=0A= +.endif=0A= +=0A= +.if defined(WITH_OPENDBX)=0A= +LIB_DEPENDS+=3D opendbx.1:${PORTSDIR}/databases/opendbx=0A= +CONFIGURE_MODULES+=3D "opendbx"=0A= +PLIST_SUB+=3D WITHOPENDBX=3D""=0A= +CXXFLAGS+=3D -L${LOCALBASE}/lib=0A= +.else=0A= +PLIST_SUB+=3D WITHOPENDBX=3D"@comment "=0A= +.endif=0A= +=0A= +.if defined(WITH_RECURSOR)=0A= +USE_RC_SUBR+=3D pdns_recursor=0A= CONFIGURE_ARGS+=3D --enable-recursor=0A= PLIST_SUB+=3D RECURSOR=3D""=0A= .else=0A= @@ -112,21 +131,7 @@=0A= USE_GCC=3D3.4=0A= .endif=0A= =0A= -.if defined(NO_DESCRIBE)=0A= -describe:=0A= -.if defined(BATCH)=0A= - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns=0A= -.endif=0A= - @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} BATCH=3Dyes ${.TARGET}=0A= -.endif=0A= -=0A= -pre-everything::=0A= - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns=0A= -=0A= -post-clean:=0A= - @ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc=0A= -=0A= -.if defined(WITH_LDAP)=0A= +.if defined(WITH_OPENLDAP)=0A= post-patch:=0A= ${REINPLACE_CMD} -e 's;-I. ;-I. -I${LOCALBASE}/include ;' \=0A= -e 's;la_LDFLAGS =3D;la_LDFLAGS =3D -L${LOCALBASE}/lib;' \=0A= diff -ruN powerdns.org/Makefile.inc powerdns/Makefile.inc=0A= --- powerdns.org/Makefile.inc Thu May 11 11:15:47 2006=0A= +++ powerdns/Makefile.inc Thu Jan 1 01:00:00 1970=0A= @@ -1 +0,0 @@=0A= -WITH_POSTGRESQL_DRIVER=3DYES=0A= diff -ruN powerdns.org/files/configure.powerdns = powerdns/files/configure.powerdns=0A= --- powerdns.org/files/configure.powerdns Thu May 11 11:15:47 2006=0A= +++ powerdns/files/configure.powerdns Thu Jan 1 01:00:00 1970=0A= @@ -1,70 +0,0 @@=0A= -#!/bin/sh=0A= -#=0A= -# $FreeBSD: ports/dns/powerdns/files/configure.powerdns,v 1.9 = 2005/11/04 10:27:39 kwm Exp $=0A= -#=0A= -if [ -f ${WRKDIRPREFIX}${CURDIR2}/Makefile.inc ]; then=0A= - exit=0A= -fi=0A= -=0A= -if [ "${POWERDNS_OPTIONS}" ]; then=0A= - set ${POWERDNS_OPTIONS}=0A= -else=0A= - dialog --title "configuration options" --clear \=0A= - --checklist "\n\=0A= -Please select desired options:" -1 -1 8 \=0A= -PostgreSQL "PostgreSQL driver" ON \=0A= -MySQL "MySQL driver" OFF \=0A= -OpenLDAP "OpenLDAP backend" OFF \=0A= -SQLite "SQLite backend" OFF \=0A= -Recursor "Build Recursor" OFF \=0A= -2> /tmp/checklist.tmp.$$=0A= -=0A= - retval=3D$?=0A= - if [ -s /tmp/checklist.tmp.$$ ]; then=0A= - set `cat /tmp/checklist.tmp.$$`=0A= - fi=0A= - rm -f /tmp/checklist.tmp.$$=0A= -=0A= - case $retval in=0A= - 0) if [ -z "$*" ]; then=0A= - echo "Nothing selected"=0A= - fi=0A= - ;;=0A= - 1) echo "Cancel pressed."=0A= - exit 1=0A= - ;;=0A= - esac=0A= -fi=0A= -=0A= -${MKDIR} ${WRKDIRPREFIX}${CURDIR2}=0A= -exec > ${WRKDIRPREFIX}${CURDIR2}/Makefile.inc=0A= -=0A= -while [ "$1" ]; do=0A= - case $1 in=0A= - \"PostgreSQL\")=0A= - echo WITH_POSTGRESQL_DRIVER=3DYES=0A= - ;;=0A= - \"MySQL\")=0A= - echo WITH_MYSQL_DRIVER=3DYES=0A= - ;;=0A= - \"OpenLDAP\")=0A= - echo WITH_LDAP=3DYES=0A= - ;;=0A= - \"SQLite\")=0A= - echo WITH_SQLITE=3DYES=0A= - echo SQLITE_PORT?=3Ddatabases/sqlite=0A= - ;;=0A= - \"Recursor\")=0A= - echo POWERDNS_WITH_RECURSOR=3DYES=0A= - ;;=0A= - \"nothing\"|true)=0A= - ;;=0A= - *)=0A= - echo "Invalid option(s): $*" > /dev/stderr=0A= - rm -f ${WRKDIRPREFIX}${CURDIR2}/Makefile.inc=0A= - exit 1=0A= - ;;=0A= - esac=0A= - shift=0A= -done=0A= -exec > /dev/stderr=0A= diff -ruN powerdns.org/files/pdns.conf powerdns/files/pdns.conf=0A= --- powerdns.org/files/pdns.conf Thu May 11 11:15:47 2006=0A= +++ powerdns/files/pdns.conf Thu May 11 11:16:19 2006=0A= @@ -16,6 +16,15 @@=0A= #launch=3Dgsqlite=0A= #gsqlite-database=3D<path to your SQLite database>=0A= =0A= +# OpenDBX=0A= +#launch=3Dopendbx=0A= +#opendbx-backend=3Dmysql =0A= +#opendbx-host=3D127.0.0.1=0A= +#opendbx-database=3Dpdns=0A= +#opendbx-username=3Dpdns=0A= +#opendbx-password=3Dpdns=0A= +=0A= +# Autogenerated configuration file template=0A= #################################=0A= # allow-axfr-ips If disabled, DO allow zonetransfers from these IP = addresses=0A= #=0A= @@ -240,6 +249,21 @@=0A= # soa-minimum-ttl Default SOA mininum ttl=0A= #=0A= # soa-minimum-ttl=3D3600=0A= +=0A= +#################################=0A= +# soa-refresh-default Default SOA refresh=0A= +#=0A= +# soa-refresh-default=3D10800=0A= +=0A= +#################################=0A= +# soa-retry-default Default SOA retry=0A= +#=0A= +# soa-retry-default=3D3600=0A= +=0A= +#################################=0A= +# soa-expire-default Default SOA expire=0A= +#=0A= +# soa-expire-default=3D604800=0A= =0A= #################################=0A= # soa-serial-offset Make sure that no SOA serial is less than this = number=0A= diff -ruN powerdns.org/files/pdns_mysql.sql powerdns/files/pdns_mysql.sql=0A= --- powerdns.org/files/pdns_mysql.sql Thu May 11 11:15:47 2006=0A= +++ powerdns/files/pdns_mysql.sql Thu May 11 11:16:19 2006=0A= @@ -1,38 +1,50 @@=0A= -create table domains (=0A= - id INT auto_increment,=0A= - name VARCHAR(255) NOT NULL,=0A= - master VARCHAR(20) DEFAULT NULL,=0A= - last_check INT DEFAULT NULL,=0A= - type VARCHAR(6) NOT NULL,=0A= - notified_serial INT DEFAULT NULL,=0A= - account VARCHAR(40) DEFAULT NULL,=0A= - primary key (id)=0A= -)type=3DInnoDB;=0A= +CREATE TABLE domains (=0A= + id INT auto_increment,=0A= + name VARCHAR(255) NOT NULL,=0A= + type VARCHAR(6) NOT NULL,=0A= + master VARCHAR(40) DEFAULT NULL,=0A= + account VARCHAR(40) DEFAULT NULL,=0A= + notified_serial INT DEFAULT NULL,=0A= + last_check INT DEFAULT NULL,=0A= +CONSTRAINT pk_id=0A= + PRIMARY KEY (id),=0A= +CONSTRAINT unq_name=0A= + UNIQUE (name)=0A= +) type=3DInnoDB;=0A= =0A= -CREATE UNIQUE INDEX name_index ON domains(name);=0A= =0A= CREATE TABLE records (=0A= - id INT auto_increment,=0A= - domain_id INT DEFAULT NULL,=0A= - name VARCHAR(255) DEFAULT NULL,=0A= - type VARCHAR(6) DEFAULT NULL,=0A= - content VARCHAR(255) DEFAULT NULL,=0A= - ttl INT DEFAULT NULL,=0A= - prio INT DEFAULT NULL,=0A= - change_date INT DEFAULT NULL,=0A= - primary key(id)=0A= -)type=3DInnoDB;=0A= -=0A= -CREATE INDEX rec_name_index ON records(name);=0A= -CREATE INDEX nametype_index ON records(name,type);=0A= -CREATE INDEX domain_id ON records(domain_id);=0A= -=0A= -create table supermasters (=0A= - ip VARCHAR(25) NOT NULL,=0A= - nameserver VARCHAR(255) NOT NULL,=0A= - account VARCHAR(40) DEFAULT NULL=0A= + id INT auto_increment,=0A= + domain_id INT DEFAULT NULL,=0A= + name VARCHAR(255) DEFAULT NULL,=0A= + type VARCHAR(6) DEFAULT NULL,=0A= + ttl INT DEFAULT NULL,=0A= + prio INT DEFAULT NULL,=0A= + content VARCHAR(255) DEFAULT NULL,=0A= + change_date INT DEFAULT NULL,=0A= +CONSTRAINT pk_id=0A= + PRIMARY KEY (id),=0A= +CONSTRAINT fk_domainid=0A= + FOREIGN KEY (domain_id)=0A= + REFERENCES domains(id)=0A= + ON UPDATE CASCADE=0A= + ON DELETE CASCADE=0A= +) type=3DInnoDB;=0A= +=0A= +CREATE INDEX idx_rdomainid ON records(domain_id);=0A= +CREATE INDEX idx_rname ON records(name);=0A= +CREATE INDEX idx_rname_rtype ON records(name,type);=0A= +=0A= +=0A= +CREATE TABLE supermasters (=0A= + ip VARCHAR(40) NOT NULL,=0A= + nameserver VARCHAR(255) NOT NULL,=0A= + account VARCHAR(40) DEFAULT NULL=0A= );=0A= =0A= -GRANT SELECT ON supermasters TO pdns;=0A= -GRANT ALL ON domains TO pdns;=0A= -GRANT ALL ON records TO pdns;=0A= +CREATE INDEX idx_smip_smns ON supermasters(ip,nameserver);=0A= +=0A= +=0A= +GRANT SELECT ON supermasters TO powerdns;=0A= +GRANT ALL ON domains TO powerdns;=0A= +GRANT ALL ON records TO powerdns;=0A= diff -ruN powerdns.org/files/pdns_postgresql.sql = powerdns/files/pdns_postgresql.sql=0A= --- powerdns.org/files/pdns_postgresql.sql Thu May 11 11:15:47 2006=0A= +++ powerdns/files/pdns_postgresql.sql Thu May 11 11:16:19 2006=0A= @@ -1,40 +1,52 @@=0A= -create table domains (=0A= - id SERIAL PRIMARY KEY,=0A= - name VARCHAR(255) NOT NULL,=0A= - master VARCHAR(20) DEFAULT NULL,=0A= - last_check INT DEFAULT NULL,=0A= - type VARCHAR(6) NOT NULL,=0A= - notified_serial INT DEFAULT NULL,=0A= - account VARCHAR(40) DEFAULT NULL=0A= +CREATE TABLE domains (=0A= + id SERIAL,=0A= + name VARCHAR(255) NOT NULL,=0A= + type VARCHAR(6) NOT NULL,=0A= + master VARCHAR(40) DEFAULT NULL,=0A= + account VARCHAR(40) DEFAULT NULL=0A= + notified_serial INT DEFAULT NULL,=0A= + last_check INT DEFAULT NULL,=0A= +CONSTRAINT pk_id=0A= + PRIMARY KEY (id),=0A= +CONSTRAINT unq_name=0A= + UNIQUE (name)=0A= );=0A= -CREATE UNIQUE INDEX name_index ON domains(name);=0A= +=0A= =0A= CREATE TABLE records (=0A= - id SERIAL PRIMARY KEY,=0A= - domain_id INT DEFAULT NULL,=0A= - name VARCHAR(255) DEFAULT NULL,=0A= - type VARCHAR(6) DEFAULT NULL,=0A= - content VARCHAR(255) DEFAULT NULL,=0A= - ttl INT DEFAULT NULL,=0A= - prio INT DEFAULT NULL,=0A= - change_date INT DEFAULT NULL,=0A= - CONSTRAINT domain_exists=0A= - FOREIGN KEY(domain_id) REFERENCES domains(id)=0A= - ON DELETE CASCADE=0A= + id SERIAL,=0A= + domain_id INT DEFAULT NULL,=0A= + name VARCHAR(255) DEFAULT NULL,=0A= + type VARCHAR(6) DEFAULT NULL,=0A= + ttl INT DEFAULT NULL,=0A= + prio INT DEFAULT NULL,=0A= + content VARCHAR(255) DEFAULT NULL,=0A= + change_date INT DEFAULT NULL,=0A= +CONSTRAINT pk_id=0A= + PRIMARY KEY (id),=0A= +CONSTRAINT fk_domainid=0A= + FOREIGN KEY (domain_id)=0A= + REFERENCES domains(id)=0A= + ON UPDATE CASCADE=0A= + ON DELETE CASCADE=0A= );=0A= =0A= -CREATE INDEX rec_name_index ON records(name);=0A= -CREATE INDEX nametype_index ON records(name,type);=0A= -CREATE INDEX domain_id ON records(domain_id);=0A= -=0A= -create table supermasters (=0A= - ip VARCHAR(25) NOT NULL,=0A= - nameserver VARCHAR(255) NOT NULL,=0A= - account VARCHAR(40) DEFAULT NULL=0A= +CREATE INDEX idx_rdomainid ON records(domain_id);=0A= +CREATE INDEX idx_rname ON records(name);=0A= +CREATE INDEX idx_rname_rtype ON records(name,type);=0A= +=0A= +=0A= +CREATE TABLE supermasters (=0A= + ip VARCHAR(40) NOT NULL,=0A= + nameserver VARCHAR(255) NOT NULL,=0A= + account VARCHAR(40) DEFAULT NULL=0A= );=0A= =0A= -GRANT SELECT ON supermasters TO pdns;=0A= -GRANT ALL ON domains TO pdns;=0A= -GRANT ALL ON domains_id_seq TO pdns;=0A= -GRANT ALL ON records TO pdns;=0A= -GRANT ALL ON records_id_seq TO pdns;=0A= +CREATE INDEX idx_smip_smns ON supermasters(ip,nameserver);=0A= +=0A= +=0A= +GRANT SELECT ON supermasters TO powerdns;=0A= +GRANT ALL ON domains TO powerdns;=0A= +GRANT ALL ON domains_id_seq TO powerdns;=0A= +GRANT ALL ON records TO powerdns;=0A= +GRANT ALL ON records_id_seq TO powerdns;=0A= diff -ruN powerdns.org/files/pdns_sqlite.sql = powerdns/files/pdns_sqlite.sql=0A= --- powerdns.org/files/pdns_sqlite.sql Thu May 11 11:15:47 2006=0A= +++ powerdns/files/pdns_sqlite.sql Thu May 11 11:16:19 2006=0A= @@ -1,33 +1,45 @@=0A= -create table domains (=0A= - id INTEGER PRIMARY KEY,=0A= - name VARCHAR(255) NOT NULL,=0A= - master VARCHAR(20) DEFAULT NULL,=0A= - last_check INTEGER DEFAULT NULL,=0A= - type VARCHAR(6) NOT NULL,=0A= - notified_serial INTEGER DEFAULT NULL,=0A= - account VARCHAR(40) DEFAULT NULL=0A= +CREATE TABLE domains (=0A= + id INT AUTOINCREMENT,=0A= + name VARCHAR(255) NOT NULL,=0A= + type VARCHAR(6) NOT NULL,=0A= + master VARCHAR(40) DEFAULT NULL,=0A= + account VARCHAR(40) DEFAULT NULL,=0A= + notified_serial INT DEFAULT NULL,=0A= + last_check INT DEFAULT NULL,=0A= +CONSTRAINT pk_id=0A= + PRIMARY KEY (id),=0A= +CONSTRAINT unq_name=0A= + UNIQUE (name)=0A= );=0A= =0A= -CREATE UNIQUE INDEX name_index ON domains(name);=0A= =0A= CREATE TABLE records (=0A= - id INTEGER PRIMARY KEY,=0A= - domain_id INTEGER DEFAULT NULL,=0A= - name VARCHAR(255) DEFAULT NULL,=0A= - type VARCHAR(6) DEFAULT NULL,=0A= - content VARCHAR(255) DEFAULT NULL,=0A= - ttl INTEGER DEFAULT NULL,=0A= - prio INTEGER DEFAULT NULL,=0A= - change_date INTEGER DEFAULT NULL=0A= + id INT AUTOINCREMENT,=0A= + domain_id INT DEFAULT NULL,=0A= + name VARCHAR(255) DEFAULT NULL,=0A= + type VARCHAR(6) DEFAULT NULL,=0A= + ttl INT DEFAULT NULL,=0A= + prio INT DEFAULT NULL,=0A= + content VARCHAR(255) DEFAULT NULL,=0A= + change_date INT DEFAULT NULL,=0A= +CONSTRAINT pk_id=0A= + PRIMARY KEY (id),=0A= +CONSTRAINT fk_domainid=0A= + FOREIGN KEY (domain_id)=0A= + REFERENCES domains(id)=0A= + ON UPDATE CASCADE=0A= + ON DELETE CASCADE=0A= );=0A= =0A= -CREATE INDEX rec_name_index ON records(name);=0A= -CREATE INDEX nametype_index ON records(name,type);=0A= -CREATE INDEX domain_id ON records(domain_id);=0A= -=0A= -create table supermasters (=0A= - ip VARCHAR(25) NOT NULL,=0A= - nameserver VARCHAR(255) NOT NULL,=0A= - account VARCHAR(40) DEFAULT NULL=0A= +CREATE INDEX idx_rdomainid ON records(domain_id);=0A= +CREATE INDEX idx_rname ON records(name);=0A= +CREATE INDEX idx_rname_rtype ON records(name,type);=0A= +=0A= +=0A= +CREATE TABLE supermasters (=0A= + ip VARCHAR(40) NOT NULL,=0A= + nameserver VARCHAR(255) NOT NULL,=0A= + account VARCHAR(40) DEFAULT NULL=0A= );=0A= =0A= +CREATE INDEX idx_smip_smns ON supermasters(ip,nameserver);=0A= diff -ruN powerdns.org/pkg-plist powerdns/pkg-plist=0A= --- powerdns.org/pkg-plist Thu May 11 11:15:47 2006=0A= +++ powerdns/pkg-plist Thu May 11 11:16:19 2006=0A= @@ -2,20 +2,36 @@=0A= bin/zone2ldap=0A= bin/zone2sql=0A= sbin/pdns_server=0A= +%%WITHPGSQL%%lib/libgpgmysqlbackendsqlbackend.a=0A= +%%WITHPGSQL%%lib/libgpgsqlbackend.la=0A= +%%WITHPGSQL%%lib/libgpgsqlbackend.so=0A= +%%WITHPGSQL%%lib/libgpgsqlbackend.so.0=0A= %%WITHMYSQL%%lib/libgmysqlbackend.a=0A= +%%WITHMYSQL%%lib/libgmysqlbackend.la=0A= %%WITHMYSQL%%lib/libgmysqlbackend.so=0A= %%WITHMYSQL%%lib/libgmysqlbackend.so.0=0A= %%WITHSQLLITE%%lib/libgsqlitebackend.a=0A= +%%WITHSQLLITE%%lib/libgsqlitebackend.la=0A= %%WITHSQLLITE%%lib/libgsqlitebackend.so=0A= %%WITHSQLLITE%%lib/libgsqlitebackend.so.0=0A= %%WITHLDAP%%lib/libldapbackend.a=0A= +%%WITHLDAP%%lib/libldapbackend.la=0A= %%WITHLDAP%%lib/libldapbackend.so=0A= %%WITHLDAP%%lib/libldapbackend.so.0=0A= +%%WITHOPENDBX%%lib/libopendbxbackend.a=0A= +%%WITHOPENDBX%%lib/libopendbxbackend.la=0A= +%%WITHOPENDBX%%lib/libopendbxbackend.so=0A= +%%WITHOPENDBX%%lib/libopendbxbackend.so.0=0A= +%%WITHGEO%%lib/libgeobackend.a=0A= +%%WITHGEO%%lib/libgeobackend.la=0A= +%%WITHGEO%%lib/libgeobackend.so=0A= +%%WITHGEO%%lib/libgeobackend.so.0=0A= lib/libpipebackend.a=0A= lib/libpipebackend.la=0A= lib/libpipebackend.so=0A= lib/libpipebackend.so.0=0A= %%RECURSOR%%sbin/pdns_recursor=0A= +%%RECURSOR%%sbin/rec_control=0A= @unexec if cmp -s %D/etc/pdns.conf %D/etc/pdns.conf-dist; then rm -f = %D/etc/pdns.conf; fi=0A= etc/pdns.conf-dist=0A= @exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf=0A= ------=_NextPart_000_008F_01C674EC.CF346860--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605110920.k4B9KJGx015390>