From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Fri, 11 Jun 2010 06:50:00 +0000 (+0000)
Subject: work towards pdns_recursor 3.3
X-Git-Tag: rec-3.3~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a133832188edb3405d20aa02f6760c1ca1be0a5;p=pdns

work towards pdns_recursor 3.3


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1631 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/Makefile-recursor b/pdns/Makefile-recursor
index 8118dc6fc..e475aec6f 100644
--- a/pdns/Makefile-recursor
+++ b/pdns/Makefile-recursor
@@ -19,7 +19,7 @@ arguments.o lwres.o pdns_recursor.o recursor_cache.o dnsparser.o \
 dnswriter.o dnsrecords.o rcpgenerator.o base64.o zoneparser-tng.o \
 rec_channel.o rec_channel_rec.o selectmplexer.o sillyrecords.o \
 dns_random.o aescrypt.o aeskey.o aes_modes.o aestab.o lua-pdns-recursor.o \
-randomhelper.o recpacketcache.o dns.o reczones.o
+randomhelper.o recpacketcache.o dns.o reczones.o base32.o nsecrecords.o
 
 REC_CONTROL_OBJECTS=rec_channel.o rec_control.o arguments.o 
 
diff --git a/pdns/config-recursor.h b/pdns/config-recursor.h
index 82d229b06..bc6c8a521 100644
--- a/pdns/config-recursor.h
+++ b/pdns/config-recursor.h
@@ -1,4 +1,4 @@
 #define SYSCONFDIR "/etc/powerdns/" 
 #define LOCALSTATEDIR "/var/run/" 
-#define VERSION "3.2"
+#define VERSION "3.3-pre"
 #define RECURSOR
diff --git a/pdns/dist-recursor b/pdns/dist-recursor
index b6b26a77c..cd344dea3 100755
--- a/pdns/dist-recursor
+++ b/pdns/dist-recursor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION=3.2
+VERSION=3.3-pre
 
 INCLUDES="iputils.hh arguments.hh base64.hh zoneparser-tng.hh \
 rcpgenerator.hh lock.hh dnswriter.hh  dnsrecords.hh dnsparser.hh utility.hh \
@@ -8,7 +8,7 @@ recursor_cache.hh rec_channel.hh qtype.hh misc.hh dns.hh syncres.hh \
 sstuff.hh mtasker.hh mtasker.cc lwres.hh logger.hh ahuexception.hh \
 mplexer.hh win32_mtasker.hh win32_utility.cc ntservice.hh singleton.hh \
 recursorservice.hh dns_random.hh lua-pdns-recursor.hh namespaces.hh \
-recpacketcache.hh"
+recpacketcache.hh base32.hh"
 
 CFILES="syncres.cc  misc.cc unix_utility.cc qtype.cc \
 logger.cc arguments.cc  lwres.cc pdns_recursor.cc  \
@@ -17,7 +17,7 @@ base64.cc  zoneparser-tng.cc  rec_channel.cc rec_channel_rec.cc rec_control.cc \
 selectmplexer.cc epollmplexer.cc kqueuemplexer.cc portsmplexer.cc pdns_hw.cc \
 win32_mtasker.cc win32_rec_channel.cc win32_logger.cc ntservice.cc \
 recursorservice.cc sillyrecords.cc lua-pdns-recursor.cc randomhelper.cc \
-devpollmplexer.cc recpacketcache.cc dns.cc reczones.cc"
+devpollmplexer.cc recpacketcache.cc dns.cc reczones.cc base32.cc nsecrecords.cc"
 
 cd docs
 make pdns_recursor.1 rec_control.1
@@ -30,7 +30,7 @@ cp $INCLUDES $CFILES $DIRNAME
 cp Makefile-recursor $DIRNAME/Makefile
 cp Makefile-recursor.win32 $DIRNAME/Makefile.win32
 cp README-recursor $DIRNAME/README
-cp COPYING $DIRNAME/
+cp ../COPYING $DIRNAME/
 cp config-recursor.h $DIRNAME/config.h
 mkdir $DIRNAME/rrd
 cp tools/rrd/{create,update,makegraphs,index.html} $DIRNAME/rrd
diff --git a/pdns/pdns-recursor.spec b/pdns/pdns-recursor.spec
index b41a6d75c..ae53132ee 100644
--- a/pdns/pdns-recursor.spec
+++ b/pdns/pdns-recursor.spec
@@ -2,7 +2,7 @@
 
 Buildroot: /tmp/pdns/
 Name: pdns-recursor
-Version: 3.2
+Version: 3.3pre
 Release: 1
 Summary: extremely powerful and versatile recursing nameserver
 License: GPL