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

Russ Allbery rra at alioth.debian.org
Fri Dec 21 20:39:56 UTC 2007 

Author: rra
Date: 2007-12-21 20:39:56 +0000 (Fri, 21 Dec 2007)
New Revision: 949

Added:
   openldap/trunk/debian/patches/libldap_r-link
Removed:
   openldap/trunk/debian/patches/libldap-makefile_in
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/add-autogen-sh
   openldap/trunk/debian/patches/index-files-created-as-root
   openldap/trunk/debian/patches/ldapi-socket-place
   openldap/trunk/debian/patches/libldap-symbol-versions
   openldap/trunk/debian/patches/man-slapd
   openldap/trunk/debian/patches/sasl-default-path
   openldap/trunk/debian/patches/series
   openldap/trunk/debian/patches/slapi-errorlog-file
   openldap/trunk/debian/patches/wrong-database-location
Log:
  - Add explanatory comments to every patch.
  - Refresh all patches to remove diff garbage and trailing whitespace.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2007-12-21 20:23:07 UTC (rev 948)
+++ openldap/trunk/debian/changelog	2007-12-21 20:39:56 UTC (rev 949)
@@ -75,11 +75,13 @@
     - Generally reformat and reorganize.
   * Patch cleanup:
     - Combine the NTLM patches for Evolution into a single patch.
+    - Add explanatory comments to every patch.
+    - Refresh all patches to remove diff garbage and trailing whitespace.
   * Update Vcs-* headers for new repository layout.
   * Remove versioned dependency on an ancient dpkg-dev.
   * Wrap and reorder Build-Depends for readability.
 
- -- Russ Allbery <rra at debian.org>  Fri, 21 Dec 2007 00:48:02 -0800
+ -- Russ Allbery <rra at debian.org>  Fri, 21 Dec 2007 12:39:24 -0800
 
 openldap2.3 (2.3.39-1) unstable; urgency=medium
 

Modified: openldap/trunk/debian/patches/add-autogen-sh
===================================================================
--- openldap/trunk/debian/patches/add-autogen-sh	2007-12-21 20:23:07 UTC (rev 948)
+++ openldap/trunk/debian/patches/add-autogen-sh	2007-12-21 20:39:56 UTC (rev 949)
@@ -1,6 +1,11 @@
-diff -urNad openldap2.3-2.3.11~/autogen.sh openldap2.3-2.3.11/autogen.sh
---- openldap2.3-2.3.11~/autogen.sh	1970-01-01 01:00:00.000000000 +0100
-+++ openldap2.3-2.3.11/autogen.sh	2005-12-24 16:37:21.693602500 +0100
+Add an autogen.sh script to run all of the autotools in the right order
+to regenerate the build machinery.  Needed since we have patches that
+modify the source for Autoconf.
+
+Debian-specific.
+
+--- /dev/null
++++ openldap/autogen.sh
 @@ -0,0 +1,29 @@
 +#!/bin/sh
 +#

Modified: openldap/trunk/debian/patches/index-files-created-as-root
===================================================================
--- openldap/trunk/debian/patches/index-files-created-as-root	2007-12-21 20:23:07 UTC (rev 948)
+++ openldap/trunk/debian/patches/index-files-created-as-root	2007-12-21 20:39:56 UTC (rev 949)
@@ -1,5 +1,11 @@
-Index: doc/man/man8/slapindex.8
-===================================================================
+Document in the man page that slapindex should be run as the same user
+as slapd, and print a warning if it's run as root (since Debian defaults
+to running slapd as openldap).
+
+Not suitable for upstream in this form.  This patch needs to be reworked
+to check the BerkeleyDB database ownership and only warn if running as
+root with a database that's not owned by root.
+
 --- doc/man/man8/slapindex.8.orig
 +++ doc/man/man8/slapindex.8
 @@ -129,6 +129,10 @@
@@ -13,8 +19,6 @@
  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 @@

Modified: openldap/trunk/debian/patches/ldapi-socket-place
===================================================================
--- openldap/trunk/debian/patches/ldapi-socket-place	2007-12-21 20:23:07 UTC (rev 948)
+++ openldap/trunk/debian/patches/ldapi-socket-place	2007-12-21 20:39:56 UTC (rev 949)
@@ -1,3 +1,8 @@
+Move the ldapi socket to /var/run/slapd from /var/run, since /var/run
+is only writable by root and slapd runs as openldap.
+
+Debian-specific.
+
 Index: include/ldap_defaults.h
 ===================================================================
 --- include/ldap_defaults.h.orig

Deleted: openldap/trunk/debian/patches/libldap-makefile_in
===================================================================
--- openldap/trunk/debian/patches/libldap-makefile_in	2007-12-21 20:23:07 UTC (rev 948)
+++ openldap/trunk/debian/patches/libldap-makefile_in	2007-12-21 20:39:56 UTC (rev 949)
@@ -1,15 +0,0 @@
-Link libldap_r directly with the threading libraries.  Otherwise, it gets
-unversioned references to the pthread symbols, which is a time bomb should
-the ABI ever change (as it did with glibc on alpha in the past).
-
---- trunk.orig/libraries/libldap_r/Makefile.in
-+++ trunk/libraries/libldap_r/Makefile.in
-@@ -56,7 +56,7 @@
- XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
- XXXLIBS = $(LTHREAD_LIBS)
- NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
--UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
-+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
- 
- .links : Makefile
- 	@for i in $(XXSRCS); do \

Modified: openldap/trunk/debian/patches/libldap-symbol-versions
===================================================================
--- openldap/trunk/debian/patches/libldap-symbol-versions	2007-12-21 20:23:07 UTC (rev 948)
+++ openldap/trunk/debian/patches/libldap-symbol-versions	2007-12-21 20:39:56 UTC (rev 949)
@@ -1,7 +1,12 @@
-Index: trunk/libraries/libldap_r/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap_r/Makefile.in
-+++ trunk/libraries/libldap_r/Makefile.in
+Add symbol versioning to the public LDAP libraries.  This is required for
+library transitions, such as the current transition from 2.1 to 2.4,
+since programs will sometimes have both libraries loaded by different
+dependency chains during the transition.
+
+Not yet contributed upstream.
+
+--- openldap.orig/libraries/libldap_r/Makefile.in
++++ openldap/libraries/libldap_r/Makefile.in
 @@ -57,6 +57,9 @@
  XXXLIBS = $(LTHREAD_LIBS)
  NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
@@ -12,10 +17,8 @@
  
  .links : Makefile
  	@for i in $(XXSRCS); do \
-Index: trunk/build/top.mk
-===================================================================
---- trunk.orig/build/top.mk
-+++ trunk/build/top.mk
+--- openldap.orig/build/top.mk
++++ openldap/build/top.mk
 @@ -103,6 +103,9 @@
  # LINK_LIBS referenced in library and module link commands.
  LINK_LIBS = $(MOD_LIBS) $(@PLAT at _LINK_LIBS)
@@ -35,10 +38,8 @@
  
  LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \
  	$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
-Index: trunk/build/openldap.m4
-===================================================================
---- trunk.orig/build/openldap.m4
-+++ trunk/build/openldap.m4
+--- openldap.orig/build/openldap.m4
++++ openldap/build/openldap.m4
 @@ -1312,3 +1312,54 @@
  #endif
  	], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
@@ -72,7 +73,7 @@
 +VERS_1 {
 +	global: sym;
 +};
-+            
++
 +VERS_2 {
 +	global: sym;
 +} VERS_1;
@@ -94,10 +95,8 @@
 +  ol_cv_ld_version_script_option=no
 +fi
 +rm -f conftest*])])
-Index: trunk/configure.in
-===================================================================
---- trunk.orig/configure.in
-+++ trunk/configure.in
+--- openldap.orig/configure.in
++++ openldap/configure.in
 @@ -1858,6 +1858,13 @@
  fi
  AC_SUBST(LTSTATIC)dnl
@@ -112,10 +111,8 @@
  dnl ----------------------------------------------------------------
  if test $ol_enable_wrappers != no ; then
  	AC_CHECK_HEADERS(tcpd.h,[
-Index: trunk/libraries/libldap/libldap.map
-===================================================================
 --- /dev/null
-+++ trunk/libraries/libldap/libldap.map
++++ openldap/libraries/libldap/libldap.map
 @@ -0,0 +1,6 @@
 +OPENLDAP_2.4_2 {
 +  global:
@@ -123,26 +120,20 @@
 +  local:
 +    *;
 +};
-Index: trunk/libraries/libldap/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap/Makefile.in
-+++ trunk/libraries/libldap/Makefile.in
-@@ -48,7 +48,10 @@
+--- openldap.orig/libraries/libldap/Makefile.in
++++ openldap/libraries/libldap/Makefile.in
+@@ -48,6 +48,9 @@
  XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
  NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
  UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
--
 +ifneq (,$(VERSION_OPTION))
 +  VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map
 +endif
-+  
+ 
  apitest:	$(XLIBS) apitest.o
  	$(LTLINK) -o $@ apitest.o $(LIBS)
- dntest:	$(XLIBS) dntest.o
-Index: trunk/libraries/liblber/Makefile.in
-===================================================================
---- trunk.orig/libraries/liblber/Makefile.in
-+++ trunk/libraries/liblber/Makefile.in
+--- openldap.orig/libraries/liblber/Makefile.in
++++ openldap/libraries/liblber/Makefile.in
 @@ -38,6 +38,9 @@
  XXLIBS = 
  NT_LINK_LIBS = $(AC_LIBS)
@@ -153,10 +144,8 @@
  
  dtest:    $(XLIBS) dtest.o
  	$(LTLINK) -o $@ dtest.o $(LIBS)
-Index: trunk/libraries/liblber/liblber.map
-===================================================================
 --- /dev/null
-+++ trunk/libraries/liblber/liblber.map
++++ openldap/libraries/liblber/liblber.map
 @@ -0,0 +1,8 @@
 +OPENLDAP_2.4_2 {
 +  global:

Copied: openldap/trunk/debian/patches/libldap_r-link (from rev 948, openldap/trunk/debian/patches/libldap-makefile_in)
===================================================================
--- openldap/trunk/debian/patches/libldap_r-link	                        (rev 0)
+++ openldap/trunk/debian/patches/libldap_r-link	2007-12-21 20:39:56 UTC (rev 949)
@@ -0,0 +1,15 @@
+Link libldap_r directly with the threading libraries.  Otherwise, it gets
+unversioned references to the pthread symbols, which is a time bomb should
+the ABI ever change (as it did with glibc on alpha in the past).
+
+--- trunk.orig/libraries/libldap_r/Makefile.in
++++ trunk/libraries/libldap_r/Makefile.in
+@@ -56,7 +56,7 @@
+ XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
+ XXXLIBS = $(LTHREAD_LIBS)
+ NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+-UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
++UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
+ 
+ .links : Makefile
+ 	@for i in $(XXSRCS); do \

Modified: openldap/trunk/debian/patches/man-slapd
===================================================================
--- openldap/trunk/debian/patches/man-slapd	2007-12-21 20:23:07 UTC (rev 948)
+++ openldap/trunk/debian/patches/man-slapd	2007-12-21 20:39:56 UTC (rev 949)
@@ -1,5 +1,9 @@
-Index: doc/man/man8/slapd.8
-===================================================================
+Patch the slapd man page to not refer to a header file that isn't
+installed with the slapd package and to reference the correct path
+for slapd.
+
+Debian-specific.
+
 --- doc/man/man8/slapd.8.orig
 +++ doc/man/man8/slapd.8
 @@ -5,7 +5,7 @@
@@ -7,7 +11,7 @@
  slapd \- Stand-alone LDAP Daemon
  .SH SYNOPSIS
 -.B LIBEXECDIR/slapd 
-+.B /usr/sbin/slapd 
++.B /usr/sbin/slapd
  .B [\-[4|6]]
  .B [\-T {acl|add|auth|cat|dn|index|passwd|test}]
  .B [\-d debug\-level]

Modified: openldap/trunk/debian/patches/sasl-default-path
===================================================================
--- openldap/trunk/debian/patches/sasl-default-path	2007-12-21 20:23:07 UTC (rev 948)
+++ openldap/trunk/debian/patches/sasl-default-path	2007-12-21 20:39:56 UTC (rev 949)
@@ -1,5 +1,8 @@
-Index: include/ldap_defaults.h
-===================================================================
+Add /etc/ldap/sasl2 to the SASL configuration search path.
+
+Not submitted upstream.  Somewhat Debian-specific and probably not of
+interest upstream.
+
 --- include/ldap_defaults.h.orig
 +++ include/ldap_defaults.h
 @@ -63,4 +63,6 @@
@@ -9,8 +12,6 @@
 +#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
 @@ -1181,12 +1181,38 @@

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2007-12-21 20:23:07 UTC (rev 948)
+++ openldap/trunk/debian/patches/series	2007-12-21 20:39:56 UTC (rev 949)
@@ -1,6 +1,6 @@
 man-slapd -p0
 evolution-ntlm
-libldap-makefile_in
+libldap_r-link
 add-autogen-sh
 slapi-errorlog-file -p0
 ldapi-socket-place -p0

Modified: openldap/trunk/debian/patches/slapi-errorlog-file
===================================================================
--- openldap/trunk/debian/patches/slapi-errorlog-file	2007-12-21 20:23:07 UTC (rev 948)
+++ openldap/trunk/debian/patches/slapi-errorlog-file	2007-12-21 20:39:56 UTC (rev 949)
@@ -1,3 +1,8 @@
+The slapi error log file defaults to /var/errors given our setting
+of --localstatedir.  Move it to /var/log/slapi-errors instead.
+
+Debian-specific.
+
 --- servers/slapd/slapi/slapi_overlay.c.orig
 +++ servers/slapd/slapi/slapi_overlay.c
 @@ -927,7 +927,7 @@

Modified: openldap/trunk/debian/patches/wrong-database-location
===================================================================
--- openldap/trunk/debian/patches/wrong-database-location	2007-12-21 20:23:07 UTC (rev 948)
+++ openldap/trunk/debian/patches/wrong-database-location	2007-12-21 20:39:56 UTC (rev 949)
@@ -1,5 +1,8 @@
-Index: doc/man/man5/slapd-bdb.5
-===================================================================
+Move the default slapd database location to /var/lib/ldap instead of
+/var/openldap-data.
+
+Debian-specific.
+
 --- doc/man/man5/slapd-bdb.5.orig
 +++ doc/man/man5/slapd-bdb.5
 @@ -97,7 +97,7 @@
@@ -11,8 +14,6 @@
  .TP
  .B dirtyread
  Allow reads of modified but not yet committed data.
-Index: doc/man/man5/slapd.conf.5
-===================================================================
 --- doc/man/man5/slapd.conf.5.orig
 +++ doc/man/man5/slapd.conf.5
 @@ -1811,7 +1811,7 @@
@@ -24,8 +25,6 @@
  # 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 @@
@@ -37,8 +36,6 @@
  #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 @@
@@ -53,8 +50,6 @@
  	$(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 @@

More information about the Pkg-openldap-devel mailing list