From 136c5eb82226c7d372fba334bacc7fbf92a43342 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Fri, 3 Aug 2012 15:38:16 -0400
Subject: [PATCH] * Fri Aug 03 2012 Paul Wouters <pwouters@redhat.com> -
 1.4.18-1 - Updated to 1.4.18 (FIPS related fixes mostly) - Removed patches
 that were merged in upstream

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

diff --git a/.gitignore b/.gitignore
index 9b0760b..e7afb3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ unbound-1.4.5.tar.gz
 /unbound-1.4.15.tar.gz
 /unbound-1.4.16.tar.gz
 /unbound-1.4.17.tar.gz
+/unbound-1.4.18.tar.gz
diff --git a/sources b/sources
index afbebfb..33188b2 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 812d49064a78c92765970a1364736da7  unbound-1.4.17.tar.gz
+2cad65b6a2d08bb6e0210ea92156ca4b  unbound-1.4.18.tar.gz
diff --git a/unbound.spec b/unbound.spec
index f7fd655..0c8e5a3 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -13,8 +13,8 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.4.17
-Release: 5%{?dist}
+Version: 1.4.18
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -27,8 +27,6 @@ Source6: dlv.isc.org.key
 Source7: unbound-keygen.service
 Source8: tmpfiles-unbound.conf
 Patch1: unbound-1.2-glob.patch
-Patch2: unbound-1.4.17-fips.patch
-Patch3: unbound-1.4.17-bug452.patch
 Group: System Environment/Daemons
 BuildRequires: flex, openssl-devel , ldns-devel >= 1.5.0, 
 BuildRequires: libevent-devel expat-devel
@@ -104,8 +102,6 @@ Python modules and extensions for unbound
 %prep
 %setup -q 
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
@@ -249,6 +245,10 @@ fi
 /bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
 
 %changelog
+* Fri Aug 03 2012 Paul Wouters <pwouters@redhat.com> - 1.4.18-1
+- Updated to 1.4.18 (FIPS related fixes mostly)
+- Removed patches that were merged in upstream
+
 * Mon Jul 23 2012 Paul Wouters <pwouters@redhat.com> - 1.4.17-5
 - Fix for unbound crasher (upstream bug #452)
 - Support libunbound functions in man pages and place in -devel