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

[Steve Langasek]

Author: vorlon
Date: 2007-12-15 10:39:44 +0000 (Sat, 15 Dec 2007)
New Revision: 894

Removed:
   openldap/trunk/debian/patches/slurpd-in-spool
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/man-slapd
   openldap/trunk/debian/patches/ntlm-ldap_h-hack
   openldap/trunk/debian/patches/series
Log:
refresh Debian patches for new upstream version

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2007-12-15 10:35:06 UTC (rev 893)
+++ openldap/trunk/debian/changelog	2007-12-15 10:39:44 UTC (rev 894)
@@ -4,6 +4,8 @@
     - remove another schema from upstream source, collective.schema,
       that contains text from the IETF RFCs and include a stripped copy
       in debian/schema.
+    - drop patch slurpd-in-spool, since slurpd is no longer provided
+      upstream.
   * slapd.conf and DB_CONFIG are used in the postinst, they shouldn't be
     shipped under doc/examples because /usr/share/doc can't be depended
     on per policy; ship the files under /usr/share/slapd and symlink the

Modified: openldap/trunk/debian/patches/man-slapd
===================================================================
--- openldap/trunk/debian/patches/man-slapd	2007-12-15 10:35:06 UTC (rev 893)
+++ openldap/trunk/debian/patches/man-slapd	2007-12-15 10:39:44 UTC (rev 894)
@@ -11,18 +11,23 @@
  .B [\-[4|6]]
  .B [\-T {acl|add|auth|cat|dn|index|passwd|test}]
  .B [\-d debug\-level]
-@@ -85,7 +85,9 @@
+@@ -77,11 +77,10 @@
  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_log.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.
-@@ -234,7 +236,7 @@
+-Comma-separated arrays of friendly names can be specified to select
+-debugging output of the corresponding debugging information.
+-All the names recognized by the \fIloglevel\fP directive 
+-described in \fBslapd.conf\fP(5) are supported.
++different kind of debugging information. Comma-separated arrays of friendly
++names can be specified to select debugging output of the corresponding
++debugging information. All the names recognized by the \fIloglevel\fP
++directive described in \fBslapd.conf\fP(5) are supported.
+ If \fIdebug\-level\fP is \fB?\fP, a list of installed levels is printed,
+ and slapd exits.
+ 
+@@ -263,7 +262,7 @@
  .LP
  .nf
  .ft tt
@@ -31,7 +36,7 @@
  .ft
  .fi
  .LP
-@@ -245,7 +247,7 @@
+@@ -274,7 +273,7 @@
  .LP
  .nf
  .ft tt
@@ -40,7 +45,7 @@
  .ft
  .fi
  .LP
-@@ -253,7 +255,7 @@
+@@ -282,7 +281,7 @@
  .LP
  .nf
  .ft tt

Modified: openldap/trunk/debian/patches/ntlm-ldap_h-hack
===================================================================
--- openldap/trunk/debian/patches/ntlm-ldap_h-hack	2007-12-15 10:35:06 UTC (rev 893)
+++ openldap/trunk/debian/patches/ntlm-ldap_h-hack	2007-12-15 10:39:44 UTC (rev 894)
@@ -1,11 +1,11 @@
 Index: include/ldap.h
 ===================================================================
---- include/ldap.h.orig	2007-05-23 13:05:50.000000000 -0700
-+++ include/ldap.h	2007-05-23 13:05:53.000000000 -0700
-@@ -2118,5 +2118,25 @@ LDAP_F( const char * )
- ldap_passwordpolicy_err2txt LDAP_P(( LDAPPasswordPolicyError ));
- #endif /* LDAP_CONTROL_PASSWORDPOLICYREQUEST */
+--- include/ldap.h.orig
++++ include/ldap.h
+@@ -2343,5 +2343,25 @@
  
+ #endif /* LDAP_CONTROL_X_SESSION_TRACKING */
+ 
 +/*
 + * hacks for NTLM
 + */

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2007-12-15 10:35:06 UTC (rev 893)
+++ openldap/trunk/debian/patches/series	2007-12-15 10:39:44 UTC (rev 894)
@@ -1,5 +1,4 @@
 man-slapd -p0
-slurpd-in-spool
 ntlm-ldap_h-hack -p0
 ntlm_c
 libldap-makefile_in

Deleted: openldap/trunk/debian/patches/slurpd-in-spool
===================================================================
--- openldap/trunk/debian/patches/slurpd-in-spool	2007-12-15 10:35:06 UTC (rev 893)
+++ openldap/trunk/debian/patches/slurpd-in-spool	2007-12-15 10:39:44 UTC (rev 894)
@@ -1,12 +0,0 @@
-diff -urNad openldap2.3-2.3.11~/servers/slurpd/slurp.h openldap2.3-2.3.11/servers/slurpd/slurp.h
---- openldap2.3-2.3.11~/servers/slurpd/slurp.h	2005-12-01 13:48:46.000000000 +0100
-+++ openldap2.3-2.3.11/servers/slurpd/slurp.h	2005-12-02 11:22:47.856278500 +0100
-@@ -67,7 +67,7 @@
- #define SERVICE_NAME	OPENLDAP_PACKAGE "-slurpd"
- 
- /* Default directory for slurpd's private copy of replication logs */
--#define	DEFAULT_SLURPD_REPLICA_DIR	LDAP_RUNDIR LDAP_DIRSEP "openldap-slurp"
-+#define	DEFAULT_SLURPD_REPLICA_DIR	LDAP_RUNDIR LDAP_DIRSEP "spool/slurpd"
- 
- /* Default name for slurpd's private copy of the replication log */
- #define	DEFAULT_SLURPD_REPLOGFILE	"slurpd.replog"