[Pkg-openldap-devel] r1227 - openldap/trunk/debian/patches

vorlon at alioth.debian.org vorlon at alioth.debian.org
Tue Jul 28 07:20:54 UTC 2009 

Author: vorlon
Date: 2009-07-28 07:20:52 +0000 (Tue, 28 Jul 2009)
New Revision: 1227

Removed:
   openldap/trunk/debian/patches/back-perl-init
Modified:
   openldap/trunk/debian/patches/man-slapd
   openldap/trunk/debian/patches/sasl-default-path
   openldap/trunk/debian/patches/series
   openldap/trunk/debian/patches/wrong-database-location
Log:
refresh patches for new upstream release, and drop back-perl-init patch,
integrated upstream

Deleted: openldap/trunk/debian/patches/back-perl-init
===================================================================
--- openldap/trunk/debian/patches/back-perl-init	2009-07-28 05:31:25 UTC (rev 1226)
+++ openldap/trunk/debian/patches/back-perl-init	2009-07-28 07:20:52 UTC (rev 1227)
@@ -1,48 +0,0 @@
-Perl 5.10 (and some earlier versions) require calling some additional
-macros around Perl interpreter setup and shutdown.  Not doing these
-calls causes problems on HPPA at least, and may affect other platforms
-in the future.  This patch adds the additional code modelled on the
-perlembed man page and a working patch for INN.
-
-Debian Bug#495069
-ITS #5658
-
---- openldap.orig/servers/slapd/back-perl/close.c
-+++ openldap/servers/slapd/back-perl/close.c
-@@ -30,6 +30,9 @@
- {
- 	perl_destruct(PERL_INTERPRETER);
- 	perl_free(PERL_INTERPRETER);
-+#ifdef PERL_SYS_TERM
-+	PERL_SYS_TERM();
-+#endif
- 	PERL_INTERPRETER = NULL;
- 
- 	ldap_pvt_thread_mutex_destroy( &perl_interpreter_mutex );	
---- openldap.orig/servers/slapd/back-perl/init.c
-+++ openldap/servers/slapd/back-perl/init.c
-@@ -37,6 +37,7 @@
- )
- {
- 	char *embedding[] = { "", "-e", "0" };
-+	int argc = 3;
- 
- 	bi->bi_open = NULL;
- 	bi->bi_config = 0;
-@@ -77,9 +78,15 @@
- 	
- 	ldap_pvt_thread_mutex_init( &perl_interpreter_mutex );
- 
-+#ifdef PERL_SYS_INIT3
-+	PERL_SYS_INIT3(&argc, &embedding, (char **)NULL);
-+#endif
- 	PERL_INTERPRETER = perl_alloc();
- 	perl_construct(PERL_INTERPRETER);
--	perl_parse(PERL_INTERPRETER, perl_back_xs_init, 3, embedding, (char **)NULL);
-+#ifdef PERL_EXIT_DESTRUCT_END
-+	PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
-+#endif
-+	perl_parse(PERL_INTERPRETER, perl_back_xs_init, argc, embedding, (char **)NULL);
- 	perl_run(PERL_INTERPRETER);
- 	return 0;
- }

Modified: openldap/trunk/debian/patches/man-slapd
===================================================================
--- openldap/trunk/debian/patches/man-slapd	2009-07-28 05:31:25 UTC (rev 1226)
+++ openldap/trunk/debian/patches/man-slapd	2009-07-28 07:20:52 UTC (rev 1227)
@@ -4,6 +4,8 @@
 
 Debian-specific.
 
+Index: openldap/doc/man/man8/slapd.8
+===================================================================
 --- openldap.orig/doc/man/man8/slapd.8
 +++ openldap/doc/man/man8/slapd.8
 @@ -5,7 +5,7 @@
@@ -11,27 +13,27 @@
  slapd \- Stand-alone LDAP Daemon
  .SH SYNOPSIS
 -.B LIBEXECDIR/slapd 
-+.B /usr/sbin/slapd
- .B [\-[4|6]]
- .B [\-T {acl|add|auth|cat|dn|index|passwd|test}]
- .B [\-d debug\-level]
-@@ -77,11 +77,10 @@
++.B /usr/sbin/slapd 
+ [\c
+ .BR \-4 | \-6 ]
+ [\c
+@@ -103,11 +103,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
+ 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.
 -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
++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
++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,
+ If \fIdebug-level\fP is \fB?\fP, a list of installed debug-levels is printed,
  and slapd exits.
  
-@@ -263,7 +262,7 @@
+@@ -301,7 +300,7 @@
  .LP
  .nf
  .ft tt
@@ -40,21 +42,21 @@
  .ft
  .fi
  .LP
-@@ -274,7 +273,7 @@
+@@ -312,7 +311,7 @@
  .LP
  .nf
  .ft tt
--	LIBEXECDIR/slapd -f /var/tmp/slapd.conf -d 255
-+	/usr/sbin/slapd -f /var/tmp/slapd.conf -d 255
+-	LIBEXECDIR/slapd \-f /var/tmp/slapd.conf \-d 255
++	/usr/sbin/slapd \-f /var/tmp/slapd.conf \-d 255
  .ft
  .fi
  .LP
-@@ -282,7 +281,7 @@
+@@ -320,7 +319,7 @@
  .LP
  .nf
  .ft tt
--	LIBEXECDIR/slapd -Tt
-+	/usr/sbin/slapd -Tt
+-	LIBEXECDIR/slapd \-Tt
++	/usr/sbin/slapd \-Tt
  .ft
  .fi
  .LP

Modified: openldap/trunk/debian/patches/sasl-default-path
===================================================================
--- openldap/trunk/debian/patches/sasl-default-path	2009-07-28 05:31:25 UTC (rev 1226)
+++ openldap/trunk/debian/patches/sasl-default-path	2009-07-28 07:20:52 UTC (rev 1227)
@@ -3,6 +3,8 @@
 Not submitted upstream.  Somewhat Debian-specific and probably not of
 interest upstream.
 
+Index: openldap/include/ldap_defaults.h
+===================================================================
 --- openldap.orig/include/ldap_defaults.h
 +++ openldap/include/ldap_defaults.h
 @@ -63,4 +63,6 @@
@@ -12,9 +14,11 @@
 +#define SASL_CONFIGPATH                        LDAP_SYSCONFDIR LDAP_DIRSEP "sasl2"
 +
  #endif /* _LDAP_CONFIG_H */
+Index: openldap/servers/slapd/sasl.c
+===================================================================
 --- openldap.orig/servers/slapd/sasl.c
 +++ openldap/servers/slapd/sasl.c
-@@ -1071,12 +1071,38 @@
+@@ -1093,12 +1093,38 @@
  };
  #endif
  
@@ -50,6 +54,6 @@
  	static sasl_callback_t server_callbacks[] = {
  		{ SASL_CB_LOG, &slap_sasl_log, NULL },
 +		{ SASL_CB_GETCONFPATH, &slap_sasl_getconfpath, NULL },
+ 		{ SASL_CB_GETOPT, &slap_sasl_getopt, NULL },
  		{ SASL_CB_LIST_END, NULL, NULL }
  	};
- #endif

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2009-07-28 05:31:25 UTC (rev 1226)
+++ openldap/trunk/debian/patches/series	2009-07-28 07:20:52 UTC (rev 1227)
@@ -8,4 +8,3 @@
 sasl-default-path 
 libldap-symbol-versions
 getaddrinfo-is-threadsafe
-back-perl-init

Modified: openldap/trunk/debian/patches/wrong-database-location
===================================================================
--- openldap/trunk/debian/patches/wrong-database-location	2009-07-28 05:31:25 UTC (rev 1226)
+++ openldap/trunk/debian/patches/wrong-database-location	2009-07-28 07:20:52 UTC (rev 1227)
@@ -3,28 +3,34 @@
 
 Debian-specific.
 
+Index: openldap/doc/man/man5/slapd-bdb.5
+===================================================================
 --- openldap.orig/doc/man/man5/slapd-bdb.5
 +++ openldap/doc/man/man5/slapd-bdb.5
-@@ -116,7 +116,7 @@
+@@ -133,7 +133,7 @@
  associated indexes live.
  A separate directory must be specified for each database.
  The default is
--.BR LOCALSTATEDIR/openldap-data .
+-.BR LOCALSTATEDIR/openldap\-data .
 +.BR LOCALSTATEDIR/lib/ldap .
  .TP
  .B dirtyread
  Allow reads of modified but not yet committed data.
+Index: openldap/doc/man/man5/slapd.conf.5
+===================================================================
 --- openldap.orig/doc/man/man5/slapd.conf.5
 +++ openldap/doc/man/man5/slapd.conf.5
-@@ -1765,7 +1765,7 @@
+@@ -1850,7 +1850,7 @@
  # The database directory MUST exist prior to
  # running slapd AND should only be accessible
  # by the slapd/tools. Mode 0700 recommended.
--directory LOCALSTATEDIR/openldap-data
+-directory LOCALSTATEDIR/openldap\-data
 +directory LOCALSTATEDIR/lib/ldap
  # Indices to maintain
  index     objectClass  eq
  index     cn,sn,mail   pres,eq,approx,sub
+Index: openldap/include/ldap_defaults.h
+===================================================================
 --- openldap.orig/include/ldap_defaults.h
 +++ openldap/include/ldap_defaults.h
 @@ -47,7 +47,7 @@
@@ -36,6 +42,8 @@
  #define SLAPD_DEFAULT_DB_MODE		0600
  #define SLAPD_DEFAULT_UCDATA		LDAP_DATADIR LDAP_DIRSEP "ucdata"
  	/* default max deref depth for aliases */
+Index: openldap/servers/slapd/Makefile.in
+===================================================================
 --- openldap.orig/servers/slapd/Makefile.in
 +++ openldap/servers/slapd/Makefile.in
 @@ -430,9 +430,9 @@
@@ -50,13 +58,15 @@
  	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
  		$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
  
+Index: openldap/doc/man/man5/slapd-config.5
+===================================================================
 --- openldap.orig/doc/man/man5/slapd-config.5
 +++ openldap/doc/man/man5/slapd-config.5
-@@ -1855,7 +1855,7 @@
+@@ -1885,7 +1885,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/openldap\-data
 +olcDbDirectory: LOCALSTATEDIR/lib/ldap
  # Indices to maintain
  olcDbIndex:     objectClass  eq

More information about the Pkg-openldap-devel mailing list