From b03617b2d36729d5765b7eac0f8dee1801c5ac8a1903788a881565f2ee323a8e Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 22 Jun 2010 08:45:38 +0000
Subject: [PATCH] Accepting request 41829 from network

Copy from network/bind based on submit request 41829 from user ug

OBS-URL: https://build.opensuse.org/request/show/41829
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bind?expand=0&rev=48
---
 bind-9.7.0P2.tar.gz |  3 ---
 bind-9.7.1.tar.gz   |  3 +++
 bind.changes        | 13 +++++++++++++
 bind.spec           |  8 +++-----
 dlz-dollarvar.patch | 21 ---------------------
 5 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 bind-9.7.0P2.tar.gz
 create mode 100644 bind-9.7.1.tar.gz
 delete mode 100644 dlz-dollarvar.patch

diff --git a/bind-9.7.0P2.tar.gz b/bind-9.7.0P2.tar.gz
deleted file mode 100644
index 9283148..0000000
--- a/bind-9.7.0P2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c20bfd712a4d940c531ab0ac63499640f9f133b0b54d1aa3f2eca65795f8e2f0
-size 7240336
diff --git a/bind-9.7.1.tar.gz b/bind-9.7.1.tar.gz
new file mode 100644
index 0000000..926fb34
--- /dev/null
+++ b/bind-9.7.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a720ea095f5d9fddf76571e3f39ec07f0300e1f0970330f74d340e2f8bea8c8
+size 7547503
diff --git a/bind.changes b/bind.changes
index e38f70f..438cb93 100644
--- a/bind.changes
+++ b/bind.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Jun 21 12:43:15 CEST 2010 - ug@suse.de
+
+- genrandom: add support for the generation of multiple
+  files.
+- Update empty-zones list to match
+  draft-ietf-dnsop-default-local-zones-13.
+- Incrementally write the master file after performing
+  a AXFR.
+- Add AAAA address for L.ROOT-SERVERS.NET.
+- around 50 bugs fixed (see CHANGELOG for details)
+- version 9.7.1
+
 -------------------------------------------------------------------
 Thu May 20 10:10:13 CEST 2010 - ug@suse.de
 
diff --git a/bind.spec b/bind.spec
index 5c3978d..a8d1976 100644
--- a/bind.spec
+++ b/bind.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package bind (Version 9.7.0P2)
+# spec file for package bind (Version 9.7.1)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,11 +20,11 @@
 
 Name:           bind
 %define pkg_name bind
-%define pkg_vers 9.7.0P2
+%define pkg_vers 9.7.1
 BuildRequires:  openldap2-devel
 BuildRequires:  libcap libcap-devel libmysqlclient-devel libxml2-devel openssl openssl-devel
 Summary:        Domain Name System (DNS) Server (named)
-Version:        9.7.0P2
+Version:        9.7.1
 Release:        1
 License:        BSD3c(or similar) ; MIT License (or similar)
 Group:          Productivity/Networking/DNS/Servers
@@ -46,7 +46,6 @@ Patch4:         perl-path.diff
 Patch5:         tmpfs.patch
 Patch51:        pie_compile.diff
 Patch52:        named-bootconf.diff
-Patch60:        dlz-dollarvar.patch
 Source60:       dlz-schema.txt
 %if %ul_version >= 1
 %define	VENDOR UL
@@ -225,7 +224,6 @@ Authors:
 %endif
 %patch52
 #%patch53
-%patch -P 60 -p1
 # modify settings of some files regarding to OS version and vendor
 function replaceStrings()
 {
diff --git a/dlz-dollarvar.patch b/dlz-dollarvar.patch
deleted file mode 100644
index d98fa6a..0000000
--- a/dlz-dollarvar.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.launchpad.net/ubuntu/+source/bind9/+bug/227344
-
-LDAP API does not like %.
-
---- bind-9.6.1P1/contrib/dlz/drivers/sdlz_helper.c.orig
-+++ bind-9.6.1P1/contrib/dlz/drivers/sdlz_helper.c
-@@ -166,12 +166,12 @@ build_querylist(isc_mem_t *mctx, const c
- 		ISC_LIST_APPEND(*tql, tseg, link);
- 
- 		/*
--		 * split string at the first "%". set query segment to
-+		 * split string at the first "$". set query segment to
- 		 * left portion
- 		 */
- 		tseg->sql = isc_mem_strdup(mctx,
- 					   isc_string_separate(&right_str,
--							       "%"));
-+							       "$"));
- 		if (tseg->sql == NULL) {
- 			/* no memory, clean everything up. */
- 			result = ISC_R_NOMEMORY;