[Pkg-openldap-devel] r859 - openldap/trunk-2.3/debian
Russ Allbery
rra at alioth.debian.org
Mon Nov 12 01:59:19 UTC 2007
Author: rra
Date: 2007-11-12 01:59:19 +0000 (Mon, 12 Nov 2007)
New Revision: 859
Modified:
openldap/trunk-2.3/debian/changelog
openldap/trunk-2.3/debian/check_upgradepath
openldap/trunk-2.3/debian/slapd.config
openldap/trunk-2.3/debian/slapd.postinst
openldap/trunk-2.3/debian/slapd.scripts-common
openldap/trunk-2.3/debian/slapd.templates
Log:
* Drop debconf questions, warnings, and maintainer script functions
dealing with upgrades from OpenLDAP 2.1, which is now too hold for
supported direct upgrades. (Closes: #444806)
Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog 2007-11-12 01:45:59 UTC (rev 858)
+++ openldap/trunk-2.3/debian/changelog 2007-11-12 01:59:19 UTC (rev 859)
@@ -13,8 +13,11 @@
the allowable default database choices are now BerekelyDB variants and
will probably continue to be so for the forseeable future, and this is
easier to maintain.
+ * Drop debconf questions, warnings, and maintainer script functions
+ dealing with upgrades from OpenLDAP 2.1, which is now too hold for
+ supported direct upgrades. (Closes: #444806)
- -- Russ Allbery <rra at debian.org> Sun, 11 Nov 2007 17:45:17 -0800
+ -- Russ Allbery <rra at debian.org> Sun, 11 Nov 2007 17:57:57 -0800
openldap2.3 (2.3.38-1) unstable; urgency=low
Modified: openldap/trunk-2.3/debian/check_upgradepath
===================================================================
--- openldap/trunk-2.3/debian/check_upgradepath 2007-11-12 01:45:59 UTC (rev 858)
+++ openldap/trunk-2.3/debian/check_upgradepath 2007-11-12 01:59:19 UTC (rev 859)
@@ -2,8 +2,11 @@
set -e
-# WARNING: This script is in sometimes-works-for-me state. Only use if
-# you understand what's going on.
+# WARNING: This script is obsolete and will require a fair bit of work to get
+# working again. It assumes woody, uses debconf questions that don't exist
+# any more, and probably doesn't check everything that you would want to
+# check. Preserved just because I haven't done the work to see if puiparts
+# can now do the same thing in a cleaner way.
# Setup
: ${chroot_dir:=../chroot}
Modified: openldap/trunk-2.3/debian/slapd.config
===================================================================
--- openldap/trunk-2.3/debian/slapd.config 2007-11-12 01:45:59 UTC (rev 858)
+++ openldap/trunk-2.3/debian/slapd.config 2007-11-12 01:59:19 UTC (rev 859)
@@ -11,41 +11,22 @@
# Create an initial directory on fresh install
if is_initial_configuration "$@"; then
- if ! want_manual_configuration; then
- set_defaults_for_unseen_entries
- query_initial_config
- crypt_admin_pass
- configure_allow_v2_binds
- fi
+ if ! want_manual_configuration; then
+ set_defaults_for_unseen_entries
+ query_initial_config
+ crypt_admin_pass
+ configure_allow_v2_binds
+ fi
fi
# Configure the dumping component if we are upgrading some older version
if [ "$1" = configure ] && [ -n "$2" ]; then
configure_ldbm_to_bdb_migration
configure_dumping
- configure_allow_v2_binds
+ configure_allow_v2_binds
fi
-# On upgrade from pre-2.1 we have to ask if we shall fix the config file (if
-# it exists anyway).
-if previous_version_older 2.1; then
- if [ -e "$SLAPD_CONF" ]; then
- db_input medium slapd/autoconf_modules || true
- db_go || true
- fi
-fi
-
-# Since version 2.1.23, slapd requires slave databases to have the updateref
-# option set
-if [ -e "$SLAPD_CONF" ]; then
- if slave_databases_without_updateref; then
- db_input critical slapd/slave_databases_require_updateref || true
- db_go || true
- fi
-fi
-
db_go || true
db_stop || true
exit 0
-
Modified: openldap/trunk-2.3/debian/slapd.postinst
===================================================================
--- openldap/trunk-2.3/debian/slapd.postinst 2007-11-12 01:45:59 UTC (rev 858)
+++ openldap/trunk-2.3/debian/slapd.postinst 2007-11-12 01:59:19 UTC (rev 859)
@@ -31,9 +31,6 @@
echo done. >&2
configure_v2_protocol_support
- if previous_version_older 2.1; then
- autoconfigure_modules
- fi
update_access_config_directives
if previous_version_older 2.3.25-1; then
Modified: openldap/trunk-2.3/debian/slapd.scripts-common
===================================================================
--- openldap/trunk-2.3/debian/slapd.scripts-common 2007-11-12 01:45:59 UTC (rev 858)
+++ openldap/trunk-2.3/debian/slapd.scripts-common 2007-11-12 01:59:19 UTC (rev 859)
@@ -768,43 +768,6 @@
}
# }}}
-autoconfigure_modules() { # {{{
-# On upgrades from pre-2.1 we might have to update the configuration
-# file for loading the backend modules. This function tries to figure out
-# the needed changes automatically.
-# This function should probably go away some time after sarge release.
-
- local new_conf
-
- # Without a configuration we have nothing to update
- if [ ! -e "$SLAPD_CONF" ]; then
- echo " Did not find slapd.conf to update modules" >&2
- return 0
- fi
-
- # If the modulepath directive is already used in slapd.conf we assume
- # that the configuration was already adjusted
- if grep -q ^modulepath $SLAPD_CONF; then return 0; fi
-
- # If the user does not want us to do the module config we bail out
- db_get slapd/autoconf_modules || true
- if [ "$RET" != "true" ]; then return 0; fi
-
- echo -n " Updating config for dynamic backends... " >&2
- new_conf=`mktemp -q ${SLAPD_CONF}.XXXXXX`
- cat <<-EOF >$new_conf
- # Loading of backend modules - automatically generated
-
- modulepath /usr/lib/ldap
- EOF
- read_slapd_conf < $SLAPD_CONF | sed -n >>"$new_conf" \
- 's/^database[[:space:]]\+\([a-z]\+\)/moduleload back_\1/p'
- echo >>$new_conf
- cat $SLAPD_CONF >>$new_conf
- install_new_slapd_conf "$new_conf"
- echo done. >&2
-}
-# }}}
update_path_argsfile_pidfile() { # {{{
write_slapd_conf "$SLAPD_CONF" 's|^(argsfile\s+).*|$1/var/run/slapd/slapd.args|'
write_slapd_conf "$SLAPD_CONF" 's|^(pidfile\s+).*|$1/var/run/slapd/slapd.pid|'
@@ -1151,36 +1114,6 @@
}
# }}}
-slave_databases_without_updateref() { # {{{
-# Read the configuration of the slapd server and check if there are any
-# slave backends without updateref specified.
-# Usage: if slave_databases_without_updateref; then ... fi
-
- (read_slapd_conf < $SLAPD_CONF && echo database) | \
- while read command data; do
- case $command in
- database)
- if [ -n "$backend" ] && [ -n "$updatedn" ] \
- && [ -z "$updateref" ]; then
- return 0
- fi
- backend="$data"
- updatedn=""
- updateref=""
- ;;
- updatedn)
- updatedn="$data"
- ;;
- updateref)
- updateref="$data"
- ;;
- esac
- done || return 0
-
- return 1
-}
-
-# }}}
previous_version_older() { # {{{
# Check if the previous version is newer than the reference version passed.
# If we are not upgrading the previous version is assumed to be newer than
Modified: openldap/trunk-2.3/debian/slapd.templates
===================================================================
--- openldap/trunk-2.3/debian/slapd.templates 2007-11-12 01:45:59 UTC (rev 858)
+++ openldap/trunk-2.3/debian/slapd.templates 2007-11-12 01:59:19 UTC (rev 859)
@@ -88,21 +88,6 @@
Type: password
_Description: Encrypted admin password:
-Template: slapd/autoconf_modules
-Type: boolean
-Default: true
-_Description: Change configuration to load backend modules?
- Starting with OpenLDAP 2.1 backends are not longer built into the
- server but are instead dynamically loaded at startup. This means that
- the slapd configuration has to be changed to load the modules for the
- backends you are using.
- .
- If you choose this option, an attempt to fix the configuration will be
- made. If you don't select this, you *must* fix your configuration file
- yourself or slapd (and slapcat if you are upgrading from an older version)
- will fail and the package will not be installed. For more information,
- read /usr/share/doc/slapd/README.Debian.
-
Template: slapd/allow_ldap_v2
Type: boolean
Default: false
@@ -114,17 +99,6 @@
'allow bind_v2' will be added to your slapd.conf to tell slapd to
accept LDAPv2 connections.
-Template: slapd/fix_directory
-Type: boolean
-Default: true
-_Description: Fix LDAP directory on upgrade?
- The installation scripts of the old OpenLDAP 2.0 packages create a
- directory that does not conform to the ldap schema. The new version is
- more strict about this and you won't be able to access your directory
- after the upgrade without fixing it.
- .
- If you choose this option, an attempt to fix it for you will occur.
-
Template: slapd/suffix_change
Type: boolean
Default: false
@@ -165,19 +139,6 @@
too) or due to a problem in the LDIF file. If the problem was with the
LDIF file, you may be able to fix it and attempt the slapadd again.
-Template: slapd/slave_databases_require_updateref
-Type: note
-_Description: Slave databases require updateref option
- In your slapd configuration file at least one database is
- configured as slave, and the updateref option is not set.
- The updateref option specifies the referral(s) to pass back
- when slapd is asked to modify a replicated local database.
- See slapd.conf(5) for more details.
- .
- Starting with version 2.1.23, slapd requires the updateref
- option to be set on slaves. You should make sure to fix
- your slapd.conf configuration file.
-
Template: slapd/migrate_ldbm_to_bdb
Type: boolean
Default: true
More information about the Pkg-openldap-devel
mailing list