From e0c8cdaf6a836ed746e6de9f646673c32874a8e9 Mon Sep 17 00:00:00 2001
From: Paul Wouters <paul@xelerance.com>
Date: Sun, 3 Jul 2011 18:16:09 -0400
Subject: [PATCH] * Sun Jul 03 2011 Paul Wouters <paul@xelerance.com> -
 1.4.11-1 - Updated to 1.4.11 - removed integrated CVE patch - updated stock
 unbound.conf for new options introduced

---
 .gitignore   |  1 +
 sources      |  2 ++
 unbound.spec | 15 +++++++++------
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index b6d22b2..8af834c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ unbound-1.4.5.tar.gz
 /unbound-1.4.8.tar.gz
 /unbound-1.4.9.tar.gz
 /unbound-1.4.10.tar.gz
+/unbound-1.4.11.tar.gz
diff --git a/sources b/sources
index 330c75b..804e025 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,4 @@
 7079e75210c656761d3804a9f2ac7b9f  unbound-1.4.9.tar.gz
 6bbae378db76abfe0bd72c404e484597  unbound-1.4.10.tar.gz
+b717943f424cb7a25bef4d69ef4ddf4b  unbound-1.4.11rc1.tar.gz
+8e9903dd5cba0d3501e24f55b25debbd  unbound-1.4.11.tar.gz
diff --git a/unbound.spec b/unbound.spec
index 65a4320..eb2fe0c 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -8,8 +8,8 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.4.10
-Release: 2%{?dist}
+Version: 1.4.11
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -20,7 +20,6 @@ Source4: unbound_munin_
 Source5: root.key
 Source6: dlv.isc.org.key
 Patch1: unbound-1.2-glob.patch
-Patch2: unbound-CVE-2011-1922.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,7 +29,7 @@ BuildRequires: libevent-devel expat-devel
 BuildRequires:  python-devel swig
 %endif
 # Required for SVN versions
-#BuildRequires: bison
+BuildRequires: bison
 
 
 Requires(post): chkconfig
@@ -94,11 +93,10 @@ Python modules and extensions for unbound
 %prep
 %setup -q 
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
-            --disable-rpath --enable-debug --disable-static \
+            --disable-rpath --enable-XXXdebug --disable-static \
             --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \
             --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid \
 %if %{with_python}
@@ -201,6 +199,11 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Sun Jul 03 2011 Paul Wouters <paul@xelerance.com> - 1.4.11-1
+- Updated to 1.4.11
+- removed integrated CVE patch
+- updated stock unbound.conf for new options introduced
+
 * Mon Jun 06 2011 Paul Wouters <paul@xelerance.com> - 1.4.10-1
 - Added ghost for /var/run/unbound (bz#656710)