diff --git a/.gitignore b/.gitignore index d96c1ce..4a509ec 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ bind-9.7.2b1.tar.gz /bind-9.8.1rc1.tar.gz /bind-9.8.1.tar.gz /bind-9.8.1-P1.tar.gz +/bind-9.8.2b1.tar.gz diff --git a/bind-9.5-dlz-64bit.patch b/bind-9.5-dlz-64bit.patch index 3e06577..2b0014a 100644 --- a/bind-9.5-dlz-64bit.patch +++ b/bind-9.5-dlz-64bit.patch @@ -27,20 +27,6 @@ diff -up bind-9.5.1b1/contrib/dlz/config.dlz.in.64bit bind-9.5.1b1/contrib/dlz/c else mysql_lib=$d/lib fi -@@ -274,11 +281,11 @@ case "$use_dlz_bdb" in - bdb_libnames="db42 db-4.2 db41 db-4.1 db" - for d in $bdb_libnames - do -- if test -f "$dd/lib/lib${d}.so" -+ if test -f "$dd/${target_lib}/lib${d}.so" - then - if test "$dd" != "/usr" - then -- dlz_bdb_libs="-L${dd}/lib " -+ dlz_bdb_libs="-L${dd}/${target_lib} " - else - dlz_bdb_libs="" - fi @@ -383,7 +390,7 @@ case "$use_dlz_ldap" in *) DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver, diff --git a/bind.spec b/bind.spec index 87ee6bd..e741f6f 100644 --- a/bind.spec +++ b/bind.spec @@ -2,11 +2,11 @@ # Red Hat BIND package .spec file # -#%define PREVER rc1 -#%define VERSION %{version}%{PREVER} #%define VERSION %{version} -%define VERSION %{version}-%{PATCHVER} -%define PATCHVER P1 +#%define VERSION %{version}-%{PATCHVER} +#%define PATCHVER P1 +%define VERSION %{version}%{PREVER} +%define PREVER b1 %{?!SDB: %define SDB 1} %{?!test: %define test 0} @@ -21,8 +21,8 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server Name: bind License: ISC -Version: 9.8.1 -Release: 4.%{PATCHVER}%{?dist} +Version: 9.8.2 +Release: 0.1.%{PREVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,7 +65,6 @@ Patch112:bind97-rh645544.patch Patch117:bind98-rh725741.patch Patch118:bind97-rh699951.patch Patch119:bind97-rh693982.patch -Patch120:bind97-rh700097.patch Patch121:bind97-rh714049.patch Patch122:bind98-dlz_buildfix.patch Patch123:bind98-rh735103.patch @@ -288,7 +287,6 @@ mkdir m4 %patch112 -p1 -b .rh645544 %patch118 -p1 -b .rh699951 %patch119 -p1 -b .rh693982 -%patch120 -p1 -b .rh700097 %patch121 -p1 -b .rh714049 %patch122 -p1 -b .dlz_buildfix %patch123 -p1 -b .rh735103 @@ -763,6 +761,11 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Wed Dec 14 2011 Adam Tkac 32:9.8.2-0.1.b1 +- update to 9.8.2b1 +- patches merged + - bind97-rh700097.patch + * Wed Dec 07 2011 Adam Tkac 32:9.8.1-4.P1 - ship dns/forward.h in -devel subpkg diff --git a/bind97-rh700097.patch b/bind97-rh700097.patch deleted file mode 100644 index 60db2af..0000000 --- a/bind97-rh700097.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up bind-9.7.3-P3/bin/nsupdate/nsupdate.c.rh700097 bind-9.7.3-P3/bin/nsupdate/nsupdate.c ---- bind-9.7.3-P3/bin/nsupdate/nsupdate.c.rh700097 2011-08-12 16:24:18.730205763 +0200 -+++ bind-9.7.3-P3/bin/nsupdate/nsupdate.c 2011-08-12 16:24:27.833205103 +0200 -@@ -2298,6 +2298,7 @@ recvsoa(isc_task_t *task, isc_event_t *e - dns_message_destroy(&soaquery); - ddebug("Out of recvsoa"); - done_update(); -+ seenerror = ISC_TRUE; - return; - } - diff --git a/bind98-dlz_buildfix.patch b/bind98-dlz_buildfix.patch index dc44919..5d718a8 100644 --- a/bind98-dlz_buildfix.patch +++ b/bind98-dlz_buildfix.patch @@ -11,15 +11,4 @@ diff -up bind-9.8.1rc1/bin/tests/system/Makefile.in.dlz_buildfix bind-9.8.1rc1/b TARGETS = @BIND9_MAKE_RULES@ -diff -up bind-9.8.1rc1/contrib/dlz/drivers/sdlz_helper.c.dlz_buildfix bind-9.8.1rc1/contrib/dlz/drivers/sdlz_helper.c ---- bind-9.8.1rc1/contrib/dlz/drivers/sdlz_helper.c.dlz_buildfix 2010-05-14 08:29:37.000000000 +0200 -+++ bind-9.8.1rc1/contrib/dlz/drivers/sdlz_helper.c 2011-08-31 16:53:47.736468453 +0200 -@@ -50,7 +50,7 @@ - * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - --#ifdef DLZ -+#ifdef CONTRIB_DLZ - - #include diff --git a/sources b/sources index 00b25b5..ee9e850 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 76857526420dc8e153ad688aeb5a2c4b config-8.tar.bz2 -afa41f8203d50bedad65071f9b6f96d7 bind-9.8.1-P1.tar.gz +34c65009a023e1e60d9f5d2c19d19f01 bind-9.8.2b1.tar.gz