[unbound: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/unbound

[Paul Wouters]

commit 5f65c3ce7c4135c41edd1ae9b085e2af8c0b1840
Merge: 035078b 79ada29
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Mar 13 21:47:40 2014 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/unbound
    
    Conflicts:
    	unbound.spec

 ...segfault_caused_by_i_with_module_iterator.patch |  122 ++++++++++++++++++++
 unbound.spec                                       |    3 +
 2 files changed, 125 insertions(+), 0 deletions(-)
---
diff --cc unbound.spec
index 895b8bf,4da623a..342210d
--- a/unbound.spec
+++ b/unbound.spec
@@@ -279,10 -283,9 +279,13 @@@ exit 
  /bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
  
  %changelog
 +* Thu Mar 13 2014 Paul Wouters <pwouters at redhat.com> - 1.4.22-1
 +- Updated to 1.4.22
 +- No longer requires the ldns library
 +
+ * Thu Jan 16 2014 Tomas Hozza <thozza at redhat.com> - 1.4.21-3
+ - Fix segfault on adding insecure forward zone when using only iterator (#1054192)
+ 
  * Mon Oct 21 2013 Tomas Hozza <thozza at redhat.com> - 1.4.21-2
  - run test suite during the build