2.9.2

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

diff --git a/README b/README
index 383bb142d18c705547ad51596d052e44bcd0772a..10baa7d8e8655ec1470a8c75845581dc6f66813a 100644 (file)
--- a/README
+++ b/README
@@ -23,6 +23,7 @@ SOLARIS NOTES
 -------------
 You need gcc 3.x, preferably 3.2! The 'Sunpro' compiler is currently not
 supported (patches are welcome if not too intrusive).
+
 If you encounter problems with the Solaris make, gmake is advised
 
 IPv6 is currently (2.9.1.) broken in Solaris, awaiting patches!
@@ -30,7 +31,7 @@ IPv6 is currently (2.9.1.) broken in Solaris, awaiting patches!
 FREEBSD NOTES
 -------------
 gcc 2.95.x works. You need to compile using gmake - regular make only appears to
-work, but doesn't in fact.
+work, but doesn't in fact. Use gmake, not make.
 
 LINUX NOTES
 -----------

diff --git a/configure.in b/configure.in
index 73ea9b8ecb2a7d3514c68e052f7d5e371059ec9b..ac8e235b1d66fea037166299f24b03a82c5366c2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_HOST
 AM_CONFIG_HEADER(config.h)
 AC_C_BIGENDIAN 
 AC_PREREQ(2.52)
-CXXFLAGS="$CXXFLAGS -Wall"
+CXXFLAGS="$CXXFLAGS -Wall -O2"
 
 AC_PREFIX_DEFAULT(/usr/local)
 AC_PROG_CC
@@ -184,7 +184,7 @@ AC_ARG_WITH(socketdir, [  --with-socketdir Where the controlsocket lives ],
         socketdir="$withval"  
 ])
 
-AC_MSG_CHECKING(whether we to include mysql support in the generic backend)
+AC_MSG_CHECKING(whether we to include MySQL support in the generic backend)
 AC_ARG_ENABLE(mysql, 
  [  --enable-mysql     Whether to include MySQL support in generic backend],enable_mysql=$enableval,enable_mysql=yes)
 AC_MSG_RESULT($enable_mysql)
@@ -357,13 +357,13 @@ do
                pgmysql)
 
                echo -n "gmysqlbackend.o " >  $srcdir/modules/pgmysqlbackend/OBJECTFILES
-               if test -n "$domysql"
+               if test x"$domysql" = xyes
                then 
                        echo -n "smysql.o " >> $srcdir/modules/pgmysqlbackend/OBJECTFILES
-                       echo -n "-lmysql " >> $srcdir/modules/pgmysqlbackend/OBJECTLIBS
+                       echo -n "-lmysqlclient " >> $srcdir/modules/pgmysqlbackend/OBJECTLIBS
                fi 
 
-               if test -n "$dopgsql"
+               if test x"$dopgsql" = xyes
                then 
                        echo -n "spgsql.o " >> $srcdir/modules/pgmysqlbackend/OBJECTFILES
                        echo -n "-lpq++ -lpq -lssl -lcrypt -lcrypto " >> $srcdir/modules/pgmysqlbackend/OBJECTLIBS

diff --git a/makerelease b/makerelease
index e5b214fed71d2a859da934a26eb56c27077b1360..e1c0cad51b1e42f5907005551741244edafb29a2 100755 (executable)
--- a/makerelease
+++ b/makerelease
@@ -1,5 +1,5 @@
 #!/bin/sh
 fakeroot debian/rules clean
-rm -r debian/*~
+rm -f debian/*~
 ./configure --with-modules="mysql pdns pgmysql oracle db2 xdb odbc xdb pipe" --enable-pgsql
 make dist

diff --git a/modules/gmysqlbackend/gmysqlbackend.cc b/modules/gmysqlbackend/gmysqlbackend.cc
index 49c4af835e1583993de5063fd01caf26ffa62630..c90b8daabf4c495e8814acdc8935b861fdea7621 100644 (file)
--- a/modules/gmysqlbackend/gmysqlbackend.cc
+++ b/modules/gmysqlbackend/gmysqlbackend.cc
@@ -1,4 +1,4 @@
-// $Id: gmysqlbackend.cc,v 1.5 2002/12/13 13:24:34 ahu Exp $ 
+// $Id: gmysqlbackend.cc,v 1.6 2002/12/13 15:22:33 ahu Exp $ 
 #include <string>
 #include <map>
 
@@ -122,7 +122,7 @@ void gMySQLBackend::getUnfreshSlaveInfos(vector<DomainInfo> *unfreshDomains)
     sdata.serial=0;
     sdata.refresh=0;
     getSOA(i->zone,sdata);
-    if(i->last_check+sdata.refresh<time(0)) {
+    if((time_t)(i->last_check+sdata.refresh) < time(0)) {
       i->serial=sdata.serial;
       unfreshDomains->push_back(*i);
     }

diff --git a/modules/odbcbackend/Makefile.in b/modules/odbcbackend/Makefile.in
new file mode 100644 (file)
index 0000000..759a685
--- /dev/null
+++ b/modules/odbcbackend/Makefile.in
@@ -0,0 +1,25 @@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+DISTFILES=*.cc *.hh Makefile.in OBJECTFILES OBJECTLIBS
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+       @for file in $(DISTFILES); do \
+         if test -f $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           $(mkinstalldirs) "$(distdir)/$$dir"; \
+         fi; \
+         if test -d $$d/$$file; then \
+           cp -pR $$d/$$file $(distdir) \
+           || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+
+

diff --git a/modules/oraclebackend/OBJECTLIBS b/modules/oraclebackend/OBJECTLIBS
index 3c460f05a3a75a443a03acf9226edc12b0589472..e274f2177cc45d08774851b61764358169297f6d 100644 (file)
--- a/modules/oraclebackend/OBJECTLIBS
+++ b/modules/oraclebackend/OBJECTLIBS
@@ -1 +1 @@
--ldl -L/opt/oracle/lib -ldl -lclient8  -ldl -lclntst8
\ No newline at end of file
+-L/opt/oracle/lib -lclient8  -lclntst8 
\ No newline at end of file

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index e244a47091f5b8def9c9a3497614208a53278ec4..4f1dac930c19940f7e9d52973194dbdfc347adf9 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -4,7 +4,8 @@ AM_CPPFLAGS=-Ibackends/bind
 EXTRA_DIST = codedocs/Makefile codedocs/doxygen.conf docs/Makefile \
 docs/gslb-operations.sgml docs/powerdns-case.sgml docs/powerdns-install.sgml \
 docs/powerdns-overview.sgml docs/powerdns-technical.sgml  \
- release-scripts/ docs/pdns.sgml mtasker.cc 
+ release-scripts/ docs/pdns.sgml mtasker.cc \
+docs/pdns_control.8  docs/pdns_server.8 docs/zone2sql.8
 
 noinst_SCRIPTS = pdns
 sysconf_DATA = pdns.conf-dist 
@@ -30,7 +31,7 @@ backends/bind/bindparser.cc backends/bind/bindlexer.c \
 backends/bind/huffman.cc
 
 #
-pdns_server_LDFLAGS=@DYNLINKFLAGS@ @LIBDL@ @moduleobjects@ @modulelibs@ 
+pdns_server_LDFLAGS= @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ 
 pdns_server_INCLUDES=
 
 

diff --git a/pdns/docs/pdns.sgml b/pdns/docs/pdns.sgml
index 23f098ef72e3498ed10df87943ab078539f31b37..8bb1bc63cfb1cf8dc9b4e6d39ff7508c847abbdc 100644 (file)
--- a/pdns/docs/pdns.sgml
+++ b/pdns/docs/pdns.sgml
@@ -15,7 +15,7 @@
       </affiliation>
     </author>
     
-    <PubDate>v2.1 $Date: 2002/12/13 13:24:34 $</PubDate>
+    <PubDate>v2.1 $Date: 2002/12/13 15:22:33 $</PubDate>
     
     <Abstract>
        <para>  
@@ -87,7 +87,8 @@
       </para>
       <sect2 id="changelog-2-9-2"><title>Version 2.9.2</title> 
        <para>
-         Bugfixes galore. Solaris porting created some issues on all platforms. 
+         Bugfixes galore. Solaris porting created some issues on all platforms. Great news is that PowerDNS is now in Debian 'sid' (unstable). The 2.9.1
+         packages in there currently aren't very good but the 2.9.2 ones will be. Many thanks to Wichert Akkerman, our 'downstream' for making this possible.
        </para>
        <warning>
          <para>
@@ -5417,8 +5418,7 @@ GRANT ALL ON records_id_seq TO pdns;
       </para>
       <para>
        PowerDNS is currently ascertaining if this backend can be distributed in binary form without violating Oracle licensing. In the meantime, 
-       the source code to the Oracle backend is available for runtime linking into dynamic versions of PowerDNS. See 
-       <ulink url="http://downloads.powerdns.com/backends">http://downloads.powerdns.com/backends</ulink> for sources.
+       the source code to the Oracle backend is available in the pdns distribution.
       </para>
       <para>
        The following configuration settings are available: