From 6d7184e9c8b6fcf5bb360a482beb4c55e91994a1 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Mon, 8 Apr 2013 10:52:51 -0400
Subject: [PATCH 1/3] * move root.anchor to /var/lib/unbound

---
 unbound.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/unbound.spec b/unbound.spec
index ea9739d..47124ad 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -14,7 +14,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.4.20
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -154,8 +154,10 @@ install -m 0755 streamtcp %{buildroot}%{_sbindir}/unbound-streamtcp
 mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d/
 install -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/tmpfiles.d/unbound.conf
 
-# install root and DLV key
+# install root and DLV key - we keep a copy of the root key in old location,
+# in case user has changed the configuration and we wouldn't update it there
 install -m 0644 %{SOURCE5} %{SOURCE6} %{SOURCE13} %{buildroot}%{_sysconfdir}/unbound/
+install -m 0644 %{SOURCE13} %{buildroot}%{_libdir}/unbound/
 
 # remove static library from install (fedora packaging guidelines)
 rm %{buildroot}%{_libdir}/*.la
@@ -228,6 +230,7 @@ ln -s %{_mandir}/man8/unbound-control.8 %{buildroot}/%{_mandir}/man8/unbound-con
 %{_libdir}/libunbound.so.*
 %{_sysconfdir}/%{name}/icannbundle.pem
 %{_sysconfdir}/cron.monthly/unbound-anchor
+%attr(0644,root,root) %config(noreplace) %{_libdir}/%{name}/root.anchor
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/root.anchor
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/root.key
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/dlv.isc.org.key
@@ -273,7 +276,7 @@ exit 0
 /bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
 
 %changelog
-* Thu Mar 21 2013 Paul Wouters <pwouters@redhat.com> - 1.4.20-1
+* Thu Mar 21 2013 Paul Wouters <pwouters@redhat.com> - 1.4.20-2
 - Updated to 1.4.20
 - Removed patch for rhbz#888759 merged in upstream
 

From f2c4fe0294666be3437b2f7da155b33e65e51515 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Mon, 8 Apr 2013 10:53:49 -0400
Subject: [PATCH 2/3] * update changelog

---
 unbound.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/unbound.spec b/unbound.spec
index 47124ad..0e5ce4e 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -276,9 +276,10 @@ exit 0
 /bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
 
 %changelog
-* Thu Mar 21 2013 Paul Wouters <pwouters@redhat.com> - 1.4.20-2
+* Mon Apr 8 2013 Paul Wouters <pwouters@redhat.com> - 1.4.20-2
 - Updated to 1.4.20
 - Removed patch for rhbz#888759 merged in upstream
+- Move root.anchor to /var/lib/unbound to make selinux policy easier for updating
 
 * Tue Mar 05 2013 Adam Tkac <atkac redhat com> - 1.4.19-5
 - build with full RELRO

From 34289517d1c0aa772925857ed64e3e536be2db72 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Mon, 8 Apr 2013 10:54:03 -0400
Subject: [PATCH 3/3] update sources

---
 sources | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sources b/sources
index cc00c74..9435d03 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-39f121e1921c7b5ad2f05a4d756a0487  unbound-1.4.19.tar.gz
 1f2d0b490fd7928a708a326beda21948  unbound-1.4.20.tar.gz