1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

- Update to 3.0.20080406

PR:		ports/125005
Submitted by:	Ralf van der Enden <tremere cainites.net> (maintainer)
This commit is contained in:
Philippe Audeoud 2008-06-26 15:54:19 +00:00
parent 3efda162f6
commit 3f7459dbcc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=215805
3 changed files with 5 additions and 47 deletions

View File

@ -7,7 +7,6 @@
PORTNAME= powerdns
PORTVERSION= 3.0.${SNAPSHOT}
PORTREVISION= 2
CATEGORIES= dns ipv6
MASTER_SITES= http://svn.powerdns.com/snapshots/${REVISION}/
PKGNAMESUFFIX= -devel
@ -18,8 +17,8 @@ COMMENT= An advanced DNS server with multiple backends including SQL
BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost
SNAPSHOT= 20080406
REVISION= 1177
SNAPSHOT= 20080624
REVISION= 1223
CONFLICTS= powerdns-[0-2]*

View File

@ -1,3 +1,3 @@
MD5 (pdns-3.0-svn.20080406.1177.tar.gz) = af423e94344620573304aa0d52071a29
SHA256 (pdns-3.0-svn.20080406.1177.tar.gz) = 9e3b62912dfc7fb10cf59f7215331701d9b219b9869a03020d680a41f0a12f4a
SIZE (pdns-3.0-svn.20080406.1177.tar.gz) = 1035388
MD5 (pdns-3.0-svn.20080624.1223.tar.gz) = 37670536c18fafda4b11e4e0ae0008bf
SHA256 (pdns-3.0-svn.20080624.1223.tar.gz) = 8fd68efa8dc4eb85679a19c0a3556a8206f8d7a98cdfa94f874d6d56d3470f6e
SIZE (pdns-3.0-svn.20080624.1223.tar.gz) = 1043348

View File

@ -1,41 +0,0 @@
--- modules/opendbxbackend/odbxbackend.hh (revision 1154)
+++ modules/opendbxbackend/odbxbackend.hh (revision 1181)
@@ -124,7 +124,7 @@
declare( suffix, "sql-lookuptype", "Lookup query with type","SELECT r.\"domain_id\", r.\"name\", r.\"type\", r.\"ttl\", r.\"prio\", r.\"content\" FROM \"records\" r WHERE r.\"name\"=':name' AND r.\"type\"=':type'" );
declare( suffix, "sql-lookuptypeid", "Lookup query with type and id","SELECT r.\"domain_id\", r.\"name\", r.\"type\", r.\"ttl\", r.\"prio\", r.\"content\" FROM \"records\" r WHERE r.\"domain_id\"=:id AND r.\"name\"=':name' AND r.\"type\"=':type'" );
- declare( suffix, "sql-lookupsoa","Lookup query for SOA record","SELECT d.\"id\", d.\"auto_serial\", r.\"content\" FROM \"records\" r JOIN \"domains\" d ON r.\"domain_id\"=d.\"id\" WHERE r.\"name\"=':name' AND r.\"type\"='SOA' AND d.\"status\"='A'" );
+ declare( suffix, "sql-lookupsoa","Lookup query for SOA record","SELECT d.\"id\", d.\"auto_serial\", r.\"ttl\", r.\"content\" FROM \"records\" r JOIN \"domains\" d ON r.\"domain_id\"=d.\"id\" WHERE r.\"name\"=':name' AND r.\"type\"='SOA' AND d.\"status\"='A'" );
- declare( suffix, "sql-zonedelete","Delete all records for this zone","DELETE FROM \"records\" r WHERE r.\"domain_id\"=:id" );
+ 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\", d.\"auto_serial\", 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'" );
@@ -136,6 +136,6 @@
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\" d SET d.\"notified_serial\"=%d WHERE d.\"id\"=%d" );
- declare( suffix, "sql-update-lastcheck", "Set time of last check", "UPDATE \"domains\" d SET d.\"last_check\"=%d WHERE d.\"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 d.\"master\" FROM \"domains\" d WHERE d.\"name\"=':name' AND d.\"status\"='A' AND d.\"type\"='SLAVE'" );
--- modules/opendbxbackend/odbxbackend.cc (revision 1154)
+++ modules/opendbxbackend/odbxbackend.cc (revision 1181)
@@ -185,9 +185,15 @@
{
sd.serial = 0;
+ sd.ttl = m_default_ttl;
+
+ if( ( tmp = odbx_field_value( m_result, 3 ) ) != NULL )
+ {
+ fillSOAData( string( tmp, odbx_field_length( m_result, 3 ) ), sd );
+ }
if( ( tmp = odbx_field_value( m_result, 2 ) ) != NULL )
{
- fillSOAData( string( tmp, odbx_field_length( m_result, 2 ) ), sd );
- }
+ sd.ttl = strtoul( tmp, NULL, 10 );
+ }
if( sd.serial == 0 && ( tmp = odbx_field_value( m_result, 1 ) ) != NULL )