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

matthijs at alioth.debian.org matthijs at alioth.debian.org
Sun Apr 11 20:16:54 UTC 2010 

tags 561144 pending
tags 465024 pending
tags 502769 pending
tags 528695 pending
tags 564686 pending
tags 504728 pending
thanks

Author: matthijs
Date: 2010-04-11 20:16:54 +0000 (Sun, 11 Apr 2010)
New Revision: 1252

Added:
   openldap/trunk/debian/source/
   openldap/trunk/debian/source/format
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/add-autogen-sh
   openldap/trunk/debian/patches/do-not-second-guess-sonames
   openldap/trunk/debian/patches/evolution-ntlm
   openldap/trunk/debian/patches/getaddrinfo-is-threadsafe
   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/slapi-errorlog-file
   openldap/trunk/debian/patches/wrong-database-location
Log:
 * Add source/format for the new dpkg.
 * Refreshed all patches.
 * Added changelog entries.


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-04-11 13:35:33 UTC (rev 1251)
+++ openldap/trunk/debian/changelog	2010-04-11 20:16:54 UTC (rev 1252)
@@ -1,7 +1,8 @@
 openldap (2.4.21-1) unstable; urgency=low
 
   [ Steve Langasek ]
-  * New upstream version (Closes: #561144, #465024, #502769, #528695, #564686)
+  * New upstream version
+    (Closes: #561144, #465024, #502769, #528695, #564686, #504728)
   * Add upstream manpage for ldapexop; thanks to Peter Marschall
     <peter at adpm.de>.  Closes: #549291.
 
@@ -12,8 +13,9 @@
   * Improve the wording for the slapd/invalid_config question (Closes: #452834)
   * Make lintian a bit more happy (Closes: #518660)
   * Fix bashism (Closes: #518657)
+  * Refresh all patches.
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sat, 10 Apr 2010 23:28:05 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun, 11 Apr 2010 22:13:46 +0200
 
 openldap (2.4.17-2.1) unstable; urgency=high
 

Modified: openldap/trunk/debian/patches/add-autogen-sh
===================================================================
--- openldap/trunk/debian/patches/add-autogen-sh	2010-04-11 13:35:33 UTC (rev 1251)
+++ openldap/trunk/debian/patches/add-autogen-sh	2010-04-11 20:16:54 UTC (rev 1252)
@@ -4,8 +4,10 @@
 
 Debian-specific.
 
+Index: b/autogen.sh
+===================================================================
 --- /dev/null
-+++ openldap/autogen.sh
++++ b/autogen.sh
 @@ -0,0 +1,29 @@
 +#!/bin/sh
 +#

Modified: openldap/trunk/debian/patches/do-not-second-guess-sonames
===================================================================
--- openldap/trunk/debian/patches/do-not-second-guess-sonames	2010-04-11 13:35:33 UTC (rev 1251)
+++ openldap/trunk/debian/patches/do-not-second-guess-sonames	2010-04-11 20:16:54 UTC (rev 1252)
@@ -6,10 +6,10 @@
 
 Upstream ITS #6302 filed.
 
-Index: trunk/libraries/libldap/cyrus.c
+Index: b/libraries/libldap/cyrus.c
 ===================================================================
---- trunk.orig/libraries/libldap/cyrus.c
-+++ trunk/libraries/libldap/cyrus.c
+--- a/libraries/libldap/cyrus.c
++++ b/libraries/libldap/cyrus.c
 @@ -78,28 +78,6 @@
  	/* XXX not threadsafe */
  	static int sasl_initialized = 0;
@@ -39,11 +39,11 @@
  	if ( sasl_initialized ) {
  		return 0;
  	}
-Index: trunk/servers/slapd/sasl.c
+Index: b/servers/slapd/sasl.c
 ===================================================================
---- trunk.orig/servers/slapd/sasl.c
-+++ trunk/servers/slapd/sasl.c
-@@ -1135,26 +1135,6 @@
+--- a/servers/slapd/sasl.c
++++ b/servers/slapd/sasl.c
+@@ -1137,26 +1137,6 @@
  #endif
  
  #ifdef HAVE_CYRUS_SASL

Modified: openldap/trunk/debian/patches/evolution-ntlm
===================================================================
--- openldap/trunk/debian/patches/evolution-ntlm	2010-04-11 13:35:33 UTC (rev 1251)
+++ openldap/trunk/debian/patches/evolution-ntlm	2010-04-11 20:16:54 UTC (rev 1252)
@@ -11,11 +11,11 @@
 Bug#457374 filed against evolution-data-server asking if this support is
 still required on 2007-12-21.
 
-Index: trunk/include/ldap.h
+Index: b/include/ldap.h
 ===================================================================
---- trunk.orig/include/ldap.h
-+++ trunk/include/ldap.h
-@@ -2461,5 +2461,25 @@
+--- a/include/ldap.h
++++ b/include/ldap.h
+@@ -2486,5 +2486,25 @@
  	LDAPControl	**ctrls,
  	LDAPDerefRes	**drp ));
  
@@ -41,10 +41,10 @@
 +
  LDAP_END_DECL
  #endif /* _LDAP_H */
-Index: trunk/libraries/libldap/ntlm.c
+Index: b/libraries/libldap/ntlm.c
 ===================================================================
 --- /dev/null
-+++ trunk/libraries/libldap/ntlm.c
++++ b/libraries/libldap/ntlm.c
 @@ -0,0 +1,138 @@
 +/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
 +/*
@@ -184,10 +184,10 @@
 + return( ld->ld_errno );
 +}
 +
-Index: trunk/libraries/libldap/Makefile.in
+Index: b/libraries/libldap/Makefile.in
 ===================================================================
---- trunk.orig/libraries/libldap/Makefile.in
-+++ trunk/libraries/libldap/Makefile.in
+--- a/libraries/libldap/Makefile.in
++++ b/libraries/libldap/Makefile.in
 @@ -27,7 +27,7 @@
  	init.c options.c print.c string.c util-int.c schema.c \
  	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
@@ -206,10 +206,10 @@
  	assertion.lo deref.lo
  
  LDAP_INCDIR= ../../include       
-Index: trunk/libraries/libldap_r/Makefile.in
+Index: b/libraries/libldap_r/Makefile.in
 ===================================================================
---- trunk.orig/libraries/libldap_r/Makefile.in
-+++ trunk/libraries/libldap_r/Makefile.in
+--- a/libraries/libldap_r/Makefile.in
++++ b/libraries/libldap_r/Makefile.in
 @@ -29,7 +29,7 @@
  	init.c options.c print.c string.c util-int.c schema.c \
  	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \

Modified: openldap/trunk/debian/patches/getaddrinfo-is-threadsafe
===================================================================
--- openldap/trunk/debian/patches/getaddrinfo-is-threadsafe	2010-04-11 13:35:33 UTC (rev 1251)
+++ openldap/trunk/debian/patches/getaddrinfo-is-threadsafe	2010-04-11 20:16:54 UTC (rev 1252)
@@ -13,11 +13,11 @@
 configure-time check for glibc and disabling the mutex only on known
 thread-safe implementations.
 
-Index: trunk/libraries/libldap/os-ip.c
+Index: b/libraries/libldap/os-ip.c
 ===================================================================
---- trunk.orig/libraries/libldap/os-ip.c
-+++ trunk/libraries/libldap/os-ip.c
-@@ -477,17 +477,8 @@
+--- a/libraries/libldap/os-ip.c
++++ b/libraries/libldap/os-ip.c
+@@ -592,17 +592,8 @@
  	hints.ai_socktype = socktype;
  	snprintf(serv, sizeof serv, "%d", port );
  
@@ -35,10 +35,10 @@
  	if ( err != 0 ) {
  		osip_debug(ld, "ldap_connect_to_host: getaddrinfo failed: %s\n",
  			AC_GAI_STRERROR(err), 0, 0);
-Index: trunk/libraries/libldap/util-int.c
+Index: b/libraries/libldap/util-int.c
 ===================================================================
---- trunk.orig/libraries/libldap/util-int.c
-+++ trunk/libraries/libldap/util-int.c
+--- a/libraries/libldap/util-int.c
++++ b/libraries/libldap/util-int.c
 @@ -224,13 +224,7 @@
  	int rc;
  #if defined( HAVE_GETNAMEINFO )

Modified: openldap/trunk/debian/patches/index-files-created-as-root
===================================================================
--- openldap/trunk/debian/patches/index-files-created-as-root	2010-04-11 13:35:33 UTC (rev 1251)
+++ openldap/trunk/debian/patches/index-files-created-as-root	2010-04-11 20:16:54 UTC (rev 1252)
@@ -11,9 +11,11 @@
 backend and aborting if slapd is run as a different user than the database
 owner, which is an even better fix.
 
---- openldap.orig/doc/man/man8/slapindex.8
-+++ openldap/doc/man/man8/slapindex.8
-@@ -131,6 +131,10 @@
+Index: b/doc/man/man8/slapindex.8
+===================================================================
+--- a/doc/man/man8/slapindex.8
++++ b/doc/man/man8/slapindex.8
+@@ -148,6 +148,10 @@
  should not be running (at least, not in read-write
  mode) when you do this to ensure consistency of the database.
  .LP
@@ -24,8 +26,10 @@
  This command provides ample opportunity for the user to obtain
  and drink their favorite beverage.
  .SH EXAMPLES
---- openldap.orig/servers/slapd/slapindex.c
-+++ openldap/servers/slapd/slapindex.c
+Index: b/servers/slapd/slapindex.c
+===================================================================
+--- a/servers/slapd/slapindex.c
++++ b/servers/slapd/slapindex.c
 @@ -34,6 +34,8 @@
  int
  slapindex( int argc, char **argv )

Modified: openldap/trunk/debian/patches/ldapi-socket-place
===================================================================
--- openldap/trunk/debian/patches/ldapi-socket-place	2010-04-11 13:35:33 UTC (rev 1251)
+++ openldap/trunk/debian/patches/ldapi-socket-place	2010-04-11 20:16:54 UTC (rev 1252)
@@ -3,8 +3,10 @@
 
 Debian-specific.
 
---- openldap.orig/include/ldap_defaults.h
-+++ openldap/include/ldap_defaults.h
+Index: b/include/ldap_defaults.h
+===================================================================
+--- a/include/ldap_defaults.h
++++ b/include/ldap_defaults.h
 @@ -39,7 +39,7 @@
  #define LDAP_ENV_PREFIX "LDAP"
  

Modified: openldap/trunk/debian/patches/libldap-symbol-versions
===================================================================
--- openldap/trunk/debian/patches/libldap-symbol-versions	2010-04-11 13:35:33 UTC (rev 1251)
+++ openldap/trunk/debian/patches/libldap-symbol-versions	2010-04-11 20:16:54 UTC (rev 1252)
@@ -8,9 +8,11 @@
 Upstream ITS #5365 filed requesting symbol versioning for libldap and
 libber.
 
---- openldap.orig/libraries/libldap_r/Makefile.in
-+++ openldap/libraries/libldap_r/Makefile.in
-@@ -57,6 +57,9 @@
+Index: b/libraries/libldap_r/Makefile.in
+===================================================================
+--- a/libraries/libldap_r/Makefile.in
++++ b/libraries/libldap_r/Makefile.in
+@@ -61,6 +61,9 @@
  XXXLIBS = $(LTHREAD_LIBS)
  NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
  UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
@@ -20,9 +22,11 @@
  
  .links : Makefile
  	@for i in $(XXSRCS); do \
---- openldap.orig/build/top.mk
-+++ openldap/build/top.mk
-@@ -103,6 +103,9 @@
+Index: b/build/top.mk
+===================================================================
+--- a/build/top.mk
++++ b/build/top.mk
+@@ -104,6 +104,9 @@
  # LINK_LIBS referenced in library and module link commands.
  LINK_LIBS = $(MOD_LIBS) $(@PLAT at _LINK_LIBS)
  
@@ -32,7 +36,7 @@
  LTSTATIC = @LTSTATIC@
  
  LTLINK   = $(LIBTOOL) --mode=link \
-@@ -112,7 +115,7 @@
+@@ -113,7 +116,7 @@
  	$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c
  
  LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \
@@ -41,9 +45,11 @@
  
  LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \
  	$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
---- openldap.orig/build/openldap.m4
-+++ openldap/build/openldap.m4
-@@ -1312,3 +1312,54 @@
+Index: b/build/openldap.m4
+===================================================================
+--- a/build/openldap.m4
++++ b/build/openldap.m4
+@@ -1129,3 +1129,54 @@
  #endif
  	], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
  ])
@@ -98,9 +104,11 @@
 +  ol_cv_ld_version_script_option=no
 +fi
 +rm -f conftest*])])
---- openldap.orig/configure.in
-+++ openldap/configure.in
-@@ -1863,6 +1863,13 @@
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -1894,6 +1894,13 @@
  fi
  AC_SUBST(LTSTATIC)dnl
  
@@ -114,8 +122,10 @@
  dnl ----------------------------------------------------------------
  if test $ol_enable_wrappers != no ; then
  	AC_CHECK_HEADERS(tcpd.h,[
+Index: b/libraries/libldap/libldap.map
+===================================================================
 --- /dev/null
-+++ openldap/libraries/libldap/libldap.map
++++ b/libraries/libldap/libldap.map
 @@ -0,0 +1,6 @@
 +OPENLDAP_2.4_2 {
 +  global:
@@ -123,9 +133,11 @@
 +  local:
 +    *;
 +};
---- openldap.orig/libraries/libldap/Makefile.in
-+++ openldap/libraries/libldap/Makefile.in
-@@ -48,6 +48,9 @@
+Index: b/libraries/libldap/Makefile.in
+===================================================================
+--- a/libraries/libldap/Makefile.in
++++ b/libraries/libldap/Makefile.in
+@@ -52,6 +52,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)
@@ -135,8 +147,10 @@
  
  apitest:	$(XLIBS) apitest.o
  	$(LTLINK) -o $@ apitest.o $(LIBS)
---- openldap.orig/libraries/liblber/Makefile.in
-+++ openldap/libraries/liblber/Makefile.in
+Index: b/libraries/liblber/Makefile.in
+===================================================================
+--- a/libraries/liblber/Makefile.in
++++ b/libraries/liblber/Makefile.in
 @@ -38,6 +38,9 @@
  XXLIBS = 
  NT_LINK_LIBS = $(AC_LIBS)
@@ -147,8 +161,10 @@
  
  dtest:    $(XLIBS) dtest.o
  	$(LTLINK) -o $@ dtest.o $(LIBS)
+Index: b/libraries/liblber/liblber.map
+===================================================================
 --- /dev/null
-+++ openldap/libraries/liblber/liblber.map
++++ b/libraries/liblber/liblber.map
 @@ -0,0 +1,8 @@
 +OPENLDAP_2.4_2 {
 +  global:

Modified: openldap/trunk/debian/patches/man-slapd
===================================================================
--- openldap/trunk/debian/patches/man-slapd	2010-04-11 13:35:33 UTC (rev 1251)
+++ openldap/trunk/debian/patches/man-slapd	2010-04-11 20:16:54 UTC (rev 1252)
@@ -4,10 +4,10 @@
 
 Debian-specific.
 
-Index: openldap/doc/man/man8/slapd.8
+Index: b/doc/man/man8/slapd.8
 ===================================================================
---- openldap.orig/doc/man/man8/slapd.8
-+++ openldap/doc/man/man8/slapd.8
+--- a/doc/man/man8/slapd.8
++++ b/doc/man/man8/slapd.8
 @@ -5,7 +5,7 @@
  .SH NAME
  slapd \- Stand-alone LDAP Daemon

Modified: openldap/trunk/debian/patches/sasl-default-path
===================================================================
--- openldap/trunk/debian/patches/sasl-default-path	2010-04-11 13:35:33 UTC (rev 1251)
+++ openldap/trunk/debian/patches/sasl-default-path	2010-04-11 20:16:54 UTC (rev 1252)
@@ -3,10 +3,10 @@
 Not submitted upstream.  Somewhat Debian-specific and probably not of
 interest upstream.
 
-Index: openldap/include/ldap_defaults.h
+Index: b/include/ldap_defaults.h
 ===================================================================
---- openldap.orig/include/ldap_defaults.h
-+++ openldap/include/ldap_defaults.h
+--- a/include/ldap_defaults.h
++++ b/include/ldap_defaults.h
 @@ -63,4 +63,6 @@
  	/* dn of the default "monitor" subentry */
  #define SLAPD_MONITOR_DN		"cn=Monitor"
@@ -14,11 +14,11 @@
 +#define SASL_CONFIGPATH                        LDAP_SYSCONFDIR LDAP_DIRSEP "sasl2"
 +
  #endif /* _LDAP_CONFIG_H */
-Index: openldap/servers/slapd/sasl.c
+Index: b/servers/slapd/sasl.c
 ===================================================================
---- openldap.orig/servers/slapd/sasl.c
-+++ openldap/servers/slapd/sasl.c
-@@ -1093,12 +1093,38 @@
+--- a/servers/slapd/sasl.c
++++ b/servers/slapd/sasl.c
+@@ -1095,12 +1095,38 @@
  };
  #endif
  

Modified: openldap/trunk/debian/patches/slapi-errorlog-file
===================================================================
--- openldap/trunk/debian/patches/slapi-errorlog-file	2010-04-11 13:35:33 UTC (rev 1251)
+++ openldap/trunk/debian/patches/slapi-errorlog-file	2010-04-11 20:16:54 UTC (rev 1252)
@@ -3,8 +3,10 @@
 
 Debian-specific.
 
---- openldap.orig/servers/slapd/slapi/slapi_overlay.c
-+++ openldap/servers/slapd/slapi/slapi_overlay.c
+Index: b/servers/slapd/slapi/slapi_overlay.c
+===================================================================
+--- a/servers/slapd/slapi/slapi_overlay.c
++++ b/servers/slapd/slapi/slapi_overlay.c
 @@ -927,7 +927,7 @@
  		ldap_pvt_thread_mutex_init( &slapi_printmessage_mutex );
  

Modified: openldap/trunk/debian/patches/wrong-database-location
===================================================================
--- openldap/trunk/debian/patches/wrong-database-location	2010-04-11 13:35:33 UTC (rev 1251)
+++ openldap/trunk/debian/patches/wrong-database-location	2010-04-11 20:16:54 UTC (rev 1252)
@@ -3,10 +3,10 @@
 
 Debian-specific.
 
-Index: openldap/doc/man/man5/slapd-bdb.5
+Index: b/doc/man/man5/slapd-bdb.5
 ===================================================================
---- openldap.orig/doc/man/man5/slapd-bdb.5
-+++ openldap/doc/man/man5/slapd-bdb.5
+--- a/doc/man/man5/slapd-bdb.5
++++ b/doc/man/man5/slapd-bdb.5
 @@ -133,7 +133,7 @@
  associated indexes live.
  A separate directory must be specified for each database.
@@ -16,11 +16,11 @@
  .TP
  .B dirtyread
  Allow reads of modified but not yet committed data.
-Index: openldap/doc/man/man5/slapd.conf.5
+Index: b/doc/man/man5/slapd.conf.5
 ===================================================================
---- openldap.orig/doc/man/man5/slapd.conf.5
-+++ openldap/doc/man/man5/slapd.conf.5
-@@ -1850,7 +1850,7 @@
+--- a/doc/man/man5/slapd.conf.5
++++ b/doc/man/man5/slapd.conf.5
+@@ -1881,7 +1881,7 @@
  # The database directory MUST exist prior to
  # running slapd AND should only be accessible
  # by the slapd/tools. Mode 0700 recommended.
@@ -29,10 +29,10 @@
  # Indices to maintain
  index     objectClass  eq
  index     cn,sn,mail   pres,eq,approx,sub
-Index: openldap/include/ldap_defaults.h
+Index: b/include/ldap_defaults.h
 ===================================================================
---- openldap.orig/include/ldap_defaults.h
-+++ openldap/include/ldap_defaults.h
+--- a/include/ldap_defaults.h
++++ b/include/ldap_defaults.h
 @@ -47,7 +47,7 @@
  	/* location of the default slapd config file */
  #define SLAPD_DEFAULT_CONFIGFILE	LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
@@ -42,10 +42,10 @@
  #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
+Index: b/servers/slapd/Makefile.in
 ===================================================================
---- openldap.orig/servers/slapd/Makefile.in
-+++ openldap/servers/slapd/Makefile.in
+--- a/servers/slapd/Makefile.in
++++ b/servers/slapd/Makefile.in
 @@ -430,9 +430,9 @@
  
  install-db-config: FORCE
@@ -58,11 +58,11 @@
  	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
  		$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
  
-Index: openldap/doc/man/man5/slapd-config.5
+Index: b/doc/man/man5/slapd-config.5
 ===================================================================
---- openldap.orig/doc/man/man5/slapd-config.5
-+++ openldap/doc/man/man5/slapd-config.5
-@@ -1885,7 +1885,7 @@
+--- a/doc/man/man5/slapd-config.5
++++ b/doc/man/man5/slapd-config.5
+@@ -1919,7 +1919,7 @@
  # The database directory MUST exist prior to
  # running slapd AND should only be accessible
  # by the slapd/tools. Mode 0700 recommended.

Added: openldap/trunk/debian/source/format
===================================================================
--- openldap/trunk/debian/source/format	                        (rev 0)
+++ openldap/trunk/debian/source/format	2010-04-11 20:16:54 UTC (rev 1252)
@@ -0,0 +1 @@
+1.0

More information about the Pkg-openldap-devel mailing list