[unbound/f14] * Wed Sep 21 2011 Paul Wouters <paul at xelerance.com> - 1.4.13-1 - Upgraded to 1.4.13 - Removed merged

[Paul Wouters]

commit 15fee211f329a6d05b38c8b7ede19495890c7b4d
Author: Paul Wouters <paul at xelerance.com>
Date:   Wed Sep 21 15:06:11 2011 -0400

    * Wed Sep 21 2011 Paul Wouters <paul at xelerance.com> - 1.4.13-1
    - Upgraded to 1.4.13
    - Removed merged in pythonmod patch
    - Added EDNS1480 patch to fix unbound on broken EDNS/UDP networks
    - Updated unbound.conf with commented out new option tcp-upstream:

 unbound.conf |    4 ++++
 unbound.spec |   16 +++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/unbound.conf b/unbound.conf
index 5d73c55..ae7e406 100644
--- a/unbound.conf
+++ b/unbound.conf
@@ -153,6 +153,10 @@ server:
 	# Enable TCP, "yes" or "no".
 	# do-tcp: yes
 
+	# upstream connections use TCP only (and no UDP), "yes" or "no"
+	# useful for tunneling scenarios, default no.
+	# tcp-upstream: no
+
 	# Detach from the terminal, run in background, "yes" or "no".
 	# do-daemonize: yes
 
diff --git a/unbound.spec b/unbound.spec
index a210e64..bd05a18 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -8,7 +8,7 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.4.12
+Version: 1.4.13
 Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
@@ -20,7 +20,7 @@ Source4: unbound_munin_
 Source5: root.key
 Source6: dlv.isc.org.key
 Patch1: unbound-1.2-glob.patch
-Patch2: unbound-1.4.12-pythonmod.patch
+Patch2: unbound-1.4.13-edns1480.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -127,7 +127,7 @@ install -m 0644 %{SOURCE5} %{SOURCE6} %{buildroot}%{_sysconfdir}/unbound/
 # remove static library from install (fedora packaging guidelines)
 rm %{buildroot}%{_libdir}/*.la
 %if %{with_python}
-rm %{buildroot}%{python_sitelib}/*.la
+rm %{buildroot}%{python_sitearch}/*.la
 %endif
 
 mkdir -p %{buildroot}%{_localstatedir}/run/unbound
@@ -149,8 +149,8 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %if %{with_python}
 %files python
-%attr(0644,root,root) %{python_sitelib}/*
-%{python_sitelib}/*
+%attr(0644,root,root) %{python_sitearch}/*
+%{python_sitearch}/*
 %doc libunbound/python/examples/*
 %doc pythonmod/examples/*
 %endif
@@ -202,6 +202,12 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 21 2011 Paul Wouters <paul at xelerance.com> - 1.4.13-1
+- Upgraded to 1.4.13
+- Removed merged in pythonmod patch
+- Added EDNS1480 patch to fix unbound on broken EDNS/UDP networks
+- Updated unbound.conf with commented out new option tcp-upstream:
+
 * Mon Aug 08 2011 Paul Wouters <paul at xelerance.com> - 1.4.12-1
 - Updated to 1.4.12
 - Updated stock unbound.conf for new options introduced