[Pkg-openldap-devel] r1299 - in openldap/trunk/debian: . patches
matthijs at alioth.debian.org
matthijs at alioth.debian.org
Sun Aug 8 14:36:52 UTC 2010
tags 589915 pending
thanks
Author: matthijs
Date: 2010-08-08 14:36:48 +0000 (Sun, 08 Aug 2010)
New Revision: 1299
Added:
openldap/trunk/debian/patches/service-operational-before-detach
Modified:
openldap/trunk/debian/changelog
openldap/trunk/debian/control
openldap/trunk/debian/patches/series
openldap/trunk/debian/slapd.NEWS
Log:
* Update Standards-Version
* Add patch to have the service operational before detaching.
Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog 2010-08-03 15:51:18 UTC (rev 1298)
+++ openldap/trunk/debian/changelog 2010-08-08 14:36:48 UTC (rev 1299)
@@ -1,4 +1,4 @@
-openldap (2.4.23-3exp1) experimental; urgency=low
+openldap (2.4.23-3) unstable; urgency=low
* Configure the newly installed openldap package using slapd.d instead of
slapd.conf, merged from ubuntu. (Closes: #562723, #494155, #333428)
@@ -14,8 +14,11 @@
* Update spanish translation, thanks Francisco Javier Cuadrado
(Closes: #590829)
* Update basque translation, thanks Iñaki Larrañaga Murgoitio
+ * Bump Standards-Version to 3.9.1
+ * Added debian specific patch to wait until slapd is operational before
+ detaching to the terminal (Closes: #589915)
- -- Matthijs Mohlmann <matthijs at cacholong.nl> Sun, 01 Aug 2010 14:18:17 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl> Sun, 08 Aug 2010 15:59:31 +0200
openldap (2.4.23-2) unstable; urgency=medium
Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control 2010-08-03 15:51:18 UTC (rev 1298)
+++ openldap/trunk/debian/control 2010-08-08 14:36:48 UTC (rev 1299)
@@ -14,7 +14,7 @@
libwrap0-dev, perl, debconf-utils, po-debconf, quilt (>= 0.40),
autotools-dev, libtool, automake, autoconf, groff-base, time, heimdal-dev
Build-Conflicts: libbind-dev, bind-dev, libicu-dev, libssl-dev
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://www.openldap.org/
Vcs-Svn: svn://svn.debian.org/pkg-openldap/openldap/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-openldap/openldap/trunk
Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series 2010-08-03 15:51:18 UTC (rev 1298)
+++ openldap/trunk/debian/patches/series 2010-08-08 14:36:48 UTC (rev 1299)
@@ -14,3 +14,4 @@
autogroup-makefile
issue-6534-patch
ldap-conf-tls-cacertdir
+service-operational-before-detach
Added: openldap/trunk/debian/patches/service-operational-before-detach
===================================================================
--- openldap/trunk/debian/patches/service-operational-before-detach (rev 0)
+++ openldap/trunk/debian/patches/service-operational-before-detach 2010-08-08 14:36:48 UTC (rev 1299)
@@ -0,0 +1,26 @@
+Index: b/servers/slapd/main.c
+===================================================================
+--- a/servers/slapd/main.c
++++ b/servers/slapd/main.c
+@@ -880,10 +880,6 @@
+ (void) SIGNAL( SIGBREAK, slap_sig_shutdown );
+ #endif
+
+-#ifndef HAVE_WINSOCK
+- lutil_detach( no_detach, 0 );
+-#endif /* HAVE_WINSOCK */
+-
+ #ifdef CSRIMALLOC
+ mal_leaktrace(1);
+ #endif
+@@ -950,6 +946,10 @@
+ goto shutdown;
+ }
+
++#ifndef HAVE_WINSOCK
++ lutil_detach( no_detach, 0 );
++#endif /* HAVE_WINSOCK */
++
+ Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
+
+ #ifdef HAVE_NT_EVENT_LOG
Modified: openldap/trunk/debian/slapd.NEWS
===================================================================
--- openldap/trunk/debian/slapd.NEWS 2010-08-03 15:51:18 UTC (rev 1298)
+++ openldap/trunk/debian/slapd.NEWS 2010-08-08 14:36:48 UTC (rev 1299)
@@ -1,4 +1,4 @@
-openldap (2.4.23-3exp1) unstable; urgency=low
+openldap (2.4.23-3) unstable; urgency=low
The OpenLDAP packages in Debian have a different configuration style now.
Please take a look at README.Debian for more information.
More information about the Pkg-openldap-devel
mailing list