[Pkg-openldap-devel] r628 - in openldap/trunk-2.3/debian: . lintian-overrides po

Sun Feb 26 16:46:05 UTC 2006

Author: active2-guest
Date: 2006-02-26 16:46:04 +0000 (Sun, 26 Feb 2006)
New Revision: 628

Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/configure.options.new
   openldap/trunk-2.3/debian/lintian-overrides/ldap-utils
   openldap/trunk-2.3/debian/lintian-overrides/slapd
   openldap/trunk-2.3/debian/po/fr.po
   openldap/trunk-2.3/debian/po/vi.po
   openldap/trunk-2.3/debian/slapd.README.Debian
   openldap/trunk-2.3/debian/slapd.manpages
   openldap/trunk-2.3/debian/slapd.scripts-common
Log:
 * Updated README.Debian about removal of LDBM backend. (Needs proof reading)
 * Fixed lintian overrides.
 * Updated French and Vietnamese translations
 * Added utf8 and base64 encoding for organisation name.
 * Removed the LDBM backend.


Modified: openldap/trunk-2.3/debian/changelog
===================================================================

--- openldap/trunk-2.3/debian/changelog	2006-02-22 00:18:51 UTC (rev 627)
+++ openldap/trunk-2.3/debian/changelog	2006-02-26 16:46:04 UTC (rev 628)
@@ -2,7 +2,7 @@
 
   [ Matthijs Mohlmann ]
   * New upstream release. (Closes: #308906, #310282, #353877, #335618, #315158)
-    (Closes: #310282)
+    (Closes: #310282, #319155)
   * OpenLDAP checks database before starting up.
     (Closes: #190165, #195079, #294701, #308416)
   * move_old_database_away isn't called in a while loop anymore (which would
@@ -25,12 +25,16 @@
     --enable-overlays=mod
   * Add | debconf-2.0 to unblock cdebconf transition (Closes: #332053)
   * Added Danish debconf translation (Closes: #353897)
+  * Updated French debconf translation (Closes: #320739)
+  * Updated Vietnamese debconf translation (Closes: #319706)
+  * Encode the organization utf8 and base64 encoded (Closes: #236097)
+  * Disabled the LDBM backend.
 
   [ Steve Langasek ]
   * debian/slapd.templates: Fix typo durin -> during; re-run
     debconf-updatepo, fixing up the fuzzies (closes: #319596).
 
- -- Russ Allbery <rra at debian.org>  Tue, 21 Feb 2006 15:43:46 -0800
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Fri, 24 Feb 2006 22:45:55 +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-22 00:18:51 UTC (rev 627)
+++ openldap/trunk-2.3/debian/configure.options.new	2006-02-26 16:46:04 UTC (rev 628)
@@ -108,8 +108,8 @@
 #--enable-hdb	  enable Hierarchical DB backend no|yes|mod [yes]
 #--enable-ldap	  enable ldap backend no|yes|mod [no]
 #--enable-ldbm	  enable ldbm backend no|yes|mod [no]
+--enable-ldbm=no
 #--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-monitor	  enable monitor backend no|yes|mod [yes]

Modified: openldap/trunk-2.3/debian/lintian-overrides/ldap-utils
===================================================================
--- openldap/trunk-2.3/debian/lintian-overrides/ldap-utils	2006-02-22 00:18:51 UTC (rev 627)
+++ openldap/trunk-2.3/debian/lintian-overrides/ldap-utils	2006-02-26 16:46:04 UTC (rev 628)
@@ -1,3 +1,3 @@
 # dh_shlibdeps is not smart enough to wipe additional relations. Since this
 # is not easy to fix we don't even try to do it at this time.  -- Torsten
-ldap-utils: package-has-a-duplicate-relation depends: libldap-2.3-0, libldap-2.3-0 (= 2.3.19-1)
+ldap-utils: package-has-a-duplicate-relation depends: libldap-2.3-0, libldap-2.3-0 (= 2.3.20-1)

Modified: openldap/trunk-2.3/debian/lintian-overrides/slapd
===================================================================
--- openldap/trunk-2.3/debian/lintian-overrides/slapd	2006-02-22 00:18:51 UTC (rev 627)
+++ openldap/trunk-2.3/debian/lintian-overrides/slapd	2006-02-26 16:46:04 UTC (rev 628)
@@ -5,4 +5,4 @@
 
 # dh_shlibdeps is not smart enough to wipe additional relations. Since this
 # is not easy to fix we don't even try to do it at this time.  -- Torsten
-slapd: package-has-a-duplicate-relation depends: libldap-2.3-0, libldap-2.3-0 (= 2.3.19-1)
+slapd: package-has-a-duplicate-relation depends: libldap-2.3-0, libldap-2.3-0 (= 2.3.20-1)

Modified: openldap/trunk-2.3/debian/po/fr.po
===================================================================
--- openldap/trunk-2.3/debian/po/fr.po	2006-02-22 00:18:51 UTC (rev 627)
+++ openldap/trunk-2.3/debian/po/fr.po	2006-02-26 16:46:04 UTC (rev 628)
@@ -17,8 +17,8 @@
 msgstr ""
 "Project-Id-Version: openldap2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-23 02:50-0700\n"
-"PO-Revision-Date: 2005-06-12 09:02+0200\n"
+"POT-Creation-Date: 2005-07-19 20:52+0200\n"
+"PO-Revision-Date: 2005-07-23 09:35+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -359,7 +359,7 @@
 #. Description
 #: ../slapd.templates:140
 msgid ""
-"An error occurred during the attempt to upgrade your LDAP directory. This "
+"An error occurred durin the attempt to upgrade your LDAP directory. This "
 "error occurred when performing the 'slapcat' which attempts to extract your "
 "LDAP directory.  This failure could be because of an incorrect config file.  "
 "For example, if the appropriate moduleload lines for your backend database "
@@ -410,14 +410,14 @@
 "the slapadd again."
 msgstr ""
 "Une erreur s'est produite lors de la mise à niveau de l'annuaire LDAP. La "
-"commande « slapadd » utilisée pour déplacer les données de l'ancien annuaire "
-"dans le nouveau a échoué. Les anciens fichiers des bases de données vont "
-"être déplacés dans /var/backups. Les résultats de la tentative de mise à "
-"niveau sont dans le fichier LDIF situé dans /var/backups. L'échec de slapadd "
-"peut être dû à un problème de configuration (qui a probablement également "
-"provoqué l'échec de slapcat) ou à un problème dans le fichier LDIF. Dans ce "
-"dernier cas, il est possible de corriger ce fichier et tenter l'opération à "
-"nouveau."
+"commande « slapadd », utilisée pour remplir un nouvel annuaire LDAP avec "
+"celles de votre annuaire d'origine, a échoué. Les fichiers de votre annuaire "
+"d'origine ont été préservés dans /var/backups. Les résultats de la tentative "
+"de mise à niveau sont dans le fichier LDIF situé dans /var/backups. L'échec "
+"de slapadd peut être dû à un problème de configuration (qui a probablement "
+"également provoqué l'échec de slapcat) ou à un problème dans le fichier "
+"LDIF. Dans ce dernier cas, il est possible de corriger ce fichier et tenter "
+"l'opération à nouveau."
 
 #. Type: note
 #. Description

Modified: openldap/trunk-2.3/debian/po/vi.po
===================================================================
--- openldap/trunk-2.3/debian/po/vi.po	2006-02-22 00:18:51 UTC (rev 627)
+++ openldap/trunk-2.3/debian/po/vi.po	2006-02-26 16:46:04 UTC (rev 628)
@@ -4,10 +4,10 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: openldap2.2 2.2.26-1\n"
+"Project-Id-Version: openldap2.2 2.2.26-4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-23 02:50-0700\n"
-"PO-Revision-Date: 2005-07-02 21:10+0930\n"
+"POT-Creation-Date: 2005-07-19 20:52+0200\n"
+"PO-Revision-Date: 2005-07-24 17:54+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -335,7 +335,7 @@
 #. Description
 #: ../slapd.templates:140
 msgid ""
-"An error occurred during the attempt to upgrade your LDAP directory. This "
+"An error occurred durin the attempt to upgrade your LDAP directory. This "
 "error occurred when performing the 'slapcat' which attempts to extract your "
 "LDAP directory.  This failure could be because of an incorrect config file.  "
 "For example, if the appropriate moduleload lines for your backend database "
@@ -346,13 +346,13 @@
 " slapcat | /usr/share/slapd/fix_ldif -w -o \"$organization\" > $location"
 msgstr ""
 "Gáº·p lá»—i trong khi cá»‘ nÃ¢ng cáº¥p thÆ° má»¥c LDAP cá»§a báº¡n. Lá»—i nÃ y xáº£y ra khi thá»±c "
-"hiá»‡n Â«slapcatÂ» mÃ  cá»‘ rÃºt thÆ° má»¥c LDAP cá»§a báº¡n. Lá»—i nÃ y cÃ³ láº½ vÃ¬ cÃ³ má»™t táºp "
-"tin cáº¥u hÃ¬nh khÃ´ng Ä‘Ãºng. Láº¥y thÃ dá»¥, náº¿u thiáº¿u nhá»¯ng dÃ²ng Â«moduleloadÂ» (táº£i "
+"hiá»‡n Â« slapcat Â» mÃ  cá»‘ rÃºt thÆ° má»¥c LDAP cá»§a báº¡n. Lá»—i nÃ y cÃ³ láº½ vÃ¬ cÃ³ má»™t táºp "
+"tin cáº¥u hÃ¬nh khÃ´ng Ä‘Ãºng. Láº¥y thÃ dá»¥, náº¿u thiáº¿u nhá»¯ng dÃ²ng Â« moduleload Â» (táº£i "
 "mÃ´-Ä‘un) thÃch há»£p cho cÆ¡ sá»Ÿ dá»¯ liá»‡u háºu phÆ°Æ¡ng. Lá»—i nÃ y sáº½ cÅ©ng gÃ¢y ra trÃ¬nh "
-"Â«slapaddÂ» bá»‹ lá»—i. Sáº¯p di chuyá»ƒn nhá»¯ng táºp tin cÆ¡ sá»Ÿ dá»¯ liá»‡u cÅ© sang Â«/var/"
-"backupsÂ». Náº¿u báº¡n muá»‘n thá» láº¡i nÃ¢ng cáº¥p, thÃ¬ hÃ£y di chuyá»ƒn nhá»¯ng táºp tin cÆ¡ "
-"sá»Ÿ dá»¯ liá»‡u cÅ© vá» vá»‹ trÃ trÆ°á»›c, sá»a lá»—i áº¥y, rá»“i cháº¡y lá»‡nh Â«slapcat | /usr/"
-"share/slapd/fix_ldif -w -o \"$organization\" > $locationÂ»."
+"Â« slapadd Â» bá»‹ lá»—i. Sáº¯p di chuyá»ƒn nhá»¯ng táºp tin cÆ¡ sá»Ÿ dá»¯ liá»‡u cÅ© sang Â« /var/"
+"backups Â». Náº¿u báº¡n muá»‘n thá» láº¡i nÃ¢ng cáº¥p, thÃ¬ hÃ£y di chuyá»ƒn nhá»¯ng táºp tin cÆ¡ "
+"sá»Ÿ dá»¯ liá»‡u cÅ© vá» vá»‹ trÃ trÆ°á»›c, sá»a lá»—i áº¥y, rá»“i cháº¡y lá»‡nh Â« slapcat | /usr/"
+"share/slapd/fix_ldif -w -o \"$organization\" > $location Â»."
 
 #. Type: note
 #. Description
@@ -385,10 +385,10 @@
 "the slapadd again."
 msgstr ""
 "Gáº·p lá»—i trong khi cá»‘ nÃ¢ng cáº¥p danh báº¡ LDAP báº¡n. Lá»—i nÃ y xáº£y ra khi thá»±c hiá»‡n "
-"Â«slapaddÂ» mÃ  cá»‘ táº¡o Ä‘iá»u trong má»™t danh báº¡ LDAP má»›i, dÃ¹ng thÃ´ng tin tá»« danh "
+"Â« slapadd Â» mÃ  cá»‘ táº¡o Ä‘iá»u trong má»™t danh báº¡ LDAP má»›i, dÃ¹ng thÃ´ng tin tá»« danh "
 "báº¡ LDAP gá»‘c cá»§a báº¡n. Nhá»¯ng táºp tin danh báº¡ LDAP gá»‘c cá»§a báº¡n Ä‘Ã£ Ä‘Æ°á»£c lÆ°u vÃ o "
-"Â«/var/backupsÂ». Káº¿t quáº£ cá»§a viá»‡c nÃ¢ng cáº¥p Ä‘Ã£ cá»‘ lÃ  táºp tin .ldif trong Â«/var/"
-"backupsÂ». TrÃ¬nh slapadd cÃ³ láº½ gáº·p lá»—i cáº¥u hÃ¬nh (trong trÆ°á»ng há»£p áº¥y, trÃ¬nh "
+"Â« /var/backups Â». Káº¿t quáº£ cá»§a viá»‡c nÃ¢ng cáº¥p Ä‘Ã£ cá»‘ lÃ  táºp tin .ldif trong Â« /var/"
+"backups Â». TrÃ¬nh slapadd cÃ³ láº½ gáº·p lá»—i cáº¥u hÃ¬nh (trong trÆ°á»ng há»£p áº¥y, trÃ¬nh "
 "slapcat cÅ©ng bá»‹ lá»—i), hoáº·c vÃ¬ gáº·p lá»—i trong táºp tin LDIF. Náº¿u gáº·p lá»—i trong "
 "táºp tin LDIF thÃ¬ cÃ³ láº½ báº¡n cÃ³ thá»ƒ sá»a nÃ³, rá»“i cá»‘ láº¡i slapadd."
 

Modified: openldap/trunk-2.3/debian/slapd.README.Debian
===================================================================
--- openldap/trunk-2.3/debian/slapd.README.Debian	2006-02-22 00:18:51 UTC (rev 627)
+++ openldap/trunk-2.3/debian/slapd.README.Debian	2006-02-26 16:46:04 UTC (rev 628)
@@ -1,6 +1,14 @@
 Notes about Debian's slapd package
 ----------------------------------
 
+++ Disabled the LDBM backend
+
+   In this version of slapd is the LDBM backend disabled. This due to various
+   reasons. One of the reasons is that it caused data loss and it is not
+   supported upstream anymore. See for more information: http://www.openldap.org/faq/index.cgi?_highlightWords=ldbm&file=756
+   The BDB backend is now the main backend to use. These backend is supported
+   upstream and has several fixes included for known problems.
+
 ++ Using BDB/HDB backends
    
    slapd BDB and HDB backends rely on libdb to store data on your

Modified: openldap/trunk-2.3/debian/slapd.manpages
===================================================================
--- openldap/trunk-2.3/debian/slapd.manpages	2006-02-22 00:18:51 UTC (rev 627)
+++ openldap/trunk-2.3/debian/slapd.manpages	2006-02-26 16:46:04 UTC (rev 628)
@@ -10,7 +10,6 @@
 debian/tmp/usr/share/man/man5/slapd.plugin.5
 debian/tmp/usr/share/man/man5/slapd-sql.5
 debian/tmp/usr/share/man/man5/slapd.conf.5
-debian/tmp/usr/share/man/man5/slapd-ldbm.5
 debian/tmp/usr/share/man/man5/slapd-null.5
 debian/tmp/usr/share/man/man5/slapd-relay.5
 debian/tmp/usr/share/man/man5/slapd-tcl.5

Modified: openldap/trunk-2.3/debian/slapd.scripts-common
===================================================================
--- openldap/trunk-2.3/debian/slapd.scripts-common	2006-02-22 00:18:51 UTC (rev 627)
+++ openldap/trunk-2.3/debian/slapd.scripts-common	2006-02-26 16:46:04 UTC (rev 628)
@@ -575,6 +575,17 @@
 	fi
 	rm "$ldif_tmp"
 } # }}}
+encode_utf8() { #{{{
+# Make the value utf8 encoded. Takes one argument and utf8 encode it.
+# Usage: val=`encode_utf8 <value>`
+  perl -e 'use Encode; print encode_utf8($ARGV[0]);' "$1"
+} #}}}
+encode_base64() { #{{{
+# Make the value base64 encoded. Takes one argument and base64 encode it.
+# Usage: val=`encode_base64 <value>`
+  perl -e 'use MIME::Base64; print encode_base64($ARGV[0]);' "$1"
+}
+#}}}
 create_new_directory() {						# {{{
 # Create a new directory. Takes the basedn and the dc value of that entry.
 # Other information is extracted from debconf.
@@ -584,8 +595,9 @@
 	basedn="$1"
 	dc="$2"
 	
+  # Encode to utf8 and base64 encode the organization.
 	db_get shared/organization
-	organization="$RET"
+	organization=`encode_base64 `encode_utf8 "$RET"``
 	db_get slapd/internal/adminpw
 	adminpass="$RET"
  


