[debian-edu-commits] debian-edu/pkg-team/ 05/13: Imported Debian patch 0.1-5

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository ldap2bind.

commit 4b2abbf24ccf1a8a6c3b0229cd75d9f7bf506f96
Author: Benoit Mortier <benoit.mortier at opensides.be>
Date:   Sun Nov 15 13:34:49 2009 +0100

    Imported Debian patch 0.1-5
---
 debian/README.debian                       | 10 +++++++++-
 debian/changelog                           |  6 ++++++
 debian/control                             |  2 +-
 debian/doc-base                            |  2 +-
 debian/patches/00list                      |  3 +++
 debian/patches/07_printf_error.dpatch      | 20 ++++++++++++++++++++
 debian/patches/08_ldapsearch.dpatch        | 24 ++++++++++++++++++++++++
 debian/patches/09_program_not_found.dpatch | 25 +++++++++++++++++++++++++
 8 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/debian/README.debian b/debian/README.debian
index c3303d7..909f9b4 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -1,7 +1,15 @@
 ldap2zone for Debian
 --------------------
 
-This program extract dns record from ldap and create zone files for bind9
+This program extract dns record from ldap and create zone files for bind9.
+
+If you want your zone definitions to be automatically created :
+
+- Create an empty named.conf.ldap2zone in /etc/bind
+
+- Add this line to /etc/bind/named.conf.local
+
+include "/etc/bind/named.conf.ldap2zone";
 
 Cajus Pollmeier <cajus at debian.org>, Thu, 17 Mar 2005 09:05:17 +0100
 ldap2zone for Debian
diff --git a/debian/changelog b/debian/changelog
index f602d65..8981541 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ldap2zone (0.1-5) unstable; urgency=low
+
+  * Added missing printf patch
+
+ -- Benoit Mortier <benoit.mortier at opensides.be>  Sun, 15 Nov 2009 13:34:49 +0100
+
 ldap2zone (0.1-4) unstable; urgency=low
 
   * FTBFS with binutils-gold (Closes: #555077)
diff --git a/debian/control b/debian/control
index 0176fe7..ecc9be9 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Svn: https://oss.gonicus.de/repositories/goto/trunk/ldap2zone
 
 Package: ldap2zone
 Architecture: any
-Depends: ${shlibs:Depends}, bind9
+Depends: ${misc:Depends}, ${shlibs:Depends}, bind9
 Conflicts: ldapdns, ldap2dns
 Description: Extract DNS zones from LDAP trees
  This is a tool that reads info for a zone from LDAP and constructs
diff --git a/debian/doc-base b/debian/doc-base
index a014fae..c4b9a75 100644
--- a/debian/doc-base
+++ b/debian/doc-base
@@ -1,6 +1,6 @@
 Document: ldap2zone
 Title: ldap2zone howto
-Section: Programming/PHP
+Section: System/Administration
 
 Format: HTML
 Index: /usr/share/doc/ldap2zone/dnszonehowto.html
diff --git a/debian/patches/00list b/debian/patches/00list
index f43ebd3..c4af9bb 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -4,3 +4,6 @@
 04_add_html_docs
 05_correct_bashisms_ldap2bind
 06_non_correct_zone
+07_printf_error
+08_ldapsearch
+09_program_not_found
diff --git a/debian/patches/07_printf_error.dpatch b/debian/patches/07_printf_error.dpatch
new file mode 100644
index 0000000..5e7bdba
--- /dev/null
+++ b/debian/patches/07_printf_error.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_printf_error.dpatch by  <benoit.mortier at opensides.be>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: printf error patch
+
+ at DPATCH@
+
+--- ldap2zone-0.1.orig/ldap2bind
++++ ldap2zone-0.1/newldap2bind
+@@ -61,7 +61,7 @@
+ 
+ 	result=$($rndc reload $domain 2>&1)
+ 	if [ $? -ne 0 ]; then
+-		prinf "Reloading the zone '$domain' failed:\n$result" 1>&2
++		printf "Reloading the zone '$domain' failed:\n$result" 1>&2
+ 	else
+ 		printf "Reloading the zone '$domain' was successful\n" 1>&2
+ 	fi
+
diff --git a/debian/patches/08_ldapsearch.dpatch b/debian/patches/08_ldapsearch.dpatch
new file mode 100644
index 0000000..699b577
--- /dev/null
+++ b/debian/patches/08_ldapsearch.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_ldapsearch.dpatch by  <benoit.mortier at opensides.be>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: test if ldapsearch exist
+
+ at DPATCH@
+
+--- ldap2zone-0.1.orig/ldap2bind
++++ ldap2zone-0.1/newldap2bind
+@@ -8,6 +8,12 @@
+  esac
+ 
+ LDAPSEARCH=`which ldapsearch`
++
++if [ -z "${LDAPSEARCH}" ]; then
++        echo "ldapsearch program not in $PATH. Exiting..."
++        exit 1
++fi
++
+ LDAP_URI_PARAM=${LDAP_URI:+"-H $LDAP_URI"}
+ 
+ if [ "$ALLOW_UPDATE" ]; then
+
diff --git a/debian/patches/09_program_not_found.dpatch b/debian/patches/09_program_not_found.dpatch
new file mode 100644
index 0000000..12dee61
--- /dev/null
+++ b/debian/patches/09_program_not_found.dpatch
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_program_not_found.dpatch by  <benoit.mortier at opensides.be>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: change from utility to program
+
+ at DPATCH@
+
+--- ldap2zone-0.1.orig/ldap2bind
++++ ldap2zone-0.1/newldap2bind
+@@ -25,12 +25,12 @@
+ fi
+ 
+ if [ -z "${rndc}" ]; then
+-	echo "rndc utilty not in $PATH. Exiting..."
++	echo "rndc program not in $PATH. Exiting..."
+ 	exit 1
+ fi
+ 
+ if [ -z "${ldap2zone}" ]; then
+-	echo "ldap2zone utilty not in $PATH. Exiting..."
++	echo "ldap2zone program not in $PATH. Exiting..."
+ 	exit 1
+ fi
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/ldap2bind.git