rpms/bind/F-9 bind95-rh454783.patch, NONE, 1.1 .cvsignore, 1.43, 1.44 bind.spec, 1.268, 1.269 sources, 1.52, 1.53 bind95-rh450995.patch, 1.1, NONE
Adam Tkac (atkac)
fedora-extras-commits at redhat.com
Wed Aug 6 09:59:57 UTC 2008
- Previous message (by thread): rpms/sugar/OLPC-3 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 sugar.spec, 1.16, 1.17
- Next message (by thread): 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: atkac
Update of /cvs/pkgs/rpms/bind/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32024
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-9/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore 8 Jul 2008 22:23:45 -0000 1.43
+++ .cvsignore 6 Aug 2008 09:59:26 -0000 1.44
@@ -1,4 +1,4 @@
bind-chroot.tar.bz2
config-3.tar.bz2
libbind-man.tar.gz
-bind-9.5.0-P1.tar.gz
+bind-9.5.0-P2.tar.gz
Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-9/bind.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- bind.spec 31 Jul 2008 14:56:29 -0000 1.268
+++ bind.spec 6 Aug 2008 09:59:26 -0000 1.269
@@ -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}
@@ -19,13 +20,13 @@
Name: bind
License: ISC
Version: 9.5.0
-Release: 34.1.%{PATCHVER}%{?dist}
+Release: 35.%{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
@@ -60,8 +61,8 @@
Patch87: bind-9.5-parallel-build.patch
Patch91: bind-9.5-recv-race.patch
Patch92: bind-9.5-edns.patch
-Patch93: bind95-rh450995.patch
Patch94: bind95-rh457175.patch
+Patch95: bind95-rh454783.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -176,7 +177,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
@@ -184,6 +185,7 @@
%patch5 -p1 -b .nonexec
%patch10 -p1 -b .PIE
%patch16 -p1 -b .redhat_doc
+%patch95 -p1 -b .rh454783
%if %{SDB}
mkdir bin/named-sdb
cp -r bin/named/* bin/named-sdb
@@ -242,7 +244,6 @@
%patch87 -p1 -b .parallel
%patch91 -p1 -b .recv-race
%patch92 -p1 -b .edns
-%patch93 -p1 -b .rh450995
%patch94 -p1 -b .rh457175
# Sparc and s390 arches need to use -fPIE
@@ -656,6 +657,11 @@
%{_sbindir}/bind-chroot-admin
%changelog
+* Wed Aug 06 2008 Adam Tkac <atkac redhat com> 32:9.5.0-35.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-34.1.P1
- IP acls weren't merged correctly (#457175)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-9/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources 8 Jul 2008 22:23:45 -0000 1.52
+++ sources 6 Aug 2008 09:59:26 -0000 1.53
@@ -1,4 +1,4 @@
4faa4395b955e5f8a3d50f308b9fabc8 bind-chroot.tar.bz2
d4bc7234a0d7b93328335ed9c076c6e9 config-3.tar.bz2
13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz
-a4f9dd6d205d24ec89fa4e44d8188197 bind-9.5.0-P1.tar.gz
+16c893f73a394c8cc36d7900cb9bb801 bind-9.5.0-P2.tar.gz
--- bind95-rh450995.patch DELETED ---
- Previous message (by thread): rpms/sugar/OLPC-3 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 sugar.spec, 1.16, 1.17
- Next message (by thread): 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list