[Pkg-openldap-devel] r698 - openldap/trunk-2.3/debian

Sun Jul 23 09:52:50 UTC 2006

Author: active2-guest
Date: 2006-07-23 09:52:50 +0000 (Sun, 23 Jul 2006)
New Revision: 698

Removed:
   openldap/trunk-2.3/debian/move_files
Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/slapd.README.Debian
Log:
 * Remove move_files, it's been replaced by dh_install.
 * Documented that slapd is compiled with TCP wrappers in README.Debian.


Modified: openldap/trunk-2.3/debian/changelog
===================================================================

--- openldap/trunk-2.3/debian/changelog	2006-07-23 08:48:25 UTC (rev 697)
+++ openldap/trunk-2.3/debian/changelog	2006-07-23 09:52:50 UTC (rev 698)
@@ -14,8 +14,11 @@
     change. Thanks to Peter Marschall. (Closes: #368891)
   * Added patch to fix a bold issue in the manpage ldapsearch. Thanks to
     Matt Kraai. (Closes: #355670)
+  * Removed script move_files, dh_install is used instead. (Closes: #368896)
+  * Dutch translation already updated. Closes: #375101)
+  * Documented that slapd is compiled with TCP wrappers (Closes: #351428)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun, 23 Jul 2006 10:46:43 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun, 23 Jul 2006 11:47:57 +0200
 
 openldap2.3 (2.3.24-2) unstable; urgency=low
 

Deleted: openldap/trunk-2.3/debian/move_files
===================================================================
--- openldap/trunk-2.3/debian/move_files	2006-07-23 08:48:25 UTC (rev 697)
+++ openldap/trunk-2.3/debian/move_files	2006-07-23 09:52:50 UTC (rev 698)
@@ -1,121 +0,0 @@
-#! /bin/sh
-
-set -e
-
-# Move the files of the complete installation into the appropriate 
-# packages.
-
-install_stuff() {
-  from=debian/tmp
-  to=debian/$target
-
-  while [ "$#" -ge 1 ]; do
-    dir="`dirname $1`"
-    name="`basename $1`"
-
-    mkdir -p $to/$dir
-    mv $from/$dir/$name $to/$dir/
-    shift
-  done
-}
-
-install_slapd_symlinks()
-{
-	local LINKS link t
-	
-  	LINKS=`find debian/tmp/usr/sbin -type l | sed 's@^\./@@'`
-  	for link in $LINKS; do
-		t=`readlink $link`
-		[ ${t##*/} != slapd ] || ln -sf slapd $link
-  	done
-}
-
-set_target() {
-  target="$1"
-  echo -n " $target"
-  
-  create_lintian_overrides
-}
-
-create_lintian_overrides() {
-  local destdir tmpfile
-  destdir=debian/$target/usr/share/lintian/overrides
-  tmpfile=`mktemp`
-
-  if grep "^$target:" debian/lintian-overrides >$tmpfile; then
-    local libpkg libver
-    libpkg=`awk '/^Package:.*libldap/ { print $2 }' < debian/control`
-    libver=`dpkg-parsechangelog|awk '/^Version:/ { print $2 }'`
-    mkdir -p -m 755 $destdir
-    sed -e "s/@LIBPKG@/$libpkg/g" -e "s/@LIBVER@/$libver/g" \
-    	$tmpfile > $destdir/$target
-  fi
-  rm $tmpfile
-}
-
-check_completeness() {
-  missing=`find debian/tmp -not -type d|wc -w`
-  if [ "$missing" -gt 0 ]; then
-    echo "There are $missing files missing from the resulting package set: "
-    find debian/tmp -not -type d
-    exit 1
-  fi
-}
-
-echo -n "Removing default configuration files... "
-find debian/tmp -name \*.default|xargs rm
-echo done
-
-echo -n "Removing broken .la files... "
-find debian/tmp -name \*.la|xargs rm
-echo done
-
-echo -n "Removing static backend archives... "
-rm -f debian/tmp/usr/lib/ldap/back_*.a
-echo done
-
-echo -n Installing:
-set_target slapd
-# move binaries and adapt links (tools are links to slapd in OL2.2+)
-mv debian/tmp/usr/lib/slapd debian/tmp/usr/lib/slurpd debian/tmp/usr/sbin/
-install_slapd_symlinks
-install_stuff usr/sbin
-install_stuff usr/lib/ldap
-install_stuff usr/share/ldap
-#install_stuff usr/lib/slapd usr/lib/slurpd
-install_stuff usr/share/man/man5/slapd*
-install_stuff usr/share/man/man8
-install_stuff etc/ldap/schema
-rm -f debian/tmp/etc/ldap/slapd.conf
-install -m644 debian/slapd.conf debian/slapd/usr/share/slapd/slapd.conf
-install -m644 debian/DB_CONFIG debian/slapd/usr/share/slapd/DB_CONFIG
-install -m755 debian/fix_ldif debian/slapd/usr/share/slapd/fix_ldif
-install -m755 debian/ldiftopasswd debian/slapd/usr/share/slapd/ldiftopasswd
-
-set_target ldap-utils
-install_stuff usr/bin
-install_stuff usr/share/man/man1
-install_stuff usr/share/man/man5/ldif*
-
-set_target libldap-2.2-7
-# Drop the config files for now since they clash with libldap2
-# TODO: Should get moved to libldap2.2 later on...
-# install_stuff etc/ldap/ldap*.conf
-rm debian/tmp/etc/ldap/ldap*.conf
-rm debian/tmp/usr/share/man/man5/ldap.conf*
-# link libldap-2.2*.so* to libldap_r-2.2*.so*
-( cd debian/tmp/usr/lib; \
-  ln -sf libldap_r-2.2.so.? libldap-2.2.so.?;
-  ln -sf libldap_r-2.2.so.?.?.?? libldap-2.2.so.?.?.??
-)
-install_stuff usr/lib/*.so.*
-
-set_target libldap2.2-dev
-# link libldap.a to libldap_r.la
-ln -sf libldap_r.a debian/tmp/usr/lib/libldap.a
-install_stuff usr/include
-install_stuff usr/lib/*.so usr/lib/*.a
-install_stuff usr/share/man/man3
-echo "."
-
-check_completeness

Modified: openldap/trunk-2.3/debian/slapd.README.Debian
===================================================================
--- openldap/trunk-2.3/debian/slapd.README.Debian	2006-07-23 08:48:25 UTC (rev 697)
+++ openldap/trunk-2.3/debian/slapd.README.Debian	2006-07-23 09:52:50 UTC (rev 698)
@@ -1,6 +1,12 @@
 Notes about Debian's slapd package
 ----------------------------------
 
+++ TCP Wrappers
+
+   The Debian slapd package is compiled with TCP wrappers. This means that you
+   are able to restrict access to the LDAP server using /etc/hosts.deny or
+   /etc/hosts.allow.
+
 ++ No LDBM backend support
 
    The Debian slapd package no longer includes support for the LDBM backend.


