[unbound/f18: 20/21] Merge branch 'master' into f18

[Paul Wouters]

commit d86affcddfac67ace97e8789e5d9983116e2f1a2
Merge: ee7f373 41fd112
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Apr 8 17:28:45 2013 -0400

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	sources
    	unbound.spec

 .gitignore              |    1 +
 sources                 |    2 +-
 unbound-monthly.cron    |    2 +-
 unbound-rootkey.service |   14 --------------
 unbound.conf            |    2 +-
 unbound.service         |    2 +-
 unbound.spec            |   29 +++++++++++++++++++++--------
 unbound.sysconfig       |    2 +-
 8 files changed, 27 insertions(+), 27 deletions(-)
---
diff --cc unbound.spec
index 70f5290,e5e8246..64011b4
--- a/unbound.spec
+++ b/unbound.spec
@@@ -270,13 -278,29 +278,18 @@@ 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
+ - 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
+ - Move cronjob for root.anchor from unbound to unbound-libs, require crontabs
+ 
 -* 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
 +* Wed Dec 19 2012 Paul Wouters <pwouters at redhat.com> - 1.4.19-1
 +- Updated to 1.4.19, which incorporates all our patches
  - Patch for unbound-anchor (rhbz#888759)
  
 -* 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
 +* Fri Nov 09 2012 Paul Wouters <pwouters at redhat.com> - 1.4.18-5
  - Patch to allow wildcards in include: statements
- - Patch to ensure stube-zone's are lost when using dnssec-triggerd
  - Add directories /etc/unbound/keys.d,conf.d,local.d with
    example entries
  - Added /etc/unbound/root.anchor, maintained by unbound-anchor