summaryrefslogtreecommitdiffstats
path: root/bind.spec
diff options
context:
space:
mode:
authorTomas Hozza <thozza@redhat.com>2013-10-29 15:18:12 +0100
committerTomas Hozza <thozza@redhat.com>2013-10-29 15:18:12 +0100
commitc159c7865275aafa522f1752a0328a4e51a5cfec (patch)
tree8d89bb2884b74ebc3e96349a0c4a9415a3a43401 /bind.spec
parenta556cfb3e4dd91fa30876a3a00f62d6e4c09c1f2 (diff)
parent48fc9b39c5a3022b42a321e963350eace6f07926 (diff)
downloadbind-c159c7865275aafa522f1752a0328a4e51a5cfec.tar.gz
bind-c159c7865275aafa522f1752a0328a4e51a5cfec.tar.xz
bind-c159c7865275aafa522f1752a0328a4e51a5cfec.zip
Merge branch 'master' into f20
Diffstat (limited to 'bind.spec')
-rw-r--r--bind.spec9
1 files changed, 6 insertions, 3 deletions
diff --git a/bind.spec b/bind.spec
index cf76487..865b3c7 100644
--- a/bind.spec
+++ b/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: 3%{?PATCHVER}%{?PREVER}%{?dist}
+Release: 4%{?PATCHVER}%{?PREVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,8 +82,8 @@ Patch137:bind99-rrl.patch
# Install dns/update.h header for bind-dyndb-ldap plugin
Patch138:bind-9.9.3-include-update-h.patch
Patch139:bind99-ISC-Bugs-34738.patch
-# reported upstream -> [ISC-Bugs #34870]
-Patch140:bind99-ISC-Bugs-34870.patch
+# upstream patch [ISC-Bugs #34870]
+Patch140:bind99-ISC-Bugs-34870-v2.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -787,6 +787,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Tue Oct 29 2013 Tomas Hozza <thozza@redhat.com> 32:9.9.4-4
+- Use upstream version of patch for previously fixed #794940
+
* Fri Oct 18 2013 Tomas Hozza <thozza@redhat.com> 32:9.9.4-3
- Fix race condition on send buffers in dighost.c (#794940)