summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@fedoraproject.org>2010-03-26 14:40:10 +0000
committerAdam Tkac <atkac@fedoraproject.org>2010-03-26 14:40:10 +0000
commitb360005238f5216028fc4ca175b0ef3968ef53fa (patch)
tree6303ef25e77f0a467da633a64018c0e28b27b169
parentbc36826f0df657219e6cfa771e77c373554bd89e (diff)
downloadbind-b360005238f5216028fc4ca175b0ef3968ef53fa.tar.gz
bind-b360005238f5216028fc4ca175b0ef3968ef53fa.tar.xz
bind-b360005238f5216028fc4ca175b0ef3968ef53fa.zip
- added lost patch for #554316 (occasional crash in keytable.c)bind-9_7_0-9_P1_fc14
-rw-r--r--bind.spec7
-rw-r--r--bind97-rh554316.patch20
2 files changed, 26 insertions, 1 deletions
diff --git a/bind.spec b/bind.spec
index 00b80b3..b9ff41e 100644
--- a/bind.spec
+++ b/bind.spec
@@ -21,7 +21,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: ISC
Version: 9.7.0
-Release: 8.%{PATCHVER}%{?dist}
+Release: 9.%{PATCHVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +60,7 @@ Patch107:bind97-dist-pkcs11.patch
Patch108:bind97-managed-keyfile.patch
Patch109:bind97-rh478718.patch
Patch110:bind97-rh507429.patch
+Patch111:bind97-rh554316.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -243,6 +244,7 @@ mkdir m4
%patch107 -p1 -b .dist-pkcs11
%patch109 -p1 -b .rh478718
%patch110 -p1 -b .rh507429
+%patch111 -p1 -b .rh554316
# Sparc and s390 arches need to use -fPIE
%ifarch sparcv9 sparc64 s390 s390x
@@ -666,6 +668,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Fri Mar 26 2010 Adam Tkac <atkac redhat com> 32:9.7.0-9.P1
+- added lost patch for #554316 (occasional crash in keytable.c)
+
* Fri Mar 26 2010 Adam Tkac <atkac redhat com> 32:9.7.0-8.P1
- active query might be destroyed in resume_dslookup() which triggered REQUIRE
failure (#507429)
diff --git a/bind97-rh554316.patch b/bind97-rh554316.patch
new file mode 100644
index 0000000..161cdb0
--- /dev/null
+++ b/bind97-rh554316.patch
@@ -0,0 +1,20 @@
+diff -up bind-9.7.0-P1/lib/dns/validator.c.rh554316 bind-9.7.0-P1/lib/dns/validator.c
+--- bind-9.7.0-P1/lib/dns/validator.c.rh554316 2010-02-25 06:26:27.000000000 +0100
++++ bind-9.7.0-P1/lib/dns/validator.c 2010-03-26 15:37:56.113969498 +0100
+@@ -2211,7 +2211,7 @@ validatezonekey(dns_validator_t *val) {
+ result == ISC_R_SUCCESS;
+ result = dns_rdataset_next(val->event->sigrdataset))
+ {
+- dns_keynode_t *keynode = NULL, *nextnode = NULL;
++ dns_keynode_t *keynode = NULL;
+
+ dns_rdata_reset(&sigrdata);
+ dns_rdataset_current(val->event->sigrdataset,
+@@ -2231,6 +2231,7 @@ validatezonekey(dns_validator_t *val) {
+ result == ISC_R_SUCCESS)
+ atsep = ISC_TRUE;
+ while (result == ISC_R_SUCCESS) {
++ dns_keynode_t *nextnode = NULL;
+ dstkey = dns_keynode_key(keynode);
+ if (dstkey == NULL) {
+ dns_keytable_detachkeynode(