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

Sat Dec 15 10:49:45 UTC 2007

Author: vorlon
Date: 2007-12-15 10:49:45 +0000 (Sat, 15 Dec 2007)
New Revision: 896

Removed:
   openldap/trunk/debian/patches/man-slurpd
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/index-files-created-as-root
   openldap/trunk/debian/patches/sasl-default-path
   openldap/trunk/debian/patches/series
   openldap/trunk/debian/patches/wrong-database-location
Log:
refresh Debian patches for new upstream version

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

--- openldap/trunk/debian/changelog	2007-12-15 10:43:07 UTC (rev 895)
+++ openldap/trunk/debian/changelog	2007-12-15 10:49:45 UTC (rev 896)
@@ -4,8 +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.
+    - drop patches slurpd-in-spool an man-slurpd, 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/index-files-created-as-root
===================================================================
--- openldap/trunk/debian/patches/index-files-created-as-root	2007-12-15 10:43:07 UTC (rev 895)
+++ openldap/trunk/debian/patches/index-files-created-as-root	2007-12-15 10:49:45 UTC (rev 896)
@@ -1,6 +1,8 @@
+Index: doc/man/man8/slapindex.8
+===================================================================
 --- doc/man/man8/slapindex.8.orig
 +++ doc/man/man8/slapindex.8
-@@ -105,6 +105,10 @@
+@@ -129,6 +129,10 @@
  should not be running (at least, not in read-write
  mode) when you do this to ensure consistency of the database.
  .LP
@@ -11,6 +13,8 @@
  This command provides ample opportunity for the user to obtain
  and drink their favorite beverage.
  .SH EXAMPLES
+Index: servers/slapd/slapindex.c
+===================================================================
 --- servers/slapd/slapindex.c.orig
 +++ servers/slapd/slapindex.c
 @@ -34,6 +34,8 @@

Deleted: openldap/trunk/debian/patches/man-slurpd
===================================================================
--- openldap/trunk/debian/patches/man-slurpd	2007-12-15 10:43:07 UTC (rev 895)
+++ openldap/trunk/debian/patches/man-slurpd	2007-12-15 10:49:45 UTC (rev 896)
@@ -1,49 +0,0 @@
-Index: doc/man/man8/slurpd.8
-===================================================================
---- doc/man/man8/slurpd.8.orig
-+++ doc/man/man8/slurpd.8
-@@ -5,7 +5,7 @@
- .SH NAME
- slurpd \- Standalone LDAP Update Replication Daemon
- .SH SYNOPSIS
--.B LIBEXECDIR/slurpd [\-d debug\-level]
-+.B /usr/sbin/slurpd [\-d debug\-level]
- .B [\-f slapd\-config\-file] [\-r slapd\-replog\-file]
- .B [\-t temp\-dir] [\-o]
- .B 
-@@ -82,7 +82,7 @@
- .TP
- .BI \-f " slapd\-config\-file"
- Specifies the slapd configuration file.  The default is
--.BR ETCDIR/slapd.conf .
-+.BR /etc/ldap/slapd.conf .
- .TP
- .BI \-r " slapd\-replog\-file"
- Specifies the name of the 
-@@ -120,7 +120,7 @@
- temporary files may contain sensitive information.
- This option allows you to specify the location of these temporary files. 
- The default is
--.BR LOCALSTATEDIR/openldap-slurp .
-+.BR /var/spool/slurpd/replica .
- .SH EXAMPLES
- To start 
- .I slurpd
-@@ -131,7 +131,7 @@
- .LP
- .nf
- .ft tt
--	LIBEXECDIR/slurpd
-+	/usr/sbin/slurpd
- .ft
- .fi
- .LP
-@@ -144,7 +144,7 @@
- .LP
- .nf
- .ft tt
--	LIBEXECDIR/slurpd -f ETCDIR/slapd.conf -d 255
-+	/usr/sbin/slurpd -f /etc/ldap/slapd.conf -d 255
- .ft
- .fi
- .LP

Modified: openldap/trunk/debian/patches/sasl-default-path
===================================================================
--- openldap/trunk/debian/patches/sasl-default-path	2007-12-15 10:43:07 UTC (rev 895)
+++ openldap/trunk/debian/patches/sasl-default-path	2007-12-15 10:49:45 UTC (rev 896)
@@ -1,18 +1,22 @@
+Index: include/ldap_defaults.h
+===================================================================
 --- include/ldap_defaults.h.orig
 +++ include/ldap_defaults.h
-@@ -65,4 +65,6 @@
+@@ -63,4 +63,6 @@
  	/* dn of the default "monitor" subentry */
  #define SLAPD_MONITOR_DN		"cn=Monitor"
  
 +#define SASL_CONFIGPATH                        LDAP_SYSCONFDIR LDAP_DIRSEP "sasl2"
 +
  #endif /* _LDAP_CONFIG_H */
+Index: servers/slapd/sasl.c
+===================================================================
 --- servers/slapd/sasl.c.orig
 +++ servers/slapd/sasl.c
-@@ -952,12 +952,38 @@
+@@ -1181,12 +1181,38 @@
+ };
+ #endif
  
- #endif /* HAVE_CYRUS_SASL */
- 
 +static int
 +slap_sasl_getconfpath( void * context, char ** path )
 +{
@@ -47,4 +51,4 @@
 +		{ SASL_CB_GETCONFPATH, &slap_sasl_getconfpath, NULL },
  		{ SASL_CB_LIST_END, NULL, NULL }
  	};
- 
+ #endif

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2007-12-15 10:43:07 UTC (rev 895)
+++ openldap/trunk/debian/patches/series	2007-12-15 10:49:45 UTC (rev 896)
@@ -8,4 +8,3 @@
 wrong-database-location -p0
 index-files-created-as-root -p0
 sasl-default-path -p0
-man-slurpd -p0

Modified: openldap/trunk/debian/patches/wrong-database-location
===================================================================
--- openldap/trunk/debian/patches/wrong-database-location	2007-12-15 10:43:07 UTC (rev 895)
+++ openldap/trunk/debian/patches/wrong-database-location	2007-12-15 10:49:45 UTC (rev 896)
@@ -1,3 +1,5 @@
+Index: doc/man/man5/slapd-bdb.5
+===================================================================
 --- doc/man/man5/slapd-bdb.5.orig
 +++ doc/man/man5/slapd-bdb.5
 @@ -97,7 +97,7 @@
@@ -9,20 +11,11 @@
  .TP
  .B dirtyread
  Allow reads of modified but not yet committed data.
---- doc/man/man5/slapd-ldbm.5.orig
-+++ doc/man/man5/slapd-ldbm.5
-@@ -84,7 +84,7 @@
- associated indexes live.
- A separate directory must be specified for each database.
- The default is
--.BR LOCALSTATEDIR/openldap-data .
-+.BR LOCALSTATEDIR/lib/ldap .
- .TP
- .B
- index {<attrlist>|default} [pres,eq,approx,sub,<special>]
+Index: doc/man/man5/slapd.conf.5
+===================================================================
 --- doc/man/man5/slapd.conf.5.orig
 +++ doc/man/man5/slapd.conf.5
-@@ -1875,7 +1875,7 @@
+@@ -1811,7 +1811,7 @@
  # The database directory MUST exist prior to
  # running slapd AND should only be accessible
  # by the slapd/tools. Mode 0700 recommended.
@@ -31,6 +24,8 @@
  # Indices to maintain
  index     objectClass  eq
  index     cn,sn,mail   pres,eq,approx,sub
+Index: include/ldap_defaults.h
+===================================================================
 --- include/ldap_defaults.h.orig
 +++ include/ldap_defaults.h
 @@ -47,7 +47,7 @@
@@ -42,6 +37,8 @@
  #define SLAPD_DEFAULT_DB_MODE		0600
  #define SLAPD_DEFAULT_UCDATA		LDAP_DATADIR LDAP_DIRSEP "ucdata"
  	/* default max deref depth for aliases */
+Index: servers/slapd/Makefile.in
+===================================================================
 --- servers/slapd/Makefile.in.orig
 +++ servers/slapd/Makefile.in
 @@ -430,9 +430,9 @@
@@ -56,3 +53,16 @@
  	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
  		$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
  
+Index: doc/man/man5/slapd-config.5
+===================================================================
+--- doc/man/man5/slapd-config.5.orig
++++ doc/man/man5/slapd-config.5
+@@ -1840,7 +1840,7 @@
+ # The database directory MUST exist prior to
+ # running slapd AND should only be accessible
+ # by the slapd/tools. Mode 0700 recommended.
+-olcDbDirectory: LOCALSTATEDIR/openldap-data
++olcDbDirectory: LOCALSTATEDIR/lib/ldap
+ # Indices to maintain
+ olcDbIndex:     objectClass  eq
+ olcDbIndex:     cn,sn,mail   pres,eq,approx,sub


