[debian-edu-commits] debian-edu/pkg-team/ 06/13: Imported Debian patch 0.1-6

Wed Oct 1 02:59:14 UTC 2014

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

sunweaver pushed a commit to branch master
in repository ldap2bind.

commit d68b533f90581d19592d0ff9a5c5c7ac84fac218
Author: Benoit Mortier <benoit.mortier at opensides.be>
Date:   Mon Apr 26 00:16:23 2010 +0200

    Imported Debian patch 0.1-6
---
 debian/changelog                                   |  6 ++++
 debian/control                                     |  3 +-
 debian/default                                     |  4 +++
 debian/patches/00list                              |  2 +-
 .../patches/05_correct_bashisms_ldap2bind.dpatch   |  2 +-
 debian/patches/07_printf_error.dpatch              | 20 -------------
 debian/patches/10_add_transfer_notify              | 33 ++++++++++++++++++++++
 debian/rules                                       |  1 -
 debian/source/format                               |  1 +
 9 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8981541..8c5498c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ldap2zone (0.1-6) unstable; urgency=low
+
+  * Added parameters to allow notify dns protocol and zone transfer
+
+ -- Benoit Mortier <benoit.mortier at opensides.be>  Mon, 26 Apr 2010 00:16:23 +0200
+
 ldap2zone (0.1-5) unstable; urgency=low
 
   * Added missing printf patch
diff --git a/debian/control b/debian/control
index ecc9be9..37fe91e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,12 @@ Section: utils
 Priority: optional
 Maintainer: GOsa packages maintainers group <gosa-pkg at oss.gonicus.de>
 Uploaders: Cajus Pollmeier <cajus at debian.org>, Benoit Mortier <benoit.mortier at opensides.be>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Build-Depends: debhelper (>= 5.0.0), dpatch, libldap2-dev, ldap-utils
 Homepage: https://oss.gonicus.de/labs/gosa
 Vcs-Browser: https://oss.gonicus.de/repositories/goto/trunk/ldap2zone
 Vcs-Svn: https://oss.gonicus.de/repositories/goto/trunk/ldap2zone
+DM-Upload-Allowed: yes
 
 Package: ldap2zone
 Architecture: any
diff --git a/debian/default b/debian/default
index e80bbe7..4d43cc7 100644
--- a/debian/default
+++ b/debian/default
@@ -24,6 +24,10 @@ PREFIX="db."
 # Allow Updates from these networks (semicolon separated and ended)
 # DEFAULT: Don't allow updates
 #ALLOW_UPDATE="192.168.0.0/24;"
+
+# Allow Transfer to zones (semicolon separated and ended)
+# DEFAULT: Dont allow zone transfer
+#ALLOW_TRANSFER=192.168.0.0;"
 # Configuration file for automatic deployment of ldap2zone generated zones to bind
 
 # Should we run the cronjob
diff --git a/debian/patches/00list b/debian/patches/00list
index c4af9bb..a651ba1 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -4,6 +4,6 @@
 04_add_html_docs
 05_correct_bashisms_ldap2bind
 06_non_correct_zone
-07_printf_error
 08_ldapsearch
 09_program_not_found
+10_add_transfer_notify
diff --git a/debian/patches/05_correct_bashisms_ldap2bind.dpatch b/debian/patches/05_correct_bashisms_ldap2bind.dpatch
index d2eeb2a..a959802 100644
--- a/debian/patches/05_correct_bashisms_ldap2bind.dpatch
+++ b/debian/patches/05_correct_bashisms_ldap2bind.dpatch
@@ -26,7 +26,7 @@
  	result=$($rndc reload $domain 2>&1)
  	if [ $? -ne 0 ]; then
 -		echo -e "Reloading the zone '$domain' failed:\n$result" 1>&2
-+		prinf "Reloading the zone '$domain' failed:\n$result" 1>&2
++		printf "Reloading the zone '$domain' failed: $result\n" 1>&2
 +	else
 +		printf "Reloading the zone '$domain' was successful\n" 1>&2
  	fi
diff --git a/debian/patches/07_printf_error.dpatch b/debian/patches/07_printf_error.dpatch
deleted file mode 100644
index 5e7bdba..0000000
--- a/debian/patches/07_printf_error.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /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/10_add_transfer_notify b/debian/patches/10_add_transfer_notify
new file mode 100644
index 0000000..f9c898a
--- /dev/null
+++ b/debian/patches/10_add_transfer_notify
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_add_transfer_notify.dpatch by Benoit Mortier <benoit.mortier at opensides.be>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add transfer and notify option to ldap2bind
+
+ at DPATCH@
+
+--- ldap2zone-0.1.orig/ldap2bind	2010-04-26 01:02:00.000000000 +0200
++++ ldap2zone-0.1/ldap2bind.new	2010-04-26 01:13:57.000000000 +0200
+@@ -21,6 +21,11 @@
+ else ALLOW_UPDATE_PARAM=;
+ fi
+ 
++if [ "$ALLOW_TRANSFER" ]; then
++	ALLOW_TRANSFER_PARAM="allow-transfer {$ALLOW_TRANSFER}";
++else ALLOW_TRANSFER_PARAM=;
++fi
++
+ ZONES=`ldapsearch -LLL $LDAP_HOST_PARAM -x "(objectClass=dNSZone)" zoneName | grep zoneName: | sort | uniq | awk '{print $2}'`
+ ldap2zone=`which ldap2zone`
+ rndc=`which rndc`
+@@ -51,8 +56,10 @@
+ 		cat << EOF >> ${BIND_DIR}/named.conf.ldap2zone
+ zone "${domain}" {
+ 	type master;
++	notify;
+ 	file "${BIND_DIR}/${PREFIX}${domain}";
+ 	$ALLOW_UPDATE_PARAM
++	$ALLOW_TRANSFER_PARAM
+ };
+ EOF
+ 	done
diff --git a/debian/rules b/debian/rules
index 6d6967f..c3ff8ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,6 @@ clean-patched:
 	dh_testroot
 	$(MAKE) clean
 	rm -f build-stamp
-#	dh_clean
 
 patch: patch-stamp
 patch-stamp:
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0

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

