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

[Paul Wouters]

commit a4760670b64ca0b386eb4e39df4b778513c95487
Merge: c52f55a d05d213
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri May 31 23:56:35 2013 -0400

    Merge branch 'f19' into f18
    
    Conflicts:
    	unbound.spec

 unbound-1.4.20-roundrobin.patch |   12 ++++++++++++
 unbound.conf                    |    4 ++--
 unbound.service                 |    4 +++-
 unbound.spec                    |   18 ++++++++++++------
 4 files changed, 29 insertions(+), 9 deletions(-)
---
diff --cc unbound.spec
index 69da192,1061c77..f5d9c19
--- a/unbound.spec
+++ b/unbound.spec
@@@ -11,7 -11,7 +11,7 @@@
  Summary: Validating, recursive, and caching DNS(SEC) resolver
  Name: unbound
  Version: 1.4.20
- Release: 1%{?dist}
 -Release: 9%{?dist}
++Release: 2%{?dist}
  License: BSD
  Url: http://www.nlnetlabs.nl/unbound/
  Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@@ -279,7 -280,18 +280,12 @@@ exit 
  /bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
  
  %changelog
 -* Fri May 31 2013 Paul Wouters <pwouters at redhat.com> - 1.4.20-9
++* Fri May 31 2013 Paul Wouters <pwouters at redhat.com> - 1.4.20-2
+ - Enable round-robin (with noths() patch)
+ - Use /var/lib/unbound/root.key (more consistent with other distros)
+ - Enable minimal responses
+ 
 -* Mon Apr 22 2013 Paul Wouters <pwouters at redhat.com> - 1.4.20-8
 -- Refix
 -
 -* Fri Apr 19 2013 Paul Wouters <pwouters at redhat.com> - 1.4.20-7
 -- Fix for the runuser command in post (rhbz#953337)
 -
 -* 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