rpms/bind/F-8 bind95-rh454783.patch, NONE, 1.1 .cvsignore, 1.42, 1.43 bind.spec, 1.250, 1.251 sources, 1.51, 1.52 bind95-rh450995.patch, 1.1, NONE

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6415

Modified Files:
	.cvsignore bind.spec sources 
Added Files:
	bind95-rh454783.patch 
Removed Files:
	bind95-rh450995.patch 
Log Message:
- 9.5.0-P2 release
  - bind95-rh450995.patch was merged
- disable transfer stats on DLZ zones (#454783)


bind95-rh454783.patch:

--- NEW FILE bind95-rh454783.patch ---
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);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	8 Jul 2008 22:14:21 -0000	1.42
+++ .cvsignore	6 Aug 2008 10:01:39 -0000	1.43
@@ -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


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/bind.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- bind.spec	31 Jul 2008 14:56:00 -0000	1.250
+++ bind.spec	6 Aug 2008 10:01:39 -0000	1.251
@@ -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 @@
 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 @@
 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 @@
 Based on the code from Jan "Yenya" Kasprzak <kas at 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 @@
 %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 @@
 %patch83 -p1 -b .libidn2
 %patch85 -p1 -b .libidn3
 %patch88 -p1 -b .recv-race
-%patch89 -p1 -b .rh450995
 %patch90 -p1 -b .rh457175
 :;
 
@@ -669,6 +670,11 @@
 %{_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)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	8 Jul 2008 22:14:22 -0000	1.51
+++ sources	6 Aug 2008 10:01:39 -0000	1.52
@@ -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


--- bind95-rh450995.patch DELETED ---