[Pkg-openldap-devel] r1138 - in openldap/trunk/debian: . patches

[rra at alioth.debian.org]

tags 475744 pending
thanks

Author: rra
Date: 2008-05-26 18:43:40 +0000 (Mon, 26 May 2008)
New Revision: 1138

Added:
   openldap/trunk/debian/patches/hurd-path-max
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
* Use MAXPATHLEN rather than PATH_MAX, since OpenLDAP defines the
  former and the latter isn't defined on GNU Hurd.  Thanks, Samuel
  Thibault.  (Closes: #475744)

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-05-26 18:37:45 UTC (rev 1137)
+++ openldap/trunk/debian/changelog	2008-05-26 18:43:40 UTC (rev 1138)
@@ -33,6 +33,11 @@
   * Bump Standards-Version to 3.7.3
   * Add versioned build dependency on libgnutls-dev (Closes: #466558)
 
+  [ Russ Allbery ]
+  * Use MAXPATHLEN rather than PATH_MAX, since OpenLDAP defines the
+    former and the latter isn't defined on GNU Hurd.  Thanks, Samuel
+    Thibault.  (Closes: #475744)
+
  -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun, 25 May 2008 22:02:51 +0200
 
 openldap2.3 (2.4.7-6.3) unstable; urgency=low

Added: openldap/trunk/debian/patches/hurd-path-max
===================================================================
--- openldap/trunk/debian/patches/hurd-path-max	                        (rev 0)
+++ openldap/trunk/debian/patches/hurd-path-max	2008-05-26 18:43:40 UTC (rev 1138)
@@ -0,0 +1,18 @@
+GNU Hurd doesn't have PATH_MAX.  Use MAXPATHLEN instead, which is
+defined by OpenLDAP portably in include/ac/param.h.  Patch from
+Samuel Thibault.
+
+Debian Bug#475744
+ITS #5531
+
+--- ./servers/slapd/back-bdb/monitor.c.orig	2008-04-12 11:08:22.540562000 -0400
++++ ./servers/slapd/back-bdb/monitor.c	2008-04-12 11:08:18.580562000 -0400
+@@ -395,7 +395,7 @@
+ 	{
+ 		struct berval	bv, nbv;
+ 		ber_len_t	pathlen = 0, len = 0;
+-		char		path[ PATH_MAX ] = { '\0' };
++		char		path[ MAXPATHLEN ] = { '\0' };
+ 		char		*fname = bdb->bi_dbenv_home,
+ 				*ptr;
+ 

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2008-05-26 18:37:45 UTC (rev 1137)
+++ openldap/trunk/debian/patches/series	2008-05-26 18:43:40 UTC (rev 1138)
@@ -9,3 +9,4 @@
 libldap-symbol-versions
 gnutls-ciphers
 getaddrinfo-is-threadsafe
+hurd-path-max