heading up to rc2

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

diff --git a/pdns/config-recursor.h b/pdns/config-recursor.h
index 535b9b66c6c9f787bee80f43c336e124d549a615..7fad1c91f65cd602739c706347c64010e6089ed8 100644 (file)
--- a/pdns/config-recursor.h
+++ b/pdns/config-recursor.h
@@ -1,12 +1,4 @@
 #define SYSCONFDIR "/etc/powerdns/" 
 #define LOCALSTATEDIR "/var/run/" 
-#define VERSION "3.2-rc1"
+#define VERSION "3.2-rc2"
 #define RECURSOR
-#ifndef WIN32
-
-#if __GNUC__ == 4 &&  __GNUC_MINOR__ < 2
-#define GCC_SKIP_LOCKING
-#endif
-
-
-#endif

diff --git a/pdns/docs/pdns.sgml b/pdns/docs/pdns.sgml
index 25c4ed352a27f8ea1dca7a24f39e2a5bcab4b89d..b651b061495e5fb5ad7f2f9328b74e1ab75ac305 100644 (file)
--- a/pdns/docs/pdns.sgml
+++ b/pdns/docs/pdns.sgml
@@ -151,6 +151,27 @@
            in such a way that total memory usage will remain identical, so each thread will use half of the allocated maximum number of cache entries. 
        </para>
        </note>
+       Changes between RC1 and RC2:
+       <itemizedlist>
+         <listitem><para>
+           Compilation on Solaris 10 has been fixed (various patchlevels had different issues), code in c1522.
+         </para></listitem>
+         <listitem><para>
+           Compatibility with CentOS4/RHEL4 has been restored, the gcc and glibc versions shipped with this distribution contain a Thread Local Storage bug 
+           which we now work around. Thanks to Darren Gamble and Imre Gergely for debugging this issue, code in c1527.
+         </para></listitem>
+         <listitem><para>
+           A failed setuid operation, because of misconfiguration, would result in a crash instead of an error message. Fixed in c1523.
+         </para></listitem>
+         <listitem><para>
+           Imre Gergely discovered our rrd graphs had not been changed for the new multithreaded world, and did not allow scaling beyond 200% cpu use. In addition,
+           CPU usage graphs did not add up correctly. Implemented in c1524.
+         </para></listitem>
+          <listitem><para>
+           Andreas Jakum discovered the description of 'max-packetcache-entries' and 'forward-zones-recurse' was wrong in the output of '--help' and '--config'. 
+           In addition, some stray backup files made it into the RC1 release. Addressed in c1529.
+         </para></listitem>
+       </itemizedlist>
        Improvements:
          <itemizedlist>
            <listitem>

diff --git a/pdns/pdns-recursor.spec b/pdns/pdns-recursor.spec
index 637375bc0b3f2190ef667fdb4458d83f2f2fc2e2..d3a23cbbdbb780728a2dbfb856762cf6c4593fca 100644 (file)
--- a/pdns/pdns-recursor.spec
+++ b/pdns/pdns-recursor.spec
@@ -2,7 +2,7 @@
 
 Buildroot: /tmp/pdns/
 Name: pdns-recursor
-Version: 3.2rc1
+Version: 3.2rc2
 Release: 1
 Summary: extremely powerful and versatile recursing nameserver
 License: GPL