[debian-edu-commits] debian-edu/pkg-team/ 10/13: Imported Debian patch 0.2-1
Mike Gabriel
sunweaver at debian.org
Wed Oct 1 02:59:15 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 10338431d3cd8672d45cf56ea0990797311370cd
Merge: 325ae3b e474670
Author: Benoit Mortier <benoit.mortier at opensides.be>
Date: Fri May 27 18:52:11 2011 +0100
Imported Debian patch 0.2-1
Makefile | 14 +-
changelog | 3 +
debian/README.debian | 6 -
debian/README.source | 2 -
debian/changelog | 14 +-
debian/compat | 1 -
debian/control | 22 +--
debian/copyright | 12 --
debian/cron.d | 4 -
debian/default | 35 +---
debian/dirs | 3 -
debian/install | 12 +-
debian/ldap2zone.lintian-overrides | 4 -
debian/ldap2zone.manpages | 3 +-
debian/patches/00list | 9 -
debian/patches/01_makefile.dpatch | 19 --
debian/patches/02_old_ldap_libs.dpatch | 34 ----
debian/patches/03_original_changelog.dpatch | 14 --
debian/patches/04_add_html_docs.dpatch | 213 ---------------------
.../patches/05_correct_bashisms_ldap2bind.dpatch | 33 ----
debian/patches/06_non_correct_zone.dpatch | 23 ---
debian/patches/08_ldapsearch.dpatch | 24 ---
debian/patches/09_program_not_found.dpatch | 25 ---
debian/patches/10_add_transfer_notify | 33 ----
debian/rules | 104 +---------
debian/source/format | 2 +-
dnszonehowto.html | 202 +++++++++++++++++++
ldap2bind | 56 ++++--
ldap2zone.c | 42 ++--
29 files changed, 303 insertions(+), 665 deletions(-)
diff --cc debian/README.debian
index 909f9b4,0000000..53a4ef6
mode 100644,000000..100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@@ -1,20 -1,0 +1,14 @@@
+ldap2zone for Debian
+--------------------
+
+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
- --------------------
-
- This program extract dns record from ldap and create zone files
-
- Cajus Pollmeier <cajus at debian.org>, Thu, 17 Mar 2005 09:05:17 +0100
diff --cc debian/changelog
index c1ed177,0000000..726d110
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,55 -1,0 +1,57 @@@
++ldap2zone (0.2-1) unstable; urgency=low
++
++ * Converted to format 3.0 quilt
++ * Corrected semicolon missing in update and transfer parameter
++ * Make notify an optional argument
++
++ -- Benoit Mortier <benoit.mortier at opensides.be> Fri, 27 May 2011 18:52:11 +0100
++
+ldap2zone (0.1-8) unstable; urgency=low
+
+ * Added manpage for ldap2bind provided by Andreas B. Mundt
+
+ -- Cajus Pollmeier <cajus at debian.org> Tue, 17 May 2011 09:00:17 +0200
+
+ldap2zone (0.1-7) unstable; urgency=low
+
+ * Corrected error in notify dns statement breaking the program
+
+ -- Benoit Mortier <benoit.mortier at opensides.be> Wed, 09 Jun 2010 12:50:28 +0200
+
+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
+
+ -- 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)
+
+ -- Benoit Mortier <benoit.mortier at opensides.be> Sun, 08 Nov 2009 15:27:55 +0100
+
+ldap2zone (0.1-3) unstable; urgency=low
+
+ * ldap2bind incorrectly looks for rndc and ldap2zone (Closes: #544855)
+ * correct bashism in /bin/sh script (Closes: #547749)
+
+ -- Benoit Mortier <benoit.mortier at opensides.be> Tue, 20 Oct 2009 00:39:24 +0200
+
+ldap2zone (0.1-2) unstable; urgency=low
+
+ * Converted to new ldap api (Closes: #540293)
+ * Corrected binary-arch target (Closes: #540673)
+
+ -- Cajus Pollmeier <cajus at debian.org> Wed, 12 Aug 2009 02:34:00 +0200
+
+ldap2zone (0.1-1) unstable; urgency=low
+
+ * Initial upload (Closes: #532665)
+
+ -- Cajus Pollmeier <cajus at debian.org> Wed, 24 Jun 2009 10:02:00 +0200
- ldap2zone (0.1-1) unstable; urgency=low
-
- * Initial upload (Closes: #532665)
- * Include cron script
-
- -- Cajus Pollmeier <cajus at debian.org> Wed, 24 Jun 2009 10:02:00 +0200
diff --cc debian/compat
index fd3c81a,0000000..7ed6ff8
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,2 -1,0 +1,1 @@@
+5
- 5
diff --cc debian/control
index 37fe91e,0000000..c2d3816
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,38 -1,0 +1,20 @@@
+Source: ldap2zone
+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.4
- Build-Depends: debhelper (>= 5.0.0), dpatch, libldap2-dev, ldap-utils
++Standards-Version: 3.9.2
++Build-Depends: debhelper (>= 7.0.0), 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
+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
+ a standard plain ascii zone file. The LDAP information has to be
+ stored using the dnszone schema.
- Source: ldap2zone
- Section: utils
- Priority: optional
- Maintainer: GOsa packages mainteners 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.2
- Build-Depends: debhelper (>= 5.0.0), libldap2-dev
- 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
-
- Package: ldap2zone
- Architecture: any
- Depends: ${shlibs:Depends}, bind9
- Conflicts: ldapdns, ldap2dns
- Description: Extract DNS zones from LDAP trees
- This tool allows the extraction of GOsa edited DNS
- zones and the creation of the Bind flat files.
diff --cc debian/copyright
index 2c638c1,0000000..7f59564
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,24 -1,0 +1,12 @@@
+This package was debianized by Cajus Pollmeier <cajus at debian.org>
+Thu, 17 Mar 2005 09:05:17 +0100.
+
+It was downloaded from http://www.venaas.no/dns/ldap2zone/
+
+Copyright:
+
+This software is copyright (C) 2004, 2005 Stig Venaas <venaas at uninett.no>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
- This package was debianized by Cajus Pollmeier <cajus at debian.org>
- Thu, 17 Mar 2005 09:05:17 +0100.
-
- It was downloaded from http://www.uninett.no
-
- Copyright:
-
- This software is copyright (C) 2004, 2005 Stig Venaas <venaas at uninett.no>
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
diff --cc debian/cron.d
index e6949eb,0000000..2984f81
mode 100644,000000..100644
--- a/debian/cron.d
+++ b/debian/cron.d
@@@ -1,8 -1,0 +1,4 @@@
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+ at reboot bind /usr/sbin/ldap2bind
+ at hourly bind /usr/sbin/ldap2bind
- PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
- @reboot bind /usr/sbin/ldap2bind
- @hourly bind /usr/sbin/ldap2bind
diff --cc debian/default
index 4d43cc7,0000000..4768c00
mode 100644,000000..100644
--- a/debian/default
+++ b/debian/default
@@@ -1,56 -1,0 +1,39 @@@
+# Configuration file for automatic deployment of ldap2zone generated zones to bind
+
+# Should we run the cronjob
+# DEFAULT: "false"
+RUN_DEPLOY="false"
+
+# How the LDAP server can be accessed
+# DEFAULT: "ldap://localhost"
+#LDAP_URI="ldap://localhost"
+
- # Where the zonefiles are located
++# Where the bind config is stored
+# DEFAULT: "/etc/bind"
+BIND_DIR="/etc/bind"
+
++# Where the zonefiles are located
++# DEFAULT: "/var/cache/bind"
++#BIND_DATA="/var/cache/bind"
++
+# Time to live value for a and ptr records
+# DEFAULT: 500 Seconds
+TTL="500"
+
+# Prefix for zone definition files
+# DEFAULT: "db."
+# The zone definition file for 0.168.192.in-addr.arpa is stored as 'db.0.168.192.in-addr.arpa'
+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
- # DEFAULT: "false"
- RUN_DEPLOY="false"
++#ALLOW_TRANSFER="192.168.0.1;"
+
- # How the LDAP server can be accessed
- # DEFAULT: "ldap://localhost"
- #LDAP_URI="ldap://localhost"
++# Allow notify to slaves (semicolon separated and ended)
++# DEFAULT: Dont allow notify
++#ALLOW_NOTIFY="notify yes;"
+
- # Where the zonefiles are located
- # DEFAULT: "/etc/bind"
- BIND_DIR="/etc/bind"
-
- # Time to live value for a and ptr records
- # DEFAULT: 500 Seconds
- TTL="500"
-
- # Prefix for zone definition files
- # DEFAULT: "db."
- # The zone definition file for 0.168.192.in-addr.arpa is stored as 'db.0.168.192.in-addr.arpa'
- PREFIX="db."
-
- # Allow Updates from these networks (semicolon separated and ended)
- # DEFAULT: Don't allow updates
- #ALLOW_UPDATE="192.168.0.0/24;"
diff --cc debian/dirs
index c011d58,0000000..dc52318
mode 100644,000000..100644
--- a/debian/dirs
+++ b/debian/dirs
@@@ -1,6 -1,0 +1,3 @@@
+etc/default
+usr/sbin
+usr/share/doc/ldap2zone
- etc/default
- usr/sbin
- usr/share/doc/ldap2zone
diff --cc debian/install
index 5ce4968,0000000..d7a9545
mode 100644,000000..100644
--- a/debian/install
+++ b/debian/install
@@@ -1,10 -1,0 +1,4 @@@
- usr/sbin/ldap2zone
- usr/sbin/ldap2bind
- etc/default/ldap2zone
- usr/share/lintian/overrides/ldap2zone
-
- usr/sbin/ldap2zone
- usr/sbin/ldap2bind
- etc/default/ldap2zone
- usr/share/lintian/overrides/ldap2zone
++ldap2zone /usr/sbin
++ldap2bind /usr/sbin
++debian/default /etc/default/ldap2zone
+
diff --cc debian/ldap2zone.manpages
index d42882a,0000000..bec610e
mode 100644,000000..100644
--- a/debian/ldap2zone.manpages
+++ b/debian/ldap2zone.manpages
@@@ -1,4 -1,0 +1,3 @@@
+ldap2zone.1
-
- ldap2zone.1
++ldap2bind.1
+
diff --cc debian/rules
index c3ff8ab,0000000..abde6ef
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,105 -1,0 +1,5 @@@
+#!/usr/bin/make -f
+
- PACKAGE=ldap2zone
- VERSION=$(shell dpkg-parsechangelog |grep "^Version:" | cut -f2 -d' ')
++%:
++ dh $@
+
- build: patch build-stamp
- build-stamp:
- dh_testdir
- $(MAKE)
- touch build-stamp
-
- clean: clean-patched unpatch
- clean-patched:
- dh_testdir
- dh_testroot
- $(MAKE) clean
- rm -f build-stamp
-
- patch: patch-stamp
- patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
- unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
- install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
- binary-arch: build install
- dh_testdir
- dh_testroot
- dh_install --fail-missing --sourcedir=debian/tmp
- dh_installman
- dh_installchangelogs changelog
- dh_installdocs debian/copyright
- dh_compress
- dh_fixperms
- dh_installcron
- dh_shlibdeps
- dh_strip
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
- binary: binary-arch
- binary-indep: binary-arch
-
- .PHONY: binary binary-arch clean checkroot
- #!/usr/bin/make -f
-
- PACKAGE=ldap2zone
- VERSION=$(shell dpkg-parsechangelog |grep "^Version:" | cut -f2 -d' ')
-
- build: build-stamp
- build-stamp:
- dh_testdir
- $(MAKE)
- touch build-stamp
-
- clean:
- dh_testdir
- $(MAKE) clean
- rm -f build-stamp
- dh_clean
-
- install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- # install -d $(CURDIR)/debian/tmp/etc/default
- # install -m 644 $(CURDIR)/debian/default $(CURDIR)/debian/tmp/etc/default/ldap2zone
-
- binary-indep: build install
- dh_testdir
- dh_testroot
- dh_install --fail-missing --sourcedir=debian/tmp
- dh_installman
- dh_installchangelogs
- dh_installdocs debian/copyright
- dh_compress
- dh_fixperms
- dh_installcron
- dh_shlibdeps
- dh_strip
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
- binary: binary-indep
-
- binary-arch:
-
- .PHONY: binary binary-indep clean checkroot
diff --cc debian/source/format
index d3827e7,0000000..163aaf8
mode 100644,000000..100644
--- a/debian/source/format
+++ b/debian/source/format
@@@ -1,1 -1,0 +1,1 @@@
- 1.0
++3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/ldap2bind.git
More information about the debian-edu-commits
mailing list