dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-pdns-2.9.21.tar.gz

.gitignore

@@ -0,0 +1 @@
+pdns-2.9.21.2.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: pdns
-# $Id$
-NAME := pdns
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

pdns-bz461768.patch

@@ -0,0 +1,33 @@
+Index: /trunk/pdns/pdns/packethandler.cc
+===================================================================
+--- /trunk/pdns/pdns/packethandler.cc (revision 1079)
++++ /trunk/pdns/pdns/packethandler.cc (revision 1081)
+@@ -399,6 +399,8 @@
+       }
+     }
+-    if(hits && !found && !rfound && shortcut ) // we found matching qnames but not a qtype
++    if(hits && !found && !rfound && shortcut ) { // we found matching qnames but not a qtype
++      DLOG(L<<"Found matching qname, but not the qtype"<<endl);
+       return 2;
++    }
+ 
+     if(rfound)
+@@ -654,4 +656,5 @@
+ 
+     if(mret==2) { // there is some data, but not of the correct type
++      r->clearRecords();
+       DLOG(L<<"There is some data, but not of the correct type, adding SOA for NXRECORDSET"<<endl);
+       SOAData sd;
+@@ -696,5 +699,4 @@
+       }
+     }
+-
+     noSameLevelNS=true;
+ 
+@@ -739,5 +741,5 @@
+     // not found yet, try wildcards (we only try here in case of recursion - we should check before we hand off)
+ 
+-    if(p->d.rd && d_doRecursion && d_doWildcards) { 
++    if(mret != 2 && p->d.rd && d_doRecursion && d_doWildcards) { 
+       int res=doWildcardRecords(p,r,target);
+       if(res) { // had a result

pdns-gcc43.patch

@@ -0,0 +1,53 @@
+diff -up pdns-2.9.21/pdns/misc.hh.orig pdns-2.9.21/pdns/misc.hh
+--- pdns-2.9.21/pdns/misc.hh.orig	2008-02-09 15:32:57.000000000 +0100
++++ pdns-2.9.21/pdns/misc.hh	2008-02-09 15:33:23.000000000 +0100
+@@ -19,6 +19,7 @@
+ #ifndef MISC_HH
+ #define MISC_HH
+ #include <stdint.h>
++#include <cstring>
+ 
+ #if 0
+ #define RDTSC(qp) \
+@@ -234,7 +235,7 @@ inline bool dns_isspace(char c)
+   return c==' ' || c=='\t' || c=='\r' || c=='\n';
+ }
+ 
+-inline const char dns_tolower(char c)
++inline char dns_tolower(char c)
+ {
+   if(c>='A' && c<='Z')
+     c+='a'-'A';
+diff -up pdns-2.9.21/pdns/dns.hh.orig pdns-2.9.21/pdns/dns.hh
+--- pdns-2.9.21/pdns/dns.hh.orig	2008-02-09 15:37:26.000000000 +0100
++++ pdns-2.9.21/pdns/dns.hh	2008-02-09 15:37:43.000000000 +0100
+@@ -115,7 +115,7 @@ struct EDNS0Record 
+ #pragma pack (pop)
+ #endif 
+ 
+-typedef enum  {
++enum  {
+         ns_t_invalid = 0,       /* Cookie. */
+         ns_t_a = 1,             /* Host address. */
+         ns_t_ns = 2,            /* Authoritative server. */
+diff -up pdns-2.9.21/modules/ldapbackend/powerldap.cc.orig pdns-2.9.21/modules/ldapbackend/powerldap.cc
+--- pdns-2.9.21/modules/ldapbackend/powerldap.cc.orig	2008-02-09 15:41:12.000000000 +0100
++++ pdns-2.9.21/modules/ldapbackend/powerldap.cc	2008-02-09 15:42:17.000000000 +0100
+@@ -1,4 +1,6 @@
+ #include "powerldap.hh"
++// for timeval
++#include <sys/time.h>
+ 
+ 
+ 
+diff -up pdns-2.9.21/pdns/dynmessenger.cc.orig pdns-2.9.21/pdns/dynmessenger.cc
+--- pdns-2.9.21/pdns/dynmessenger.cc.orig	2008-02-09 15:47:52.000000000 +0100
++++ pdns-2.9.21/pdns/dynmessenger.cc	2008-02-09 15:48:38.000000000 +0100
+@@ -18,6 +18,7 @@
+ */
+ #include "dynmessenger.hh"
+ #include <cstdio>
++#include <cstdlib>
+ #include <cstring>
+ #include <cerrno>
+ #include <iostream>

pdns.spec

@@ -1,7 +1,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
-Version:	2.9.21
-Release:	2%{?dist}
+Version:	2.9.21.2
+Release:	1%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -10,6 +10,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
 Patch0:		%{name}-fixinit.patch
 Patch1:		%{name}-avoid-version.patch
+Patch2:		%{name}-gcc43.patch
+Patch3:         %{name}-bz461768.patch
 
 Requires(post):	%{_sbindir}/useradd, /sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig
@@ -82,6 +84,8 @@ This package contains the SQLite backend for %{name}
 %setup -q
 %patch0 -p1 -b .fixinit
 %patch1 -p1 -b .avoid-version
+%patch2 -p1
+%patch3 -p3
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -181,6 +185,21 @@ fi
 
 
 %changelog
+* Mon Nov 17 2008 Ruben Kerkhof <ruben@rubenkerkhof.com> 2.9.21.2-1
+- Upstream released new version
+
+* Fri Sep 12 2008 Ruben Kerkhof <ruben@rubenkerkhof.com> 2.9.21.1-2
+- Fix handling of AAAA records (bz #461768)
+
+* Wed Aug 06 2008 Ruben Kerkhof <ruben@rubenkerkhof.com> 2.9.21.1-1
+- CVE-2008-3337
+
+* Sat Feb 09 2008 Ruben Kerkhof <ruben@rubenkerkhof.com> 2.9.21-4
+- GCC 4.3 fixes
+
+* Wed Dec 05 2007 Ruben Kerkhof <ruben@rubenkerkhof.com> 2.9.21-3
+- Rebuild to pick up new openldap
+
 * Tue Sep 11 2007 Ruben Kerkhof <ruben@rubenkerkhof.com> 2.9.21-2
 - Fix license tag
 - Add README for geo backend to docs

sources

@@ -1 +1 @@
-a0d650dd1489ed46b36dfcc1d73653af  pdns-2.9.21.tar.gz
+2aa79c1d120a071298340ed2d4e02165  pdns-2.9.21.2.tar.gz