From 038b2aa8e77bbdfc32421a08d9d6d04b00d51df6 Mon Sep 17 00:00:00 2001
From: Ruben <ruben@rubenkerkhof.com>
Date: Jan 09 2012 18:35:36 +0000
Subject: CVE-2012-0206


---

diff --git a/.gitignore b/.gitignore
index c06df21..d071bd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pdns-2.9.22.tar.gz
+/pdns-2.9.22.5.tar.gz
diff --git a/pdns-fix-postgres-detection.patch b/pdns-fix-postgres-detection.patch
index 2a21872..3c8cc45 100644
--- a/pdns-fix-postgres-detection.patch
+++ b/pdns-fix-postgres-detection.patch
@@ -1,7 +1,8 @@
-diff -up pdns-2.9.22/configure.orig pdns-2.9.22/configure
---- pdns-2.9.22/configure.orig	2010-01-14 20:40:16.000000000 +0100
-+++ pdns-2.9.22/configure	2010-01-14 20:41:13.000000000 +0100
-@@ -23298,7 +23298,7 @@ if test "${with_pgsql+set}" = set; then
+diff --git a/configure b/configure
+index 60df456..8bf578d 100755
+--- a/configure
++++ b/configure
+@@ -16644,7 +16644,7 @@ if test "${with_pgsql+set}" = set; then :
    withval=$with_pgsql; PGSQL_lib_check="$withval/lib/pgsql $with_pgsql/lib"
  	PGSQL_inc_check="$withval/include/pgsql"
  else
@@ -10,8 +11,8 @@ diff -up pdns-2.9.22/configure.orig pdns-2.9.22/configure
  	PGSQL_inc_check="/usr/local/pgsql/include/pgsql /usr/include /usr/local/include/postgresql/ /usr/local/include /opt/pgsql/include/pgsql /opt/pgsql/include /usr/include/pgsql/ /usr/include/postgresql"
  fi
  
-@@ -23318,8 +23318,7 @@ fi
- echo $ECHO_N "checking for PgSQL library directory... $ECHO_C" >&6; }
+@@ -16664,8 +16664,7 @@ fi
+ $as_echo_n "checking for PgSQL library directory... " >&6; }
  	PGSQL_libdir=
  	for m in $PGSQL_lib_check; do
 -	        if test -d "$m" && \
diff --git a/pdns.spec b/pdns.spec
index 35347ce..abce89d 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -1,7 +1,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
-Version:	2.9.22
-Release:	10%{?dist}
+Version:	2.9.22.5
+Release:	1%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -9,9 +9,8 @@ URL:		http://powerdns.com
 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}-gcc44.patch
-Patch2:		pdns-fix-postgres-detection.patch
-Patch3:		pdns-fix-crash-on-sigstop.patch
+Patch1:		pdns-fix-postgres-detection.patch
+Patch2:		pdns-fix-crash-on-sigstop.patch
 
 Requires(post):	%{_sbindir}/useradd, /sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig
@@ -83,9 +82,8 @@ This package contains the SQLite backend for %{name}
 %prep
 %setup -q
 %patch0 -p1 -b .fixinit
-%patch1 -p1 -b .gcc44
-%patch2 -p1 -b .postgres
-%patch3 -p1 -b .sigstop
+%patch1 -p1 -b .postgres
+%patch2 -p1 -b .sigstop
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -184,6 +182,9 @@ fi
 
 
 %changelog
+* Mon Jan 09 2012 Ruben Kerkhof <ruben@rubenkerkhof.com> 2.9.22.5-1
+- CVE-2012-0206
+
 * Tue Dec 14 2010 Ruben Kerkhof <ruben@rubenkerkhof.com> 2.9.22-10
 - Fix crash on SIGSTOP and SIGCONT, thanks to Anders Kaseorg (#652841)
 
diff --git a/sources b/sources
index 624e7eb..a188a46 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a6ff842733aca885577eb54e983a1ff  pdns-2.9.22.tar.gz
+449e7a8352e563c67f9d8e45c30d825e  pdns-2.9.22.5.tar.gz