[unbound/el6] * Wed Dec 21 2012 Paul Wouters <pwouters at redhat.com> - 1.4.19-1 - Updated to 1.4.19 - this integrate

[Paul Wouters]

commit 3bd83f34de7a49a2433aca377307fd3db6cee916
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Dec 21 10:29:26 2012 -0500

    * Wed Dec 21 2012 Paul Wouters <pwouters at redhat.com> - 1.4.19-1
    - Updated to 1.4.19 - this integrates all existing patches
    - Patch for unbound-anchor (rhbz#888759)

 unbound-1.4.19-888759.patch |   32 ++++++++++++++++++++++++++++++++
 unbound.spec                |   34 +++++++++++++++++-----------------
 2 files changed, 49 insertions(+), 17 deletions(-)
---
diff --git a/unbound-1.4.19-888759.patch b/unbound-1.4.19-888759.patch
new file mode 100644
index 0000000..bc86810
--- /dev/null
+++ b/unbound-1.4.19-888759.patch
@@ -0,0 +1,32 @@
+diff -Naur unbound-1.4.19-orig/smallapp/unbound-anchor.c unbound-1.4.19/smallapp/unbound-anchor.c
+--- unbound-1.4.19-orig/smallapp/unbound-anchor.c	2012-10-30 11:13:53.000000000 -0400
++++ unbound-1.4.19/smallapp/unbound-anchor.c	2012-12-20 13:18:11.048256192 -0500
+@@ -1503,6 +1503,20 @@
+ 	}
+ }
+ 
++/* Stop the parser when an entity declaration is encountered. For safety. */
++static void
++xml_entitydeclhandler(void *userData,
++	const XML_Char *ATTR_UNUSED(entityName),
++	int ATTR_UNUSED(is_parameter_entity),
++	const XML_Char *ATTR_UNUSED(value), int ATTR_UNUSED(value_length),
++	const XML_Char *ATTR_UNUSED(base),
++	const XML_Char *ATTR_UNUSED(systemId),
++	const XML_Char *ATTR_UNUSED(publicId),
++	const XML_Char *ATTR_UNUSED(notationName))
++{
++	XML_StopParser((XML_Parser)userData, XML_FALSE);
++}
++
+ /**
+  * XML parser setup of the callbacks for the tags
+  */
+@@ -1531,6 +1545,7 @@
+ 		if(verb) printf("out of memory\n");
+ 		exit(0);
+ 	}
++	XML_SetEntityDeclHandler(parser, xml_entitydeclhandler);
+ 	XML_SetElementHandler(parser, xml_startelem, xml_endelem);
+ 	XML_SetCharacterDataHandler(parser, xml_charhandle);
+ }
diff --git a/unbound.spec b/unbound.spec
index 05ab1e5..cb44d3c 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -7,8 +7,8 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.4.18
-Release: 5%{?dist}
+Version: 1.4.19
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -26,17 +26,16 @@ Source12: icannbundle.pem
 Source13: root.anchor
 Source14: unbound.sysconfig
 Source15: unbound-monthly.cron
-
-Patch1: unbound-1.2-glob.patch
-Patch2: unbound-1.4.18-openssl_threads.patch
-Patch3: unbound-1.4.18-includeglob.patch
-Patch4: unbound-1.4.18-stub-hole.patch
+Source16: unbound-munin.README
+Patch1: unbound-1.4.19-888759.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel , ldns-devel >= 1.6.13, 
 BuildRequires: libevent-devel expat-devel
+# Needed because /usr/sbin/unbound links unbound libs staticly
 Requires: %{name}-libs = %{version}-%{release}
+
 %if %{with_python}
 BuildRequires:  python-devel swig
 %endif
@@ -102,10 +101,7 @@ Python modules and extensions for unbound
 
 %prep
 %setup -q 
-%patch1 -p1
-%patch2 -p0
-%patch3 -p1
-%patch4 -p0
+%patch1 -p1 -b .888759
 
 %build
 %configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
@@ -123,8 +119,8 @@ Python modules and extensions for unbound
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 install -d 0755 %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/sysconfig
-install -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/unbound
-install -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/unbound
+install -p -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/unbound
+install -p -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/unbound
 install -p -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/unbound
 install -p -m 0644 %{SOURCE14}  %{buildroot}%{_sysconfdir}/sysconfig/unbound
 install -d 0755 %{buildroot}%{_sysconfdir}/cron.monthly
@@ -132,18 +128,18 @@ install -p -m 0755 %{SOURCE15}   %{buildroot}%{_sysconfdir}/cron.monthly/unbound
 
 # Install munin plugin and its softlinks
 install -d 0755 %{buildroot}%{_sysconfdir}/munin/plugin-conf.d
-install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/munin/plugin-conf.d/unbound
+install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/munin/plugin-conf.d/unbound
 install -d 0755 %{buildroot}%{_datadir}/munin/plugins/
-install -m 0755 %{SOURCE4} %{buildroot}%{_datadir}/munin/plugins/unbound
+install -p -m 0755 %{SOURCE4} %{buildroot}%{_datadir}/munin/plugins/unbound
 for plugin in unbound_munin_hits unbound_munin_queue unbound_munin_memory unbound_munin_by_type unbound_munin_by_class unbound_munin_by_opcode unbound_munin_by_rcode unbound_munin_by_flags unbound_munin_histogram; do
     ln -s unbound %{buildroot}%{_datadir}/munin/plugins/$plugin
 done 
 
 # install streamtcp used for monitoring / debugging unbound's port 80/443 modes
-install -m 0755 streamtcp %{buildroot}%{_sbindir}/unbound-streamtcp
+install -p -m 0755 streamtcp %{buildroot}%{_sbindir}/unbound-streamtcp
 
 # install root and DLV key
-install -m 0644 %{SOURCE5} %{SOURCE6} %{SOURCE13} %{buildroot}%{_sysconfdir}/unbound/
+install -p -m 0644 %{SOURCE5} %{SOURCE6} %{SOURCE13} %{buildroot}%{_sysconfdir}/unbound/
 
 # remove static library from install (fedora packaging guidelines)
 rm -rf %{buildroot}%{_libdir}/*.la
@@ -255,6 +251,10 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Dec 21 2012 Paul Wouters <pwouters at redhat.com> - 1.4.19-1
+- Updated to 1.4.19 - this integrates all existing patches
+- Patch for unbound-anchor (rhbz#888759)
+
 * Wed Nov 14 2012 Paul Wouters <pwouters at redhat.com> - 1.4.18-5
 - Patch to allow wildcards in include: statements
 - Patch to ensure stub-zone's aren't lost when reconfiguring forwarder