diff --git a/.gitignore b/.gitignore index fe3e5f8..4d28634 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ bind-9.7.2b1.tar.gz /bind-9.8.1-P1.tar.gz /bind-9.8.2b1.tar.gz /bind-9.8.2rc1.tar.gz +/bind-9.8.2.tar.gz diff --git a/bind-9.5-overflow.patch b/bind-9.5-overflow.patch deleted file mode 100644 index 34b7bed..0000000 --- a/bind-9.5-overflow.patch +++ /dev/null @@ -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); - } diff --git a/bind.spec b/bind.spec index 951213c..5c19665 100644 --- a/bind.spec +++ b/bind.spec @@ -2,11 +2,11 @@ # Red Hat BIND package .spec file # -#%define VERSION %{version} #%define VERSION %{version}-%{PATCHVER} #%define PATCHVER P1 -%define VERSION %{version}%{PREVER} -%define PREVER rc1 +#%define VERSION %{version}%{PREVER} +#%define PREVER rc2 +%define VERSION %{version} %{?!SDB: %define SDB 1} %{?!test: %define test 0} @@ -22,7 +22,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.8.2 -Release: 0.2.%{PREVER}%{?dist} +Release: 1%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -50,7 +50,6 @@ Source36: trusted-key.key 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 @@ -264,7 +263,6 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools %if %{SDB} %patch62 -p1 -b .sdb-sqlite-bld %endif -%patch71 -p1 -b .overflow %ifnarch alpha ia64 %patch72 -p1 -b .64bit %endif @@ -761,6 +759,10 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Tue Apr 24 2012 Adam Tkac 32:9.8.2-1 +- update to 9.8.2 +- bind-9.5-overflow.patch is no longer needed + * Mon Jan 23 2012 Adam Tkac 32:9.8.2-0.2.rc1 - update to 9.8.2rc1 diff --git a/sources b/sources index 4834d40..5203d61 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +9d92bed18795a35ebe629f715cf41353 bind-9.8.2.tar.gz 76857526420dc8e153ad688aeb5a2c4b config-8.tar.bz2 -919e20996750808c2e68b3a3f4040aef bind-9.8.2rc1.tar.gz