diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | bind-9.3.2b2-sdbsrc.patch | 9 | ||||
| -rw-r--r-- | bind-96-db_unregister.patch | 13 | ||||
| -rw-r--r-- | bind.spec | 18 | ||||
| -rw-r--r-- | bind96-rh507469.patch | 14 | ||||
| -rw-r--r-- | sources | 2 |
6 files changed, 12 insertions, 46 deletions
@@ -1,2 +1,2 @@ config-4.tar.bz2 -bind-9.6.1-P3.tar.gz +bind-9.6.2.tar.gz diff --git a/bind-9.3.2b2-sdbsrc.patch b/bind-9.3.2b2-sdbsrc.patch index 04525ce..bd0ed32 100644 --- a/bind-9.3.2b2-sdbsrc.patch +++ b/bind-9.3.2b2-sdbsrc.patch @@ -241,12 +241,3 @@ void addrdata(dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) { unsigned char namearray[DNS_NAME_MAXTEXT + 1]; -@@ -165,7 +172,7 @@ - check_result(result, "isc_mem_create"); - - result = isc_entropy_create(mctx, &ectx); -- result_check (result, "isc_entropy_create"); -+ check_result (result, "isc_entropy_create"); - - result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE); - check_result (result, "isc_hash_create"); diff --git a/bind-96-db_unregister.patch b/bind-96-db_unregister.patch deleted file mode 100644 index fcea84b..0000000 --- a/bind-96-db_unregister.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/dns/db.c b/lib/dns/db.c -index a4c2864..62f461c 100644 ---- a/lib/dns/db.c -+++ b/lib/dns/db.c -@@ -860,6 +860,8 @@ dns_db_unregister(dns_dbimplementation_t **dbimp) { - isc_mem_put(mctx, imp, sizeof(dns_dbimplementation_t)); - isc_mem_detach(&mctx); - RWUNLOCK(&implock, isc_rwlocktype_write); -+ -+ *dbimp = NULL; - } - - isc_result_t @@ -2,11 +2,11 @@ # Red Hat BIND package .spec file # -%define PATCHVER P3 +#%define PATCHVER P3 #%define PREVER rc1 #%define VERSION %{version} #%define VERSION %{version}-%{PATCHVER} -%define VERSION %{version}-%{PATCHVER} +%define VERSION %{version} %{?!SDB: %define SDB 1} %{?!test: %define test 0} @@ -19,8 +19,8 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server Name: bind License: ISC -Version: 9.6.1 -Release: 10.%{PATCHVER}%{?dist} +Version: 9.6.2 +Release: 1%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,7 +53,6 @@ Patch99: bind-96-libtool2.patch Patch101:bind-96-old-api.patch Patch102:bind-95-rh452060.patch Patch106:bind93-rh490837.patch -Patch107:bind96-rh507469.patch Patch108:bind96-rh549284.patch # SDB patches @@ -64,7 +63,6 @@ Patch62: bind-9.5-sdb-sqlite-bld.patch # needs inpection Patch17: bind-9.3.2b1-fix_sdb_ldap.patch Patch104: bind-96-dyndb.patch -Patch105: bind-96-db_unregister.patch # IDN paches Patch73: bind-9.5-libidn.patch @@ -172,7 +170,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 -%patch105 -p1 -b .db_unregister %if %{SDB} %patch101 -p1 -b .old-api mkdir bin/named-sdb @@ -220,7 +217,6 @@ mkdir m4 %patch102 -p1 -b .rh452060 %patch106 -p0 -b .rh490837 -%patch107 -p1 -b .rh507469 %patch108 -p1 -b .rh549284 # Sparc and s390 arches need to use -fPIE @@ -589,6 +585,12 @@ rm -rf ${RPM_BUILD_ROOT} %ghost %{chroot_prefix}/etc/localtime %changelog +* Fri Mar 12 2010 Adam Tkac <atkac redhat com> 32:9.6.2-1 +- update to 9.6.2 +- patches merged + - bind-96-db_unregister.patch + - bind96-rh507469.patch + * Wed Jan 27 2010 Adam Tkac <atkac redhat com> 32:9.6.1-10.P3 - revert the "DEBUG" feature (#510283), it causes too many problems (#545128) diff --git a/bind96-rh507469.patch b/bind96-rh507469.patch deleted file mode 100644 index 84719fa..0000000 --- a/bind96-rh507469.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up bind-9.6.1/bin/dig/dighost.c.rh507469 bind-9.6.1/bin/dig/dighost.c ---- bind-9.6.1/bin/dig/dighost.c.rh507469 2009-06-23 15:52:08.974779538 +0200 -+++ bind-9.6.1/bin/dig/dighost.c 2009-06-23 15:54:19.934977907 +0200 -@@ -1064,7 +1064,9 @@ setup_system(void) { - debug("ndots is %d.", ndots); - } - -- copy_server_list(lwconf, &server_list); -+ /* If user doesn't specify server use nameservers from resolv.conf */ -+ if (ISC_LIST_EMPTY(server_list)) -+ copy_server_list(lwconf, &server_list); - - /* If we don't find a nameserver fall back to localhost */ - if (ISC_LIST_EMPTY(server_list)) { @@ -1,2 +1,2 @@ de68e10e91e05ab100be879b5bcaa6cb config-4.tar.bz2 -a0952d589b3051538033387be4c983f9 bind-9.6.1-P3.tar.gz +e3054a98a55095c666d73177908d63c6 bind-9.6.2.tar.gz |