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 ef813cd..2e58964 100644 --- a/unbound.spec +++ b/unbound.spec @@ -35,6 +35,7 @@ Source13: root.anchor Source14: unbound.sysconfig Source15: unbound-monthly.cron Source16: unbound-munin.README +Patch1: unbound-1.4.19-888759.patch Group: System Environment/Daemons BuildRequires: flex, openssl-devel , ldns-devel >= 1.6.13 BuildRequires: libevent-devel expat-devel @@ -109,6 +110,7 @@ Python modules and extensions for unbound %prep %setup -q +%patch1 -p1 -b .888759 %build %configure --with-ldns= --with-libevent --with-pthreads --with-ssl \ @@ -194,12 +196,10 @@ install -p %{SOURCE11} %{buildroot}%{_sysconfdir}/unbound/local.d/ %{_sbindir}/unbound-control-setup %{_sbindir}/unbound-host %{_sbindir}/unbound-streamtcp - %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* - %if %{with_python} %files python %{python_sitearch}/* @@ -271,7 +271,8 @@ exit 0 %changelog * Wed Dec 12 2012 Paul Wouters - 1.4.19-1 -- Updated to 1.4.19 - this integrates all our patches +- Updated to 1.4.19 - this integrates all existing patches +- Patch for unbound-anchor (rhbz#888759) * Fri Nov 09 2012 Paul Wouters - 1.4.18-6 - Patch to ensure stube-zone's aren't lost when using dnssec-triggerd