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

[Matthijs Mohlmann]

Author: active2-guest
Date: 2006-07-14 13:31:01 +0000 (Fri, 14 Jul 2006)
New Revision: 681

Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/control
   openldap/trunk-2.3/debian/slapd.scripts-common
Log:
 * slapd won't segfault when a moduleload parameter is after a backend directive   or access control directives.
 * cleaned up the dependencies a bit, fileutils is superseeded by Sarge already.
 * use find in combination with mv instead of just mv


Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2006-07-12 21:50:46 UTC (rev 680)
+++ openldap/trunk-2.3/debian/changelog	2006-07-14 13:31:01 UTC (rev 681)
@@ -17,8 +17,14 @@
   * epoll(4) system call is missing on kernels <2.6, this causes slapd to
     not work on 2.4 kernels. Added patch that remove the #define in
     portable.in (Closes: #369352, #372194, #373233)
+  * In 2.3.24 slapd won't segfault if the moduleload directive appears
+    somewhere else. (Closes: #349011)
+  * Removed fileutils dependency, it's superseeded in Sarge already.
+    (Closes: #370013)
+  * Use find in combination with mv to move an old directory away.
+    (Closes: #306435)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Thu, 15 Jun 2006 18:53:37 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Fri, 14 Jul 2006 08:54:52 +0200
 
 openldap2.3 (2.3.24-1) unstable; urgency=low
 

Modified: openldap/trunk-2.3/debian/control
===================================================================
--- openldap/trunk-2.3/debian/control	2006-07-12 21:50:46 UTC (rev 680)
+++ openldap/trunk-2.3/debian/control	2006-07-14 13:31:01 UTC (rev 681)
@@ -12,7 +12,7 @@
 Priority: optional
 Architecture: any
 Pre-Depends: debconf (>= 0.5) | debconf-2.0
-Depends: ${shlibs:Depends}, coreutils (>= 4.5.1-1) | fileutils (>= 4.0i-1), psmisc, perl (>> 5.8.0) | libmime-base64-perl, libldap-2.3-0 (= ${Source-Version}), adduser
+Depends: ${shlibs:Depends}, coreutils (>= 4.5.1-1), psmisc, perl (>> 5.8.0) | libmime-base64-perl, libldap-2.3-0 (= ${Source-Version}), adduser
 Recommends: db4.2-util, libsasl2-modules
 Suggests: ldap-utils
 Conflicts: umich-ldapd, ldap-server, libbind-dev, bind-dev, libltdl3 (= 1.5.4-1)

Modified: openldap/trunk-2.3/debian/slapd.scripts-common
===================================================================
--- openldap/trunk-2.3/debian/slapd.scripts-common	2006-07-12 21:50:46 UTC (rev 680)
+++ openldap/trunk-2.3/debian/slapd.scripts-common	2006-07-14 13:31:01 UTC (rev 681)
@@ -563,7 +563,7 @@
 		backupdir=`compute_backup_path "$databasedir" "$suffix"`
 		echo -n "  - directory $suffix... " >&2
 		mkdir -p "$backupdir"
-		mv "$databasedir"/* "$backupdir"/
+		find "$databasedir" -depth -exec mv {} "$backupdir" \;
 		echo done. >&2
 	else
 		cat >&2 <<EOF