[Pkg-openldap-devel] r659 - in openldap/trunk-2.3/debian: . patches
Matthijs Mohlmann
active2-guest at costa.debian.org
Thu May 25 20:56:26 UTC 2006
Author: active2-guest
Date: 2006-05-25 20:56:25 +0000 (Thu, 25 May 2006)
New Revision: 659
Added:
openldap/trunk-2.3/debian/patches/slapi-errorlog-file
Removed:
openldap/trunk-2.3/debian/configure.options
openldap/trunk-2.3/debian/patches/configure.in-fix
Modified:
openldap/trunk-2.3/debian/changelog
openldap/trunk-2.3/debian/patches/series
openldap/trunk-2.3/debian/rules
Log:
* Remove configure.in patch
* Added patch slapi-errorlog-file.
* Move debian/configure.options.new to configure.options (move will be done in
next commit)
* Updated debian/rules to use debian/configure.options.
Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog 2006-05-25 19:11:57 UTC (rev 658)
+++ openldap/trunk-2.3/debian/changelog 2006-05-25 20:56:25 UTC (rev 659)
@@ -1,13 +1,15 @@
openldap2.3 (2.3.23-2) unstable; urgency=low
[ Matthijs Mohlmann ]
- * Update patch slurpd-in-spool. (Closes: #368586, #368709)
+ * Update patch slurpd-in-spool. (Closes: #368586, #368709, #368889)
+ * Removed patch configure.in-fix, incorporated upstream.
+ * Move debian/configure.options.new to debian/configure.options.
[ Torsten Landschoff ]
- * Include man pages for accesslog and auditlog overlays, patch by
+ * Include man pages for accesslog and auditlog overlays, patch by
Peter Marschall (closes: #368888).
- -- Matthijs Mohlmann <matthijs at cacholong.nl> Mon, 22 May 2006 19:25:19 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl> Thu, 25 May 2006 22:54:10 +0200
openldap2.3 (2.3.23-1) unstable; urgency=low
Deleted: openldap/trunk-2.3/debian/configure.options
===================================================================
--- openldap/trunk-2.3/debian/configure.options 2006-05-25 19:11:57 UTC (rev 658)
+++ openldap/trunk-2.3/debian/configure.options 2006-05-25 20:56:25 UTC (rev 659)
@@ -1,152 +0,0 @@
-#Copyright 1998-2004 The OpenLDAP Foundation. All rights reserved.
-# Restrictions apply, see COPYRIGHT and LICENSE files.
-#Usage: configure [options] [host]
-#Options: [defaults in brackets after descriptions]
-#Configuration:
-# --cache-file=FILE cache test results in FILE
-# --help print this message
-# --no-create do not create output files
-# --quiet, --silent do not print `checking...' messages
-# --version print the version of autoconf that created configure
-#Directory and file names:
-# --prefix=PREFIX install architecture-independent files in PREFIX
-# [/usr/local]
---prefix=/usr
-# --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-# [same as prefix]
-# --bindir=DIR user executables in DIR [EPREFIX/bin]
-# --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
-# --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
---libexecdir='${prefix}/lib'
-# --datadir=DIR read-only architecture-independent data in DIR
-# [PREFIX/share]
-# --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
---sysconfdir=/etc
-# --sharedstatedir=DIR modifiable architecture-independent data in DIR
-# [PREFIX/com]
-# --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
---localstatedir=/var
-# --libdir=DIR object code libraries in DIR [EPREFIX/lib]
-# --includedir=DIR C header files in DIR [PREFIX/include]
-# --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
-# --infodir=DIR info documentation in DIR [PREFIX/info]
-# --mandir=DIR man documentation in DIR [PREFIX/man]
---mandir='${prefix}/share/man'
-# --srcdir=DIR find the sources in DIR [configure dir or ..]
-# --program-prefix=PREFIX prepend PREFIX to installed program names
-# --program-suffix=SUFFIX append SUFFIX to installed program names
-# --program-transform-name=PROGRAM
-# run sed PROGRAM on installed program names
-#Host type:
-# --build=BUILD configure for building on BUILD [BUILD=HOST]
-# --host=HOST configure for HOST [guessed]
-# --target=TARGET configure for TARGET [TARGET=HOST]
-#Features and packages:
-# --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
-# --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-# --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-# --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
-# --x-includes=DIR X include files are in DIR
-# --x-libraries=DIR X library files are in DIR
-#--enable and --with options recognized:
-# --with-subdir=DIR change default subdirectory used for installs
---with-subdir=ldap
-# --enable-debug enable debugging [yes]
-## Our users might want to use the -d option
---enable-debug
-# --enable-dynamic enable linking built binaries with dynamic libs [no]
---enable-dynamic
-# --enable-syslog enable syslog support [auto]
---enable-syslog
-# --enable-proctitle enable proctitle support [yes]
---enable-proctitle
-# --enable-ipv6 enable IPv6 support [auto]
-## Debian tries to fully support IPv6 so we need this
---enable-ipv6
-# --enable-local enable AF_LOCAL (AF_UNIX) socket support [auto]
---enable-local
-# --with-cyrus-sasl with Cyrus SASL support [auto]
---with-cyrus-sasl
-# --with-fetch with fetch(3) URL support [auto]
-# --with-threads with threads [auto]
---with-threads
-# --with-tls with TLS/SSL support [auto]
-## XXX: Use OpenSSL for now - need a new GNUTLS patch
---with-tls
-# --with-yielding-select with implicitly yielding select [auto]
-#
-#SLAPD (Standalone LDAP Daemon) Options:
-# --enable-slapd enable building slapd [yes]
---enable-slapd
-# --enable-aci enable per-object ACIs (experimental) [no]
---enable-aci
-# --enable-cleartext enable cleartext passwords [yes]
---enable-cleartext
-# --enable-crypt enable crypt(3) passwords [no]
---enable-crypt
-# --enable-lmpasswd enable LAN Manager passwords [no]
-## XXX: disabled, needs OpenSSL
-# --enable-spasswd enable (Cyrus) SASL password verification [no]
---enable-spasswd
-# --enable-modules enable dynamic module support [no]
---enable-modules
-# --enable-rewrite enable DN rewriting in back-ldap and the rwm overlay [auto]
---enable-rewrite
-# --enable-rlookups enable reverse lookups of client hostnames [no]
---enable-rlookups
-# --enable-slapi enable SLAPI support (experimental) [no]
-# --enable-slp enable SLPv2 support [no]
---enable-slp
-# --enable-wrappers enable tcp wrapper support [no]
---enable-wrappers
-#
-#SLAPD Backend Options:
-# --enable-bdb enable Berkeley DB backend no|yes|mod [yes]
---enable-bdb=mod
-# --enable-dnssrv enable dnssrv backend no|yes|mod [no]
---enable-dnssrv=mod
-# --enable-hdb enable Hierarchical DB backend no|yes|mod [no]
-# XXX: new, let's see if it builds -- Torsten
---enable-hdb=mod
-# --enable-ldap enable ldap backend no|yes|mod [no]
-# XXX: build statically because meta and ldap depend on each other
---enable-ldap=yes
-# --enable-ldbm enable ldbm backend no|yes|mod [no]
---enable-ldbm=mod
-# --with-ldbm-api with LDBM API auto|berkeley|bcompat|mdbm|gdbm [auto]
---with-ldbm-api=berkeley
-# --with-ldbm-type use LDBM type auto|btree|hash [auto]
-# --enable-meta enable metadirectory backend no|yes|mod [no]
---enable-meta=mod
-# --enable-monitor enable monitor backend no|yes|mod [yes]
---enable-monitor=mod
-# --enable-null enable null backend no|yes|mod [no]
---enable-null=mod
-# --enable-passwd enable passwd backend no|yes|mod [no]
---enable-passwd=mod
-# --enable-perl enable perl backend no|yes|mod [no]
---enable-perl=mod
-# --enable-shell enable shell backend no|yes|mod [no]
---enable-shell=mod
-# --enable-sql enable sql backend no|yes|mod [no]
---enable-sql=mod
-#
-#SLAPD Overlay Options:
-# --enable-dyngroup Dynamic Group overlay no|yes|mod [no]
---enable-dyngroup=mod
-# --enable-proxycache Proxy Cache overlay no|yes|mod [no]
---enable-proxycache=mod
-#
-#SLURPD (Replication Daemon) Options:
-# --enable-slurpd enable building slurpd [auto]
---enable-slurpd
-#
-#Library Generation & Linking Options
-# --enable-static[=PKGS] build static libraries [default=yes]
-# --enable-shared[=PKGS] build shared libraries [default=yes]
-# --enable-fast-install[=PKGS] optimize for fast installation [default=yes]
-# --with-gnu-ld assume the C compiler uses GNU ld [default=no]
-# --disable-libtool-lock avoid locking (might break parallel builds)
-# --with-pic try to use only PIC/non-PIC objects [default=use both]
-#
-#See INSTALL file for further details.
Deleted: openldap/trunk-2.3/debian/patches/configure.in-fix
===================================================================
--- openldap/trunk-2.3/debian/patches/configure.in-fix 2006-05-25 19:11:57 UTC (rev 658)
+++ openldap/trunk-2.3/debian/patches/configure.in-fix 2006-05-25 20:56:25 UTC (rev 659)
@@ -1,22 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in.orig
-+++ configure.in
-@@ -2413,7 +2413,7 @@
- dnl ----------------------------------------------------------------
- dnl Check for multiple precision support
- if test $ol_with_mp = longlong || test $ol_with_mp = auto ; then
-- if test $ac_cv_sizeof_long_long > 4 ; then
-+ if test $ac_cv_sizeof_long_long -gt 4 ; then
- ol_with_mp=longlong
- AC_DEFINE(USE_MP_LONG_LONG,1,[define to use 'long long' for MP])
- elif test $ol_with_mp = longlong ; then
-@@ -2421,7 +2421,7 @@
- fi
- fi
- if test $ol_with_mp = long || test $ol_with_mp = auto ; then
-- if test $ac_cv_sizeof_long > 4 ; then
-+ if test $ac_cv_sizeof_long -gt 4 ; then
- ol_with_mp=long
- AC_DEFINE(USE_MP_LONG,1,[define to use 'long' for MP])
- elif test $ol_with_mp = long ; then
Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series 2006-05-25 19:11:57 UTC (rev 658)
+++ openldap/trunk-2.3/debian/patches/series 2006-05-25 20:56:25 UTC (rev 659)
@@ -6,3 +6,4 @@
libldap-makefile_in
add-autogen-sh
fixmanpages -p0
+slapi-errorlog-file -p0
Added: openldap/trunk-2.3/debian/patches/slapi-errorlog-file
===================================================================
--- openldap/trunk-2.3/debian/patches/slapi-errorlog-file 2006-05-25 19:11:57 UTC (rev 658)
+++ openldap/trunk-2.3/debian/patches/slapi-errorlog-file 2006-05-25 20:56:25 UTC (rev 659)
@@ -0,0 +1,13 @@
+Index: servers/slapd/slapi/slapi_overlay.c
+===================================================================
+--- servers/slapd/slapi/slapi_overlay.c.orig
++++ servers/slapd/slapi/slapi_overlay.c
+@@ -882,7 +882,7 @@
+ ldap_pvt_thread_mutex_init( &slapi_printmessage_mutex );
+
+ if ( slapi_log_file == NULL )
+- slapi_log_file = slapi_ch_strdup( LDAP_RUNDIR LDAP_DIRSEP "errors" );
++ slapi_log_file = slapi_ch_strdup( LDAP_RUNDIR LDAP_DIRSEP "log" LDAP_DIRSEP "slapi-errors" );
+
+ rc = slapi_int_init_object_extensions();
+ if ( rc != 0 )
Modified: openldap/trunk-2.3/debian/rules
===================================================================
--- openldap/trunk-2.3/debian/rules 2006-05-25 19:11:57 UTC (rev 658)
+++ openldap/trunk-2.3/debian/rules 2006-05-25 20:56:25 UTC (rev 659)
@@ -19,7 +19,7 @@
INSTALL_PROGRAM += -s
endif
-CONFIG = $(shell grep -v "^\#" debian/configure.options.new)
+CONFIG = $(shell grep -v "^\#" debian/configure.options)
installdir := $(CURDIR)/debian/install
tmpdir := $(CURDIR)/debian/tmp
More information about the Pkg-openldap-devel
mailing list