# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1316608051 -7200
# Node ID 4f3b1ee715dddad4c07e14067016b794523b2cd5
# Parent  5974eb964eec3e91cd171fd10331f224601bbf84
Update to new version of vendor software and make slight corrections.

diff -r 5974eb964eec -r 4f3b1ee715dd openldap/openldap.patch
--- a/openldap/openldap.patch	Wed Sep 21 14:13:05 2011 +0200
+++ b/openldap/openldap.patch	Wed Sep 21 14:27:31 2011 +0200
@@ -1,6 +1,6 @@
 Index: include/ac/fdset.h
---- include/ac/fdset.h.orig	2008-02-12 00:26:40 +0100
-+++ include/ac/fdset.h	2008-10-13 11:38:23 +0200
+--- include/ac/fdset.h.orig	2011-01-05 00:49:56.000000000 +0100
++++ include/ac/fdset.h	2011-02-12 10:17:43.000000000 +0100
 @@ -22,6 +22,13 @@
  #ifndef _AC_FDSET_H
  #define _AC_FDSET_H
@@ -16,9 +16,9 @@
  #  define OPENLDAP_FD_SETSIZE 4096
  #endif
 Index: include/ldap_int_thread.h
---- include/ldap_int_thread.h.orig	2008-02-12 00:26:40 +0100
-+++ include/ldap_int_thread.h	2008-10-13 11:38:23 +0200
-@@ -100,6 +100,7 @@
+--- include/ldap_int_thread.h.orig	2011-01-06 19:43:20.000000000 +0100
++++ include/ldap_int_thread.h	2011-02-12 10:17:43.000000000 +0100
+@@ -110,6 +110,7 @@
   *                                 *
   ***********************************/
  
@@ -27,9 +27,9 @@
  #include <pth.h>
  
 Index: libraries/libldap_r/tpool.c
---- libraries/libldap_r/tpool.c.orig	2008-03-21 01:46:03 +0100
-+++ libraries/libldap_r/tpool.c	2008-10-13 11:38:23 +0200
-@@ -950,6 +950,6 @@
+--- libraries/libldap_r/tpool.c.orig	2011-01-05 00:50:08.000000000 +0100
++++ libraries/libldap_r/tpool.c	2011-02-12 10:17:43.000000000 +0100
+@@ -968,6 +968,6 @@
  {
  	ldap_int_thread_userctx_t *ctx = vctx;
  
@@ -38,8 +38,8 @@
  }
  #endif /* LDAP_THREAD_HAVE_TPOOL */
 Index: servers/slapd/back-perl/config.c
---- servers/slapd/back-perl/config.c.orig	2008-02-12 00:26:47 +0100
-+++ servers/slapd/back-perl/config.c	2008-10-13 11:38:23 +0200
+--- servers/slapd/back-perl/config.c.orig	2011-01-05 00:50:41.000000000 +0100
++++ servers/slapd/back-perl/config.c	2011-02-12 10:17:43.000000000 +0100
 @@ -49,6 +49,9 @@
  		}
  
diff -r 5974eb964eec -r 4f3b1ee715dd openldap/openldap.spec
--- a/openldap/openldap.spec	Wed Sep 21 14:13:05 2011 +0200
+++ b/openldap/openldap.spec	Wed Sep 21 14:27:31 2011 +0200
@@ -31,8 +31,8 @@
 Class:        BASE
 Group:        LDAP
 License:      GPL
-Version:      2.4.16
-Release:      20090420
+Version:      2.4.26
+Release:      20110914
 
 #   package options
 %option       with_server   yes
@@ -116,9 +116,10 @@
     export LIBS=""
     export ARGS=""
     ARGS="$ARGS --prefix=%{l_prefix}"
+    ARGS="$ARGS --mandir=%{l_prefix}/man"
+    ARGS="$ARGS --infodir=%{l_prefix}/info"
     ARGS="$ARGS --libexecdir=%{l_prefix}/libexec/openldap"
     ARGS="$ARGS --localstatedir=%{l_prefix}/var/openldap"
-    ARGS="$ARGS --mandir=%{l_prefix}/man"
     ARGS="$ARGS --enable-syslog"
     ARGS="$ARGS --with-tls"
     ARGS="$ARGS --without-fetch"
@@ -220,8 +221,10 @@
     %{l_make} %{l_mflags}
 
 %install
+    #   clean build cruft
+    rm -rf $RPM_BUILD_ROOT
+
     #   install toolkit
-    rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
 
     #   post adjustment: remove extra files
@@ -238,7 +241,8 @@
     #   post adjustment: enable and correct slapd.pid
 %if "%{with_server}" == "yes"
     %{l_shtool} subst \
-        -e 's;^[ #]*\(pidfile \).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \
+        -e 's;^[ #]*\(pidfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \
+        -e 's;^\(argsfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.args;' \
         $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
 %endif