Thu Oct 10 05:34:23 UTC 2013

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

tjaalton-guest pushed a commit to annotated tag 2.2.23-0.pre2
in repository openldap.

commit 685f0ab3bcb1139c591dcc6cc5f502571510a1b1
Author: Torsten Landschoff <torsten at debian.org>
Date:   Fri Feb 25 13:47:41 2005 +0000

     r414 at pulsar:  torsten | 2005-02-25 14:45:28 +0100
     Applied some changes suggested by Ondrej Sury:
     + debian/rules: Add MAKEVARS variable and set datadir =
       /usr/share/libldap2.2/ucdata instead of changing build/top.mk as
       suggested.
     + debian/move_files: Install /usr/share/libldap2.2 into libldap2.2
       and remove duplicate ldap.conf manpage.
     + debian/control: Let libldap2.2 dependon libldap2 for config files.
     Also in Ondrej's patch:
     + doc/man/man8/slapd.8: Refer to slapd.conf instead of ldap.h for
       loglevel documentation. Changed by ubuntu? I don't know...
     debian/slapd.README.Debian: Update TLS/SSL information.
---
 debian/changelog           |   15 +++++++++++++--
 debian/control             |    2 +-
 debian/move_files          |    4 ++--
 debian/rules               |    6 ++++--
 debian/slapd.README.Debian |   18 ++++++++++++------
 doc/man/man8/slapd.8       |    4 +++-
 6 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc08f80..8dd101d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,19 @@ openldap2.2 (2.2.23-0.pre2) experimental; urgency=low
       or 30 minutes by default.
     + debian/slapd.scripts-common: Make is_empty_dir less noisy on first
       install (cosmetic).
-
- -- 
+  * Applied some changes suggested by Ondrej Sury: 
+    + debian/rules: Add MAKEVARS variable and set datadir =
+      /usr/share/libldap2.2/ucdata instead of changing build/top.mk as 
+      suggested.
+    + debian/move_files: Install /usr/share/libldap2.2 into libldap2.2
+      and remove duplicate ldap.conf manpage.
+    + debian/control: Let libldap2.2 dependon libldap2 for config files.
+  * Also in Ondrej's patch: 
+    + doc/man/man8/slapd.8: Refer to slapd.conf instead of ldap.h for
+      loglevel documentation. Changed by ubuntu? I don't know...
+  * debian/slapd.README.Debian: Update TLS/SSL information.
+
+ -- Torsten Landschoff <torsten at debian.org>  Fri, 25 Feb 2005 14:44:59 +0100
 
 openldap2.2 (2.2.23-0.pre1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index d71342b..6897453 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Section: libs
 Priority: important
 Architecture: any
 Conflicts: ldap-utils (<= 2.1.23-1)
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libldap2
 Replaces: libldap2
 Description: OpenLDAP libraries 
  These are the run-time libraries for the OpenLDAP (Lightweight Directory
diff --git a/debian/move_files b/debian/move_files
index 67d0263..a91a4bc 100644
--- a/debian/move_files
+++ b/debian/move_files
@@ -68,8 +68,8 @@ echo -n " $target"
 # TODO: Should get moved to libldap2.2 later on...
 # install_stuff etc/ldap/ldap*.conf
 rm debian/tmp/etc/ldap/ldap*.conf
-install_stuff usr/share/man/man5/ldap.conf*
-install_stuff usr/share/ldap/ucdata	# TODO: does this belong elsewhere?
+rm debian/tmp/usr/share/man/man5/ldap.conf*
+install_stuff usr/share/libldap2.2	# TODO: does this belong elsewhere?
 install_stuff usr/lib/*.so.*
 
 target=libldap2.2-dev
diff --git a/debian/rules b/debian/rules
index c2a4ef7..1bf70d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,8 @@ installdir	:= $(rootdir)/debian/install
 tmpdir		:= $(rootdir)/debian/tmp
 builddir	:= $(rootdir)/debian/build
 
+MAKEVARS	:= DESTDIR=$(installdir) datadir=/usr/share/libldap2.2
+
 $(builddir)/Makefile:
 	mkdir -p $(builddir)
 	cd $(builddir) && CFLAGS="$(CFLAGS)" $(rootdir)/configure \
@@ -34,12 +36,12 @@ $(builddir)/Makefile:
 
 build: build-stamp
 build-stamp: $(builddir)/Makefile
-	$(MAKE) -C $(builddir) DESTDIR=$(installdir) 
+	$(MAKE) -C $(builddir) $(MAKEVARS)
 	touch $@
 
 install: install-stamp
 install-stamp: build-stamp
-	$(MAKE) -C $(builddir) DESTDIR=$(installdir) install
+	$(MAKE) -C $(builddir) $(MAKEVARS) install
 	# Upstream installs schema files in mode 0444 - policy wants 0644
 	find $(installdir)/etc -type f|xargs chmod 0644
 	# Upstream manpages are section 8C but installed as section 8
diff --git a/debian/slapd.README.Debian b/debian/slapd.README.Debian
index d960ffe..2aaab6f 100644
--- a/debian/slapd.README.Debian
+++ b/debian/slapd.README.Debian
@@ -27,12 +27,18 @@ Notes about Debian's slapd package
 
 ++ TLS/SSL support
 
-   Different to the official version, Debian's OpenLDAP packages are compiled
-   with the GNUTLS library rather than with OpenSSL. This was necessary for
-   other third-party packages licensed under the GPL (such as Samba) to be
-   able to link with OpenLDAP. As of this version, Debian's GNUTLS extension
-   has not been included in the official version of OpenLDAP; however, we
-   are seeking for it to be included in the future.
+   This version of the OpenLDAP server and its library is compiled with the
+   OpenSSL library as supported by the upstream sources. Other packages 
+   are not allowed to link against this version of OpenLDAP (or rather
+   its library) but this way we have a working OpenLDAP server. 
+
+   Client packages will have to continue using the old libldap2 package
+   for ldap access as that version is linked against GNUTLS to allow
+   for example dynamic linking into Samba. We are working on updating that
+   GNUTLS patch for OpenLDAP 2.2 and getting it into the upstream package. 
+
+   When that is accomplished the old libldap2 packages will disappear
+   and OpenLDAP 2.2 will be used together with GNUTLS in Debian.
 
 ++ If slapd depends on other service (such as SQL)
 
diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
index 5cc0158..63d239c 100644
--- a/doc/man/man8/slapd.8
+++ b/doc/man/man8/slapd.8
@@ -80,7 +80,9 @@ If this option is specified, even with a zero argument,
 will not fork or disassociate from the invoking terminal.  Some general
 operation and status messages are printed for any value of \fIdebug\-level\fP.
 \fIdebug\-level\fP is taken as a bit string, with each bit corresponding to a
-different kind of debugging information.  See <ldap.h> for details.
+different kind of debugging information. The meaning is the same as for 
+the \fBloglevel\fP configuration option documented in  
+.BR slapd.conf (5).
 Remember that if you turn on packet logging, packets containing bind passwords
 will be output, so if you redirect the log to a logfile, that file should
 be read-protected.

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

