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

[Paul Wouters]

commit 97c849787bcc5206437ac96358e4ca471d146286
Merge: cfcdefa 98184a5
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Aug 12 11:56:28 2013 -0400

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

 unbound-1.1-checkconf.patch            |   15 -
 unbound-1.1-scandir.patch              |   73 -
 unbound-1.2-glob.patch                 |   13 -
 unbound-1.4.12-pythonmod.patch         |   11 -
 unbound-1.4.13-edns1480.patch          |  109 --
 unbound-1.4.15-version.patch           |   49 -
 unbound-1.4.17-bug452.patch            |  100 -
 unbound-1.4.17-fips.patch              |  109 --
 unbound-1.4.18-includeglob.patch       |  265 ---
 unbound-1.4.18-openssl_threads.patch   |  104 -
 unbound-1.4.18-stub-hole.patch         |   44 -
 unbound-1.4.19-888759.patch            |   32 -
 unbound-1.4.20-streamtcp-manpage.patch |   86 +
 unbound-1.4.4-00f12c.patch             |   52 -
 unbound-1.4.4-28093c.patch             |  196 --
 unbound-1.4.4-374822.patch             |   38 -
 unbound-1.4.4-40d18f.patch             |  153 --
 unbound-1.4.4-41b631.patch             |  159 --
 unbound-1.4.4-5e989a.patch             |   51 -
 unbound-1.4.4-5f58ed.patch             |   18 -
 unbound-1.4.4-74d75e.patch             |   26 -
 unbound-1.4.4-778d4a.patch             |   77 -
 unbound-1.4.4-7f27d6.patch             |   88 -
 unbound-1.4.4-a6f07b.patch             |   62 -
 unbound-1.4.4-c2baa7.patch             |   61 -
 unbound-1.4.4-d7ef7b.patch             |  123 --
 unbound-CVE-2011-1922.patch            |   11 -
 unbound-initgroups-r1453.patch         |  105 -
 unbound-iterator.patch                 |   23 -
 unbound-lame-r1953.patch               |  348 ----
 unbound-r1657.patch                    |   66 -
 unbound-r1670.patch                    |   77 -
 unbound-r1677.patch                    |   33 -
 unbound-trunk.patch                    | 3316 --------------------------------
 unbound.spec                           |   14 +-
 35 files changed, 98 insertions(+), 6009 deletions(-)
---
diff --cc unbound.spec
index a8f92a5,9f2d5e4..629a3c5
--- 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: 16%{?dist}
 -Release: 17%{?dist}
++Release: 18%{?dist}
  License: BSD
  Url: http://www.nlnetlabs.nl/unbound/
  Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@@ -277,9 -281,12 +281,15 @@@ exit 
  /bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
  
  %changelog
- * Mon Aug 12 2013 Paul Wouters <pwouters at redhat.com> - 1.4.20-16
++* Mon Aug 12 2013 Paul Wouters <pwouters at redhat.com> - 1.4.20-18
 +- Change unbound.conf to only use ephemeral ports (32768-65535)
 +
+ * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.20-17
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Mon Jul 22 2013 Tomas Hozza <thozza at redhat.com> - 1.4.20-16
+ - provide man page for unbound-streamtcp
+ 
  * Mon Jul 08 2013 Paul Wouters <pwouters at redhat.com> - 1.4.20-15
  - Re-introduce hardening flags for full relro and pie
  - Fixes compilation failure for python module