[Pkg-openldap-devel] r1085 - in openldap/trunk/debian: . po

Sat Feb 9 19:09:45 UTC 2008

tags 462588 pending
thanks

Author: vorlon
Date: 2008-02-09 19:09:45 +0000 (Sat, 09 Feb 2008)
New Revision: 1085

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/po/cs.po
   openldap/trunk/debian/po/da.po
   openldap/trunk/debian/po/de.po
   openldap/trunk/debian/po/es.po
   openldap/trunk/debian/po/fi.po
   openldap/trunk/debian/po/fr.po
   openldap/trunk/debian/po/gl.po
   openldap/trunk/debian/po/it.po
   openldap/trunk/debian/po/ja.po
   openldap/trunk/debian/po/nl.po
   openldap/trunk/debian/po/pt.po
   openldap/trunk/debian/po/pt_BR.po
   openldap/trunk/debian/po/ru.po
   openldap/trunk/debian/po/templates.pot
   openldap/trunk/debian/po/vi.po
   openldap/trunk/debian/slapd.postinst
   openldap/trunk/debian/slapd.scripts-common
   openldap/trunk/debian/slapd.templates
Log:
  - Comment out TLSCipherSuite settings on upgrade from all versions prior
    to 2.4.7-5, and throw a debconf error to the user notifying them of
    this, since all OpenSSL cipher suite values are incompatible with
    GnuTLS.
  Closes: #462588.

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

--- openldap/trunk/debian/changelog	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/changelog	2008-02-09 19:09:45 UTC (rev 1085)
@@ -19,7 +19,11 @@
       default value of "TLSVerifyClient never" in the right place.
     - Add new patch, gnutls-altname-nulterminated, to account for differences
       in how the "length" is returned for commonName vs. subjectAltName.
-    Partially addresses bug #462588.
+    - Comment out TLSCipherSuite settings on upgrade from all versions prior
+      to 2.4.7-5, and throw a debconf error to the user notifying them of
+      this, since all OpenSSL cipher suite values are incompatible with
+      GnuTLS.
+    Closes: #462588.
   * Add new patch from upstream, entryCSN-backwards-compatibility, to support
     auto-converting entryCSN attributes in a previously supported old format,
     fixing an upgrade failure.  Closes: #462099.

Modified: openldap/trunk/debian/po/cs.po
===================================================================
--- openldap/trunk/debian/po/cs.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/cs.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap2.3\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-01-31 21:20+0100\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -404,8 +404,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 "PÅ™i aktualizaci byla v konfiguraÄnÃm souboru slapd nalezena nejmÃ©nÄ› jedna "
 "volba â€žreplicaâ€œ pro slurpd. ProtoÅ¾e je slurpd od OpenLDAPu verze 2.4 "
@@ -424,3 +424,29 @@
 "Konverzi ze slurpd na protokol syncrepl (zaloÅ¾enÃ½ na technologii pull) nelze "
 "provÃ©st automaticky a budete muset svÃ© replikaÄnÃ servery nastavit ruÄnÄ›. "
 "Podrobnosti naleznete na http://www.openldap.org/doc/admin24/syncrepl.html."
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/da.po
===================================================================
--- openldap/trunk/debian/po/da.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/da.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap2 debconf\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2006-05-13 10:30+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish\n"
@@ -428,8 +428,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 
 #. Type: error
@@ -441,3 +441,29 @@
 "hand.  Please see http://www.openldap.org/doc/admin24/syncrepl.html for "
 "details."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/de.po
===================================================================
--- openldap/trunk/debian/po/de.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/de.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: openldap2.3 2.4.7-4\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-02-08 17:48+0100\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german at lists.debian.org>\n"
@@ -413,8 +413,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 "In Ihrer Konfiguration wurde beim Upgrade eine oder mehrere »replica«-"
 "Optionen gefunden. Da slurpd beginnend mit OpenLDAP 2.4 veraltet ist, müssen "
@@ -433,3 +433,29 @@
 "nicht automatisch geschehen und Sie müssen Ihre Repliken-Server von Hand "
 "konfigurieren. Bitte lesen Sie http://www.openldap.org/doc/admin24/syncrepl."
 "html für Details."
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/es.po
===================================================================
--- openldap/trunk/debian/po/es.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/es.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -33,7 +33,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.3.30\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-01-13 00:52-0800\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -442,8 +442,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 
 #. Type: error
@@ -455,3 +455,29 @@
 "hand.  Please see http://www.openldap.org/doc/admin24/syncrepl.html for "
 "details."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/fi.po
===================================================================
--- openldap/trunk/debian/po/fi.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/fi.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: openldap2.3\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-01-26 23:23+0200\n"
 "Last-Translator: Esko ArajÃ¤rvi <edu at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -391,8 +391,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 "PÃ¤ivitettÃ¤essÃ¤ slapdin asetuksista lÃ¶ytyi yksi tai useampia â€replicaâ€-"
 "asetuksia. Koska slurpd on vanhentunut OpenLDAPin versiosta 2.4 alkaen, "
@@ -411,3 +411,29 @@
 "tehdÃ¤ automaattisesti ja kopiopalvelimien asetukset tulee tehdÃ¤ kÃ¤sin. "
 "LisÃ¤tietoja (englanniksi) lÃ¶ytyy tiedostosta http://www.openldap.org/doc/"
 "admin24/syncrepl.html."
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/fr.po
===================================================================
--- openldap/trunk/debian/po/fr.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/fr.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-01-22 18:10+0100\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -414,8 +414,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 "Une ou plusieurs options Â«Â replicaÂ Â» de slurpd ont Ã©tÃ© trouvÃ©e dans le "
 "fichier de configuration lors de la mise Ã  niveau. Le programme slurpd est "
@@ -434,3 +434,29 @@
 "Cette conversion ne peut se faire automatiquement et vous devez configurer "
 "les serveurs rÃ©plicats vous-mÃªme. Veuillez consulter http://www.openldap.org/"
 "doc/admin24/syncrepl.html pour plus d'informations."
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/gl.po
===================================================================
--- openldap/trunk/debian/po/gl.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/gl.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: openldap2.3\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-01-28 18:58+0000\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -399,8 +399,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 "Atopouse unha ou mÃ¡is opciÃ³ns \"replica\" na configuraciÃ³n de slapd ao "
 "actualizar. Como slurpd estÃ¡ obsoleto a partires de OpenLDAP 2.4, ha ter que "
@@ -419,3 +419,29 @@
 "syncrepl baseado en pull, e ha ter que configurar manualmente os seus "
 "servidores rÃ©plica. Consulte http://www.openldap.org/doc/admin24/syncrepl."
 "html para mÃ¡is detalles."
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/it.po
===================================================================
--- openldap/trunk/debian/po/it.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/it.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: openldap2.3 2.3.38 italian debconf templates\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2007-11-17 13:43+0100\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -414,8 +414,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 
 #. Type: error
@@ -427,3 +427,29 @@
 "hand.  Please see http://www.openldap.org/doc/admin24/syncrepl.html for "
 "details."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/ja.po
===================================================================
--- openldap/trunk/debian/po/ja.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/ja.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap2.3\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-01-23 12:16+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -399,8 +399,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 "æ›´æ–°ä¸ã€1ã¤ä»¥ä¸Šã® slurpd ã® \"replica\" ã‚ªãƒ—ã‚·ãƒ§ãƒ³ãŒã‚ãªãŸã® slapd è¨å®šã«è¦‹ã¤"
 "ã‹ã‚Šã¾ã—ãŸã€‚slurpd ã¯ OpenLDAP 2.4 ã‹ã‚‰æ™‚ä»£é…ã‚Œã«ãªã£ã¦ã„ã‚‹ã®ã§ã€syncrepl ãƒ—"
@@ -418,3 +418,29 @@
 "slurpd ã‹ã‚‰ãƒ—ãƒ«ãƒ™ãƒ¼ã‚¹ã® syncrepl ãƒ—ãƒãƒˆã‚³ãƒ«ã¸ã®å¤‰æ›ã¯è‡ªå‹•ã§ã¯è¡Œã†ã“ã¨ãŒã§ã"
 "ãšã€ã‚ãªãŸã®è¤‡è£½ã‚µãƒ¼ãƒã‚’æ‰‹å‹•ã§è¨å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚è©³ç´°ã«ã¤ã„ã¦ã¯ http://"
 "www.openldap.org/doc/admin24/syncrepl.html ã‚’å‚ç…§ã—ã¦ãã ã•ã„ã€‚"
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/nl.po
===================================================================
--- openldap/trunk/debian/po/nl.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/nl.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap2\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2007-11-14 18:02+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -431,8 +431,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 
 #. Type: error
@@ -444,3 +444,29 @@
 "hand.  Please see http://www.openldap.org/doc/admin24/syncrepl.html for "
 "details."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/pt.po
===================================================================
--- openldap/trunk/debian/po/pt.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/pt.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: openldap2.3 2.3.38-2\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2007-11-28 21:22+0000\n"
 "Last-Translator: Tiago Fernandes <tjg.fernandes at gmail.com>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -414,8 +414,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 
 #. Type: error
@@ -427,3 +427,29 @@
 "hand.  Please see http://www.openldap.org/doc/admin24/syncrepl.html for "
 "details."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/pt_BR.po
===================================================================
--- openldap/trunk/debian/po/pt_BR.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/pt_BR.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: openldap2_2.1.17-1\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-01-13 04:56-0800\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: l10n portuguese <debian-l10n-portuguese at lists.debian.org>\n"
@@ -429,8 +429,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 
 #. Type: error
@@ -442,3 +442,29 @@
 "hand.  Please see http://www.openldap.org/doc/admin24/syncrepl.html for "
 "details."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/ru.po
===================================================================
--- openldap/trunk/debian/po/ru.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/ru.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: 2.4.7-3\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2008-01-23 20:45+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -409,8 +409,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 "ÐŸÑ€Ð¸ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¸ Ð² Ð²Ð°ÑˆÐµÐ¼ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¾Ð¼ Ñ„Ð°Ð¹Ð»Ðµ Ð´Ð»Ñ slapd Ð½Ð°Ð¹Ð´ÐµÐ½ Ð¾Ð´Ð¸Ð½ Ð¸Ð»Ð¸ "
 "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð² \"replica\" Ð´Ð»Ñ slurpd. Ð¢Ð°Ðº ÐºÐ°Ðº slurpd ÑƒÑÑ‚Ð°Ñ€ÐµÐ» Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ "
@@ -429,3 +429,29 @@
 "Ð²Ñ‹Ñ‚ÑÐ³Ð¸Ð²Ð°Ð½Ð¸Ð¸ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð° syncrepl Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð¸ Ð¿Ð¾ÑÑ‚Ð¾Ð¼Ñƒ Ð²Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ "
 "ÑÐ²Ð¾Ð¸ ÑÐµÑ€Ð²ÐµÑ€Ñ‹ Ñ€ÐµÐ¿Ð»Ð¸Ðº Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ. ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½ÐµÐ¹ Ð¾Ð± ÑÑ‚Ð¾Ð¼ ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ Ð½Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ðµ http://"
 "www.openldap.org/doc/admin24/syncrepl.html."
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/templates.pot
===================================================================
--- openldap/trunk/debian/po/templates.pot	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/templates.pot	2008-02-09 19:09:45 UTC (rev 1085)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-08 13:56-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -350,3 +350,29 @@
 "hand.  Please see http://www.openldap.org/doc/admin24/syncrepl.html for "
 "details."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/po/vi.po
===================================================================
--- openldap/trunk/debian/po/vi.po	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/po/vi.po	2008-02-09 19:09:45 UTC (rev 1085)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: openldap2.3 2.3.38-2\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-19 00:20-0800\n"
+"POT-Creation-Date: 2008-02-09 10:32-0800\n"
 "PO-Revision-Date: 2007-11-29 22:34+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -423,8 +423,8 @@
 #: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
-"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you "
-"will need to migrate your replicas to use the syncrepl protocol instead."
+"upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
+"need to migrate your replicas to use the syncrepl protocol instead."
 msgstr ""
 
 #. Type: error
@@ -436,3 +436,29 @@
 "hand.  Please see http://www.openldap.org/doc/admin24/syncrepl.html for "
 "details."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid "TLSCipherSuite values have changed"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
+"The values allowed for this option are determined by the SSL implementation "
+"used, which has been changed from OpenSSL to GnuTLS.  As a result, your "
+"existing TLSCipherSuite setting will not work with this package."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../slapd.templates:19001
+msgid ""
+"This setting has been automatically commented out for you.  If you have "
+"specific encryption needs that require this option to be re-enabled, see the "
+"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
+"supported by GnuTLS."
+msgstr ""

Modified: openldap/trunk/debian/slapd.postinst
===================================================================
--- openldap/trunk/debian/slapd.postinst	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/slapd.postinst	2008-02-09 19:09:45 UTC (rev 1085)
@@ -51,6 +51,13 @@
 		config_obsolete_schemacheck
 	fi
 
+	if previous_version_older 2.4.7-5; then
+		if ! disable_openssl_cipher_suite; then
+			db_input critical slapd/tlsciphersuite || true
+			db_go || true
+		fi
+	fi
+
 	if database_format_changed; then
 		# During upgrading we have to load the old data
 		move_incompatible_databases_away

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/slapd.scripts-common	2008-02-09 19:09:45 UTC (rev 1085)
@@ -535,6 +535,25 @@
 }
 # }}}
 
+disable_openssl_cipher_suite() {					# {{{
+# disable any occurrences of the TLSCipherSuite on upgrade, because 
+# OpenSSL cipher suite specs are completely incompatible with GnuTLS ones
+
+	# If $SLAPD_CONF is a directory, the user is using cn=config.  Assume
+	# they know what they're doing.
+	if [ -d "$SLAPD_CONF" ]; then return 0; fi
+
+	# Check if there's anything for us to do
+	if ! read_slapd_conf < $SLAPD_CONF | \
+			grep -q -E '^TLSCipherSuite[[:space:]]'; then
+		return 0
+	fi
+
+	write_slapd_conf "$SLAPD_CONF" 's|^(TLSCipherSuite\s+)|#$1|i'
+	return 1
+}
+# }}}
+
 compute_backup_path() {							# {{{
 # Compute the path to backup a database directory
 # Usage: compute_backup_path [-n] <dir> <basedn>

Modified: openldap/trunk/debian/slapd.templates
===================================================================
--- openldap/trunk/debian/slapd.templates	2008-02-09 02:45:27 UTC (rev 1084)
+++ openldap/trunk/debian/slapd.templates	2008-02-09 19:09:45 UTC (rev 1085)
@@ -173,3 +173,17 @@
  done automatically and you will need to configure your replica servers by
  hand.  Please see http://www.openldap.org/doc/admin24/syncrepl.html for
  details.
+
+Template: slapd/tlsciphersuite
+Type: error
+_Description: TLSCipherSuite values have changed
+ A "TLSCipherSuite" option was found in your slapd config when upgrading.
+ The values allowed for this option are determined by the SSL
+ implementation used, which has been changed from OpenSSL to GnuTLS.  As a
+ result, your existing TLSCipherSuite setting will not work with this
+ package.
+ .
+ This setting has been automatically commented out for you.  If you have
+ specific encryption needs that require this option to be re-enabled,
+ see the output of 'gnutls-cli -l' in the gnutls-bin package for the
+ list of ciphers supported by GnuTLS.


