diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | bind.spec | 20 | ||||
| -rw-r--r-- | bind95-rh450995.patch | 11 | ||||
| -rw-r--r-- | bind95-rh454783.patch | 50 | ||||
| -rw-r--r-- | sources | 2 |
5 files changed, 65 insertions, 20 deletions
@@ -1,4 +1,4 @@ -bind-9.5.0-P1.tar.gz +bind-9.5.0-P2.tar.gz config-2.tar bind-chroot.tar.bz2 libbind-man.tar.gz @@ -2,7 +2,8 @@ # Red Hat BIND package .spec file # -%define PATCHVER P1 +%define PATCHVER P2 +%define VERSION %{version}-%{PATCHVER} %define _default_patch_fuzz 2 %{?!SDB: %define SDB 1} @@ -21,13 +22,13 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.5.0 -Release: 28.1.%{PATCHVER}%{?dist} +Release: 29.%{PATCHVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Group: System Environment/Daemons # -Source: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}-%{PATCHVER}.tar.gz +Source: ftp://ftp.isc.org/isc/bind9/%{VERSION}/bind-%{VERSION}.tar.gz Source1: named.sysconfig Source2: named.init Source3: named.logrotate @@ -62,8 +63,8 @@ Patch71: bind-9.5-overflow.patch Patch72: bind-9.5-dlz-64bit.patch Patch80: bind-9.5-edns.patch Patch88: bind-9.5-recv-race.patch -Patch89: bind95-rh450995.patch Patch90: bind95-rh457175.patch +Patch91: bind95-rh454783.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -186,7 +187,7 @@ chroot(2) jail for the named(8) program from the BIND package. Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz> %prep -%setup -q -n %{name}-%{version}-%{PATCHVER} +%setup -q -n %{name}-%{VERSION} # Common patches %patch0 -p1 -b .varrun @@ -196,6 +197,7 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz> %patch10 -p1 -b .PIE %patch16 -p1 -b .redhat_doc %patch80 -p1 -b .edns +%patch91 -p1 -b .rh454783 %if %{SDB} mkdir bin/named-sdb cp -r bin/named/* bin/named-sdb @@ -252,7 +254,6 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named %patch83 -p1 -b .libidn2 %patch85 -p1 -b .libidn3 %patch88 -p1 -b .recv-race -%patch89 -p1 -b .rh450995 %patch90 -p1 -b .rh457175 :; @@ -410,7 +411,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int echo '@ in soa localhost. root 1 3H 15M 1W 1D ns localhost.' > sample/var/named/$f; done -/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.250 2008/07/31 14:56:00 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ +/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.251 2008/08/06 10:01:39 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ *\ * NOTE: you only need to create this file if it is to\ * differ from the following default contents: @@ -669,6 +670,11 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/bind-chroot-admin %changelog +* Wed Aug 05 2008 Adam Tkac <atkac redhat com> 32:9.5.0-29.P2 +- 9.5.0-P2 release + - bind95-rh450995.patch was merged +- disable transfer stats on DLZ zones (#454783) + * Thu Jul 31 2008 Adam Tkac <atkac redhat com> 32:9.5.0-28.1.P1 - IP acls weren't merged correctly (#457175) diff --git a/bind95-rh450995.patch b/bind95-rh450995.patch deleted file mode 100644 index d8f7115..0000000 --- a/bind95-rh450995.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up bind-9.5.0/lib/isccfg/aclconf.c.450995 bind-9.5.0/lib/isccfg/aclconf.c ---- bind-9.5.0/lib/isccfg/aclconf.c.450995 2008-06-18 12:29:05.000000000 +0200 -+++ bind-9.5.0/lib/isccfg/aclconf.c 2008-06-18 12:30:01.000000000 +0200 -@@ -287,6 +287,7 @@ nested_acl: - } else { - dns_acl_merge(dacl, inneracl, - ISC_TF(!neg)); -+ de += inneracl->length; /* elements added */ - dns_acl_detach(&inneracl); - continue; - } diff --git a/bind95-rh454783.patch b/bind95-rh454783.patch new file mode 100644 index 0000000..f2f332a --- /dev/null +++ b/bind95-rh454783.patch @@ -0,0 +1,50 @@ +diff -up bind-9.5.0-P1/bin/named/xfrout.c.rh454783 bind-9.5.0-P1/bin/named-sdb/xfrout.c +--- bind-9.5.0-P1/bin/named/xfrout.c.rh454783 2008-08-05 12:50:44.000000000 +0200 ++++ bind-9.5.0-P1/bin/named/xfrout.c 2008-08-05 12:57:54.000000000 +0200 +@@ -829,7 +829,9 @@ typedef struct { + dns_name_t *qname; /* Question name of request */ + dns_rdatatype_t qtype; /* dns_rdatatype_{a,i}xfr */ + dns_rdataclass_t qclass; ++#ifndef DLZ + dns_zone_t *zone; /* (necessary for stats) */ ++#endif + dns_db_t *db; + dns_dbversion_t *ver; + isc_quota_t *quota; +@@ -1330,10 +1332,14 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_cl + xfr->qname = qname; + xfr->qtype = qtype; + xfr->qclass = qclass; ++#ifndef DLZ + xfr->zone = NULL; ++#endif + xfr->db = NULL; + xfr->ver = NULL; ++#ifndef DLZ + dns_zone_attach(zone, &xfr->zone); ++#endif + dns_db_attach(db, &xfr->db); + dns_db_attachversion(db, ver, &xfr->ver); + xfr->end_of_stream = ISC_FALSE; +@@ -1709,8 +1715,10 @@ xfrout_ctx_destroy(xfrout_ctx_t **xfrp) + isc_quota_detach(&xfr->quota); + if (xfr->ver != NULL) + dns_db_closeversion(xfr->db, &xfr->ver, ISC_FALSE); ++#ifndef DLZ + if (xfr->zone != NULL) + dns_zone_detach(&xfr->zone); ++#endif + if (xfr->db != NULL) + dns_db_detach(&xfr->db); + +@@ -1744,7 +1752,10 @@ xfrout_senddone(isc_task_t *task, isc_ev + sendstream(xfr); + } else { + /* End of zone transfer stream. */ ++#ifndef DLZ ++ /* XXX DLZ zones doesn't support stats */ + inc_stats(xfr->zone, dns_nsstatscounter_xfrdone); ++#endif + xfrout_log(xfr, ISC_LOG_INFO, "%s ended", xfr->mnemonic); + ns_client_next(xfr->client, ISC_R_SUCCESS); + xfrout_ctx_destroy(&xfr); @@ -1,4 +1,4 @@ -a4f9dd6d205d24ec89fa4e44d8188197 bind-9.5.0-P1.tar.gz +16c893f73a394c8cc36d7900cb9bb801 bind-9.5.0-P2.tar.gz 9c3905b6aece5b4aa0deba6029437483 config-2.tar 4faa4395b955e5f8a3d50f308b9fabc8 bind-chroot.tar.bz2 13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz |