[unbound/f17: 16/16] Merge branch 'master' into f17

[Paul Wouters]

commit 1787648bf94ad1c8b5244817fc7886612917540e
Merge: 8d43a3d 8580858
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Jul 25 11:14:58 2012 -0400

    Merge branch 'master' into f17
    
    Conflicts:
    	unbound.spec

 unbound-1.4.17-bug452.patch |  104 +++++++++++++++++++++++++++++++++++++++++++
 unbound.spec                |   26 ++++++++++-
 2 files changed, 128 insertions(+), 2 deletions(-)
---
diff --cc unbound.spec
index fb029d6,f7fd655..aa5ffdf
--- a/unbound.spec
+++ b/unbound.spec
@@@ -14,7 -14,7 +14,7 @@@
  Summary: Validating, recursive, and caching DNS(SEC) resolver
  Name: unbound
  Version: 1.4.17
- Release: 1%{?dist}
 -Release: 5%{?dist}
++Release: 2%{?dist}
  License: BSD
  Url: http://www.nlnetlabs.nl/unbound/
  Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@@ -232,11 -249,27 +249,16 @@@ f
  /bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
  
  %changelog
 -* Mon Jul 23 2012 Paul Wouters <pwouters at redhat.com> - 1.4.17-5
 -- Fix for unbound crasher (upstream bug #452)
 -- Support libunbound functions in man pages and place in -devel
 -
 -* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.17-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
 -* Tue Jul 03 2012 Paul Wouters <pwouters at redhat.com> - 1.4.17-3
 +* Tue Jul 17 2012 Paul Wouters <pwouters at redhat.com> - 1.4.17-1
  - unbound FIPS patches for MD5,randomness (rhbz#835106)
 -
 -* Fri Jun 15 2012 Adam Tkac <atkac redhat com> - 1.4.17-2
  - don't build unbound-munin on RHEL
 -
 -* Thu May 24 2012 Paul Wouters <pwouters at redhat.com> - 1.4.17-1
  - Updated to 1.4.17 (which mostly brings in patches we already
    applied from svn trunk)
 -
 -* Wed Feb 29 2012 Paul Wouters <pwouters at redhat.com> - 1.4.16-3 
++- Fix for unbound crasher (upstream bug #452)
++- Support libunbound functions in man pages and place in -devel
++- Includes unbound-streamtcp (for monitoring)
+ - Since the daemon links to the libs staticly, add Requires:
+   (this is rhbz#745288)
 -- Package up streamtcp as unbound-streamtcp (for monitoring)
  
  * Mon Feb 27 2012 Paul Wouters <pwouters at redhat.com> - 1.4.16-2
  - Don't ghost the directory (rhbz#788805)