[unbound/f18: 5/5] Merge branch 'f19' into f18

[Paul Wouters]

commit c52f55aaca756627175903cf7d3cb95b48151d12
Merge: bacb3da 9ab98dd
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Apr 17 00:05:00 2013 -0400

    Merge branch 'f19' into f18

 unbound-monthly.cron |    3 --
 unbound.cron         |    3 ++
 unbound.spec         |   87 ++++++++++++++++++++++++++++++-------------------
 3 files changed, 56 insertions(+), 37 deletions(-)
---
diff --cc unbound.spec
index 64011b4,a2a0274..69da192
--- a/unbound.spec
+++ b/unbound.spec
@@@ -14,7 -11,7 +11,7 @@@
  Summary: Validating, recursive, and caching DNS(SEC) resolver
  Name: unbound
  Version: 1.4.20
- Release: 2%{?dist}
 -Release: 6%{?dist}
++Release: 1%{?dist}
  License: BSD
  Url: http://www.nlnetlabs.nl/unbound/
  Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@@ -278,17 -279,35 +279,35 @@@ exit 
  /bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
  
  %changelog
- * Mon Apr 8 2013 Paul Wouters <pwouters at redhat.com> - 1.4.20-2
 -* Tue Apr 16 2013 Paul Wouters <pwouters at redhat.com> - 1.4.20-6
++* Tue Apr 16 2013 Paul Wouters <pwouters at redhat.com> - 1.4.20-1
  - Updated to 1.4.20
+ - Build with full RELRO (not use -z,relro but with -z,relo,-z,now)
+ - Fixup man page for unbound-control-setup
+ - unbound.service should start before nss-lookup.target (rhbz#919955)
  - Removed patch for rhbz#888759 merged in upstream
- - Move root.anchor to /var/lib/unbound to make selinux policy easier for updating
+ - Move root.anchor to /var/lib/unbound to make selinux policy easier for updating (rhbz#896599/rhbz#891008)
  - Move cronjob for root.anchor from unbound to unbound-libs, require crontabs
+ - /etc/unbound (and all) should be owned by unbound-libs (rhbz#909691)
+ - Remove Obsolete/Provides for dnssec-conf which was last seen in f13
+ - Ensure any unbound-anchor failure in post is ignored
+ - Use install -p to prevent .rpmnew files that are identical to originals
  
- * Wed Dec 19 2012 Paul Wouters <pwouters at redhat.com> - 1.4.19-1
- - Updated to 1.4.19, which incorporates all our patches
+ * Tue Mar 05 2013 Adam Tkac <atkac redhat com> - 1.4.19-5
+ - build with full RELRO
+ - symlink unbound-control-setup.8 manpage to unbound-control.8
+ 
+ * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.19-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Wed Dec 12 2012 Paul Wouters <pwouters at redhat.com> - 1.4.19-3
+ - Updated to 1.4.19 - this integrates all existing patches
  - Patch for unbound-anchor (rhbz#888759)
  
- * Fri Nov 09 2012 Paul Wouters <pwouters at redhat.com> - 1.4.18-5
+ * Fri Nov 09 2012 Paul Wouters <pwouters at redhat.com> - 1.4.18-6
+ - Patch to ensure stube-zone's aren't lost when using dnssec-triggerd
+ - added unbound-munin.README file
+ 
+ * Wed Sep 26 2012 Paul Wouters <pwouters at redhat.com> - 1.4.18-5
  - Patch to allow wildcards in include: statements
  - Add directories /etc/unbound/keys.d,conf.d,local.d with
    example entries