[Pkg-openldap-devel] r623 - openldap/trunk-2.3/debian
Matthijs Mohlmann
active2-guest at costa.debian.org
Tue Feb 21 08:37:39 UTC 2006
Author: active2-guest
Date: 2006-02-21 08:37:38 +0000 (Tue, 21 Feb 2006)
New Revision: 623
Modified:
openldap/trunk-2.3/debian/changelog
openldap/trunk-2.3/debian/configure.options.new
openldap/trunk-2.3/debian/control
openldap/trunk-2.3/debian/control.dev
openldap/trunk-2.3/debian/rules
openldap/trunk-2.3/debian/slapd.config
openldap/trunk-2.3/debian/slapd.scripts-common
Log:
* Removed comments from debian/control, they are actually in debian/control.dev
after we have a gnutls patch we can enable them.
* Now really fix the serious bugs where the password in the database is empty,
it's if [ ! -z "$RET" ] instead of if [ -z "$RET" ]
* chmod fix_ldif and ldiftopasswd executable in debian/rules.
* Use --enable-backends=mod and --enable-overlays instead of specifying every
backend by hand.
* Updated debian/changelog.
* Fix upgrade path from 2.2.* to 2.3.19, this is a major release and the bdb
backend has changed a bit, so dump and import the database again.
* Tested the upgrade path with a 250 entries db and a 10k entries db and it
succeeded.
Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog 2006-02-18 18:57:35 UTC (rev 622)
+++ openldap/trunk-2.3/debian/changelog 2006-02-21 08:37:38 UTC (rev 623)
@@ -16,12 +16,18 @@
slapd/internal/adminpw to be empty. This fixes the issue with having an
empty password in the ldap database. (Closes: #343113, #347725)
* Added #DEBHELPER# token to fix a lintian warning.
+ * bdb has changed between major versions, so dump the database and import it
+ again for versions before 2.3.19.
+ * Remove comments from debian/control (The out commented control information
+ is actually in debian/control.dev)
+ * Enable all backends and overlays with: --enable-backends=mod and
+ --enable-overlays=mod
[ Steve Langasek ]
* debian/slapd.templates: Fix typo durin -> during; re-run
debconf-updatepo, fixing up the fuzzies (closes: #319596).
- -- Debian OpenLDAP Maintainers <pkg-openldap-devel at lists.alioth.debian.org> Sat, 18 Feb 2006 19:56:54 +0100
+ -- Matthijs Mohlmann <matthijs at cacholong.nl> Mon, 20 Feb 2006 23:07:03 +0100
openldap2.2 (2.2.26-4) unstable; urgency=low
Modified: openldap/trunk-2.3/debian/configure.options.new
===================================================================
--- openldap/trunk-2.3/debian/configure.options.new 2006-02-18 18:57:35 UTC (rev 622)
+++ openldap/trunk-2.3/debian/configure.options.new 2006-02-21 08:37:38 UTC (rev 623)
@@ -102,47 +102,34 @@
#
#SLAPD Backend Options:
#--enable-backends enable all available backends no|yes|mod
+--enable-backends=mod
#--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 [yes]
---enable-hdb=mod
#--enable-ldap enable ldap backend no|yes|mod [no]
---enable-ldap=yes
#--enable-ldbm enable ldbm backend no|yes|mod [no]
---enable-ldbm=mod
#--enable-ldbm-api use LDBM API auto|berkeley|bcompat|mdbm|gdbm [auto]
--enable-ldbm-api=berkeley
#--enable-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-relay enable relay backend no|yes|mod [yes]
---enable-relay=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-overlays enable all available overlays no|yes|mod
+--enable-overlays=mod
#--enable-accesslog In-Directory Access Logging overlay no|yes|mod [no]
#--enable-denyop Deny Operation overlay no|yes|mod [no]
#--enable-dyngroup Dynamic Group overlay no|yes|mod [no]
---enable-dyngroup=mod
#--enable-dynlist Dynamic List overlay no|yes|mod [no]
#--enable-lastmod Last Modification overlay no|yes|mod [no]
#--enable-ppolicy Password Policy overlay no|yes|mod [no]
#--enable-proxycache Proxy Cache overlay no|yes|mod [no]
---enable-proxycache=mod
#--enable-refint Referential Integrity overlay no|yes|mod [no]
#--enable-retcode Return Code testing overlay no|yes|mod [no]
#--enable-rwm Rewrite/Remap overlay no|yes|mod [no]
Modified: openldap/trunk-2.3/debian/control
===================================================================
--- openldap/trunk-2.3/debian/control 2006-02-18 18:57:35 UTC (rev 622)
+++ openldap/trunk-2.3/debian/control 2006-02-21 08:37:38 UTC (rev 623)
@@ -48,29 +48,3 @@
These are the run-time libraries for the OpenLDAP (Lightweight Directory
Access Protocol) servers and clients.
-#Package: libldap2.3-dev
-#Section: libdevel
-#Priority: extra
-#Architecture: any
-#Conflicts: libldap-dev, libopenldap-dev
-#Replaces: libopenldap-dev
-#Provides: libldap-dev
-#Depends: libldap2.3 (= ${Source-Version})
-#Description: OpenLDAP development libraries
-# This package allows development of LDAP applications using the OpenLDAP
-# libraries. It includes headers, libraries and links to allow static and
-# dynamic linking.
-
-#Package: libslapd2.3-dev
-#Section: libdevel
-#Priority: extra
-#Architecture: all
-#Depends: libldap2.3 (= ${Source-Version})
-#Description: OpenLDAP slapd back-end development headers
-# This package allows development of back-ends for the OpenLDAP slapd.
-# It includes headers used when developing a back-end for slapd.
-# These headers are, per upstream, *not* intended to be used outside of
-# their build system so you are on your own with them. Things can and
-# probably will break, feel free to file bugs about them but don't expect
-# them to be fixed.
-
Modified: openldap/trunk-2.3/debian/control.dev
===================================================================
--- openldap/trunk-2.3/debian/control.dev 2006-02-18 18:57:35 UTC (rev 622)
+++ openldap/trunk-2.3/debian/control.dev 2006-02-21 08:37:38 UTC (rev 623)
@@ -1,4 +1,4 @@
-Package: libldap2.2-dev
+Package: libldap2.3-dev
Section: libdevel
Priority: extra
Architecture: any
@@ -11,7 +11,7 @@
libraries. It includes headers, libraries and links to allow static and
dynamic linking.
-Package: libslapd2.2-dev
+Package: libslapd2.3-dev
Section: libdevel
Priority: extra
Architecture: all
Modified: openldap/trunk-2.3/debian/rules
===================================================================
--- openldap/trunk-2.3/debian/rules 2006-02-18 18:57:35 UTC (rev 622)
+++ openldap/trunk-2.3/debian/rules 2006-02-21 08:37:38 UTC (rev 623)
@@ -96,6 +96,9 @@
cp -al $(installdir) $(tmpdir)
dh_install -a
+
+ # Make fix_ldif and ldiftopasswd executable.
+ chmod 0755 $(CURDIR)/debian/slapd/usr/share/slapd/fix_ldif $(CURDIR)/debian/slapd/usr/share/slapd/ldiftopasswd
dh_installchangelogs -a
dh_installdocs -a
dh_installexamples -a
Modified: openldap/trunk-2.3/debian/slapd.config
===================================================================
--- openldap/trunk-2.3/debian/slapd.config 2006-02-18 18:57:35 UTC (rev 622)
+++ openldap/trunk-2.3/debian/slapd.config 2006-02-21 08:37:38 UTC (rev 623)
@@ -48,3 +48,6 @@
db_input medium slapd/allow_ldap_v2 || true
db_go || true
db_stop || true
+
+exit 0
+
Modified: openldap/trunk-2.3/debian/slapd.scripts-common
===================================================================
--- openldap/trunk-2.3/debian/slapd.scripts-common 2006-02-18 18:57:35 UTC (rev 622)
+++ openldap/trunk-2.3/debian/slapd.scripts-common 2006-02-21 08:37:38 UTC (rev 623)
@@ -90,7 +90,7 @@
db_get slapd/migrate_ldbm_to_bdb
if [ "$RET" = "true" ] || dpkg --compare-versions \
- "$OLD_VERSION" lt-nl "2.2.23"; then
+ "$OLD_VERSION" lt-nl "2.3.19"; then
return 0
else
return 1
@@ -951,7 +951,7 @@
# XXX: This is the standard unix crypt. Maybe we can get something stronger?
db_get slapd/password1
- if [ -z "$RET" ]; then
+ if [ ! -z "$RET" ]; then
db_set slapd/internal/adminpw `create_password_hash "$RET"`
fi
}
More information about the Pkg-openldap-devel
mailing list