[Pkg-openldap-devel] r1341 - in openldap/trunk/debian: . patches
matthijs at alioth.debian.org
matthijs at alioth.debian.org
Sat Mar 26 11:12:36 UTC 2011
Author: matthijs
Date: 2011-03-26 11:12:18 +0000 (Sat, 26 Mar 2011)
New Revision: 1341
Removed:
openldap/trunk/debian/patches/manpage-tlscyphersuite-additions
Modified:
openldap/trunk/debian/changelog
openldap/trunk/debian/patches/add-autogen-sh
openldap/trunk/debian/patches/autogroup-makefile
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/issue-6534-patch
openldap/trunk/debian/patches/ldap-conf-tls-cacertdir
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/service-operational-before-detach
openldap/trunk/debian/patches/slapi-errorlog-file
openldap/trunk/debian/patches/smbk5pwd-makefile
openldap/trunk/debian/patches/wrong-database-location
Log:
* Refresh all patches.
* Remove patches applied upstream.
Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/changelog 2011-03-26 11:12:18 UTC (rev 1341)
@@ -1,8 +1,10 @@
openldap (2.4.24-1) unstable; urgency=low
* New upstream version
+ * Refresh all patches
+ * Remove manpage-tlscyphersuite-additions, applied upstream
- -- Matthijs Möhlmann <matthijs at cacholong.nl> Sat, 26 Mar 2011 10:22:16 +0100
+ -- Matthijs Möhlmann <matthijs at cacholong.nl> Sat, 26 Mar 2011 12:11:30 +0100
openldap (2.4.23-7) unstable; urgency=low
Modified: openldap/trunk/debian/patches/add-autogen-sh
===================================================================
--- openldap/trunk/debian/patches/add-autogen-sh 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/add-autogen-sh 2011-03-26 11:12:18 UTC (rev 1341)
@@ -4,10 +4,8 @@
Debian-specific.
-Index: b/autogen.sh
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/autogen.sh 2010-07-12 12:07:21.000000000 +0200
+--- /dev/null
++++ b/autogen.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
Modified: openldap/trunk/debian/patches/autogroup-makefile
===================================================================
--- openldap/trunk/debian/patches/autogroup-makefile 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/autogroup-makefile 2011-03-26 11:12:18 UTC (rev 1341)
@@ -1,7 +1,5 @@
-Index: b/contrib/slapd-modules/autogroup/Makefile
-===================================================================
---- a/contrib/slapd-modules/autogroup/Makefile 2010-07-12 12:05:36.000000000 +0200
-+++ b/contrib/slapd-modules/autogroup/Makefile 2010-07-12 12:07:34.000000000 +0200
+--- a/contrib/slapd-modules/autogroup/Makefile
++++ b/contrib/slapd-modules/autogroup/Makefile
@@ -1,6 +1,6 @@
-LIBTOOL=../../../libtool
+LIBTOOL=../../../debian/build/libtool
@@ -9,22 +7,22 @@
-CPPFLAGS+=-I../../../include -I../../../servers/slapd
+CPPFLAGS+=-I../../../debian/build/include -I../../../include -I../../../servers/slapd
- all: autogroup.la
+ ldap_subdir = openldap
+ prefix=/usr/local
+@@ -16,12 +16,12 @@
-@@ -9,12 +9,12 @@
-
autogroup.la: autogroup.lo
$(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
-- -rpath $(PREFIX)/lib -module -o $@ $?
+- -rpath $(libdir) -module -o $@ $?
+ -rpath /usr/lib/ldap -module -o $@ $?
clean:
rm -f autogroup.lo autogroup.la
install: autogroup.la
-- mkdir -p $(PREFIX)/lib/openldap
-- $(LIBTOOL) --mode=install cp autogroup.la $(PREFIX)/lib/openldap
-- $(LIBTOOL) --finish $(PREFIX)/lib
+- mkdir -p $(DESTDIR)$(moduledir)
+- $(LIBTOOL) --mode=install cp autogroup.la $(DESTDIR)$(moduledir)
+- $(LIBTOOL) --finish $(DESTDIR)$(moduledir)
+ mkdir -p $(DESTDIR)/usr/lib/ldap
+ $(LIBTOOL) --mode=install cp autogroup.la $(DESTDIR)/usr/lib/ldap
+
Modified: openldap/trunk/debian/patches/do-not-second-guess-sonames
===================================================================
--- openldap/trunk/debian/patches/do-not-second-guess-sonames 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/do-not-second-guess-sonames 2011-03-26 11:12:18 UTC (rev 1341)
@@ -6,10 +6,8 @@
Upstream ITS #6302 filed.
-Index: b/libraries/libldap/cyrus.c
-===================================================================
---- a/libraries/libldap/cyrus.c 2010-07-12 12:05:37.000000000 +0200
-+++ b/libraries/libldap/cyrus.c 2010-07-12 12:07:31.000000000 +0200
+--- a/libraries/libldap/cyrus.c
++++ b/libraries/libldap/cyrus.c
@@ -78,28 +78,6 @@
/* XXX not threadsafe */
static int sasl_initialized = 0;
@@ -39,10 +37,8 @@
if ( sasl_initialized ) {
return 0;
}
-Index: b/servers/slapd/sasl.c
-===================================================================
---- a/servers/slapd/sasl.c 2010-07-12 12:07:27.000000000 +0200
-+++ b/servers/slapd/sasl.c 2010-07-12 12:07:31.000000000 +0200
+--- a/servers/slapd/sasl.c
++++ b/servers/slapd/sasl.c
@@ -1146,26 +1146,6 @@
#endif
Modified: openldap/trunk/debian/patches/evolution-ntlm
===================================================================
--- openldap/trunk/debian/patches/evolution-ntlm 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/evolution-ntlm 2011-03-26 11:12:18 UTC (rev 1341)
@@ -11,11 +11,9 @@
Bug#457374 filed against evolution-data-server asking if this support is
still required on 2007-12-21.
-Index: b/include/ldap.h
-===================================================================
---- a/include/ldap.h 2010-07-12 12:05:43.000000000 +0200
-+++ b/include/ldap.h 2010-07-12 12:07:19.000000000 +0200
-@@ -2487,5 +2487,25 @@
+--- a/include/ldap.h
++++ b/include/ldap.h
+@@ -2518,5 +2518,25 @@
LDAPControl **ctrls,
LDAPDerefRes **drp ));
@@ -41,10 +39,8 @@
+
LDAP_END_DECL
#endif /* _LDAP_H */
-Index: b/libraries/libldap/ntlm.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/libraries/libldap/ntlm.c 2010-07-12 12:07:19.000000000 +0200
+--- /dev/null
++++ 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 +180,8 @@
+ return( ld->ld_errno );
+}
+
-Index: b/libraries/libldap/Makefile.in
-===================================================================
---- a/libraries/libldap/Makefile.in 2010-07-12 12:05:43.000000000 +0200
-+++ b/libraries/libldap/Makefile.in 2010-07-12 12:07:19.000000000 +0200
+--- 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 +200,8 @@
assertion.lo deref.lo
LDAP_INCDIR= ../../include
-Index: b/libraries/libldap_r/Makefile.in
-===================================================================
---- a/libraries/libldap_r/Makefile.in 2010-07-12 12:05:42.000000000 +0200
-+++ b/libraries/libldap_r/Makefile.in 2010-07-12 12:07:19.000000000 +0200
+--- 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 \
@@ -218,7 +210,7 @@
+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
assertion.c deref.c
SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \
- thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
+ thr_posix.c thr_cthreads.c thr_thr.c thr_nt.c \
@@ -47,7 +47,7 @@
init.lo options.lo print.lo string.lo util-int.lo schema.lo \
charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
Modified: openldap/trunk/debian/patches/getaddrinfo-is-threadsafe
===================================================================
--- openldap/trunk/debian/patches/getaddrinfo-is-threadsafe 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/getaddrinfo-is-threadsafe 2011-03-26 11:12:18 UTC (rev 1341)
@@ -13,43 +13,31 @@
configure-time check for glibc and disabling the mutex only on known
thread-safe implementations.
-Index: b/libraries/libldap/os-ip.c
-===================================================================
---- a/libraries/libldap/os-ip.c 2010-07-12 12:05:38.000000000 +0200
-+++ b/libraries/libldap/os-ip.c 2010-07-12 12:07:30.000000000 +0200
-@@ -592,17 +592,8 @@
+--- a/libraries/libldap/os-ip.c
++++ b/libraries/libldap/os-ip.c
+@@ -592,13 +592,7 @@
hints.ai_socktype = socktype;
snprintf(serv, sizeof serv, "%d", port );
--#ifdef LDAP_R_COMPILE
- /* most getaddrinfo(3) use non-threadsafe resolver libraries */
-- ldap_pvt_thread_mutex_lock(&ldap_int_resolv_mutex);
--#endif
+- LDAP_MUTEX_LOCK(&ldap_int_resolv_mutex);
-
err = getaddrinfo( host, serv, &hints, &res );
-
--#ifdef LDAP_R_COMPILE
-- ldap_pvt_thread_mutex_unlock(&ldap_int_resolv_mutex);
--#endif
-
+- LDAP_MUTEX_UNLOCK(&ldap_int_resolv_mutex);
+-
if ( err != 0 ) {
osip_debug(ld, "ldap_connect_to_host: getaddrinfo failed: %s\n",
AC_GAI_STRERROR(err), 0, 0);
-Index: b/libraries/libldap/util-int.c
-===================================================================
---- a/libraries/libldap/util-int.c 2010-07-12 12:05:37.000000000 +0200
-+++ b/libraries/libldap/util-int.c 2010-07-12 12:07:30.000000000 +0200
-@@ -444,13 +444,7 @@
+--- a/libraries/libldap/util-int.c
++++ b/libraries/libldap/util-int.c
+@@ -426,9 +426,7 @@
int rc;
#if defined( HAVE_GETNAMEINFO )
--#if defined( LDAP_R_COMPILE )
-- ldap_pvt_thread_mutex_lock( &ldap_int_resolv_mutex );
--#endif
+- LDAP_MUTEX_LOCK( &ldap_int_resolv_mutex );
rc = getnameinfo( sa, len, name, namelen, NULL, 0, 0 );
--#if defined( LDAP_R_COMPILE )
-- ldap_pvt_thread_mutex_unlock( &ldap_int_resolv_mutex );
--#endif
+- LDAP_MUTEX_UNLOCK( &ldap_int_resolv_mutex );
if ( rc ) *err = (char *)AC_GAI_STRERROR( rc );
return rc;
Modified: openldap/trunk/debian/patches/index-files-created-as-root
===================================================================
--- openldap/trunk/debian/patches/index-files-created-as-root 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/index-files-created-as-root 2011-03-26 11:12:18 UTC (rev 1341)
@@ -11,10 +11,8 @@
backend and aborting if slapd is run as a different user than the database
owner, which is an even better fix.
-Index: b/doc/man/man8/slapindex.8
-===================================================================
---- a/doc/man/man8/slapindex.8 2010-07-12 12:05:40.000000000 +0200
-+++ b/doc/man/man8/slapindex.8 2010-07-12 12:07:26.000000000 +0200
+--- 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.
@@ -26,10 +24,8 @@
This command provides ample opportunity for the user to obtain
and drink their favorite beverage.
.SH EXAMPLES
-Index: b/servers/slapd/slapindex.c
-===================================================================
---- a/servers/slapd/slapindex.c 2010-07-12 12:05:39.000000000 +0200
-+++ b/servers/slapd/slapindex.c 2010-07-12 12:07:26.000000000 +0200
+--- 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/issue-6534-patch
===================================================================
--- openldap/trunk/debian/patches/issue-6534-patch 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/issue-6534-patch 2011-03-26 11:12:18 UTC (rev 1341)
@@ -1,7 +1,5 @@
-Index: b/libraries/liblutil/detach.c
-===================================================================
---- a/libraries/liblutil/detach.c 2010-07-12 12:05:35.000000000 +0200
-+++ b/libraries/liblutil/detach.c 2010-07-12 12:07:36.000000000 +0200
+--- a/libraries/liblutil/detach.c
++++ b/libraries/liblutil/detach.c
@@ -128,7 +128,7 @@
#ifdef HAVE_SETSID
Modified: openldap/trunk/debian/patches/ldap-conf-tls-cacertdir
===================================================================
--- openldap/trunk/debian/patches/ldap-conf-tls-cacertdir 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/ldap-conf-tls-cacertdir 2011-03-26 11:12:18 UTC (rev 1341)
@@ -1,31 +1,29 @@
-Index: b/doc/man/man5/ldap.conf.5
-===================================================================
---- a/doc/man/man5/ldap.conf.5 2010-07-12 12:07:32.000000000 +0200
-+++ b/doc/man/man5/ldap.conf.5 2010-07-12 12:07:37.000000000 +0200
+--- a/doc/man/man5/ldap.conf.5
++++ b/doc/man/man5/ldap.conf.5
@@ -317,7 +317,7 @@
.B TLS_CACERT
is always used before
.B TLS_CACERTDIR.
--This parameter is ignored with GNUtls.
-+This parameter is ignored with GNUtls. On Debian openldap is linked against GNUtls.
- .TP
- .B TLS_CERT <filename>
- Specifies the file that contains the client certificate.
-@@ -368,7 +368,7 @@
+-This parameter is ignored with GnuTLS.
++This parameter is ignored with GnuTLS. On Debian openldap is linked against GnuTLS.
+
+ When using Mozilla NSS, <path> may contain a Mozilla NSS cert/key
+ database. If <path> contains a Mozilla NSS cert/key database and
+@@ -411,7 +411,7 @@
Specifies the file to obtain random bits from when /dev/[u]random is
not available. Generally set to the name of the EGD/PRNGD socket.
The environment variable RANDFILE can also be used to specify the filename.
--This parameter is ignored with GNUtls.
-+This parameter is ignored with GNUtls. On Debian openldap is linked against GNUtls.
+-This parameter is ignored with GnuTLS and Mozilla NSS.
++This parameter is ignored with GnuTLS and Mozilla NSS. On Debian openldap is linked against GnuTLS.
.TP
.B TLS_REQCERT <level>
Specifies what checks to perform on server certificates in a TLS session,
-@@ -401,7 +401,7 @@
+@@ -444,7 +444,7 @@
used to verify if the server certificates have not been revoked. This
requires
.B TLS_CACERTDIR
--parameter to be set. This parameter is ignored with GNUtls.
-+parameter to be set. This parameter is ignored with GNUtls. On Debian openldap is linked against GNUtls.
+-parameter to be set. This parameter is ignored with GnuTLS and Mozilla NSS.
++parameter to be set. This parameter is ignored with GnuTLS and Mozilla NSS. On Debian openldap is linked against GnuTLS.
.B <level>
can be specified as one of the following keywords:
.RS
Modified: openldap/trunk/debian/patches/ldapi-socket-place
===================================================================
--- openldap/trunk/debian/patches/ldapi-socket-place 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/ldapi-socket-place 2011-03-26 11:12:18 UTC (rev 1341)
@@ -3,10 +3,8 @@
Debian-specific.
-Index: b/include/ldap_defaults.h
-===================================================================
---- a/include/ldap_defaults.h 2010-07-12 12:05:41.000000000 +0200
-+++ b/include/ldap_defaults.h 2010-07-12 12:07:23.000000000 +0200
+--- 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 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/libldap-symbol-versions 2011-03-26 11:12:18 UTC (rev 1341)
@@ -8,10 +8,8 @@
Upstream ITS #5365 filed requesting symbol versioning for libldap and
libber.
-Index: b/libraries/libldap_r/Makefile.in
-===================================================================
---- a/libraries/libldap_r/Makefile.in 2010-07-12 12:07:19.000000000 +0200
-+++ b/libraries/libldap_r/Makefile.in 2010-07-12 12:07:28.000000000 +0200
+--- 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)
@@ -22,10 +20,8 @@
.links : Makefile
@for i in $(XXSRCS); do \
-Index: b/build/top.mk
-===================================================================
---- a/build/top.mk 2010-07-12 12:05:38.000000000 +0200
-+++ b/build/top.mk 2010-07-12 12:07:28.000000000 +0200
+--- 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)
@@ -45,11 +41,9 @@
LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \
$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
-Index: b/build/openldap.m4
-===================================================================
---- a/build/openldap.m4 2010-07-12 12:05:38.000000000 +0200
-+++ b/build/openldap.m4 2010-07-12 12:07:28.000000000 +0200
-@@ -1129,3 +1129,54 @@
+--- a/build/openldap.m4
++++ b/build/openldap.m4
+@@ -1136,3 +1136,54 @@
#endif
], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
])
@@ -104,11 +98,9 @@
+ ol_cv_ld_version_script_option=no
+fi
+rm -f conftest*])])
-Index: b/configure.in
-===================================================================
---- a/configure.in 2010-07-12 12:05:38.000000000 +0200
-+++ b/configure.in 2010-07-12 12:07:28.000000000 +0200
-@@ -1895,6 +1895,13 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1901,6 +1901,13 @@
fi
AC_SUBST(LTSTATIC)dnl
@@ -122,10 +114,8 @@
dnl ----------------------------------------------------------------
if test $ol_enable_wrappers != no ; then
AC_CHECK_HEADERS(tcpd.h,[
-Index: b/libraries/libldap/libldap.map
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/libraries/libldap/libldap.map 2010-07-12 12:07:28.000000000 +0200
+--- /dev/null
++++ b/libraries/libldap/libldap.map
@@ -0,0 +1,6 @@
+OPENLDAP_2.4_2 {
+ global:
@@ -133,10 +123,8 @@
+ local:
+ *;
+};
-Index: b/libraries/libldap/Makefile.in
-===================================================================
---- a/libraries/libldap/Makefile.in 2010-07-12 12:07:19.000000000 +0200
-+++ b/libraries/libldap/Makefile.in 2010-07-12 12:07:28.000000000 +0200
+--- 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)
@@ -147,10 +135,8 @@
apitest: $(XLIBS) apitest.o
$(LTLINK) -o $@ apitest.o $(LIBS)
-Index: b/libraries/liblber/Makefile.in
-===================================================================
---- a/libraries/liblber/Makefile.in 2010-07-12 12:05:38.000000000 +0200
-+++ b/libraries/liblber/Makefile.in 2010-07-12 12:07:28.000000000 +0200
+--- a/libraries/liblber/Makefile.in
++++ b/libraries/liblber/Makefile.in
@@ -38,6 +38,9 @@
XXLIBS =
NT_LINK_LIBS = $(AC_LIBS)
@@ -161,10 +147,8 @@
dtest: $(XLIBS) dtest.o
$(LTLINK) -o $@ dtest.o $(LIBS)
-Index: b/libraries/liblber/liblber.map
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/libraries/liblber/liblber.map 2010-07-12 12:07:28.000000000 +0200
+--- /dev/null
++++ 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 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/man-slapd 2011-03-26 11:12:18 UTC (rev 1341)
@@ -4,10 +4,8 @@
Debian-specific.
-Index: b/doc/man/man8/slapd.8
-===================================================================
---- a/doc/man/man8/slapd.8 2010-07-12 12:05:43.000000000 +0200
-+++ b/doc/man/man8/slapd.8 2010-07-12 12:07:18.000000000 +0200
+--- a/doc/man/man8/slapd.8
++++ b/doc/man/man8/slapd.8
@@ -5,7 +5,7 @@
.SH NAME
slapd \- Stand-alone LDAP Daemon
Deleted: openldap/trunk/debian/patches/manpage-tlscyphersuite-additions
===================================================================
--- openldap/trunk/debian/patches/manpage-tlscyphersuite-additions 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/manpage-tlscyphersuite-additions 2011-03-26 11:12:18 UTC (rev 1341)
@@ -1,94 +0,0 @@
-Index: b/doc/man/man5/ldap.conf.5
-===================================================================
---- a/doc/man/man5/ldap.conf.5 2010-07-12 12:05:36.000000000 +0200
-+++ b/doc/man/man5/ldap.conf.5 2010-07-12 12:07:32.000000000 +0200
-@@ -333,20 +333,36 @@
- .TP
- .B TLS_CIPHER_SUITE <cipher-suite-spec>
- Specifies acceptable cipher suite and preference order.
--<cipher-suite-spec> should be a cipher specification for OpenSSL,
--e.g., HIGH:MEDIUM:+SSLv2.
-+<cipher-suite-spec> should be a cipher specification for OpenSSL resp. GNUtls
-+Example:
-+.RS
-+.RS
-+.TP
-+.I OpenSSL:
-+TLS_CIPHER_SUITE HIGH:MEDIUM:+SSLv2
-+.TP
-+.I GNUtls:
-+TLS_CIPHER_SUITE SECURE256:!AES-128-CBC
-+.RE
-
--To check what ciphers a given spec selects, use:
-+To check what ciphers a given spec selects in OpenSSL, use:
-
- .nf
- openssl ciphers \-v <cipher-suite-spec>
- .fi
-
--To obtain the list of ciphers in GNUtls use:
-+With GNUtls the available specs can be found in the manual page of
-+.BR gnutls\-cli (1)
-+(see the description of the
-+option
-+.BR \-\-priority ).
-
-+In older versions of GNUtls, where gnutls\-cli does not support the option
-+\-\-priority, you can obtain the \(em more limited \(em list of ciphers by calling:
- .nf
-- gnutls-cli \-l
-+ gnutls\-cli \-l
- .fi
-+.RE
- .TP
- .B TLS_RANDFILE <filename>
- Specifies the file to obtain random bits from when /dev/[u]random is
-Index: b/doc/man/man5/slapd.conf.5
-===================================================================
---- a/doc/man/man5/slapd.conf.5 2010-07-12 12:07:24.000000000 +0200
-+++ b/doc/man/man5/slapd.conf.5 2010-07-12 12:07:32.000000000 +0200
-@@ -1029,22 +1029,37 @@
- .TP
- .B TLSCipherSuite <cipher-suite-spec>
- Permits configuring what ciphers will be accepted and the preference order.
--<cipher-suite-spec> should be a cipher specification for OpenSSL. Example:
--
-+<cipher-suite-spec> should be a cipher specification for OpenSSL resp. GNUtls.
-+Example:
-+.RS
-+.RS
-+.TP
-+.I OpenSSL:
- TLSCipherSuite HIGH:MEDIUM:+SSLv2
-+.TP
-+.I GNUtls:
-+TLSCiphersuite SECURE256:!AES-128-CBC
-+.RE
-
--To check what ciphers a given spec selects, use:
-+To check what ciphers a given spec selects in OpenSSL, use:
-
- .nf
- openssl ciphers \-v <cipher-suite-spec>
- .fi
-
--To obtain the list of ciphers in GNUtls use:
-+With GNUtls the available specs can be found in the manual page of
-+.BR gnutls\-cli (1)
-+(see the description of the
-+option
-+.BR \-\-priority ).
-+
-+In older versions of GNUtls, where gnutls\-cli does not support the option
-+\-\-priority, you can obtain the \(em more limited \(em list of ciphers by calling:
-
- .nf
-- gnutls-cli \-l
-+ gnutls\-cli \-l
- .fi
--
-+.RE
- .TP
- .B TLSCACertificateFile <filename>
- Specifies the file that contains certificates for all of the Certificate
Modified: openldap/trunk/debian/patches/sasl-default-path
===================================================================
--- openldap/trunk/debian/patches/sasl-default-path 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/sasl-default-path 2011-03-26 11:12:18 UTC (rev 1341)
@@ -3,10 +3,8 @@
Not submitted upstream. Somewhat Debian-specific and probably not of
interest upstream.
-Index: b/include/ldap_defaults.h
-===================================================================
---- a/include/ldap_defaults.h 2010-07-12 12:07:24.000000000 +0200
-+++ b/include/ldap_defaults.h 2010-07-12 12:07:27.000000000 +0200
+--- 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,10 +12,8 @@
+#define SASL_CONFIGPATH LDAP_SYSCONFDIR LDAP_DIRSEP "sasl2"
+
#endif /* _LDAP_CONFIG_H */
-Index: b/servers/slapd/sasl.c
-===================================================================
---- a/servers/slapd/sasl.c 2010-07-12 12:05:39.000000000 +0200
-+++ b/servers/slapd/sasl.c 2010-07-12 12:07:27.000000000 +0200
+--- a/servers/slapd/sasl.c
++++ b/servers/slapd/sasl.c
@@ -1104,12 +1104,38 @@
};
#endif
Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/series 2011-03-26 11:12:18 UTC (rev 1341)
@@ -9,7 +9,6 @@
libldap-symbol-versions
getaddrinfo-is-threadsafe
do-not-second-guess-sonames
-manpage-tlscyphersuite-additions
smbk5pwd-makefile
autogroup-makefile
issue-6534-patch
Modified: openldap/trunk/debian/patches/service-operational-before-detach
===================================================================
--- openldap/trunk/debian/patches/service-operational-before-detach 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/service-operational-before-detach 2011-03-26 11:12:18 UTC (rev 1341)
@@ -1,8 +1,6 @@
-Index: b/servers/slapd/main.c
-===================================================================
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
-@@ -880,14 +880,28 @@
+@@ -902,14 +902,28 @@
(void) SIGNAL( SIGBREAK, slap_sig_shutdown );
#endif
@@ -35,7 +33,7 @@
if ( slapd_pid_file != NULL ) {
FILE *fp = fopen( slapd_pid_file, "w" );
-@@ -936,20 +950,6 @@
+@@ -958,20 +972,6 @@
slapd_args_file_unlink = 1;
}
Modified: openldap/trunk/debian/patches/slapi-errorlog-file
===================================================================
--- openldap/trunk/debian/patches/slapi-errorlog-file 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/slapi-errorlog-file 2011-03-26 11:12:18 UTC (rev 1341)
@@ -3,10 +3,8 @@
Debian-specific.
-Index: b/servers/slapd/slapi/slapi_overlay.c
-===================================================================
---- a/servers/slapd/slapi/slapi_overlay.c 2010-07-12 12:05:41.000000000 +0200
-+++ b/servers/slapd/slapi/slapi_overlay.c 2010-07-12 12:07:22.000000000 +0200
+--- 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/smbk5pwd-makefile
===================================================================
--- openldap/trunk/debian/patches/smbk5pwd-makefile 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/smbk5pwd-makefile 2011-03-26 11:12:18 UTC (rev 1341)
@@ -1,7 +1,5 @@
-Index: b/contrib/slapd-modules/smbk5pwd/Makefile
-===================================================================
---- a/contrib/slapd-modules/smbk5pwd/Makefile 2010-07-12 12:05:36.000000000 +0200
-+++ b/contrib/slapd-modules/smbk5pwd/Makefile 2010-07-12 12:07:33.000000000 +0200
+--- a/contrib/slapd-modules/smbk5pwd/Makefile
++++ b/contrib/slapd-modules/smbk5pwd/Makefile
@@ -12,30 +12,30 @@
# top-level directory of the distribution or, alternatively, at
# <http://www.OpenLDAP.org/license.html>.
Modified: openldap/trunk/debian/patches/wrong-database-location
===================================================================
--- openldap/trunk/debian/patches/wrong-database-location 2011-03-26 09:23:02 UTC (rev 1340)
+++ openldap/trunk/debian/patches/wrong-database-location 2011-03-26 11:12:18 UTC (rev 1341)
@@ -3,10 +3,8 @@
Debian-specific.
-Index: b/doc/man/man5/slapd-bdb.5
-===================================================================
---- a/doc/man/man5/slapd-bdb.5 2010-07-12 12:05:40.000000000 +0200
-+++ b/doc/man/man5/slapd-bdb.5 2010-07-12 12:07:24.000000000 +0200
+--- 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 +14,9 @@
.TP
.B dirtyread
Allow reads of modified but not yet committed data.
-Index: b/doc/man/man5/slapd.conf.5
-===================================================================
---- a/doc/man/man5/slapd.conf.5 2010-07-12 12:05:41.000000000 +0200
-+++ b/doc/man/man5/slapd.conf.5 2010-07-12 12:07:24.000000000 +0200
-@@ -1899,7 +1899,7 @@
+--- a/doc/man/man5/slapd.conf.5
++++ b/doc/man/man5/slapd.conf.5
+@@ -1969,7 +1969,7 @@
# The database directory MUST exist prior to
# running slapd AND should only be accessible
# by the slapd/tools. Mode 0700 recommended.
@@ -29,10 +25,8 @@
# Indices to maintain
index objectClass eq
index cn,sn,mail pres,eq,approx,sub
-Index: b/include/ldap_defaults.h
-===================================================================
---- a/include/ldap_defaults.h 2010-07-12 12:07:23.000000000 +0200
-+++ b/include/ldap_defaults.h 2010-07-12 12:07:24.000000000 +0200
+--- 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 +36,8 @@
#define SLAPD_DEFAULT_DB_MODE 0600
#define SLAPD_DEFAULT_UCDATA LDAP_DATADIR LDAP_DIRSEP "ucdata"
/* default max deref depth for aliases */
-Index: b/servers/slapd/Makefile.in
-===================================================================
---- a/servers/slapd/Makefile.in 2010-07-12 12:05:40.000000000 +0200
-+++ b/servers/slapd/Makefile.in 2010-07-12 12:07:24.000000000 +0200
+--- a/servers/slapd/Makefile.in
++++ b/servers/slapd/Makefile.in
@@ -430,9 +430,9 @@
install-db-config: FORCE
@@ -58,11 +50,9 @@
$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
-Index: b/doc/man/man5/slapd-config.5
-===================================================================
---- a/doc/man/man5/slapd-config.5 2010-07-12 12:05:40.000000000 +0200
-+++ b/doc/man/man5/slapd-config.5 2010-07-12 12:07:24.000000000 +0200
-@@ -1943,7 +1943,7 @@
+--- a/doc/man/man5/slapd-config.5
++++ b/doc/man/man5/slapd-config.5
+@@ -2015,7 +2015,7 @@
# The database directory MUST exist prior to
# running slapd AND should only be accessible
# by the slapd/tools. Mode 0700 recommended.
More information about the Pkg-openldap-devel
mailing list