Update to 9.9.1

- bind99-coverity.patch merged
- bind-9.5-overflow.patch merged

Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2012-05-24 14:50:55 +02:00
parent 341c7de50d
commit 475645f00d
5 changed files with 9 additions and 52 deletions

1
.gitignore vendored
View File

@ -21,3 +21,4 @@ bind-9.7.2b1.tar.gz
/bind-9.9.0rc1.tar.gz
/bind-9.9.0rc2.tar.gz
/bind-9.9.0.tar.gz
/bind-9.9.1.tar.gz

View File

@ -1,24 +0,0 @@
diff -up bind-9.5.0a5/lib/isc/pthreads/condition.c.overflow bind-9.5.0a5/lib/isc/pthreads/condition.c
--- bind-9.5.0a5/lib/isc/pthreads/condition.c.overflow 2007-07-17 07:53:59.000000000 +0200
+++ bind-9.5.0a5/lib/isc/pthreads/condition.c 2007-07-17 07:55:08.000000000 +0200
@@ -43,7 +43,7 @@ isc_condition_waituntil(isc_condition_t
* POSIX defines a timespec's tv_sec as time_t.
*/
result = isc_time_secondsastimet(t, &ts.tv_sec);
- if (result != ISC_R_SUCCESS)
+ if (result != ISC_R_RANGE && result != ISC_R_SUCCESS)
return (result);
/*!
diff -up bind-9.5.0a5/lib/isc/unix/time.c.overflow bind-9.5.0a5/lib/isc/unix/time.c
--- bind-9.5.0a5/lib/isc/unix/time.c.overflow 2007-02-14 01:27:27.000000000 +0100
+++ bind-9.5.0a5/lib/isc/unix/time.c 2007-07-17 07:53:08.000000000 +0200
@@ -379,6 +379,9 @@ isc_time_secondsastimet(const isc_time_t
* (Let's hope the compiler got the actual test right.)
*/
UNUSED(i);
+
+ /* Means that t->seconds > maximum value in time_t and we have int time_t */
+ seconds = INT_MAX;
return (ISC_R_RANGE);
}

View File

@ -21,8 +21,8 @@
Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
Name: bind
License: ISC
Version: 9.9.0
Release: 6%{?dist}
Version: 9.9.1
Release: 1%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -54,7 +54,6 @@ Source41: setup-named-chroot.sh
Patch5: bind-nonexec.patch
Patch10: bind-9.5-PIE.patch
Patch16: bind-9.3.2-redhat_doc.patch
Patch71: bind-9.5-overflow.patch
Patch72: bind-9.5-dlz-64bit.patch
Patch87: bind-9.5-parallel-build.patch
Patch99: bind-96-libtool2.patch
@ -72,7 +71,6 @@ Patch123:bind98-rh735103.patch
Patch124:nslookup-norec.patch
Patch125:bind99-buildfix.patch
Patch127:bind99-forward.patch
Patch128:bind99-coverity.patch
Patch129:bind98-rh816164.patch
# SDB patches
@ -241,8 +239,6 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
%patch10 -p1 -b .PIE
%patch16 -p1 -b .redhat_doc
%patch104 -p1 -b .dyndb
%patch128 -p1 -b .coverity
%patch71 -p1 -b .overflow
%ifnarch alpha ia64
%patch72 -p1 -b .64bit
%endif
@ -776,6 +772,11 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
* Thu May 24 2012 Adam Tkac <atkac redhat com> 32:9.9.1-1
- update to 9.9.1
- bind99-coverity.patch merged
- bind-9.5-overflow.patch merged
* Mon May 07 2012 Adam Tkac <atkac redhat com> 32:9.9.0-6
- nslookup: return non-zero exit code when fail to get answer (#816164)

View File

@ -1,21 +0,0 @@
diff -up bind-9.9.0/bin/named/controlconf.c.coverity bind-9.9.0/bin/named/controlconf.c
--- bind-9.9.0/bin/named/controlconf.c.coverity 2012-03-05 13:57:37.665539706 +0100
+++ bind-9.9.0/bin/named/controlconf.c 2012-03-05 14:15:15.981420790 +0100
@@ -373,14 +373,9 @@ control_recvmessage(isc_task_t *task, is
if (result == ISC_R_SUCCESS)
break;
isc_mem_put(listener->mctx, secret.rstart, REGION_SIZE(secret));
- if (result == ISCCC_R_BADAUTH) {
- /*
- * For some reason, request is non-NULL when
- * isccc_cc_fromwire returns ISCCC_R_BADAUTH.
- */
- if (request != NULL)
- isccc_sexpr_free(&request);
- } else {
+ /* request can be non-NULL even in failure case */
+ isccc_sexpr_free(&request);
+ if (result != ISCCC_R_BADAUTH) {
log_invalid(&conn->ccmsg, result);
goto cleanup;
}

View File

@ -1,2 +1,2 @@
9281d0b04f711d28153ba1ab04a54026 bind-9.9.0.tar.gz
bb37c88f81e03b1d5208d238c6aa51fa bind-9.9.1.tar.gz
76857526420dc8e153ad688aeb5a2c4b config-8.tar.bz2