diff --git a/SOURCES/bind99-rh1647539.patch b/SOURCES/bind99-rh1647539.patch new file mode 100644 index 0000000..5e02852 --- /dev/null +++ b/SOURCES/bind99-rh1647539.patch @@ -0,0 +1,28 @@ +From 89293e44e0d022463b03a92a30b3790d4569bd50 Mon Sep 17 00:00:00 2001 +From: Mark Andrews +Date: Thu, 20 Feb 2014 23:04:54 +1100 +Subject: [PATCH] 3752. [bug] Address potential REQUIRE failure if + DNS_STYLEFLAG_COMMENTDATA is set when printing out + a rdataset. + +(cherry picked from commit 86856f4f3069bb2d75851b56401ffde18f41198f) +--- + lib/dns/masterdump.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c +index 80fcd4c12d..58dcd3de3e 100644 +--- a/lib/dns/masterdump.c ++++ b/lib/dns/masterdump.c +@@ -451,7 +451,7 @@ rdataset_totext(dns_rdataset_t *rdataset, + * Comment? + */ + if ((ctx->style.flags & DNS_STYLEFLAG_COMMENTDATA) != 0) +- isc_buffer_putstr(target, ";"); ++ RETERR(str_totext(";", target)); + + /* + * Owner name. +-- +2.14.5 + diff --git a/SPECS/bind.spec b/SPECS/bind.spec index 124de49..48f91b1 100644 --- a/SPECS/bind.spec +++ b/SPECS/bind.spec @@ -26,7 +26,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.9.4 -Release: 72%{?PATCHVER}%{?PREVER}%{?dist} +Release: 73%{?PATCHVER}%{?PREVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -173,6 +173,7 @@ Patch196: bind99-rh1549130.patch # commit cb735b3f902d4bb5f6e30328d5828d38efa63573 Patch197: bind99-rh1549130-2.patch Patch198: bind99-CVE-2018-5740.patch +Patch199: bind99-rh1647539.patch # Native PKCS#11 functionality from 9.10 Patch150:bind-9.9-allow_external_dnskey.patch @@ -498,6 +499,7 @@ tar -xf %{SOURCE48} -C bin/tests/system/geoip/data %patch196 -p1 -b .rh1549130 %patch197 -p1 -b .rh1549130-2 %patch198 -p1 -b .CVE-2018-5740 +%patch199 -p1 -b .rh1647539 # Override upstream builtin keys cp -fp %{SOURCE29} bind.keys @@ -1205,6 +1207,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Fri Nov 23 2018 Petr Menšík - 32:9.9.4-73 +- Fixes debug level comments (#1647539) + * Thu Sep 20 2018 Petr Menšík - 32:9.9.4-72 - Fix automatic selinux boolean named_write_master_zones (#1569466) - Allow starting named with readonly home again