From c61a563321b5dc65c60a5d1ce5c72b4eac667ebb2a08009e80cfc70e4abae072 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Wed, 3 Aug 2011 14:09:08 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/bind revision
 67.0

OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=20b08d2f06a5b3973a78780597820b73
---
 bind.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bind.spec b/bind.spec
index b443e6b..7157d18 100644
--- a/bind.spec
+++ b/bind.spec
@@ -27,7 +27,7 @@ BuildRequires:  update-desktop-files
 BuildRequires:  krb5-devel
 Summary:        Domain Name System (DNS) Server (named)
 Version:        9.8.0P4
-Release:        2
+Release:        1
 License:        BSD3c(or similar) ; MIT License (or similar)
 Group:          Productivity/Networking/DNS/Servers
 Provides:       dns_daemon bind8 bind9
@@ -49,7 +49,7 @@ Patch5:         tmpfs.patch
 Patch51:        pie_compile.diff
 Patch52:        named-bootconf.diff
 Patch54:        named-direct-proc-mount.diff
-patch100:      configure.in.diff2
+Patch100:       configure.in.diff2
 Source60:       dlz-schema.txt
 %if %ul_version >= 1
 %define	VENDOR UL

From 184ce3adffb60aa090608a15bb1a0fb422d5559884424f28fffd3705d204ed8c Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <ralf@h4kamp.de>
Date: Thu, 1 Sep 2011 09:58:02 +0000
Subject: [PATCH 2/2] Accepting request 80345 from home:rhafer:branches:network

bnc#710430

OBS-URL: https://build.opensuse.org/request/show/80345
OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=60
---
 bind.changes            |  6 ++++++
 bind.spec               |  2 ++
 ldapdump-allow-uri.diff | 12 ++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 ldapdump-allow-uri.diff

diff --git a/bind.changes b/bind.changes
index 15fc182..484cf9e 100644
--- a/bind.changes
+++ b/bind.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 31 09:36:54 UTC 2011 - rhafer@suse.de
+
+- Fixed the ldapdump tool to also respect the "uri" setting in
+  /etc/openldap/ldap.conf (bnc#710430)
+
 -------------------------------------------------------------------
 Tue Jul  5 15:24:10 CEST 2011 - ug@suse.de
 
diff --git a/bind.spec b/bind.spec
index 7157d18..d8eb1ab 100644
--- a/bind.spec
+++ b/bind.spec
@@ -46,6 +46,7 @@ Patch1:         Makefile.in.diff
 Patch2:         pid-path.diff
 Patch4:         perl-path.diff
 Patch5:         tmpfs.patch
+Patch6:         ldapdump-allow-uri.diff
 Patch51:        pie_compile.diff
 Patch52:        named-bootconf.diff
 Patch54:        named-direct-proc-mount.diff
@@ -225,6 +226,7 @@ Authors:
 %patch2 -p0
 %patch4 -p0
 %patch5 -p0
+%patch6 -p1
 #%patch50
 %if 0%{?suse_version} >= 1000
 %patch51
diff --git a/ldapdump-allow-uri.diff b/ldapdump-allow-uri.diff
new file mode 100644
index 0000000..edc62f9
--- /dev/null
+++ b/ldapdump-allow-uri.diff
@@ -0,0 +1,12 @@
+Index: bind-9.6-ESVR4P3/vendor-files/tools/ldapdump
+===================================================================
+--- bind-9.6-ESVR4P3.orig/vendor-files/tools/ldapdump
++++ bind-9.6-ESVR4P3/vendor-files/tools/ldapdump
+@@ -622,6 +622,7 @@ sub getLDAPConfigServer {
+     my $data;
+     open( FILE, "< /etc/openldap/ldap.conf" ) or die "unable to open /etc/openldap/ldap.conf. $!";
+     while(<FILE>) {
++        if ( /^uri\s+([^\s]*)\s*/i ) { $data = $1; last }
+         if ( /^host\s+([^\s]*)\s*/i ) { $data = $1; last }
+     }
+     close(FILE);