--- cyrus-imapd-2.2-2.2.13.orig/debian/po/templates.pot +++ cyrus-imapd-2.2-2.2.13/debian/po/templates.pot @@ -0,0 +1,81 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "Remove the mail and news spools?" +msgstr "" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" --- cyrus-imapd-2.2-2.2.13.orig/debian/po/de.po +++ cyrus-imapd-2.2-2.2.13/debian/po/de.po @@ -0,0 +1,97 @@ +# translation of cyrus22-imapd_2.1.16-6_de.po to German +# translation of cyrus22-imapd_2.1.16-6_templates.po to German +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Erik Schanze , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: cyrus-imapd-2.2_2.2.12-1_de\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: 2004-05-29 22:44+0200\n" +"Last-Translator: Sven Mueller \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.0.2\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "Datenbankanbindungen haben sich geändert!" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" +"Ein Vergleich der Dateien /usr/lib/cyrus/cyrus-db-types.txt und /usr/lib/" +"cyrus/cyrus-db-types.active zeigt, dass die Datenbankanbindungen des Cyrus " +"IMAPd geändert wurden." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" +"Die Datenbanken, für die sich die Anbindung geändert hat, müssen mit dem " +"Hilfsprogramm cvt_cyrusdb(8) gegebenenfalls manuell in das neue Format " +"überführt werden." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" +"Mehr Informationen finden Sie in der Datei /usr/share/doc/cyrus-common-2.2/" +"README.Debian.database. Starten Sie keinesfalls cyrmaster, bevor Sie die " +"Datenbank in das neue Format überführt haben." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "Remove the mail and news spools?" +msgstr "Mail- und News-Spools entfernen?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" +"Die Cyrus Email- bzw. News-Spools und die Filterskripte (Sieve Skripte) der " +"Benutzer können gelöscht werden, wenn das Paket restlos entfernt wird " +"(purge)." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" +"Diese Frage betrifft nur die Standard-Spools und -Filterskriptverzeichnisse " +"in /var. Wenn Sie deren Ort in der Datei imapd.conf geändert haben, werden " +"sie an der neuen Stelle nicht gelöscht, nur an der Alten im Verzeichnis /var." --- cyrus-imapd-2.2-2.2.13.orig/debian/po/cs.po +++ cyrus-imapd-2.2-2.2.13/debian/po/cs.po @@ -0,0 +1,81 @@ +# Czech translation of cyrus-imapd-2.2 templates +# +msgid "" +msgstr "" +"Project-Id-Version: cyrus-imapd-2.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: 2006-08-15 20:02+0200\n" +"Last-Translator: Martin Sin \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "Backendy databáze se změnily!" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" +"Srovnání mezi /usr/lib/cyrus/cyrus-db-types.txt a /usr/lib/cyrus/cyrus-db-" +"types.active ukázalo, že se změnil backend databáze pro Cyrus IMAPd." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" +"To znamená, že ty databáze, u kterých se databázové backendy změnily, budou " +"možná vyžadovat ruční převod do nového formátu utilitou cvt_cyrusdb(8)." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" +"Pro více informací se prosím podívejte do /usr/share/doc/cyrus-common-2.2/" +"README.Debian.database. Nespouštějte cyrmaster, dokud nepřevedete databáze " +"do nového formátu." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "Remove the mail and news spools?" +msgstr "Odstranit spool adresáře pošty a news?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" +"Při odstranění balíku mohou být smazány i spool adresáře s poštou a news " +"příspěvky a také uživatelské filtrovací skripty v jazyce Sieve." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" +"Tato otázka se týká pouze výchozích spool adresářů a Sieve skriptů ve /var. " +"Při změně jejich umístění v imapd.conf nebude odstraněno jejich nové " +"umístění, ale pouze jejich staré ve /var." --- cyrus-imapd-2.2-2.2.13.orig/debian/po/es.po +++ cyrus-imapd-2.2-2.2.13/debian/po/es.po @@ -0,0 +1,108 @@ +# cyrus-imapd-2.2 po-debconf translation to Spanish +# Copyright (C) 2006 Software in the Public Interest +# This file is distributed under the same license as the cyrus-imapd-2.2 package. +# +# Changes: +# - Initial translation +# César Gómez Martín +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Equipo de traducción al español, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: César Gómez Martín \n" +"Language-Team: Debian l10n spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" +"X-Poedit-Country: SPAIN\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "¡Los gestores de la base de datos han cambiado!" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" +"La comparación entre /usr/lib/cyrus/cyrus-db-types.txt y /usr/lib/cyrus/" +"cyrus-db-types.active muestra que el gestor de Cyrus IMAPd se ha cambiado." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" +"Esto significa que quizás se necesite convertir manualmente al nuevo formato " +"las bases de datos para las que ha cambiado el gestor, para ello puede usar " +"la utilidad cvt_cyrusdb(8)." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" +"Por favor, consulte /usr/share/doc/cyrus-common-2.2/README.Debian.database " +"si desea más información. No arranque cyrmaster hasta que haya convertido " +"las bases de datos al nuevo formato." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "Remove the mail and news spools?" +msgstr "¿Quiere eliminar el correo y las colas de noticias?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" +"Al purgar el paquete se pueden eliminar tanto el correo de Cyrus y las colas " +"de noticias como los guiones de filtrado de los usuarios" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" +"Esta pregunta es sólo aplicable a los directorios por omisión de colas y de " +"guiones criba de /var. Si modificó sus ubicaciones en imapd.conf, las nuevas " +"ubicaciones no se eliminarán; sólo las viejas de /var." --- cyrus-imapd-2.2-2.2.13.orig/debian/po/fr.po +++ cyrus-imapd-2.2-2.2.13/debian/po/fr.po @@ -0,0 +1,88 @@ +# PO-DEBCONF TEMPLATE FOR cyrus22-imapd. +# Copyright (C) 2002 Henrique de Moraes Holschuh +# This file is distributed under the same license as the cyrus22-imapd package. +# $Id: fr.po 584 2006-08-23 16:41:40Z sven $ +# +msgid "" +msgstr "" +"Project-Id-Version: cyrus-imapd-2.2 2.2.13\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: 2006-08-23 10:09+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "Modifications dans l'interfaage avec les bases de donnes" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" +"Une comparaison entre /usr/lib/cyrus/cyrus-db-types.txt et /usr/lib/cyrus/" +"cyrus-db-types.active montre que l'interfaage de Cyrus IMAPd avec les bases " +"de donnes a chang." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" +"Cela signifie que les bases de donnes pour lesquelles l'interfaage a " +"chang peuvent ncessiter une conversion manuelle au nouveau format. Vous " +"pouvez vous servir de l'utilitaire cvt_cyrusdb (8)." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" +"Veuillez-vous reporter /usr/share/doc/cyrus-common-2.2/README.Debian." +"database pour des informations supplmentaires. Ne lancez pas cyrmaster " +"avant d'avoir converti les bases de donnes au nouveau format." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "Remove the mail and news spools?" +msgstr "" +"Faut-il supprimer les rpertoires contenant les courriers et les nouvelles?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" +"Les rpertoires stockant le courrier et les nouvelles, ainsi que les filtres " +"des utilisateurs, peuvent tre supprims en mme temps que le paquet." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" +"Cette question concerne uniquement les rpertoires par dfaut situs dans /" +"var et contenant le spool et les filtres. Si vous aviez modifi leurs " +"emplacements grce au fichier imapd.conf, ils ne seront pas supprims; " +"seuls les anciens, dans /var, le seront." --- cyrus-imapd-2.2-2.2.13.orig/debian/po/gl.po +++ cyrus-imapd-2.2-2.2.13/debian/po/gl.po @@ -0,0 +1,85 @@ +# Galician translation of cyrus-imapd-2.2's debconf templates +# This file is distributed under the same license as the cyrus-imapd-2.2 package. +# Jacobo Tarrio , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: cyrus-imapd-2.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: 2007-02-28 10:47+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "Os motores de bases de datos cambiaron" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" +"A comparación entre /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-" +"db-types.active amosa que os motores de bases de datos de Cyrus IMAPd " +"cambiaron." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" +"Isto quere dicir que é posible que as bases de datos para as que os motores " +"cambiaron se teñan que converter manualmente ao novo formato, empregando a " +"utilidade cvt_cyrusdb(8)." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" +"Consulte /usr/share/doc/cyrus-common-2.2/README.Debian.database para máis " +"información. Non inicie cyrmaster ata que teña convertido as bases de datos " +"ao novo formato." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "Remove the mail and news spools?" +msgstr "¿Borrar os directorios de traballo de correo e novas?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" +"Pódense eliminar os directorios de traballo de correo e novas de Cyrus, así " +"coma os scripts de sieve dos usuarios, ao purgar o paquete." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" +"Esta pregunta só se aplica aos directorios de traballo e de scripts de sieve " +"por defecto de /var. Se modificou a súa ubicación en imapd.conf, non se han " +"eliminar as novas ubicacións; só as antigas de /var." --- cyrus-imapd-2.2-2.2.13.orig/debian/po/ja.po +++ cyrus-imapd-2.2-2.2.13/debian/po/ja.po @@ -0,0 +1,93 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# +msgid "" +msgstr "" +"Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: 2006-09-13 00:04+0900\n" +"Last-Translator: Hideki Yamane \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "バックエンドのデータベースが変更されました!" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" +"/usr/lib/cyrus/cyrus-db-types.txt と /usr/lib/cyrus/cyrus-db-types.active を" +"比較したところ Cyrus IMAPd のデータベースが変更されています。" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" +"これらのバックエンドが変更されたデータベースは cvt_cyrusdb(8) ユーティリティ" +"を使って手動で新しい形式に変換する必要があります。" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" +"より詳細については /usr/share/doc/cyrus-common-2.2/README.Debian.database を" +"参照してください。データベースを新しい形式に変換するまで cyrmaster を起動しな" +"いでください。" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "Remove the mail and news spools?" +msgstr "Cyrus スプールと、ユーザの sieve スクリプトを削除しますか?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" +"Cyrus メール・ニューススプールは、パッケージが完全に削除される際にユーザの " +"sieve スクリプトと同様に削除できます。" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" +"この質問は /var にある標準のスプールと sieve スクリプトディレクトリにのみ適用" +"されます。imapd.conf でディレクトリを変更している場合、変更後のディレクトリに" +"あるものは削除されません。/var にある古いものだけです。" --- cyrus-imapd-2.2-2.2.13.orig/debian/po/it.po +++ cyrus-imapd-2.2-2.2.13/debian/po/it.po @@ -0,0 +1,83 @@ +# Traduzione italiana di cyrus22-imapd +# Copyright (C) 2004 Free Software Foundation, Inc. +# Cristian Rigamonti , 2004. +msgid "" +msgstr "" +"Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: 2006-08-16 11:59+0200\n" +"Last-Translator: Cristian Rigamonti \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "I backend di database sono cambiati!" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" +"Il confronto tra /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-db-" +"types.active mostra che i backend di database per Cyrus IMAPd sono cambiati." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" +"Ci significa che i database per cui sono cambiati i backend devono essere " +"convertiti manualmente al nuovo formato, usando l'utilit cvt_cyrusdb(8)." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" +"Si veda /usr/share/doc/cyrus-common-2.2/README.Debian.database per maggiori " +"informazioni. Non avviare cyrmaster prima di aver convertito i database al " +"nuovo formato." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "Remove the mail and news spools?" +msgstr "Rimuovere gli spool di Cyrus e gli script sieve degli utenti?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" +"Gli spool di posta e news di Cyrus, oltre agli script sieve degli utenti, " +"possono essere rimossi quando il pacchetto sar rimosso." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" +"Questa domanda si riferisce solo agli spool predefiniti e alle directory " +"degli script sieve in /var. Se la posizione di questi file stata " +"modificata in imapd.conf, essi non saranno rimossi; saranno rimossi solo i " +"file in /var." --- cyrus-imapd-2.2-2.2.13.orig/debian/po/nl.po +++ cyrus-imapd-2.2-2.2.13/debian/po/nl.po @@ -0,0 +1,98 @@ +# Translation of cyrus-imapd-2.2 2.2.13-7_templates.po to Debian l10n Dutch +# This file is distributed under the same license as the cyrus-imapd package. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Luk Claes , 2004 +# Kurt De Bree , 2006 +# This is an unofficial translation +# +msgid "" +msgstr "" +"Project-Id-Version: cyrus-imapd-2.2 2.2.13-7\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: 2006-09-18 20:27+0100\n" +"Last-Translator: Kurt De Bree \n" +"Language-Team: Debian l10n Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "Database-backends zijn gewijzigd!" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" +"Een vergelijking tussen /usr/lib/cyrus/cyrus-db-types.txt en /usr/lib/cyrus/" +"cyrus-db-types.active leert ons dat de database-backends voor Cyrus IMAPd " +"gewijzigd zijn." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" +"Dit betekent dat deze databases, waarvan de database-backends zijn " +"gewijzigd, mogelijk handmatig moeten worden geconverteerd naar de nieuwe " +"indeling, gebruikmakend van het cvt_cyrusdb(8)-hulpmiddel." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" +"Raadpleeg /usr/share/doc/cyrus-common-2.2/README.Debian.database voor meer " +"informatie. Start cyrmaster niet vooraleer u de databases naar de nieuwe " +"indeling geconverteerd hebt." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "Remove the mail and news spools?" +msgstr "Mail- en nieuws-spools verwijderen?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" +"De Cyrus mail- en nieuws-spools alsook de gebruikers-sieve-scripts kunnen " +"worden verwijderd wanneer het pakket wordt gewist (purged)." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" +"Deze vraag heeft enkel betrekking op de standaard spools en de sieve-" +"scriptmappen in /var. Als u deze locatie heeft gewijzigd in imapd.conf, dan " +"zal de nieuwe locatie niet worden verwijderd; enkel de oude in /var." --- cyrus-imapd-2.2-2.2.13.orig/debian/po/pt.po +++ cyrus-imapd-2.2-2.2.13/debian/po/pt.po @@ -0,0 +1,88 @@ +# Portuguese translation of cyrus-imapd-2.2 debconf messages. +# Copyright (C) 2007 Carlos Lisboa +# This file is distributed under the same license as the cyrus-imapd-2.2 package. +# Carlos Lisboa , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: cyrus-imapd-2.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: 2007-02-03 22:27+0000\n" +"Last-Translator: Carlos Lisboa \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "Os bastidores das bases de dados foram alterados!" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" +"Comparando /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-db-types." +"active mostra que o bastidor da base de dados Cyrus IMAPd foi alterado." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" +"Isto significa que as bases de dados cujos bastidores foram alterados " +"poderão necessitar de conversão manual para o novo formato, usando o " +"utilitário cvt_cyrusdb(8)." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +#, fuzzy +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" +"Por favor veja o /usr/share/doc/cyrus-common-2.2/README.Debian.database para " +"mais informações. Não inicie o cyrmaster até que tenha convertido as bases " +"de dados para o novo formato." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +#, fuzzy +msgid "Remove the mail and news spools?" +msgstr "Remover os spools do Cyrus e usar os scripts de utilizador sieve?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +#, fuzzy +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" +"Deverei remover os spools de mail e news, assim como os scripts de " +"utilizador sieve quando este pacote for purgado?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" +"Esta questão apenas se aplica aos directórios de spools e script sieve por " +"omissão em /var. Se tiver modificado o seu local em imapd.conf, os novos " +"locais não serão removidos, apenas os antigos em /var." --- cyrus-imapd-2.2-2.2.13.orig/debian/po/ru.po +++ cyrus-imapd-2.2-2.2.13/debian/po/ru.po @@ -0,0 +1,93 @@ +# translation of cyrus-imapd_2.2.13_debconf_ru.po to Russian +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Yuri Kozlov , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: cyrus-imapd_2.2.13\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: 2006-08-15 21:36+0300\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "Были изменены backend баз данных!" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" +"Сравнение файлов /usr/lib/cyrus/cyrus-db-types.txt и /usr/lib/cyrus/cyrus-db-" +"types.active показало, что backend баз данных для Cyrus IMAPd были изменены." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" +"Это означает, что для баз данных с изменёнными backend может потребоваться " +"конвертация в новый формат вручную с помощью утилиты cvt_cyrusdb(8)." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" +"Подробней об этом написано в файле /usr/share/doc/cyrus-common-2.2/README." +"Debian.database. Не запускайте cyrmaster, пока не преобразуете базы данных в " +"новый формат." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "Remove the mail and news spools?" +msgstr "Удалять буферы почты и новостей?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" +"Буферы Cyrus для почты и новостей, а также пользовательские фильтрующие " +"сценарии могут удаляться при вычистке пакета автоматически." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" +"Это относится только к буферам по умолчанию и каталогам с фильтрующими " +"сценариями в /var. Если вы изменили их расположение в файле imapd.conf, " +"новые места удаляться не будут -- только старые в /var." --- cyrus-imapd-2.2-2.2.13.orig/debian/po/sv.po +++ cyrus-imapd-2.2-2.2.13/debian/po/sv.po @@ -0,0 +1,94 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cyrus22-imapd\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: 2006-08-15 20:01+0100\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "Databasbaknderna har ndrats!" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" +"En jmfrelse mellan /usr/lib/cyrus/cyrus-db-types.txt och /usr/lib/cyrus/" +"cyrus-db-types.active visar att databasbaknderna fr Cyrus IMAPd har " +"ndrats." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" +"Detta betyder att dessa databaser som fr vilka databasbaknderna har " +"ndrats kanske manuellt behver konverteras till det nya formatet med " +"verktyget cvt_cyrusdb(8)." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" +"Referera till /usr/share/doc/cyrus-common-2.2/README.Debian.database fr mer " +"information. Starta inte cyrmaster innan du har konverterat databaserna till " +"det nya formatet." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "Remove the mail and news spools?" +msgstr "Ta bort e-post- och nyhetskfilerna?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" +"Cyrus e-post- och nyhetskfiler, svl som anvndarnas sieve-skript kan tas " +"bort nr paketet rensas ut." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" +"Denna frga gller endast fr standardkfilerna och sieve-skriptkatalogerna " +"under /var. Om du har ndrat dess plats i imapd.conf kommer inte de nya " +"platserna att tas bort, endast de gamla under /var." --- cyrus-imapd-2.2-2.2.13.orig/debian/po/vi.po +++ cyrus-imapd-2.2-2.2.13/debian/po/vi.po @@ -0,0 +1,88 @@ +# Vietnamese translation for Cyrus-IMAPd. +# Copyright © 2006 Free Software Foundation, Inc. +# Clytie Siddall , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: cyrus-imapd-2.2.13\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: 2006-08-16 18:12+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.6fc1\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "Hậu phương co sở dữ liệu bị thay đổi !" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" +"Việc so sánh với chứng minh rằng hậu phương co sở dữ liệu cho Cyrus IMAPd bị " +"thay đổi." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" +"Có nghĩa là những co sở dữ liệu cho đó hậu phương co sở dữ liệu đã thay đổi " +"sẽ cần phải tự được chuyển đổi sang dạng thức mới, dùng tiện ích « " +"cvt_cyrusdb(8) »." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" +"Hãy xem tài liệu Đọc Đi để tìm thông tin thêm. Đừng khởi chạy tiến trình cyrmaster trước " +"khi bạn đã chuyển đổi những co sở dữ liệu sang dạng thức mới." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "Remove the mail and news spools?" +msgstr "Gỡ bỏ ống chỉ thư và tin tức không?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" +"Những ống chỉ thư và tin tức Cyrus, cũng như những tập lệnh sieve của người " +"dùng, có thể được gỡ bỏ khi gói được tẩy." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" +"Câu hỏi này áp dụng chỉ cho những ống chỉ và thư mục tập lệnh sieve mặc định " +"nằm trong . Nếu bạn đã sửa đổi vị trí trong tập tin cấu hình « imapd." +"conf », những vị trí mới sẽ không được gỡ bỏ; chỉ những vị trí nằm trong sẽ được gỡ bỏ." --- cyrus-imapd-2.2-2.2.13.orig/debian/po/POTFILES.in +++ cyrus-imapd-2.2-2.2.13/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] cyrus-common-2.2.templates --- cyrus-imapd-2.2-2.2.13.orig/debian/po/pt_BR.po +++ cyrus-imapd-2.2-2.2.13/debian/po/pt_BR.po @@ -0,0 +1,86 @@ +# PO-DEBCONF TEMPLATE FOR cyrus22-imapd. +# Copyright (C) 2002 Henrique de Moraes Holschuh +# This file is distributed under the same license as the cyrus22-imapd package. +# $Id: pt_BR.po 622 2006-09-19 13:13:20Z sven $ +# +msgid "" +msgstr "" +"Project-Id-Version: cyrus-imapd-2.2 2.1.12-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-08-15 17:54+0200\n" +"PO-Revision-Date: 2003-03-03 10:45-0300\n" +"Last-Translator: Henrique de Moraes Holschuh \n" +"Language-Team: pt_BR \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "Database backends have changed!" +msgstr "Mudana de sistema nas bases de dados!" + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/" +"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been " +"changed." +msgstr "" +"Comparao entre /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-db-" +"types.active levam a crer que o sistema de base de dados do Cyrus IMAPd foi " +"mudado." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"This means that those databases for which the database backends changed " +"might need to be converted manually to the new format, using the cvt_cyrusdb" +"(8) utility." +msgstr "" +"Isso significa que as bases de dados cujo sistema mudou precisam ser " +"migradas para o novo sistema manualmente, atravs do utilitrio cvt_cyrusdb" +"(8)." + +#. Type: note +#. Description +#: ../cyrus-common-2.2.templates:3 +msgid "" +"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for " +"more information. Do not start cyrmaster until you have converted the " +"databases to the new format." +msgstr "" +"Maiores informaes esto disponveis em /usr/share/doc/cyrus-common-2.2/" +"README.Debian.database. No inicie cyrmaster at ter convertido o " +"formatodas bases de dados." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "Remove the mail and news spools?" +msgstr "Removo as spools do Cyrus e os scripts sieve?" + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"The Cyrus mail and news spools, as well as the user's sieve scripts can be " +"removed when the package is purged." +msgstr "" +" possvel remover as reas de armazenagem (spools) usadas pelo Cyrus, e " +"tambm as reas usadas para armazenar os scripts sieve dos usurios quando o " +"pacote for eliminado (purge) do sistema." + +#. Type: boolean +#. Description +#: ../cyrus-common-2.2.templates:19 +msgid "" +"This question only applies to the default spools and sieve script " +"directories in /var. If you modified their location in imapd.conf, the new " +"locations will not be removed; just the old ones in /var." +msgstr "" +"Apenas as reas padro em /var sero removidas. Caso voc tenha configurado " +"outras reas em imapd.conf, elas no sero removidas." --- cyrus-imapd-2.2-2.2.13.orig/debian/executable.files +++ cyrus-imapd-2.2-2.2.13/debian/executable.files @@ -0,0 +1,42 @@ +./autogen.sh +./configure +./contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl +./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl +./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl +./contrib/cyrus-graphtools.1.0/script/cyrus.pl +./contrib/cyrus-graphtools.1.0/script/run +./contrib/mupdate-test.pl +./contrib/notify_unix/simple_notify.pl +./contrib/notify_unix/sql_notify.pl +./debian/cyrus-makedirs +./debian/cyrus-common-2.2.cyrus2.2.init +./debian/cyrus-common-2.2.postinst +./debian/cyrus-common-2.2.postrm +./debian/cyrus-common-2.2.prerm +./debian/examples/mboxtocyrus +./debian/rules +./doc/internal/internationalization.html +./et/compile_et.sh +./et/config_script +./imap/xversion.sh +./install-sh +./lib/test/run +./makedepend/configure +./makedepend/install-sh +./mkinstalldirs +./netnews/inn.diffs +./perl/imap/examples/test-imsp.pl +./snmp/snmpgen +./tools/arbitronsort.pl +./tools/config2header +./tools/config2man +./tools/dohash +./tools/masssievec +./tools/mkimap +./tools/mknewsgroups +./tools/mupdate-loadgen.pl +./tools/not-mkdep +./tools/rehash +./tools/translatesieve +./tools/undohash +./tools/upgradesieve --- cyrus-imapd-2.2-2.2.13.orig/debian/cyradm-16x16.xpm +++ cyrus-imapd-2.2-2.2.13/debian/cyradm-16x16.xpm @@ -0,0 +1,45 @@ +/* XPM */ +static char *magick[] = { +/* columns rows colors chars-per-pixel */ +"16 16 23 1", +" c Gray0", +". c #191919", +"X c Gray20", +"o c #00007f", +"O c #007f00", +"+ c #007f7f", +"@ c #7f0000", +"# c #7f007f", +"$ c #7f7f00", +"% c #4c4c4c", +"& c #666667", +"* c Gray50", +"= c Blue", +"- c Green", +"; c Cyan", +": c Red", +"> c Magenta", +", c Yellow", +"< c Gray60", +"1 c #b2b2b2", +"2 c Gray80", +"3 c Gray90", +"4 c Gray100", +/* pixels */ +"22111;1212211111", +"211221213<121221", +"2111212232<11122", +"121121221<231<11", +"2112232<34334112", +"1112222243213212", +";2221<11*&<<*<<1", +"1221233323232231", +"2233223333332&1<", +"2213123333233*1*", +"123312121222233*", +"1233212<<213223<", +"12331<1<<11<123*", +"123333322222223*", +"123223322222323*", +"2<&%%%X%%%%X%%X%" +}; --- cyrus-imapd-2.2-2.2.13.orig/debian/control +++ cyrus-imapd-2.2-2.2.13/debian/control @@ -0,0 +1,182 @@ +Source: cyrus-imapd-2.2 +Section: mail +Priority: extra +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Cyrus Team +Uploaders: Henrique de Moraes Holschuh , Sven Mueller , Benjamin Seidenberg , Ondřej Surý +Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.6-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch, transfig, gs, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev +Xs-Vcs-Browser: https://mail.incase.de/viewcvs/trunk/?root=cyrus22 +Xs-Vcs-Svn: https://mail.incase.de/svn/cyrus22/trunk + +Package: cyrus-common-2.2 +Architecture: any +Section: mail +Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends} +Recommends: cyrus-imapd-2.2 | cyrus-pop3d-2.2 | cyrus-murder-2.2 | cyrus-nntpd-2.2 | cyrus-admin-2.2 +Suggests: cyrus-clients-2.2, cyrus-admin-2.2, cyrus-imapd-2.2, cyrus-pop3d-2.2, cyrus-murder-2.2, cyrus-nntpd-2.2, cyrus-doc-2.2, sasl2-bin, apt-listchanges (>= 2.35) +Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus21-common, cyrus22-common +Replaces: cyrus21-common, cyrus22-common +Provides: cyrus21-common, cyrus22-common +Description: Cyrus mail system (common files) + Cyrus is a fully-featured IMAP daemon, with a number of features not + found in other IMAP implementations, including: + o Designed to handle massive quantities of mail + o No need for users to have login accounts + o Virtual domain support + o Support for POP3 in addition to IMAP + o Sieve server-side email filtering + o Servers don't run as root + o Easy support for mail quotas + o SSL support, including secure IMAP + o DRAC support for pop/imap-before-smtp + o IPv6 support + o NNTP support + For more information, see http://asg.web.cmu.edu/cyrus/. + . + Note: Cyrus doesn't support reading from and storing mail in your + standard mail spool - it stores mail in a separate directory in its + own MH-like format. + . + This package contains the common files needed by the other Cyrus + components. The cyrus22-imapd and/or cyrus22-pop3d packages are needed + to enable IMAP and POP3 support respectively. cyrus22-murder can be + used to enable IMAP, POP3 and LMTP proxying. + . + Homepage: http://cyrusimap.web.cmu.edu/ + +Package: cyrus-doc-2.2 +Architecture: all +Section: doc +Provides: cyrus21-doc, cyrus22-doc +Replaces: cyrus21-doc, cyrus22-doc +Conflicts: cyrus21-doc, cyrus22-doc +Description: Cyrus mail system (documentation files) + This package contains the documentation for the Cyrus IMAPd suite. + . + For more information, please see the cyrus-common-2.2 package. + +Package: cyrus-imapd-2.2 +Architecture: any +Section: mail +Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends} +Provides: imap-server, cyrus21-imapd, cyrus22-imapd +Conflicts: imap-server, cyrus21-imapd, cyrus22-imapd +Replaces: cyrus21-imapd, cyrus22-imapd +Description: Cyrus mail system (IMAP support) + This package contains the IMAP (Internet Mail Access Protocol) portion + of the Cyrus IMAPd suite. + . + For more information, please see the cyrus-common-2.2 package. + + +Package: cyrus-pop3d-2.2 +Architecture: any +Section: mail +Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends} +Provides: cyrus21-pop3d, cyrus22-pop3d, pop3-server +Conflicts: cyrus21-pop3d, cyrus22-pop3d, pop3-server +Replaces: cyrus21-pop3d, cyrus22-pop3d +Description: Cyrus mail system (POP3 support) + This package contains the POP3 (Post Office Protocol) portion of the Cyrus + IMAPd suite. + . + For more information, please see the cyrus-common-2.2 package. + +Package: cyrus-admin-2.2 +Architecture: all +Section: mail +Depends: libcyrus-imap-perl22 (>= ${Source-Version}) +Suggests: sasl2-bin +Conflicts: cyrus-admin, cyrus21-admin, cyrus22-admin +Replaces: cyrus21-admin, cyrus22-admin +Provides: cyrus21-admin, cyrus22-admin +Description: Cyrus mail system (administration tools) + This package provides the administrative tools for the Cyrus IMAPd suite. + It contains the cyradm tool which can be used to administer + both local and remote Cyrus mail systems. It also contains sieveshell + and its deprecated cousin installsieve, which can be used to manage + sieve scripts. + . + For more information, please see the cyrus-common-2.2 package. + +Package: cyrus-murder-2.2 +Section: mail +Architecture: any +Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends} +Recommends: cyrus-imapd-2.2 (= ${Source-Version}), cyrus-pop3d-2.2 (= ${Source-Version}) +Conflicts: cyrus21-murder, cyrus22-murder +Replaces: cyrus21-murder, cyrus22-murder +Provides: cyrus21-murder, cyrus22-murder +Description: Cyrus mail system (proxies and aggregator) + This package contains the Cyrus IMAPd suite murder aggregator system, + i.e. IMAP, POP3 and LMTP proxies, and the mupdate mailbox master daemon. + It allows for cluster setups where there are many backend Cyrus spools and + frontend proxy servers. + . + For more information, please see the cyrus-common-2.2 package. + + +Package: cyrus-nntpd-2.2 +Architecture: any +Section: mail +Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends} +Conflicts: news-transport-system +Replaces: cyrus21-nntpd, cyrus22-nntpd +Provides: news-transport-system, cyrus21-nntpd, cyrus22-nntpd +Description: Cyrus mail system (NNTP support) + This package contains the NNTP (Network News Transfer Protocol) portion of + the Cyrus IMAPd suite. + . + For more information, please see the cyrus-common-2.2 package. + +Package: cyrus-clients-2.2 +Architecture: any +Section: mail +Depends: ${shlibs:Depends} +Conflicts: cyrus21-clients, cyrus22-clients +Provides: cyrus21-clients, cyrus22-clients +Replaces: cyrus21-clients, cyrus22-clients +Description: Cyrus mail system (test clients) + This package contains client tools to test the Cyrus IMAPd suite. + It contains the mupdatetest, sivtest, smtptest, lmtptest, + imtest and pop3test tools which can be used to interactively talk to + a mupdate, sieve, smtp, lmtp, imap or pop3 server. + The clients are fully SASL-enabled for authentication. + . + For more information, please see the cyrus-common-2.2 package. + + +Package: cyrus-dev-2.2 +Architecture: any +Section: devel +Depends: libcyrus-imap-perl22 (>= ${Source-Version}), cyrus-common-2.2 (= ${Source-Version}), libsasl2-dev (>= 2.1.9) +Conflicts: cyrus-dev, cyrus21-dev, cyrus22-dev, libdb3-dev (<< 3.2.9-15), libdb2-dev (<< 2.7.7.0-6), libdb4.2-dev (<<4.2.52) +Replaces: cyrus21-dev, cyrus22-dev +Provides: cyrus21-dev, cyrus22-dev +Description: Cyrus mail system (developer files) + This package contains header files and the static library needed + to develop IMAP applications that interface with the Cyrus IMAPd suite. + . + For more information, please see the cyrus-common-2.2 package. + + +Package: libcyrus-imap-perl22 +Architecture: any +Depends: ${perl:Depends}, ${shlibs:Depends} +Provides: libcyrus-imap-perl, libcyrus-imap-perl21 +Conflicts: libcyrus-imap-perl, libcyrus-imap-perl21 +Replaces: libcyrus-imap-perl21 +Section: perl +Description: Interface to Cyrus imap client imclient library + The Cyrus::IMAP module provides an interface to the Cyrus imclient + library. These are primarily useful for implementing cyradm operations + within a Perl script; there are easier ways to implement general client + operations, although they may be more limited in terms of authentication + options when talking to a Cyrus imapd. + . + The modules that compose Cyrus::SIEVE are also included, but they are + undocumented upstream. + . + For more information, please see the cyrus-common-2.2 package. + --- cyrus-imapd-2.2-2.2.13.orig/debian/license.html +++ cyrus-imapd-2.2-2.2.13/debian/license.html @@ -0,0 +1,161 @@ + + + + + +Cyrus IMAP Licensing + + + + +

+ + +Masthead
+ + + + +
+Cyrus IMAP Licensing +
+		 + + +ASG Home   + + + +What's New   + + + +Jobs   + + + +Search   + + + +Contact Us  
+ + + + +Download Software   + + + +Mailing lists   + + + +Project Cyrus Home   +
+ + + +
+
+

+ + +Please direct technical questions or issues to cyrus-bugs@andrew.cmu.edu. +
+Please direct any licensing issues to tech-transfer@andrew.cmu.edu. +

+ +ALL versions of the Cyrus IMAP server are now covered by the +following copyright message. However, please note that in + distributions before 2.0, there may still be files that have the old + copyright text. + +
+ + * Copyright (c) 1994-2000 Carnegie Mellon University. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The name "Carnegie Mellon University" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For permission or any legal + * details, please contact + * Office of Technology Transfer + * Carnegie Mellon University + * 5000 Forbes Avenue + * Pittsburgh, PA 15213-3890 + * (412) 268-4387, fax: (412) 268-7395 + * tech-transfer@andrew.cmu.edu + * + * 4. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Computing Services + * at Carnegie Mellon University (http://www.cmu.edu/computing/)." + * + * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE + * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +
+ +

+If you find this software useful and valuable in your work, we welcome +any support you can offer toward continuing this work. + +

We gratefully accept contributions, whether intellectual or +monetary. Intellectual contributions in the form of code or +constructive collaboration can be directed to cyrus-bugs+@andrew.cmu.edu +(even if it is not a bug). + +

If you wish to provide financial support to the Cyrus Project, send a +check payable to Carnegie Mellon University to + +

+ + Project Cyrus + Computing Services + Carnegie Mellon University + 5000 Forbes Ave + Pittsburgh, PA 15213 + USA + +
+
+

+Please direct technical questions or issues to cyrus-bugs@andrew.cmu.edu. +
+Please direct any licensing issues to tech-transfer@andrew.cmu.edu. + +

+

+
+ +Last Updated: Thursday, 12-Oct-2000 16:38:41 EDT + + + + --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-db-types.upgrading_from_1.5.txt +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-db-types.upgrading_from_1.5.txt @@ -0,0 +1,6 @@ +DBENGINE BerkeleyDB3.2 +DUPLICATE db3_nosync +MBOX db3 +SEEN db3 +SUBS flat +TLS db3_nosync --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-pop3d-2.2.manpages +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-pop3d-2.2.manpages @@ -0,0 +1 @@ +man/pop3d.8 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-pop3d-2.2.dirs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-pop3d-2.2.dirs @@ -0,0 +1 @@ +usr/lib/cyrus --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-makedirs.8 +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-makedirs.8 @@ -0,0 +1,49 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" $Id: cyrus-makedirs.8 229 2005-12-08 23:26:29Z astronut $ +.\" +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH CYRUS-MAKEDIRS 8 "2002-12-08" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +cyrus-makedirs \- Sets up the Cyrus IMAPd system directories (spools) +.SH SYNOPSIS +.B cyrus-makedirs +.RI [ configfile ] +.br +.SH DESCRIPTION +This manual page documents briefly the +.B cyrus-makedirs +command. +Cyrus-makedirs is the Debian version of Cyrus upstream's mkimap program. +.PP +You +.B should +call /usr/sbin/cyrus-makedirs when you change any imapd.conf(5) options +that create or rename Cyrus mail stores/spools/partitions. It will be called +automatically on package upgrades. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +.SH OPTIONS +You can optionally tell cyrus-makedirs the Cyrus imapd.conf config file +to use. /etc/imapd.conf is assumed, if no parameters are given. +.SH SEE ALSO +.BR imapd.conf(5), +.BR /etc/default/cyrus2.2 +.SH AUTHOR +This manual page was written by Henrique de Moraes Holschuh , +for the Debian GNU/Linux system (but may be used by others). --- cyrus-imapd-2.2-2.2.13.orig/debian/rules +++ cyrus-imapd-2.2-2.2.13/debian/rules @@ -0,0 +1,398 @@ +#!/usr/bin/make -f +# debian/rules for CMU Cyrus IMAP version 2.2 +# GNU copyright 1997 by Joey Hess. +# Copyright (c) 2001 by Henrique de Moraes Holschuh +# Published under the GNU GPL license +# Based on previous work by Michael-John Turner , +# David Parker +# + +# DebHelper control +export DH_ALWAYS_EXCLUDE=CVS + +export MAINPKG=cyrus-common-2.2 +export DOCPKG=cyrus-doc-2.2 +export TMPPKG := $(CURDIR)/debian/tmp +export PKGDIR := $(CURDIR)/debian/$(MAINPKG) +export DOCDIR := $(CURDIR)/debian/$(DOCPKG)/usr/share/doc/$(DOCPKG) + +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +# enable dpatch usage +#include /usr/share/dpatch/dpatch.make +# -*- Makefile -*-, you silly Emacs! +# vim: set ft=make: + +DPATCH_PACKAGE ?= ${DEB_SOURCE_PACKAGE} +DPATCH_PACKAGE ?= ${PACKAGE} +DPATCH_STAMPDIR ?= debian/patched +DPATCH_STAMPFN ?= patch-stamp + +ifdef PATCHLIST +UNPATCHLIST := ${PATCHLIST} +DPATCH_ALL := +else +DPATCH_ALL := -all +endif + +ifneq (${DPATCH_STAMPDIR},debian/patched) +_STAMPDIR := --stampdir=${DPATCH_STAMPDIR} +endif + +ifdef DPATCH_WORKDIR +_WORKDIR := --workdir ${DPATCH_WORKDIR} +endif + +patch: ${DPATCH_STAMPFN} +${DPATCH_STAMPFN}: + test -d ${DPATCH_STAMPDIR} || install -d ${DPATCH_STAMPDIR} + @echo "Patches applied in the Debian version of ${DPATCH_PACKAGE}:" > $@T + @echo >> $@T + dpatch ${_WORKDIR} apply${DPATCH_ALL} -v ${_STAMPDIR} ${PATCHLIST} + dpatch ${_WORKDIR} cat${DPATCH_ALL} ${PATCHLIST} >>$@T + mv -f $@T $@ + +unpatch: + dpatch ${_WORKDIR} deapply${DPATCH_ALL} ${_STAMPDIR} ${UNPATCHLIST} + rm -rf ${DPATCH_STAMPFN} ${DPATCH_STAMPFN}T ${DPATCH_STAMPDIR} + +# arch-tag: 6bb4c625-9a85-41d9-ab37-23cb0a16fb39 +#END_dpatch.make + +# Extra version information to add to Cyrus IMAPd ID +DEBVERSION:=$(shell LCALL=C dpkg-parsechangelog | sed -ne 's/^Version: \(.*-\)/\1/p') +EXTRA_IDENT:="Debian-$(DEBVERSION)" + +# DB engine version +DBENGINE=BerkeleyDB4.3 + +DEBUGFLAGS=-g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + DEBUGFLAGS += -O0 +else + DEBUGFLAGS += -O2 +endif + +# FOR AUTOCONF 2.52 AND NEWER ONLY +CONFFLAGS = +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + CONFFLAGS += --build $(DEB_HOST_GNU_TYPE) +else + CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +# Other oddities +ifneq (,$(findstring strict,$(DEB_BUILD_OPTIONS))) + CONFFLAGS += --enable-warnings-are-errors +endif + +# The clean target will remove any and all cruft (as defined by +# configure ; make distclean ; cd intl; make distclean ). +# This is done to make sure the build daemon's source tree is the +# same as the one I am using to produce the i386 debs. +clean: clean-patched unpatch +clean-patched: #configure + dh_testdir + dh_testroot + -xargs -t -r chmod +x < debian/executable.files + -rm -f build-indep-stamp build-arch-stamp configure-stamp install-arch-stamp install-indep-stamp build-stamp + -$(MAKE) -i distclean + -rm -f config.h config.cache config.status config.log stamp-config confdefs.h + -rm -f netnews/Makefile perl/imap/Makefile.old perl/sieve/managesieve/Makefile.old snmp/Makefile Makefile et/Makefile + -rm -f doc/pod2htm* + -rm -f master/makedepend.log + -rm -rf doc/man + -rm -f debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt debian/README.configure-options + # -rm -rf et/ + rm -rf autom4te.cache + -xargs -t -r rm -f < debian/deletable.files + dh_clean + +configure: configure-stamp + # ./autogen.sh + +build: build-arch build-indep + +configure-stamp: patch + dh_testdir + -rm -f config.sub config.guess + cp /usr/share/misc/config.sub config.sub + cp /usr/share/misc/config.guess config.guess + touch configure.in && touch aclocal.m4 && touch configure + + # IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE + # DBENGINE AT THE TOP OF THIS MAKEFILE! + ./configure CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \ + --with-extraident=$(EXTRA_IDENT) \ + --prefix=/usr/share --exec-prefix=/usr --libexecdir=/usr/sbin \ + --bindir=/usr/sbin --sbindir=/usr/sbin \ + --includedir=/usr/include/cyrus \ + --datadir=/usr/share/cyrus --sysconfdir=/etc \ + --with-statedir=/var/state \ + --sharedstatedir=/usr/share/cyrus \ + --localstatedir=/var/lib/cyrus \ + --mandir=/usr/share/man \ + --with-cyrus-prefix=/usr/lib/cyrus --with-lock=fcntl \ + --with-perl=/usr/bin/perl \ + --with-openssl=/usr --with-auth=unix \ + --enable-murder --enable-nntp \ + --disable-listext --enable-annotatemore --with-sasl=/usr \ + --with-drac=/usr \ + --with-cyrus-user=cyrus --with-cyrus-group=mail \ + --with-tclsh=/usr/bin/tclsh --with-com_err=/usr \ + --with-pidfile=/var/run/cyrmaster.pid \ + --with-syslogfacility=MAIL \ + --with-seen-db=skiplist --with-mboxlist-db=skiplist \ + --enable-gssapi --with-gss_impl=heimdal \ + --with-ucdsnmp=/usr + if grep -q "WARNING: Disabling GSSAPI" config.log ; then \ + echo "ERROR: GSSAPI not found by configure" >&2 ;\ + exit 1 ;\ + fi + echo 'To build this package, configure was called as follows:' \ + > debian/README.configure-options + grep with\ options config.status \ + | sed -e 's/^.*options \\"/configure /;s/\\"$///' \ + >> debian/README.configure-options + sed -i 's/ -lsensors//' master/Makefile + touch configure-stamp + +build-arch: build-arch-stamp +build-arch-stamp: configure-stamp + dh_testdir + + PERL_MM_OPT="INSTALLDIRS=vendor" $(MAKE) + # store database configuration for possible automatic + # upgrading later + echo "DBENGINE $(DBENGINE)" >>debian/cyrus-db-types.txt + grep _db lib/imapoptions \ + | cut -d, -f1-2 | sed -e 's/{ "//;s/_db", "/ /;s/"$$//' \ + | sed -e 's/^tls.* /TLS /;s/^subs.* /SUBS /;s/^seen.* /SEEN /;s/^pts.* /PTS /;s/^mbox.* /MBOX /'\ + | awk '{printf("%s %s\n",toupper($$1),$$2);}' \ + >>debian/cyrus-db-types.txt + mv debian/cyrus-db-types.txt debian/cyrus-db-types.txt.old \ + && sort -u < debian/cyrus-db-types.txt.old > debian/cyrus-db-types.txt \ + && rm debian/cyrus-db-types.txt.old + + # store some useful state about the current package + echo "PACKAGE_VERSION $(DEBVERSION)" >debian/cyrus-hardwired-config.txt + if grep -q -s -n -E '^[[:space:]]*#define[[:space:]]+USE_DIR_FULL[[:space:]]+1' config.h ; then \ + echo "USE_DIR_FULL 1" >>debian/cyrus-hardwired-config.txt ;\ + else \ + echo "USE_DIR_FULL 0" >>debian/cyrus-hardwired-config.txt ;\ + fi + + touch build-arch-stamp + +# We aren't actually able to build arch-indep independently from +# arch-dep, so we guarantee that the arch build has been done first +build-indep: build-indep-stamp +build-indep-stamp: configure-stamp build-arch + dh_testdir + + cd doc &&\ + pod2man ../perl/sieve/scripts/sieveshell.pl > ../man/sieveshell.1 &&\ + fig2dev -L png murder.fig murder.png &&\ + rm -f groff-html-*.png pod2htm* + cd doc &&\ + mkdir -p man &&\ + for man in ../man/*.[1-9] ../debian/*.[1-9]; do \ + echo "Generating html manpage for $$man..."; \ + groff -man -Thtml $$man > man/`basename $$man`.html; \ + done + pod2html perl/imap/cyradm.sh > doc/man/cyradm.1.html + rm -f pod2htm* + + touch build-indep-stamp + +install-arch: build-arch + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -a + + $(MAKE) install DESTDIR=$(TMPPKG) + + # fix totaly broken location of the include files; + # while at it, also avoid namespace colision, and move + # lots of admin-only/system-only stuff to sbin and lib + # also, do the renaming needed for alternatives + # and fix the weird side-effect of setting the proper cyrus + # location in configure. + mkdir -p $(TMPPKG)/usr/sbin + mkdir -p $(TMPPKG)/usr/lib/cyrus + for i in master reconstruct quota deliver ; do \ + mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/cyr$$i ;\ + done + for i in mbpath ctl_mboxlist ctl_deliver ctl_cyrusdb squatter \ + tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus arbitron \ + cyr_expire; do \ + mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/$$i ;\ + done + mkdir -p $(TMPPKG)/usr/include + mv $(TMPPKG)/usr/share/include/cyrus $(TMPPKG)/usr/include + #mv $(TMPPKG)/bin/* $(TMPPKG)/usr/bin + + # Move the perl crap to a saner place + mkdir -p $(TMPPKG)/usr/lib + mkdir -p $(TMPPKG)/usr/share/perl5 + #mv $(TMPPKG)/lib/perl5/Cyrus $(TMPPKG)/usr/share/perl5/Cyrus + #mv $(TMPPKG)/lib/* $(TMPPKG)/usr/lib + + # for stuff in /etc + mkdir -p $(TMPPKG)/etc/cyrus $(TMPPKG)/etc/pam.d + install -m 644 debian/imapd.conf $(TMPPKG)/etc + install -m 644 debian/cyrus.conf $(TMPPKG)/etc + (cd debian ; for i in *.pam ;\ + do install -m 644 $$i $(TMPPKG)/etc/pam.d/$${i%.pam} ;\ + done) + + # We rename some utils, so we need to sort out the manpages + for i in master reconstruct quota deliver ; do \ + mv $(TMPPKG)/usr/share/man/man8/$$i.8 $(TMPPKG)/usr/share/man/man8/cyr$${i}.8 ; \ + done + + # And add our own manpages + mkdir -p $(TMPPKG)/usr/share/man/man8 + install -m 644 debian/cyrdump.8 $(TMPPKG)/usr/share/man/man8/cyrdump.8 + install -m 644 debian/cyrus-makedirs.8 $(TMPPKG)/usr/share/man/man8/cyrus-makedirs.8 + install -m 644 debian/arbitronsort.8 $(TMPPKG)/usr/share/man/man8/arbitronsort.8 + + # SNMP files + mkdir -p $(TMPPKG)/usr/share/snmp/mibs + install -m 644 master/CYRUS-MASTER.mib $(TMPPKG)/usr/share/snmp/mibs/CYRUS-MASTER-MIB.txt + + # Install cyradm icons + mkdir -p $(TMPPKG)/usr/share/icons/mini + install -m 644 debian/cyradm-32x32.xpm $(TMPPKG)/usr/share/icons/cyradm.xpm + install -m 644 debian/cyradm-16x16.xpm $(TMPPKG)/usr/share/icons/mini/cyradm.xpm + + # Install debian-provided scripts + install debian/cyrus-makedirs $(TMPPKG)/usr/sbin/cyrus-makedirs + install -m 644 debian/get-backtrace.gdb $(TMPPKG)/usr/lib/cyrus/get-backtrace.gdb + + # and logcheck files + install -m 644 debian/logcheck.ignore \ + $(PKGDIR)/etc/logcheck/ignore.d.server/cyrus2_2 + install -m 644 debian/logcheck.violations.ignore \ + $(PKGDIR)/etc/logcheck/violations.ignore.d/cyrus2_2 + + # Install the stuff needed for upgrades + for i in convert-sieve.pl dohash rehash undohash translatesieve \ + upgradesieve masssievec; do \ + install -m 755 tools/$$i $(PKGDIR)/usr/lib/cyrus/upgrade ;\ + done + install -m 644 debian/cyrus-db-types.upgrading_from_1.5.txt $(PKGDIR)/usr/lib/cyrus/upgrade + # And other upgrade helpers + install -m 644 debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt \ + $(PKGDIR)/usr/lib/cyrus + # And other misc useful tools + install -m 755 tools/arbitronsort.pl $(TMPPKG)/usr/sbin/arbitronsort + + # Install imtest and its symlinks + mv $(TMPPKG)/usr/bin/imtest $(CURDIR)/debian/cyrus-clients-2.2/usr/bin + for i in $(TMPPKG)/usr/bin/*test ; do \ + rm -f "$$i" || true ;\ + (cd $(CURDIR)/debian/cyrus-clients-2.2/usr/bin &&\ + ln -s imtest `basename $$i`) ;\ + done + + # Lintian and Linda overrides + cd debian ; \ + for i in *.linda ; do \ + mkdir -p "$${i%%.linda}/usr/share/linda/overrides" ;\ + install -m 644 "$$i" "$${i%%.linda}/usr/share/linda/overrides/$${i%%.linda}" ;\ + done ;\ + for i in *.lintian ; do \ + mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\ + install -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\ + done + + dh_install -a --sourcedir=$(TMPPKG) + touch install-arch-stamp + +# We aren't actually able to install arch-indep independently from +# arch-dep, so we guarantee that the arch build has been done first +install-indep: build-indep install-arch + dh_testdir + dh_testroot + #dh_clean -k + dh_installdirs -i + + # Massage the documentation into place + #mkdir -p $(DOCDIR) + #find doc/text -name '[Ra-z]*' -type f -exec cp -f {} $(PKGDIR)/usr/share/doc/$(MAINPKG) \; + #-(cd $(PKGDIR)/usr/share/doc/$(MAINPKG) && rm copyrights changes htmlstrip.c) + #find $(PKGDIR)/usr/share/doc/$(MAINPKG) -type f ! -name '*txt' ! -name '*.*' -exec mv {} {}.txt \; + + # Install the html docs and examples + mkdir -p $(DOCDIR)/html + install -m 644 doc/*.html doc/murder.png $(DOCDIR)/html + cp -a doc/man $(DOCDIR)/html + cp -a debian/examples $(DOCDIR) + install -m 644 doc/cyrusv2.mc $(DOCDIR)/examples + + # Install contrib/ files + mkdir -p $(DOCDIR)/contrib + xargs < debian/cyrus-common-2.2.contrib -rti cp -r '{}' $(DOCDIR)/contrib + + dh_install -i --sourcedir=$(TMPPKG) + +binary-indep: install-indep + dh_testdir -i + dh_testroot -i +# dh_installdebconf -i + dh_installdocs -p cyrus-admin-2.2 -p cyrus-doc-2.2 + dh_installexamples -p cyrus-admin-2.2 + dh_installmenu -i +# dh_installlogrotate -i +# dh_installpam -i +# dh_installmime -i +# dh_installcron -i + dh_installman -i + dh_installchangelogs -p cyrus-admin-2.2 doc/changes.html + dh_installchangelogs -p cyrus-doc-2.2 + dh_strip -i + dh_link -i + dh_compress -i + dh_fixperms -i + dh_makeshlibs -i + dh_installdeb -i + dh_perl -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: install-arch + dh_testdir -a + dh_testroot -a + dh_installdebconf -a + dh_installdocs -p $(MAINPKG) -p cyrus-clients-2.2 -p libcyrus-imap-perl22 + dh_installexamples -p $(MAINPKG) -p libcyrus-imap-perl22 -p cyrus-clients-2.2 + dh_installmenu -a +# dh_installlogrotate -a +# dh_installpam -a +# dh_installmime -a + dh_installinit -p $(MAINPKG) --noscripts --name=cyrus2.2 + dh_installcron -a --name=cyrus22 + dh_installman -a +# dh_installinfo -a + dh_installchangelogs -p $(MAINPKG) -p cyrus-clients-2.2 doc/changes.html + dh_installchangelogs -p libcyrus-imap-perl22 perl/imap/Changes + dh_fixperms -a + dh_strip -a + dh_link -a + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a + dh_installdeb -a + dh_perl -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install-arch install-indep clean-patched --- cyrus-imapd-2.2-2.2.13.orig/debian/watch +++ cyrus-imapd-2.2-2.2.13/debian/watch @@ -0,0 +1,2 @@ +version=2 +ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-(2\.2\..*).tar.(?:gz|bz2) --- cyrus-imapd-2.2-2.2.13.orig/debian/libcyrus-imap-perl22.install +++ cyrus-imapd-2.2-2.2.13/debian/libcyrus-imap-perl22.install @@ -0,0 +1,2 @@ +usr/lib/perl* +usr/share/perl* --- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian.simpleinstall +++ cyrus-imapd-2.2-2.2.13/debian/README.Debian.simpleinstall @@ -0,0 +1,183 @@ +Cyrus IMAP for Debian, Simple Install Guide +$Id: README.Debian.simpleinstall 683 2006-10-29 22:33:52Z sven $ +------------------------------------------- + + "All systems administrators have their horror stories. For me, it was + setting up a HP Color Bubblejet under Linux using ghostscript before + linuxprinting.org was alive. Well that was a piece of cake compared + to what I am about to describe in this document." + -- "Hosting email for virtual domains using Postfix and Cyrus" + Haim Dimermanas, 2001-08-01 + + "I warned you to read all the documentation first, didn't I?" + -- Henrique M. Holschuh, 2002-10-01 + + +This document describes how to get Cyrus running with a simple configuration +that you can then tweak to your real needs. + +READ README.Debian AS WELL. I MEAN IT! Cyrus is easy, all the trouble is +in SASL, and even that becomes easy after you understand how SASL works. + +IMPORTANT: Cyrus is a closed-box email system. Your system will access your +email through LMTP, IMAP and POP3 *only*. No direct file access to the email +store is supposed to take place. + + +To setup Cyrus so that you can administer it (i.e. create users), +and get email inside it for those users: + + 1. Make sure libsasl2-modules, libsasl2 and sasl2-bin are installed + + 2. Make sure /etc/sasldb2 is readable by group sasl. Pay attention + to overrides (dpkg-statoverride)! + + 3. Make sure user cyrus belongs to group sasl (cyrus-common-2.2's install + tries to do this automatically for you). + + 4. Edit /etc/cyrus.conf, and make sure the services you need are + enabled. These are most probably "imap", "pop3", "lmtpunix". + + 5. Edit /etc/imapd.conf, and make sure you have some admin users + listed in the entry "admins:". I suggest using "cyrus" as your + admin. + + I also suggest enabling plain text logins, and setting + sasl_minimum_layer: 0 + + If you have unixhierarchysep enabled in imapd.conf, change all + "." in mailbox names mentioned on this document to "/", since Cyrus + will use "/" as the hierarchy separator instead of the default ".". + I suggest you just leave unixhierarchysep set to false for now. + + 6. Restart Cyrus (/etc/init.d/cyrus2.2 restart) + + 7. Use saslpasswd2 -c to create an account for your admin: + saslpasswd2 -c cyrus + + 8. Use sasldblistusers2 to make sure step 7 worked fine. + + 9. Add other users to SASL likewise (saslpasswd2 -c). + +10. Log in cyrus as the administrator, and create the mailboxes: + cyradm --user cyrus localhost + cm user.bob + cm user.anna + cm user.clark... + ^D + + (notice that there is an "user." in front of the mailbox name!) + You must use "user/bob", "user/anna" instead if you have the + unixhierarchysep option enabled in imapd.conf. + + For this to work, you obviously need the cyrus-admin-2.2 package + installed. + +11. Try to login as a normal user, using imtest or a IMAP/POP3 client. + If you have trouble with mutt and CRAM-MD5 or DIGEST-MD5, edit + /etc/imapd.conf, and look for sasl_mech_list. Set it to: + sasl_mech_list: plain cram-md5 + (this will disable digest-md5, which causes trouble with mutt). + +12. Setup your MTA to deliver email inside Cyrus. Basically that can + be done (easily) by: + + a) running /usr/sbin/cyrdeliver (SLOW) + You need the lmtpunix service enabled in /etc/cyrus.conf for this + to work. + b) delivering using LMTP to /var/run/cyrus/socket/lmtp + You need the lmtpunix service enabled in /etc/cyrus.conf for this + to work. + + Just make sure (and use dpkg-statoverride to do that) that your + MTA can get to /var/run/cyrus/socket/lmtp. It works just like any + file in a Unix system. Use this for example if you use postfix or + any other MTA which tries to delivery through LMTP with a user in + the "lmtp" group (i.e. the delivery agent program is probably set + up with the setgid bit set and with owning group set to "lmtp"): + dpkg-statoverride --force --update --add cyrus lmtp 750 /var/run/cyrus + + If you run Postfix, make sure that the LMTP delivery agent is not + run chrooted in this setup (the line starting with "lmtp" should + have an "n" as the fifth field). If you want to run that agent + chrooted, you need to move the lmtp socket into the chroot or bind + mount /var/run/cyrus/socket into the chroot. + + Cyrus REQUIRES a valid RFC2822 message, and will refuse messages with + bad headers (such as that From foobar header, notice the missing ':'), + embedded NULLs or any other crap. + + +That's it. See /usr/share/doc/cyrus-common-2.2/README.{postfix,exim,sendmail} +for help on how to setup your MTA to correctly deliver to Cyrus. + + +LDAP SETUP +---------- + +First, do the steps above and verify that your system is working fine. + +SASL is perfectly capable of trying various authentication methods one after +another. We will change our Cyrus setup for SASL to use a LDAP server lookup +through saslauthd. + +1. Create the configuration for saslauthd to know what it must do: + + Write the following file to /etc/saslauthd.conf: +----CUTHERE---- +ldap_servers: ldap://127.0.0.1/ +ldap_version: 3 +ldap_timeout: 10 +ldap_time_limit: 10 +ldap_cache_ttl: 30 +ldap_cache_mem: 32768 +ldap_scope: sub +ldap_search_base: ou=mail,o=mydomain +ldap_auth_method: bind +ldap_filter: maildrop=%u +----CUTHERE---- + And of course, edit it to fit your LDAP setup. + +2. Now, configure saslauthd to use LDAP mode and our config file: + + Modify /etc/default/saslauthd so that it reads: + MECHANISMS="ldap" + PARAMS="-O /etc/saslauthd.conf" + + (MECHANISMS can be a space-separated list of authentication + mechanisms. If you wanted saslauthd to try LDAP, then PAM, you + could use MECHANISMS="ldap pam") + +3. Start saslauthd + + /etc/init.d/saslauthd restart + +4. Make sure Cyrus will be able to talk to saslauthd + + Set the following options in /etc/imapd.conf: + sasl_mech_list: PLAIN + allowapop: no + allowplaintext: yes + sasl_minimum_layer: 0 + sasl_pwcheck_method: saslauthd + + And restart Cyrus. You'd better understand that the above allows + plaintext logins over the network. There is a LDAP SASL auxprop + plugin being worked on that might fix this issue. As it stands + right now, you're better off by only accepting IMAPS (secure IMAP) + connections. + + (sasl_pwcheck_method is a space separated list of SASL methods to + try. If you want to have some local users in /etc/sasldb2, for + example, you could have "sasl_pwcheck_method: auxprop saslauthd" + and also "sasl_auxprop_plugin: sasldb") + + One *extremely* important point to notice is that saslauthd works + ONLY with plaintext. APOP, CRAM-MD5, OTP, DIGEST-MD5 and any other + "auxprop" SASL mech will *not* work through saslauthd. + +5. That's it. There is a LDAP auxprop module in the works which can deal + with APOP, CRAM-MD5, OTP, DIGEST-MD5 and so on, look for it in the SASL + docs and openldap's contrib stuff. + + -- Henrique de Moraes Holschuh --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-clients-2.2.dirs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-clients-2.2.dirs @@ -0,0 +1 @@ +usr/bin --- cyrus-imapd-2.2-2.2.13.orig/debian/arbitronsort.8 +++ cyrus-imapd-2.2-2.2.13/debian/arbitronsort.8 @@ -0,0 +1,15 @@ +.TH ARBITRONSORT "8" "Project Cyrus" "CMU" +.SH NAME +arbitronsort \- sorts arbitron(8) output +.SH SYNOPSIS +.B +arbitronsort +.SH DESCRIPTION +.PP +This tool takes the output of arbitron (run without the -o option) +on stdin and prints out first a ranking of mailboxes by number of +people who selected the mailbox, and then a ranking of mailbox by +number of subscribers. +.SH SEE ALSO +.PP +\fBarbitron(8)\fR --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-clients-2.2.README.Debian +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-clients-2.2.README.Debian @@ -0,0 +1,9 @@ +Cyrus IMAP for Debian, generic SASL-enabled protocol clients +$Id: cyrus-clients-2.2.README.Debian 229 2005-12-08 23:26:29Z astronut $ +--------------------- + +Refer to the cyrus-doc-2.2 package for more information. There is a lot +of it, and it will save you hours (or days) of frustating bug-hunting if +you read them first. + + -- Henrique de Moraes Holschuh --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-imapd-2.2.manpages +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-imapd-2.2.manpages @@ -0,0 +1,3 @@ +debian/tmp/usr/share/man/man8/idled.8 +debian/tmp/usr/share/man/man8/imapd.8 +debian/tmp/usr/share/man/man8/squatter.8 --- cyrus-imapd-2.2-2.2.13.orig/debian/README.sendmail +++ cyrus-imapd-2.2-2.2.13/debian/README.sendmail @@ -0,0 +1,69 @@ +Setting up Cyrus IMAPd for Sendmail (Debian) +$Id: README.sendmail 308 2006-03-07 20:02:36Z sven $ +=========================================================== + +[This is user-contributed, unverified information] + +First, do *not* use the old cyrus*.m4 macros, they won't work well. The one +you can use is cyrusv2.m4. There are many methods of connecting Cyrus to +sendmail, and replacing the local mailer with Cyrus lmtpd is just one of +them. + +Andrzej Filip says: +http://anfi.homeunix.net/sendmail/localNalias.html + Cyrus Aliases + It allows to use user@CYRUS redirections in virtusertable, + aliases and .forward file e.g. I use the following ~anfi/.forward: + anfi@CYRUS + +http://anfi.homeunix.net/sendmail/localtab.html + Local Table + +http://anfi.homeunix.net/sendmail/rtcyrus2.html + Real Time Cyrus Integration + It allows sendmail to check presence of cyrus mailbox in real time, + sendmail rejects message to non existing cyrus mailboxes in reply to + "RCPT TO:" + + +I am not sure how well these will work with sieve. The one report I have +for Cyrus + sendmail with working sieve is: + +"cyrus/sieve vacation seems to work only if you integrate cyrus via +cyrusv2.m4 into sendmail (8.12.3-4)." + +Sample sendmail.mc that seems to work: +-------- +[...] +dnl define BIND_OPTS',`-DNSRCH -DEFNAMES')dnl +define(`confLOCAL_MAILER', `cyrusv2')dnl +MAILER(`local')dnl +MAILER(`smtp')dnl +MAILER(`cyrusv2')dnl +dnl MODIFY_MAILER_FLAGS(`cyrus',`+w')dnl + +LOCAL_RULE_0 +Rbb + $+ < @ $=w . > $#cyrusbb $: $1 +[...] +-------- + +Here's a sieve test script you can try. Change it as needed for your +site: + +require "fileinto"; +require "vacation"; +require "envelope"; + +if header :contains "subject" "vactest" { + vacation :days 7 :addresses ["me@home.de"] "vactest!"; +} + + +Pierre Gambarotto says: +The minimum in order to make it work with sendmail is: + +define(`confLOCAL_MAILER', `cyrusv2') +define(`CYRUSV2_MAILER_ARGS',`FILE /var/run/cyrus/socket/lmtp') +MAILER(`cyrusv2') + +The CYRUSV2_MAILER_ARGS is the key. --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-imapd-2.2.links +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-imapd-2.2.links @@ -0,0 +1 @@ +usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-imapd-2.2 --- cyrus-imapd-2.2-2.2.13.orig/debian/changelog +++ cyrus-imapd-2.2-2.2.13/debian/changelog @@ -0,0 +1,580 @@ +cyrus-imapd-2.2 (2.2.13-13ubuntu3) hardy; urgency=low + + * No-change upload to rebuild against current heimdal libraries instead of + the NBS ones. + + -- Martin Pitt Fri, 18 Apr 2008 15:01:58 +0200 + +cyrus-imapd-2.2 (2.2.13-13ubuntu2) hardy; urgency=low + + * Rebuild for libddb4.3 -> libdb4.6 migration. + -Added debian/patches/99-bereklydb-4.6.dpatch which enables us to + drop libdb4.3 as a build dependency. + -Updated debian/patches/99-update-autoconf.dpatch to support db4.6. + + -- Chuck Short Wed, 05 Mar 2008 13:49:02 -0500 + +cyrus-imapd-2.2 (2.2.13-13ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Add a patch to drop libdb4.4 detection, as it will always use that + if it's available. + - Update configure patching in 99-update-autoconf. + - Re-enable copying of config.{sub,guess}, given the upstream provided one + is from 1999. + + -- Stephan Hermann Sat, 19 Jan 2008 13:21:14 +0100 + +cyrus-imapd-2.2 (2.2.13-13) unstable; urgency=low + + * Change messages and chown's in cyrus-makedirs (Use find instead) + (Closes: #404446, 411529) + * Fix logcheck rule to ignore nonexistant sieve scripts (Closes #416826) + * Update README.exim to something more debian specific. Thanks: Romain + Chantereau and Steve Kemp . + (Closes: #395504) + * Update README.Debian.databases. Along with other fixes from a long time + ago, this addresses almost all of the issues raised in an upgrade report. + (Closes: #409945) + * Add a patch by Andrew Morgan that adds a config option + to disable referrals from frontends to backends + + -- Benjamin Seidenberg Fri, 22 Jun 2007 16:50:45 +0100 + +cyrus-imapd-2.2 (2.2.13-12) unstable; urgency=low + + * The "This-would-be-a-lot-easier-if-Ross-Boylan-used-courier" Release + + [ Sven Mueller ] + * Add rules to logcheck.violations.ignore, eliminating "SQUAT failed" + generic error message as far as logcheck is concerned. + * Fix bug number in README.Debian (151295, not 151925) (Closes: #426334) + + [ Benjamin Seidenberg ] + * Remove a redundant part of patches//13-master_process_handling.dpatch + which causes a double free. (Closes: #425844, #429164) + * Add information about tls_[service]_* options changing in UPGRADE.Debian. + (Closes: #408503) + + -- Benjamin Seidenberg Mon, 18 Jun 2007 15:38:01 -0400 + +cyrus-imapd-2.2 (2.2.13-11ubuntu2) hardy; urgency=low + + * Rebuild for libsnmp10 -> libsnmp15 transition. + + -- Steve Kowalik Mon, 10 Dec 2007 20:30:03 +1100 + +cyrus-imapd-2.2 (2.2.13-11ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. + * Remaining Ubuntu changes: + - Add a patch to drop libdb4.4 detection, as it will always use that + if it's available. + - Update configure patching in 99-update-autoconf. + - Munge Maintainer field as per spec. + * Ubuntu changes dropped: + - Add missing semi-colon and correct a const in 61-64bit-quota. + * Re-enable copying of config.{sub,guess}, given the upstream provided one + is from 1999. + * Don't have the clean rule depend on configure. + + -- Steve Kowalik Fri, 15 Jun 2007 23:13:30 +1000 + +cyrus-imapd-2.2 (2.2.13-11) unstable; urgency=low + + * Fix a bug in cyrus-common-2.2 postrm script: + Even when a package Depends on debconf, it is not guaranteed to be there + when postrm is called. (Closes: #416739) + * Assume removal of spools is not desired if debconf isn't available (least + surprise / least chance of data loss principle). + * Add Xs-Vcs-Browser and Xs-Vcs-Svn control fields for the PTS. + * Fix a number of small issues with the 64bit quota patch. + * update automake/autoconf patch with latest autotools-dev and + automake/autoconf packages from unstable. + * Add optional patch which allows uploads of messages with "From " headers. + Taken from fastmail.fm patchset. + * Add upstream patch to avoid sending empty literal responses. + * Add upstream patch to sort illegal dates before legal ones. + * Add galician debconf translation (Closes: #412809) + * Add portuguese debconf translation (Closes: #410964) + * Add a little more detail to the squatter manpage (Closes: #395063) + * Add dependency on heimdal-dev, add check to debian/rules wether GSSAPI is + used (Closes: #423970) + + -- Sven Mueller Fri, 18 May 2007 13:05:58 +0200 + +cyrus-imapd-2.2 (2.2.13-10ubuntu2) feisty; urgency=low + + * Add missing semi-colon and correct a const in 61-64bit-quota. + * Add a patch to drop libdb4.4 detection, as it will always use that + if it's available. (LP: #67111) + * Update configure patching in 99-update-autoconf. + * Correct Maintainer fields. + + -- Steve Kowalik Fri, 23 Feb 2007 19:36:54 +1100 + +cyrus-imapd-2.2 (2.2.13-10ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Build using DB4.3. + * Modified Maintainer values to match Debian-Maintainer-Field spec. + + -- Michael Bienia Mon, 12 Feb 2007 15:10:50 +0100 + +cyrus-imapd-2.2 (2.2.13-10) unstable; urgency=high + + * High urgency due to #400747 + + [ Sven Mueller ] + * Update README.Debian.simpleinstall (Closes: #395250) + * Upstream change: applied RFC4314 READ-ONLY logic + + [ Benjamin Seidenberg ] + * Add notice about lmtp overquota configuration option rename to + UPGRADE.Debian (Closes: #400645) + * Disable upstream patch 0019 due to bad sasl interactions (Closes: #400747) + + -- Benjamin Seidenberg Sat, 9 Dec 2006 10:03:38 -0500 + +cyrus-imapd-2.2 (2.2.13-9ubuntu1) feisty; urgency=low + + * Merge with Debian unstable; remaining changes: + - Build using DB4.3. + + -- Matthias Klose Thu, 7 Dec 2006 17:31:51 +0100 + +cyrus-imapd-2.2 (2.2.13-9) unstable; urgency=high + + * The "Benjamin made it in time for etch" release. + * High urgency upload with simple fixes for Etch + + [ Henrique de Moraes Holschuh ] + * Prevent cronjobs and initscript from working when another version + of Cyrus IMAPD is installed and 2.2 is in removed but not purged + state (Closes: #393596) + + -- Benjamin Seidenberg Wed, 25 Oct 2006 13:39:08 -0400 + +cyrus-imapd-2.2 (2.2.13-8) unstable; urgency=medium + + [ Sven Mueller ] + * Remove unneeded drac dependency + * New vietnamese translation (thanks to Clytie Siddall, Closes: #383281) + * New russian translation (thanks to Yuri Kozlov, Closes: #383217) + * Updated dutch translation (thanks to Kurt De Bree, Closes: #384870) + * Updated logcheck rules a bit more, thanks to Ross Boylan (Closes: #384265) + * Add spanish debconf translation thanks to César Gómez Martín. + * Add patch to fix FTBFS on GNU/kFreeBSD thanks to Petr Salinger. + (Closes: #388242) + * Run autoconf to generate update configure script after above patch was + applied to configure.in + * Add patch by Ben Poliakoff which fixes an inability to set annotations + from IMAP::Admin perl module (Closes: #389597) + urgency=medium because of this bug. Might have been medium, but the + combination of this bug and the one below seems severe enough for high. + It makes the package unusable to anyone using annotations (guess is 40% + of new installs). + * Update dutch debconf translation (Closes: #389783) + * Fix a problem with repeated builds from the same tree. + * Add upstream patch to imtest.c prefixing raw client responses with C: + + [ Henrique de Moraes Holschuh ] + * Update pt_BR debconf translation + + [ Benjamin Seidenberg ] + * Update date span in debian/copyright + * Fix mistake in init script, ! check_status instead of !check_status. + Thanks to Farzad FARID + * Fix DOS encoding on several files in debian/ (Closes: #391092) + Thanks to Farzad FARID + * Changed my email in debian/control + + -- Benjamin Seidenberg Mon, 16 Oct 2006 19:41:37 -0400 + +cyrus-imapd-2.2 (2.2.13-7) unstable; urgency=low + + * The "Bad translations in the middle of the night" release. + * Update czech translation by Martin Šín + (Closes: #382775,#383226) + * Add logcheck ignore line for lmtp delivery log entries (Closes: #382942) + * Update imapd.conf and cyrus.conf to reflect the configurable IDLE patch + applied since 2.2.13-5. (Closes: #382938) + * Update a debconf question so that it doesn't ask in first persion. Fixes a + lintian warning or even two. + * Fix delprune event in cyrus.conf to use cyr_expire (Closes: #383015) + * Add swedish translation by Daniel Nylander + * Fix some mistakes in the german translation, most corrections by Holger + Wansing + * Update italian translation by Cristian Rigamonti + * Correct README.Debian.database regarding number of .seen and .sub + databases. (Closes: #383484) + * Change wording regarding installsieve in README.Debian. (Closes: #383485) + * Add a "WARNING" prefix to the error message about missing sieve scripts. + (Closes: #383640) + * Add a logcheck ignore clause for sieve redirects. (Closes: #384265) + * Fix an implicit pointer conversion in imap/global.c (Closes: #384279) + * Update french translation thanks to Philippe Batailler and the + debian-l10n-french mailing list. (Closes: #384288) + * added 'sieve_allowreferrals' option which controls whether timsieved + issues referrals (default) or proxies (by murch@andrew.cmu.edu) + * update japanese debconf translation, thanks to Hideki Yamane + (henrich@samba.gr.jp) + * Update logcheck rules (thanks to Paul Traina ) + (Closes: #387180) + * Add a patch to change a log message when a user has no sieve file. + + -- Sven Mueller Thu, 14 Sep 2006 18:58:49 +0200 + +cyrus-imapd-2.2 (2.2.13-6) unstable; urgency=low + + * Fix a problem in cyrus-common-2.2 preinst + + -- Sven Mueller Thu, 10 Aug 2006 03:58:58 +0200 + +cyrus-imapd-2.2 (2.2.13-5) unstable; urgency=low + + * The "Need to clean the Windows" release + + [ Benjamin Seidenberg ] + * Update the following documentation: + - README.Debian + - README.Debian.database + - README.Debian.postfix + - README.Debian. + (Closes: #378520, #369882) + * Bump debian policy to version 3.7.2 (No changes required) + * Move cyr_expire to /usr/sbin as this is used in cyrus.conf. + Thanks to Alexander Turic . (Closes: #380595) + * Rename cron script to cyrus22 since dots aren't allowed + (Closes: #382069) + + [ Sven Mueller ] + * Remove outdated entry about netnews removal from README.Debian + (Closes: #378519) + * Add --no-create-home to adduser arguments in cyrus-common2.2's + postinst script. (Closes: #378518) + * Modify debian/rules to once again create a meaningful + cyrus-db-types.txt file (Closes: #366957) + * Improve imapd.conf documentation to show how service specific options can + be given. Also update packaged imapd.conf to reflect 2.2 syntax and + behaviour. (Closes: #379881) + * Use ssl-cert and reference system-wide ssl certificates in imapd.conf, + leaving the service specific ssl certs as-is. + * Update imapd.conf documentation to clarify behaviour of allowplaintext in + combination with sasl_mech_list. + * Sync with 2.2 CVS tree from upstream, including a few documentation fixes + and a fix returning empty strings for empty message parts instead of NULL + * Use configurable idle patch from OndÅ~Yej Surý + * Add some more options to /etc/default/cyrus2.2 and use them in the init + script, including a generic OPTIONS variable to allow setting of any + commandline option for cyrmaster. (Closes: #382061) + * Add logic in cyrus-common-2.2 preinst/postrm scripts to rename the + cron.daily script. Supplements change by Benjamin Seidenberg, closing + #382069. + + -- Sven Mueller Thu, 10 Aug 2006 03:17:27 +0200 + +cyrus-imapd-2.2 (2.2.13-4ubuntu1) edgy; urgency=low + + * Synchronize with Debian unstable. + + -- Matthias Klose Tue, 11 Jul 2006 18:51:39 +0200 + +cyrus-imapd-2.2 (2.2.13-4) unstable; urgency=low + + [ Benjamin Seidenberg ] + * Switch from dh_movefiles (deprecated) to dh_install + + [ Sven Mueller ] + * Integrate 4 upstream CVS updates/fixes: + - Upstream fix: only free() the backend struct if we allocated it + (don't free cached connections) + - remove limit on the size of mailbox files that can be received by UNDUMP + (write file directly to disk rather than reading the literal into + memory) + - better logging to facilitate message tracking (Wes Craig + ) + - remove redundant check for wildcards in mailbox names (Wes Craig + ) + * Move expiry from ctl_deliver to cyr_expire as suggested by upstreams + upgrade information. + * Add upstream patch to fix a small issue with linking and libRSAglue + * Add upstream patch to compile with MIT krb5 1.4.3 (Philip Guenther + ) + * Add upstream patch to allow reporting of mailbox sizes above 4GB + * Add upstream patch to fix a documentation error in imapoptions + * Add patch to fix some compiler warnings about casts from pointer to + integer of different size + * Change the init script to actuall print some information when called with + the "status" argument + * Add upstream typo fixes of the day. See 0016-upstream-fix-typos for + reference to upstream CVS + + [ Benjamin Seidenberg ] + * Fix typos in UPGRADE.Debian (Closes: #368675) + * Fix link in doc/html/readme.html (Closes: #368676) + * Add upstream patch to fix POP locking when reconstructing + + -- Sven Mueller Wed, 28 Jun 2006 22:21:51 +0200 + +cyrus-imapd-2.2 (2.2.13-3) unstable; urgency=high + + [ Sven Mueller ] + * [Security] Add upstream patch to disallow user probes + * Add upstream patch to fix dump/undump of remote mailboxes (ctl_mboxlist) + * Add upstream patch to allow ACL removal for invalid IDs + * Add upstream patch to properly handle timezones and DST in fetchnews + * Urgency=high for both security fix and patch to dump/undump bug which + makes package unusuable in many supported setups + + [ Benjamin Seidenberg ] + * Add build dependency on libkvm-dev for kfreebsd (Closes: #366113) + + -- Sven Mueller Fri, 5 May 2006 18:01:41 +0200 + +cyrus-imapd-2.2 (2.2.13-2) unstable; urgency=low + + [ Sven Mueller ] + * Apply fix from upstream CVS to imap/backend.c (Closes: #365629) + + -- Sven Mueller Tue, 2 May 2006 22:14:03 +0200 + +cyrus-imapd-2.2 (2.2.13-1) unstable; urgency=low + + [ Sven Mueller ] + * Switch to new upstream release (2.2.13) + * Fix spelling mistake in debian/control (Closes: #363329) + * Fix logcheck rule (Closes: #364835) + + -- Sven Mueller Sat, 29 Apr 2006 22:31:42 +0200 + +cyrus-imapd-2.2 (2.2.12-5) unstable; urgency=low + + [ Sven Mueller ] + * Add example entries for squatter to cyrus.conf (Closes: #355303) + * Fix URLs in README.sendmail (Closes: #355771) + * Remove STDERR redirection from cyrus-common-2.2 postinst call to adduser + + [ Benjamin Seidenberg ] + * Default to lmtp_downcase_rcpt: yes for compliance with RFC 2821 + (Closes: #357040) + + -- Sven Mueller Fri, 31 Mar 2006 20:11:54 +0200 + +cyrus-imapd-2.2 (2.2.12-4ubuntu1) dapper; urgency=low + + * Synchronize with Debian unstable. + [ Taken from the cyrus21-imapd package ] + * Switch default config to use ssl-cert-snakeoil certificates only for the + global entry. Maintain the other examples to keep more clear how it works. + * Add Depends on ssl-cert. + + -- Matthias Klose Fri, 24 Feb 2006 00:28:45 +0000 + +cyrus-imapd-2.2 (2.2.12-4) unstable; urgency=low + + [ Benjamin Seidenberg ] + * Change maintainer to mailing list + * Remove multiple provides: lines in cyrus-nntpd-2.2 (Closes: #352240) + * Add lintian override for CVS dirs in source tarball, we need to hit + upstream with a cluebat for this. + * Move all Build-Depends-Indep dependencies to Build-Depends because of the + way debian/rules invokes this target, they are not installed, fixes FTBFS. + (Closes: #352775, #352779) + + [ Sven Mueller ] + * Disable DRAC authentication + * Fix reference in debian/po/POTFILES.in (Closes: #352948) + + [ Ondřej Surý ] + * Upload to unstable. + + -- Ondřej Surý Wed, 15 Feb 2006 22:42:35 +0100 + +cyrus-imapd-2.2 (2.2.12-3ubuntu1) dapper; urgency=low + + * Build using Berkeley DB 4.3. + + -- Matthias Klose Wed, 15 Feb 2006 17:40:07 +0000 + +cyrus-imapd-2.2 (2.2.12-3) unstable; urgency=low + + [ Sven Mueller ] + * Add a script which helps downloading, editing and re-uploading + sieve scripts + * Add a patch to fix db_err callback prototype when building against + Berkeley DB 4.3 or newer + + [ Henrique de Moraes Holschuh ] + * UPGRADE.Debian: warn of dangerous problem in cyrus-imapd from sarge, + which would cause data loss when UPGRADE.Debian instructions were + followed. + + [ Benjamin Seidenberg ] + * Changed debian/control so that the doc package is in section doc to match + ftpmaster override. + + [ Ondřej Surý ] + * Updated and renamed logcheck rules. + * Upload to unstable. + + -- Ondřej Surý Mon, 13 Feb 2006 14:16:44 +0100 + +cyrus-imapd-2.2 (2.2.12-2) experimental; urgency=low + + [ Henrique de Moraes Holschuh ] + * Modify the Debian default TLS cipher list to use only secure ciphers + suitable for imap/pop/smtp/lmtp TLS, and add an explanation + + [ Benjamin Seidenberg ] + * Rewrote descriptions to all refer to cyrus-common-2.2 + * Changed all package names in all required files within /debian to reflect + the new naming scheme + * Deleted two files in /usr/lib/cyrus in the purge target of postrm so that + this folder is deleted correctly + * Changed policy version to 3.6.2 + * Added upstream patchset 6662: + imap/spool.c:1.7->1.8: don't catch our own NULL (off by one error) + (Closes: #342314) + + [ Sven Mueller ] + * Add a small sed call to debian rules to work around libsnmp[59]-dev + problem which causes an unneccesary "-lsensors" in master/Makefile, + resulting in an unnessary build dependency on libsensors-dev. + Proper fix has to go into netsmp packages, also we need to properly use + Debian's libtool. (Closes: #341580) + * Add czech translation (thanks to Martin Sin and the debian-l10n-czech + team) with a spelling correction from Ondrej Surý. + * Adjust kolab2 annotation patch according to patch from Steffen Joeris + (Closes: #347527) + * Apply patch fixing some error messages in Shell.pm (Closes: #347658) + + [ Ondřej Surý ] + * Upload to experimental. + + -- Ondřej Surý Fri, 13 Jan 2006 11:52:58 +0100 + +cyrus22-imapd (2.2.12-1) experimental; urgency=low + + [ Benjamin Seidenberg ] + * Revised to build against pristine upstream sources. + [ Sven Mueller ] + * Fixed a discrepancy between documentation and actual behaviour of the + "dracinterval" imapd.conf option. Documentation always said the default + would be 0, while the default was actually 5. + [ Henrique de Moraes Holschuh ] + * Change build-dependency from libsnmp4.2-dev (ucd snmp) to libsnmp9-dev | + libsnmp5-dev (netsnmp), so that it works right in sid/etch and sarge + * Upload to experimental + + -- Henrique de Moraes Holschuh Tue, 29 Nov 2005 02:10:21 -0200 + +cyrus22-imapd (2.2.12-0.9) unstable; urgency=low + + [ Sven Mueller ] + * Add patch to be compatible with BerkeleyDB 4.3 + * Add patch to fix TLS/SSL shutdown in timsieved + + -- Sven Mueller Mon, 14 Nov 2005 14:56:20 +0100 + +cyrus22-imapd (2.2.12-0.8) unstable; urgency=low + + [ Sven Mueller ] + * Fix a problem in the init scripts new status check, found by Benjamin + Seidenberg. + + -- Sven Mueller Sun, 13 Nov 2005 20:14:05 +0100 + +cyrus22-imapd (2.2.12-0.7) unstable; urgency=low + + [ Sven Mueller ] + * Switch most deletions of autogenerated files to use debian/deletable.files + * Switch all remaining patches to dpatch so that the .diff.gz should now be + clean except for the files in debian/. + + -- Sven Mueller Thu, 10 Nov 2005 16:06:09 +0100 + +cyrus22-imapd (2.2.12-0.6) unstable; urgency=low + + [ Sven Mueller ] + * Added kolab2 annotation patch as proposed by Christoper Sacca + * Added a small patch to lower the minimum pop3 timeout to 1 minute. + The default is still at 10 minutes. I also added some documentation to make + it clear to admins that it is _not_ recommended to lower the value to less + than 10 minutes (because that is what the standard says it should be at). + I needed this change for use at my workplace though. The patch is disabled + by default. + * Patched init script to support everything LSB 3.0 asks for, including the + "right" return codes, as far as we can. + * Add patch to enhance sieveshell a bit: + - Add --execfile parameter to read commands from a file + - Add --password parameter to pass the users parameter on the commandline + - Add code to return with a non-zero exit code if the last command + executed failed for some reason. + + [ Ondřej Surý ] + * Add 64bit quota dpatch. + * Rerun autoconf and add result as dpatch. + + -- Sven Mueller Fri, 23 Sep 2005 18:55:57 +0200 + +cyrus22-imapd (2.2.12-0.5) unstable; urgency=low + + * Update upgrading information + * Include masssievec in cyrus22-common + * Applied patch from Raphaël 'SurcouF' Bordet to add + nntp support again. + * Eliminate an unused variable from tools/masssievec to get rid of perl + warning. + * Update Recommends and Suggests for cyrus22-common as suggested by HMH + * Move several patches from patching the source directly to patching through + the use of dpatch + + -- Sven Mueller Tue, 24 May 2005 23:13:18 +0200 + +cyrus22-imapd (2.2.12-0.4) unstable; urgency=low + + * Fix usage message in deliver.c to reflect Debian naming of (cyr)deliver, + (cyr)quota and (cyr)reconstruct + * Document the defaultdomain setting a bit better (hopefully) + * fix deletion of debian/cyrus-hardwired-config.txt during cleanup + * build both arch-dependend and arch-independend parts when debian/rules is + called for the build target + * Add Sven Mueller to the list of uploaders + + -- Sven Mueller Fri, 29 Apr 2005 00:14:04 +0200 + +cyrus22-imapd (2.2.12-0.3) unstable; urgency=low + + * Add a README which contains the configure options used to + compile the package. The README is auto-generated by debian/rules + * cyrus22-clients needs to conflict with cyrus21-clients + * cyrus22-common needs to conflict with cyrus21-common + * Add a guess of what the problem might be to the set_cert_stuff failure + message + * Update a few Replaces:, Provides: and Conflicts: lines in debian/control + + -- Sven Mueller Thu, 24 Mar 2005 12:26:27 +0100 + +cyrus22-imapd (2.2.12-0.2) unstable; urgency=low + + * Fix some more perl executable paths + * clean up debian directory a bit + * install sievec with cyrus22-common + * install mbexamine with cyrus22-common + * install smmapd with cyrus22-common + * install cyr_expire with cyrus22-common + * install installsieve with cyrus22-admin + + -- Sven Mueller Tue, 22 Mar 2005 14:48:33 +0100 + +cyrus22-imapd (2.2.12-0.1) unstable; urgency=low + + * Initial revision of cyrus22-imapd package + - debian packaging taken from cyrus21-imapd_2.1.18-1 + * Add/fix imapd.conf info regarding virtual domains + * Add DRAC support (i.e. apply DRAC patch from /contrib) + * Add syncldap2cyrus.pl script from #260833 (a cyrus21 bug) + + -- Sven Mueller Fri, 18 Mar 2005 13:34:09 +0100 + --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-makedirs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-makedirs @@ -0,0 +1,146 @@ +#!/bin/sh -e +# +# cyrus-makedirs - Parses a Cyrus imap.d configuration file, and creates +# the correct directory trees for all partitions +# +# Copyright 2001,2002 by Henrique de Moraes Holschuh +# Various modifications done by Sven Mueller +# Distributed under the GPL version 2 +# +# $Id: cyrus-common-2.2.cyrus2.2.init 729 2007-06-21 17:34:47Z astronut $ + +# Make sure we get sane results on borked locales +LC_ALL=C +export LC_ALL + +# Overridable defaults +unset CYRUS_VERBOSE +unset LISTENQUEUE +unset CONF +unset MASTERCONF +[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2 + +[ "x${CYRUS_VERBOSE}" != "x" ] && export CYRUS_VERBOSE +# Make sure the master process is daemonized +OPTIONS="${OPTIONS} -d" +[ "x${CONF}" != "x" ] && OPTIONS="-C ${CONF} ${OPTIONS}" +[ "x${MASTERCONF}" != "x" ] && OPTIONS="-M ${MASTERCONF} ${OPTIONS}" +[ "x${LISTENQUEUE}" != "x" ] && OPTIONS="-l ${LISTENQUEUE} ${OPTIONS}" + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DAEMON=/usr/sbin/cyrmaster +NAME=cyrmaster +[ "x${PIDFILE}" = "x" ] && PIDFILE="/var/run/${NAME}.pid" +DESC="Cyrus IMAPd" + +# Check if Cyrus 2.2 is installed +test -x ${DAEMON} || exit 0 +grep -qE '^PACKAGE_VERSION[[:blank:]]+2[.]2' \ + /usr/lib/cyrus/cyrus-hardwired-config.txt >/dev/null 2>&1 || exit 0 + +set -e + +START="--start --quiet --pidfile ${PIDFILE} --exec ${DAEMON} --name ${NAME} -- ${OPTIONS}" + +verifydb() { + while read -r DBKEY DBVALUE ; do + match=`sort -u < $1 | gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }"` + [ "x${match}" != "x${DBVALUE}" ] && return 0 + done + return 1 +} + +createdir() { +# $1 = user +# $2 = group +# $3 = permissions (octal) +# $4 = path to directory + [ -d "$4" ] || mkdir -p "$4" + chown -c -h "$1:$2" "$4" + chmod -c "$3" "$4" +} + +missingstatoverride () { + echo "$0: You are missing a dpkg-statoverride on $1. Add it." >&2 + exit 1 +} + +fixdirs () { + dir=`dpkg-statoverride --list /var/run/cyrus` \ + || missingstatoverride /var/run/cyrus + [ -z "$dir" ] \ + || createdir $dir + dir=`dpkg-statoverride --list /var/run/cyrus/socket` \ + || missingstatoverride /var/run/cyrus/socket + [ -z "$dir" ] \ + || createdir $dir +} + +check_status () { + if [ "$1" = "verbose" ]; then + PRINTIT=echo + else + PRINTIT=true + fi + if [ ! -f ${PIDFILE} ]; then + # using [c] in the grep avoids catching the grep + # process itself + if ps auxww | grep -qE 'usr/sbin/[c]yrmaster' ; then + # Damn, PID file doesn't exist, but cyrmaster process + # exists. Though strictly speaking, we should not + # do this, reconstruct the PID file here. + pidof /usr/sbin/cyrmaster > /dev/null 2>&1 \ + && pidof /usr/sbin/cyrmaster > ${PIDFILE} + ${PRINTIT} "cyrmaster running with PID `cat ${PIDFILE}`" + return 0 + fi + fi + if [ -s ${PIDFILE} ] && kill -0 `cat ${PIDFILE}` > /dev/null 2>&1; then + ${PRINTIT} "cyrmaster running with PID `cat ${PIDFILE}`" + return 0 + else + # the PID file might simply not match the cyrmaster process. + if pidof /usr/sbin/cyrmaster > /dev/null 2>&1 ; then + # go ahead and fix it + pidof /usr/sbin/cyrmaster > ${PIDFILE} + ${PRINTIT} "cyrmaster running with PID `cat ${PIDFILE}`" + return 0 + else + # no process and/or no PID file, return failure + ${PRINTIT} "cyrmaster not running with" + return 1 + fi + fi + # this point should never be reached, return unknown status if it + # is anyway + return 4 +} + +case "$1" in + start) + # Verify if there are old Cyrus 1.5 spools that were not upgraded + [ -f /var/lib/cyrus/mailboxes -a -d /var/lib/cyrus/deliverdb -a \ + -d /var/spool/cyrus/mail/user -a ! -d /var/spool/cyrus/mail/stage. ] && { + echo "$0: It appears that you still have an version 1.5 spool" 1>&2 + echo "$0: that needs to be upgraded. Please refer to the guide" 1>&2 + echo "$0: at /usr/share/doc/cyrus-common-2.2/UPGRADE.Debian" 1>&2 + echo + echo "$0: Cyrmaster not started." + exit 6 + } + # Verify consistency of database backends + [ -f /usr/lib/cyrus/cyrus-db-types.active ] && { + # is it safe to start cyrmaster? compare "key value" pairs + # from the (old) active database types file with the new one + ( sort -u /usr/lib/cyrus/cyrus-db-types.active \ + | grep DBENGINE \ + | verifydb /usr/lib/cyrus/cyrus-db-types.txt \ + ) && { + echo "$0: Database backends mismatch! You must manually" 1>&2 + echo "$0: verify and update the Cyrus databases to the" 1>&2 + echo "$0: new backends." 1>&2 + echo "$0: Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian" 1>&2 + echo "$0: for instructions." 1>&2 + echo + echo "$0: Cyrmaster not started." + exit 6 + } + } + echo -n "Starting ${DESC}: " + fixdirs + if check_status ; then + echo "${DAEMON} already running." + exit 0 + fi + if start-stop-daemon ${START} >/dev/null 2>&1 ; then + echo "$NAME." + else + if ! check_status ; then + echo "(failed)." + exit 1 + fi + fi + ;; + stop) + echo -n "Stopping $DESC: " + if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ + --name ${NAME} --quiet --startas $DAEMON >/dev/null 2>&1 ; then + echo "$NAME." + rm -f ${PIDFILE} + exit 0 + else + # process running? + if check_status; then + # Yes, report failure. + echo "(failed)." + exit 1 + else + # No, return as if stopped a running process + # successfully. + echo "." + rm -f ${PIDFILE} + exit 0 + fi + fi + ;; + reload|force-reload) + echo "Reloading $DESC configuration files." + if start-stop-daemon --stop --signal 1 --quiet \ + --name ${NAME} --pidfile /var/run/$NAME.pid >/dev/null 2>&1 ; then + exit 0 + else + exit 1 + fi + ;; + restart) + $0 stop && { + echo -n "Waiting for complete shutdown..." + i=5 + while [ $i -gt 0 ] ; do + # exit look when server is not running + check_status || break + sleep 2s + i=$(($i - 1)) + echo -n "." + done + [ $i -eq 0 ] && { + echo + echo "fatal: incomplete shutdown detected, aborting." + exit 1 + } + echo + } + exec $0 start + ;; + status) + check_status verbose + exit $? + ;; + try-restart) + check_status + if [ "$?" -eq 0 ]; then + exec $0 restart + else + # LSB says to return 0 in try-restart if the service is + # not running. + exit 0 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload}" 1>&2 + exit 1 + ;; +esac + +exit 0 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.templates +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.templates @@ -0,0 +1,25 @@ +Template: cyrus-common-2.2/warnbackendchange +Type: note +_Description: Database backends have changed! + Comparison between /usr/lib/cyrus/cyrus-db-types.txt and + /usr/lib/cyrus/cyrus-db-types.active shows that database backends for + Cyrus IMAPd have been changed. + . + This means that those databases for which the database backends changed + might need to be converted manually to the new format, using the + cvt_cyrusdb(8) utility. + . + Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database + for more information. Do not start cyrmaster until you have converted + the databases to the new format. + +Template: cyrus-common-2.2/removespools +Type: boolean +Default: false +_Description: Remove the mail and news spools? + The Cyrus mail and news spools, as well as the user's sieve scripts + can be removed when the package is purged. + . + This question only applies to the default spools and sieve script + directories in /var. If you modified their location in imapd.conf, the + new locations will not be removed; just the old ones in /var. --- cyrus-imapd-2.2-2.2.13.orig/debian/imapd.conf +++ cyrus-imapd-2.2-2.2.13/debian/imapd.conf @@ -0,0 +1,327 @@ +# Debian Cyrus imapd.conf +# $Id: imapd.conf 565 2006-08-14 16:51:28Z sven $ +# See imapd.conf(5) for more information and more options + +# Configuration directory +configdirectory: /var/lib/cyrus + +# Which partition to use for default mailboxes +defaultpartition: default +partition-default: /var/spool/cyrus/mail + +# News setup +partition-news: /var/spool/cyrus/news +newsspool: /var/spool/news + +# Alternate namespace +# If enabled, activate the alternate namespace as documented in +# /usr/share/doc/cyrus-doc-2.2/html/altnamespace.html, where an user's +# subfolders are in the same level as the INBOX +# See also userprefix and sharedprefix on imapd.conf(5) +altnamespace: no + +# UNIX Hierarchy Convention +# Set to yes, and cyrus will accept dots in names, and use the forward +# slash "/" to delimit levels of the hierarchy. This is done by converting +# internally all dots to "^", and all "/" to dots. So the "rabbit.holes" +# mailbox of user "helmer.fudd" is stored in "user.elmer^fud.rabbit^holes" +unixhierarchysep: no + +# Rejecting illegal characters in headers +# Headers of RFC2882 messages must not have characters with the 8th bit +# set. However, too many badly-written MUAs generate this, including most +# spamware. Enable this to reject such messages. +#reject8bit: yes + +# Munging illegal characters in headers +# Headers of RFC2882 messages must not have characters with the 8th bit +# set. However, too many badly-written MUAs generate this, including most +# spamware. If you kept reject8bit disabled, you can choose to leave the +# crappage untouched by disabling this (if you don't care that IMAP SEARCH +# won't work right anymore. +#munge8bit: no + +# Forcing recipient user to lowercase +# Cyrus 2.2 is case-sensitive. If all your mail users are in lowercase, it is +# probably a very good idea to set lmtp_downcase_rcpt to true. This is set by +# default, per RFC2821. This was not set by default in debian versions up to +# and including 2.2.12-4. +lmtp_downcase_rcpt: yes + +# Uncomment the following and add the space-separated users who +# have admin rights for all services. +#admins: cyrus + +# Space-separated list of users that have lmtp "admin" status (i.e. that +# can deliver email through TCP/IP lmtp). If specified, this parameter +# overrides the "admins" parameter above +#lmtp_admins: postman + +# Space-separated list of users that have mupdate "admin" status, in +# addition to those in the admins: entry above. Note that mupdate slaves and +# backends in a Murder cluster need to autenticate against the mupdate master +# as admin users. +#mupdate_admins: mupdateman + +# Space-separated list of users that have imapd "admin" status, in +# addition to those in the admins: entry above +#imap_admins: cyrus + +# Space-separated list of users that have sieve "admin" status, in +# addition to those in the admins: entry above +#sieve_admins: cyrus + +# List of users and groups that are allowed to proxy for other users, +# seperated by spaces. Any user listed in this will be allowed to login +# for any other user. Like "admins:" above, you can have imap_proxyservers +# and sieve_proxyservers. +#proxyservers: cyrus + +# No anonymous logins +allowanonymouslogin: no + +# Minimum time between POP mail fetches in minutes +popminpoll: 1 + +# If nonzero, normal users may create their own IMAP accounts by creating +# the mailbox INBOX. The user's quota is set to the value if it is positive, +# otherwise the user has unlimited quota. +autocreatequota: 0 + +# umask used by Cyrus programs +umask: 077 + +# Sendmail binary location +# DUE TO A BUG, Cyrus sends CRLF EOLs to this program. This breaks Exim 3. +# For now, to work around the bug, set this to a wrapper that calls +# /usr/sbin/sendmail -dropcr instead if you use Exim 3. +#sendmail: /usr/sbin/sendmail + +# If enabled, cyrdeliver will look for Sieve scripts in user's home +# directories: ~user/.sieve. +sieveusehomedir: false + +# If sieveusehomedir is false, this directory is searched for Sieve scripts. +sievedir: /var/spool/sieve + +# notifyd(8) method to use for "MAIL" notifications. If not set, "MAIL" +# notifications are disabled. Valid methods are: null, log, zephyr +#mailnotifier: zephyr + +# notifyd(8) method to use for "SIEVE" notifications. If not set, "SIEVE" +# notifications are disabled. This method is only used when no method is +# specified in the script. Valid methods are null, log, zephyr, mailto +#sievenotifier: zephyr + +# DRAC (pop-before-smtp, imap-before-smtp) support +# Set dracinterval to the time in minutes to call DRAC while a user is +# connected to the imap/pop services. Set to 0 to disable DRAC (default) +# Set drachost to the host where the rpc drac service is running +#dracinterval: 0 +#drachost: localhost + +# If enabled, the partitions will also be hashed, in addition to the hashing +# done on configuration directories. This is recommended if one partition has a +# very bushy mailbox tree. +hashimapspool: true + +# Allow plaintext logins by default (SASL PLAIN) +allowplaintext: yes + +# Force PLAIN/LOGIN authentication only +# (you need to uncomment this if you are not using an auxprop-based SASL +# mechanism. saslauthd users, that means you!). And pay attention to +# sasl_minimum_layer and allowapop below, too. +#sasl_mech_list: PLAIN + +# Allow use of the POP3 APOP authentication command. +# Note that this command requires that the plaintext passwords are +# available in a SASL auxprop backend (eg. sasldb), and that the system +# can provide enough entropy (eg. from /dev/urandom) to create a challenge +# in the banner. +#allowapop: no + +# The minimum SSF that the server will allow a client to negotiate. A +# value of 1 requires integrity protection; any higher value requires some +# amount of encryption. +#sasl_minimum_layer: 0 + +# The maximum SSF that the server will allow a client to negotiate. A +# value of 1 requires integrity protection; any higher value requires some +# amount of encryption. +#sasl_maximum_layer: 256 + +# List of remote realms whose users may log in using cross-realm +# authentications. Seperate each realm name by a space. A cross-realm +# identity is considered any identity returned by SASL with an "@" in it. +# NOTE: To support multiple virtual domains on the same interface/IP, +# you need to list them all as loginreals. If you don't list them here, +# (most of) your users probably won't be able to log in. +#loginrealms: example.com + +# Enable virtual domain support. If enabled, the user's domain will +# be determined by splitting a fully qualified userid at the last '@' +# or '%' symbol. If the userid is unqualified, and the virtdomains +# option is set to "on", then the domain will be determined by doing +# a reverse lookup on the IP address of the incoming network +# interface, otherwise the user is assumed to be in the default +# domain (if set). +#virtdomains: userid + +# The default domain for virtual domain support +# If the domain of a user can't be taken from its login and it can't +# be determined by doing a reverse lookup on the interface IP, this +# domain is used. +#defaultdomain: + +# +# SASL library options (these are handled directly by the SASL libraries, +# refer to SASL documentation for an up-to-date list of these) +# + +# The mechanism(s) used by the server to verify plaintext passwords. Possible +# values are "saslauthd", "auxprop", "pwcheck" and "alwaystrue". They +# are tried in order, you can specify more than one, separated by spaces. +# +# Do note that, since sasl will be run as user cyrus, you may have a lot of +# trouble to set this up right. +sasl_pwcheck_method: auxprop + +# What auxpropd plugins to load, if using sasl_pwcheck_method: auxprop +# by default, all plugins are tried (which is probably NOT what you want). +#sasl_auxprop_plugin: sasldb + +# If enabled, the SASL library will automatically create authentication secrets +# when given a plaintext password. Refer to SASL documentation +sasl_auto_transition: no + +# +# SSL/TLS Options +# + +# File containing the global certificate used for ALL services (imap, pop3, +# lmtp, sieve) +#tls_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem + +# File containing the private key belonging to the global server certificate. +#tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.key + +# File containing the certificate used for imap. If not specified, the global +# certificate is used. A value of "disabled" will disable SSL/TLS for imap. +#imap_tls_cert_file: /etc/ssl/certs/cyrus-imap.pem + +# File containing the private key belonging to the imap-specific server +# certificate. If not specified, the global private key is used. A value of +# "disabled" will disable SSL/TLS for imap. +#imap_tls_key_file: /etc/ssl/private/cyrus-imap.key + +# File containing the certificate used for pop3. If not specified, the global +# certificate is used. A value of "disabled" will disable SSL/TLS for pop3. +#pop3_tls_cert_file: /etc/ssl/certs/cyrus-pop3.pem + +# File containing the private key belonging to the pop3-specific server +# certificate. If not specified, the global private key is used. A value of +# "disabled" will disable SSL/TLS for pop3. +#pop3_tls_key_file: /etc/ssl/private/cyrus-pop3.key + +# File containing the certificate used for lmtp. If not specified, the global +# certificate is used. A value of "disabled" will disable SSL/TLS for lmtp. +#lmtp_tls_cert_file: /etc/ssl/certs/cyrus-lmtp.pem + +# File containing the private key belonging to the lmtp-specific server +# certificate. If not specified, the global private key is used. A value of +# "disabled" will disable SSL/TLS for lmtp. +#lmtp_tls_key_file: /etc/ssl/private/cyrus-lmtp.key + +# File containing the certificate used for sieve. If not specified, the global +# certificate is used. A value of "disabled" will disable SSL/TLS for sieve. +#sieve_tls_cert_file: /etc/ssl/certs/cyrus-sieve.pem + +# File containing the private key belonging to the sieve-specific server +# certificate. If not specified, the global private key is used. A value of +# "disabled" will disable SSL/TLS for sieve. +#sieve_tls_key_file: /etc/ssl/private/cyrus-sieve.key + +# File containing one or more Certificate Authority (CA) certificates. +#tls_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem + +# Path to directory with certificates of CAs. +tls_ca_path: /etc/ssl/certs + +# The length of time (in minutes) that a TLS session will be cached for later +# reuse. The maximum value is 1440 (24 hours), the default. A value of 0 will +# disable session caching. +tls_session_timeout: 1440 + +# The list of SSL/TLS ciphers to allow, in decreasing order of precedence. +# The format of the string is described in ciphers(1). The Debian default +# selects TLSv1 high-security ciphers only, and removes all anonymous ciphers +# from the list (because they provide no defense against man-in-the-middle +# attacks). It also orders the list so that stronger ciphers come first. +tls_cipher_list: TLSv1+HIGH:!aNULL:@STRENGTH + +# Require a client certificate for ALL services (imap, pop3, lmtp, sieve). +#tls_require_cert: false + +# Require a client certificate for imap ONLY. +#imap_tls_require_cert: false + +# Require a client certificate for pop3 ONLY. +#pop3_tls_require_cert: false + +# Require a client certificate for lmtp ONLY. +#lmtp_tls_require_cert: false + +# Require a client certificate for sieve ONLY. +#sieve_tls_require_cert: false + +# +# Cyrus Murder cluster configuration +# +# Set the following options to the values needed for this server to +# autenticate against the mupdate master server: +# mupdate_server +# mupdate_port +# mupdate_username +# mupdate_authname +# mupdate_realm +# mupdate_password +# mupdate_retry_delay + +## +## KEEP THESE IN SYNC WITH cyrus.conf +## +# Unix domain socket that lmtpd listens on. +lmtpsocket: /var/run/cyrus/socket/lmtp + +# The idle backend to use for IDLE command. +# Options: poll (default), idled, no +# poll doesn't need the idled daemon and is supposed to be more robust. +# however it doesn't update as quickly as the idled backend does. "no" +# turns off IDLE support. If set to "idled", you will also need to enable +# the "idled" entry in cyrus.conf. +idlemethod: poll + +# Unix domain socket that idled listens on. +idlesocket: /var/run/cyrus/socket/idle + +# Unix domain socket that the new mail notification daemon listens on. +notifysocket: /var/run/cyrus/socket/notify + +# Syslog prefix. Defaults to cyrus (so logging is done as cyrus/imap etc.) +syslog_prefix: cyrus + +## +## DEBUGGING +## +# Debugging hook. See /usr/share/doc/cyrus-common-2.2/README.Debian.debug +# Keep the hook disabled when it is not in use +# +# gdb Back-traces +#debug_command: /usr/bin/gdb -batch -cd=/tmp -x /usr/lib/cyrus/get-backtrace.gdb /usr/lib/cyrus/bin/%s %d >/tmp/gdb-backtrace.cyrus.%1$s.%2$d <&- 2>&1 & +# +# system-call traces +#debug_command: /usr/bin/strace -tt -o /tmp/strace.cyrus.%s.%d -p %2$d <&- 2>&1 & +# +# library traces +#debug_command: /usr/bin/ltrace -tt -n 2 -o /tmp/ltrace.cyrus.%s.%d -p %2$d <&- 2>&1 & --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.install +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.install @@ -0,0 +1,20 @@ +etc/*conf +etc/pam.d/lmtp +etc/pam.d/sieve +usr/sbin/cyr* +usr/sbin/ctl_* +usr/sbin/cvt_* +usr/sbin/chk_* +usr/sbin/ipurge +usr/sbin/tls_prune +usr/sbin/mbpath +usr/sbin/arbitron* +usr/lib/cyrus/bin/lmtpd +usr/lib/cyrus/bin/timsieved +usr/lib/cyrus/bin/sievec +usr/lib/cyrus/bin/mbexamine +usr/lib/cyrus/bin/smmapd +usr/lib/cyrus/bin/notifyd +usr/lib/cyrus/bin/fud +usr/lib/cyrus/get-backtrace.gdb +usr/share/snmp --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-nntpd-2.2.links +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-nntpd-2.2.links @@ -0,0 +1 @@ +usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-nntpd-2.2 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.linda +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.linda @@ -0,0 +1,2 @@ +Tag: interp-minus-n-fails +Data: usr/bin/cyradm --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-imapd-2.2.install +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-imapd-2.2.install @@ -0,0 +1,4 @@ +etc/pam.d/imap +usr/lib/cyrus/bin/imapd +usr/lib/cyrus/bin/idled +usr/sbin/squatter --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.README.Debian +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.README.Debian @@ -0,0 +1,9 @@ +Cyrus IMAP for Debian, admin utilities +$Id: cyrus-admin-2.2.README.Debian 229 2005-12-08 23:26:29Z astronut $ +--------------------- + +Refer to the cyrus-doc-2.2 package for more information. There is a lot +of it, and it will save you hours (or days) of frustating bug-hunting if +you read them first. + + -- Henrique de Moraes Holschuh --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-murder-2.2.install +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-murder-2.2.install @@ -0,0 +1,3 @@ +etc/pam.d/mupdate +usr/lib/cyrus/bin/*proxyd +usr/lib/cyrus/bin/mupdate* --- cyrus-imapd-2.2-2.2.13.orig/debian/compat +++ cyrus-imapd-2.2-2.2.13/debian/compat @@ -0,0 +1 @@ +4 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.preinst +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.preinst @@ -0,0 +1,58 @@ +#! /bin/sh +# preinst script for cyrus-common-2.2 +# Copyright (c) 2006 by Sven Mueller +# Distributed under the GNU General Public License version 2 +# $Id: cyrus-common-2.2.preinst 557 2006-08-10 02:38:26Z sven $ +# +# see: dh_installdeb(1) + +set -e + +# debconf hook +. /usr/share/debconf/confmodule + +# summary of how this script can be called: +# upgrade +# install +# abort-upgrade +# for details, see /usr/doc/packaging-manual/ + +case "$1" in + upgrade) + # old version was fully installed + if dpkg --compare-versions "$2" lt "2.2.13-4bpo1"; then + # Upgrading from a version which used a wrong + # filename for the daily cronjob + if [ -f /etc/cron.daily/cyrus-common-2.2 ] \ + && [ ! -f /etc/cron.daily/cyrus22 ]; then + mv -f /etc/cron.daily/cyrus-common-2.2 /etc/cron.daily/cyrus22 + fi + fi + ;; + install) + # old version was in "configuration files only" state + if dpkg --compare-versions "$2" lt "2.2.13-4bpo1"; then + # Upgrading from a version which used a wrong + # filename for the daily cronjob + if [ -f /etc/cron.daily/cyrus-common-2.2 ] \ + && [ ! -f /etc/cron.daily/cyrus22 ]; then + mv -f /etc/cron.daily/cyrus-common-2.2 /etc/cron.daily/cyrus22 + fi + fi + ;; + abort-upgrade) + # upgrade failed after unpack - error unwind is tried + # however, if it works, new-postrm is also called with abort-upgrade + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-dev-2.2.links +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-dev-2.2.links @@ -0,0 +1,2 @@ +usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-dev-2.2 + --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.cyrus2.2.default +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.cyrus2.2.default @@ -0,0 +1,40 @@ +# Defaults for Cyrus IMAPd 2.2 scripts +# $Id: cyrus-common-2.2.cyrus2.2.default 543 2006-08-08 16:36:00Z sven $ +# sourced by /etc/init.d/cyrus2.2, /usr/sbin/cyrus-makedirs +# installed at /etc/default/cyrus2.2 by the maintainer scripts +# + +# +# This is a POSIX shell fragment +# + +# Set this to 1 or higher to enable debugging on cyrmaster +#CYRUS_VERBOSE=1 + +# Socket listen queue backlog size +# See listen(2). Default is 32, you may want to increase +# this number if you have a very high connection rate +#LISTENQUEUE=32 + +# Wether cyrus-makedirs should optimize filesystems +# or not. Switch it off if you are going to do your +# own optimizations. Set to 1 to enable, 0 to disable +#CYRUSOPTFILESYS=1 + +# The default Cyrus IMAP config file that the scripts should +# use. You better know what you're doing if you change this +#CONF=/etc/imapd.conf + +# The default cyrus master config file that the scripts shoud +# use. You better know what you're doing if you change this. +#MASTERCONF=/etc/cyrus.conf + +# Check spool condition with chk_cyrus on daily cronjob +# Set to 1 to enable, default is disabled +#CHKCYRUS=0 + +# Set the path to the PID file +#PIDFILE=/var/run/cyrmaster.pid + +# Set other Options here. +OPTIONS="" --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-dev-2.2.install +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-dev-2.2.install @@ -0,0 +1,3 @@ +usr/lib/*.a +usr/include/cyrus/* +usr/share/man/man3/imclient* --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-clients-2.2.manpages +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-clients-2.2.manpages @@ -0,0 +1 @@ +man/*test.1 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-nntpd-2.2.dirs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-nntpd-2.2.dirs @@ -0,0 +1,2 @@ +usr/sbin +usr/lib/cyrus --- cyrus-imapd-2.2-2.2.13.orig/debian/libcyrus-imap-perl22.manpages +++ cyrus-imapd-2.2-2.2.13/debian/libcyrus-imap-perl22.manpages @@ -0,0 +1,5 @@ +perl/imap/blib/man3/Cyrus::IMAP.3pm +perl/imap/blib/man3/Cyrus::IMAP::Admin.3pm +perl/imap/blib/man3/Cyrus::IMAP::IMSP.3pm +perl/imap/blib/man3/Cyrus::IMAP::Shell.3pm +perl/sieve/managesieve/blib/man3/Cyrus::SIEVE::managesieve.3pm --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.NEWS +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.NEWS @@ -0,0 +1,86 @@ +cyrus22-imapd (2.2.12-1) unstable; urgency=low + + cyrus now supports realms by default and is therefor suitable for virtual + domains much better than it was before. However, this might break upgrades + from v2.1 installations, especially when the hostname might change during + operation (for example in hot-standby high-Availability setups). + + This is the first cyrus22 package + + -- Sven Mueller Sun, 13 Feb 2005 00:49:12 -0100 + +cyrus21-imapd (2.1.16-1) unstable; urgency=low + + ipurge behaviour is now that of the patch accepted upstream. It uses the + date: header by default, and it can use the internal date of the message as + an alternative. + + Cyrus 2.1 is officially in maintenance mode now, and the Debian packages will + follow suit. I will switch development efforts to the Cyrus 2.2 package, and + update 2.1 only to fix bugs, and apply anything that shows up on CVS. + + -- Henrique de Moraes Holschuh Sun, 23 Nov 2003 11:59:12 -0200 + +cyrus21-imapd (2.1.15-8) unstable; urgency=low + + ipurge has been patched in a way that changes its default behaviour. Now, it + uses the internal date of the message (i.e. when it entered the mail store, + be it through lmtp or imap append) instead of the Date: header for date + comparasions. + + The old behaviour is still available, refer to the ipurge manpage for more + information. + + These changes have not been accepted upstream yet, so I don't promise they + will stay around forever. + + -- Henrique de Moraes Holschuh Tue, 21 Oct 2003 13:18:30 -0200 + +cyrus21-imapd (2.1.15-1) unstable; urgency=low + + Cyrus has a big bug regarding EOL markers for /usr/sbin/sendmail. It sends + CRLF-terminated lines to the /usr/sbin/sendmail wrapper (or to whatever you + configure for sendmail: in /etc/imapd.conf), when it should be sending + LF-terminated lines only. + + Postfix and sendmail are fine with CRLF EOLs. Exim 4 can be configured + to strip the CRs off all the time in its configuration file. + + I am writing a patch to allow one to configure parameters for sendmail, but + while it is not ready and accepted upstream, users of Exim 3 should set + their sendmail: in imapd.conf to a shell wrapper that calls + /usr/sbin/sendmail -dropcr "$@" or something to that extent. + + -- Henrique de Moraes Holschuh Tue, 19 Aug 2003 07:40:40 -0300 + +cyrus21-imapd (2.1.14-1) unstable; urgency=low + + Initial instance of NEWS.Debian support. This file will be used to note all + changes the local admin must do to a Cyrus system when upgrading. + + Upgrading checklist for recent 2.1.x packages: + + 1. timsieved was corrected to behave properly in the altnamespace + configuration. However, this means that it was previously looking for + sieve scripts in "user.name" format instead of the (correct) "user^name" + format. A sample script to do this (which should be run in the top level + of the sieve directories) is in /usr/lib/cyrus/upgrade/convert-sieve.pl. + Note that this is only needed if you are running with altnamespace turned + on. + + 2. We are now more forgiving of MIME boundry headers generated by earlier + versions of eudora by default (you can switch to the more strict checks + that used to be the default using the rfc2046_strict imapd.conf(5) + option. + + However, if you have messages already in the mailstore that you want to + fix you will need to reconstruct the affected mailboxes to regenerate + the cached bodystructure data to take this into account. Nothing needs + to be done for new messages to be treated in this way. + + + Upgrading checklist for old Cyrus 1.5 or 1.6: + + Read /usr/share/doc/cyrus21-common/UPGRADE.Debian.gz + + -- Henrique de Moraes Holschuh Fri, 4 Jul 2003 10:10:53 -0300 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.dirs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.dirs @@ -0,0 +1,12 @@ +etc/pam.d +etc/default +etc/logcheck/ignore.d.server +etc/logcheck/violations.ignore.d +usr/sbin +usr/lib/cyrus +usr/lib/cyrus/upgrade +usr/share/snmp/mibs +var/lib/cyrus +var/spool/cyrus +var/spool/sieve +var/run/cyrus/socket --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.docs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.docs @@ -0,0 +1,2 @@ +debian/UPGRADE.Debian +debian/README.* --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-doc-2.2.docs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-doc-2.2.docs @@ -0,0 +1,2 @@ +debian/UPGRADE.Debian +debian/README.* --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-pop3d-2.2.links +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-pop3d-2.2.links @@ -0,0 +1,2 @@ +usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-pop3d-2.2 + --- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian.debug +++ cyrus-imapd-2.2-2.2.13/debian/README.Debian.debug @@ -0,0 +1,122 @@ +Cyrus IMAP for Debian, debugging procedures +$Id: README.Debian.debug 649 2006-10-09 17:07:53Z astronut $ +------------------------------------------- + +For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/. + +Cyrus has various levels of debugging aid, which can and should be used to +offer more information about any problems you are facing with Cyrus. + +First, edit /etc/default/cyrus2.2, and set CYRUS_VERBOSE to a number higher +than zero. The higher the number, more debug information is provided. Numbers +above 30 will cause Cyrus services to pause for 15s before executing (so that +you can do something to it, such as attach strace or a debugger to the +process). + +You can, and should use strace and ltrace to gather more information about what +was happening to Cyrus when it malfunctioned. straces are useful when +networking or signal problems appear to be the issue, and ltraces can give +hints on what the problem might be. + +If a Cyrus service is crashing and cyrmaster logs that the service is being +killed by a signal, please use the debugging hooks to provide a back-trace +using gdb (see below). Back-traces are extremely useful when locating where +Cyrus is dying, and why. + +Debugging information is sent to syslogd, using the DEBUG priority, facilities +MAIL and DAEMON. + +You can also try to set MALLOC_CHECK_=2 in the environment, so that malloc() +will cause Cyrus to dump core if it detects any sort of corruption. + + +Telemetry logs +-------------- + +Cyrus will happily log all communications between the Cyrus store closed-box and +the outside world. These logs are sometimes vital to understand exactly what +is happening and to reproduce bugs. + +To enable telemetry logging, create a directory under /var/lib/cyrus/log with +the same name as the username for which you want the communication sessions to +be logged. Cyrus will log all imap, pop3, sieve and lmtp talks authenticated +as that user (including proxied connections). Make sure the directory is owned +by user cyrus. + +IMPORTANT: +Watch out for sensitive information such as passwords when you submit the +telemetry logs to a public bug-tracking system or mailinglist. + + +Recompiling Cyrus with debugging information +-------------------------------------------- + +In order to produce useful back-traces, or to interactively debug Cyrus, +you must rebuild the package with debugging information. It is quite +easy to do so: + +1. Install all source dependencies to build the package (needs root): + apt-get install build-essential fakeroot + apt-get build-dep cyrus-imapd-2.2 + +2. Download and rebuild Cyrus with debug information: + apt-get source cyrus-imapd-2.2 + cd cyrus-imapd-2.2* + DEB_BUILD_OPTIONS=debug,noopt,nostrip dpkg-buildpackage -uc -us -rfakeroot + +3. Install the Cyrus packages with debug information (needs root): + cd .. + dpkg -i *deb (or something like that) + +Now Cyrus should be working fine, using binaries with full debug information +for gdb. For interactive debugging, you may want to make sure there are no +optimizations, in which case you should use "DEB_BUILD_OPTIONS=noopt,nostrip +dpkg-buildpackage -uc -us -rfakeroot". + +Warning: the next time a new version of cyrus is released, apt will download +the non-debugging version of the Cyrus debs, and install them over the debugging +packages. + +To install the non-debugging, optimized version of Cyrus over the debugging +one, issue "apt-get --reinstall install (package)" commands for all the Cyrus +packages you want replaced. + + +Attaching debuggers to Cyrus, and getting traces +------------------------------------------------ + +You can tell Cyrus services to run a debugging command just before they +start doing real work. This can be used to run strace, ltrace and gdb +or ddd (for interactive debugging and back-tracing) quite easily. + +Set the shell command to be run in /etc/imapd.conf, option debug_command. +Then, add the command line switch "-D" to the Cyrus services you want to +run the debug_command in /etc/cyrus.conf, and restart cyrmaster using +/etc/init.d/cyrus2.2 restart. + +The debugging command must be given as a single line in the configuration file. + +To get a back-trace using gdb: +debug_command: /usr/bin/gdb -batch -cd=/tmp -x /usr/lib/cyrus/getbacktrace.gdb /usr/lib/cyrus/bin/%s %d >/tmp/gdb-backtrace.cyrus.%1$s.%2$d <&- 2>&1 & + +The above will produce a back-trace of every service run with -D that segfaults +in the files /tmp/gdb-backtrace.cyrus.*; /usr/lib/cyrus/getbacktrace.gdb +simply has the sequence of commands for gdb: c (to continue running the +service), bt (to get the back-trace if the program didn't exit normally), quit +(to quit gdb). + +For strace, you can use: +debug_command: /usr/bin/strace -tt -o /tmp/strace.cyrus.%s.%d -p %2$d <&- 2>&1 & + +Which will produce straces in /tmp/strace.cyrus.* + +For ltrace, you can use: +debug_command: /usr/bin/ltrace -tt -n 2 -o /tmp/ltrace.cyrus.%s.%d -p %2$d <&- 2>&1 & + +Which will produce ltraces in /tmp/ltrace.cyrus.* + +Be warned that sensitive information such as passwords may be disclosed in the +strace and ltrace output, so mangle them before sending such traces to public +bug-tracking systems or mailing lists. + + -- Henrique de Moraes Holschuh --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-nntpd-2.2.install +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-nntpd-2.2.install @@ -0,0 +1,3 @@ +etc/pam.d/nntp +usr/lib/cyrus/bin/fetchnews +usr/lib/cyrus/bin/nntpd --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.contrib +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.contrib @@ -0,0 +1,7 @@ +contrib/cyrus-graphtools.1.0 +contrib/fud-client.c +contrib/README +contrib/sieve-spamasssassin +contrib/squatrunner.pl +contrib/squatrunner.txt +contrib/add-cyrus-user --- cyrus-imapd-2.2-2.2.13.orig/debian/TODO.Debian +++ cyrus-imapd-2.2-2.2.13/debian/TODO.Debian @@ -0,0 +1,67 @@ +Todo list +--------- + +$Id: TODO.Debian 521 2006-07-29 03:39:05Z astronut $ + +CONFIRMED TODO FOR 2.2: +o Cyrus 2.1 has alarm() lock breaking on lib/lock_fcntl(). This has + not been ported to 2.2 yet. And it should not be ported until + #358742 is fixed. Note that if the user has to *kill* imapd to + unstick the lock, the issue is not in the alarm() code. + + +EXTRA HIGH +o master leaks memory when a service path is not null + +HIGH +o Update copyright to my new template +o Shout loudly if anything in .stage needs cleaning up +o VERIFY SASL LEAKING CRAP TO prot_stream + [info-cyrus Re: Log messages going into imap/pop stream] +o Revise rehash, it is busted... +o Write nice shell wrapper for chk_cyrus and suggest a event to run it +o Clean up script, that finds all crap over one day old in .stage + and delete it (after logging a warning). Add it as event. + +o https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=1735 + +MEDIUM +o Verify kerberos build is still OK [gssapi] +o Add switch to enable do-not-add-return-path-if-it-is-already-there to + deliver and LMTP input: + - Return-path: Override (default: drop old return-paths, add ours) + add (add if there isn't one in there already) + note that no return-path is NOT an option ;-) + Obs: - lmtpengine uses msg->return_path to know wether it got a mail from! + - dropping old return-paths is non-trivial +o Fulldir-hash detection using the same mech as db-backend +o auth_ldap, and runtime-selection of auth backends. Add kerberos backend + and kerberos support while at it, as well. [ cyrus 2.2 only ] + +LOW +o Verify alpha build logs, and fix the warnings +o Better logcheck.ignore +o verify section of libcyrus-*-perl, as well as the manpages' +o Fix bogosity on perl manpages .TH +o netsaint example of full monitoring (imap, pop, lmtp, master via snmp) +o cyrus2-admin.menu +o find and package snmp loggers for cyrus (as examples) +o automated database backend conversion? +o sanitize usernames and folders to lowercase, no spaces or ill. chars + [does this make any sense? shouldn't that be done by user name canon.?] + +WON'T DO +o cyrus2-{pop3d,imapd} should deal with cyrus.conf + - not needed; cyrus deals gracefully with missing binaries +o Debconf configuration + - too troublesome; lusers are not welcome to using cyrus + without reading docs anyway, and it is all SASL's fault. + +BACKBURNER IDEAS +o master + - capabilities, so as to be able to bind to ports <1024 + - jailing at user level (and what of shared mbx?) + - Better handling of fucked up children that refuse to start? + + requires 5th forked state in master +o i18n (GNU gettext, with kerberos guard for logs, messages; + sanity-enforced txt files for return messages) --- cyrus-imapd-2.2-2.2.13.orig/debian/get-backtrace.gdb +++ cyrus-imapd-2.2-2.2.13/debian/get-backtrace.gdb @@ -0,0 +1,4 @@ +c +bt +quit + --- cyrus-imapd-2.2-2.2.13.orig/debian/libcyrus-imap-perl22.lintian +++ cyrus-imapd-2.2-2.2.13/debian/libcyrus-imap-perl22.lintian @@ -0,0 +1 @@ +libcyrus-imap-perl21: package-installs-nonbinary-perl-in-usr-lib-perl5 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.install +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.install @@ -0,0 +1,4 @@ +usr/bin/cyradm +usr/bin/sieveshell +usr/bin/installsieve +usr/share/icons/* --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.dirs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.dirs @@ -0,0 +1 @@ +usr/bin --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.menu +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.menu @@ -0,0 +1,6 @@ +?package(cyrus-admin-2.2):needs="text" section="Apps/System/Admin"\ + hints="Mail,Admin,Cyrus"\ + title="Cyrus 2.2 cyradm (cyrus@localhost)"\ + longtitle="Administer local Cyrus IMAPd 2.2 accounts as user cyrus"\ + icon="/usr/share/icons/cyradm.xpm"\ + command="/usr/bin/cyradm --user cyrus localhost" --- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian +++ cyrus-imapd-2.2-2.2.13/debian/README.Debian @@ -0,0 +1,334 @@ +Cyrus IMAP for Debian +$Id: README.Debian 720 2007-05-28 01:48:39Z sven $ +--------------------- + + "All systems administrators have their horror stories. For me, it was + setting up a HP Color Bubblejet under Linux using ghostscript before + linuxprinting.org was alive. Well that was a piece of cake compared + to what I am about to describe in this document." + -- "Hosting email for virtual domains using Postfix and Cyrus" + Haim Dimermanas, 2001-08-01 + + "I warned you to read all the documentation first, didn't I?" + -- Henrique M. Holschuh, 2002-10-01 + +IMPORTANT: Cyrus is a closed-box email system. Your system will access your +email through LMTP, IMAP and POP3 *only*. No direct file access to the email +store is supposed to take place. + +For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/ and +http://asg.web.cmu.edu/twiki/bin/view/Cyrus/WebHome (Cyrus WiKi). There is +also Cyrus-HOWTO (Cyrus-IMAP.txt) available as part of the LDP HOWTO +collection. Upgrade hints are in UPGRADE.Debian.gz Outdated documentation +will cause you much grief, so beware of that when hunting anywhere else than +the Cyrus mailinglist for information. + +Backports of the latest packages for Debian Stable are available from +http://www.backports.org + +WARNING: For one to get Cyrus IMAPd to work correctly, one must first get the +SASL layer to work correctly. This is far from trivial, so if you don't manage +at first, don't go around filling bugs against Cyrus IMAPd before you make damn +sure it is not a SASL configuration error. Read the hint list later on this +file as well. Start by reading README.Debian.simpleinstall. + +The Debian packaging of Cyrus has a few quirks which are important to know +about: + +1. Renaming of some Cyrus IMAP utilities + + The quota, reconstruct, master and deliver utilities have been renamed to + cyrquota, cyrreconstruct, cyrmaster and cyrdeliver, following the template + set by upstream with "cyradm". This was done because both Cyrus Debian + maintainers found the original names to be too generic and likely to cause + namespace collisions later. + + Since documentation may refer to these utilities using their original + name, you must be aware of this fact. Also, installsieve is deprecated + and will be removed from the Debian package in the future; use sieveshell + instead. + +2. Relocation of many Cyrus IMAP files + + The default Cyrus install scatters files all over the place. The Debian + package installs only a few files in /usr/bin (cyradm, sieveshell). + IMAP/email administrator utilities are installed in /usr/sbin (such as + cyrreconstruct). Programs that must be run by cyrmaster are installed in + /usr/lib/cyrus (such as imapd and pop3d). Sockets go into + /var/run/cyrus/socket, per FHS 2.2. Sieve files go in /var/spool/sieve, but + an /etc/sieve compatibility symlink is also installed just in case. + + The imapd.conf and cyrus.conf configuration files are in /etc. The PAM + policy files are in /etc/pam.d. + + Feel free to use dpkg-statoverride to change the permission of + /var/run/cyrus/socket, the cyrus packages will not override your + configuration if dpkg-statoverride is used. In fact, you will most likely + have to do so for postfix to deliver to Cyrus, for example. + +3. Cyrus Murder, the Cyrus IMAPd/POP3 aggregator is available. + + However, you will have to configure it yourself. No pre-packaged + configuration of Murder is available at this time... The documentation is + all there, and the Cyrus packages will happily preserve your Cyrus Murder + configuration. You do not have to install the cyrus-imapd-2.2 or + cyrus-pop3d-2.2 packages in hosts that only need the proxy daemons running, + but do note that the /etc/pam.d/imap and /etc/pam.d/pop files are in those + packages (and they are needed by the proxies), so you will have to create + the files manually. + + One important note: MUPDATE doesn't support TLS, so you won't be able to + use plaintext authentication methods. The easiest thing to do is to put + an entry for your mupdate user in sasldb2 and use DIGEST-MD5. + +4. Configurable idled support. + + Cyrus IMAPd supports three options of using IDLE in IMAP sessions. The first + option is not to support IDLE at all. The second is to use internal polling + in the IMAP daemon. The third option is to use an external daemon, idled. + Upstream only supports configuration of this during compilation, Debian + however includes a patch which makes this runtime-configurable. Please + set the 'idlemethod' imapd.conf option according to your needs and enable + idled in cyrus.conf if you want to use it. + +General notes and hints: +------------------------ + + o *** ALWAYS READ /usr/share/doc/cyrus-common-2.2/NEWS.Debian *** after + you upgrade the package. This, and every other NEWS.Debian can automatically + be shown to you before the upgrade, see the apt-listchanges package for more + information. + + o QUOTAS ARE LIMITIED TO 2GB on some platforms. + Be careful to not set quotas over that ammount if your platform doesn't + support the C datatype "long long". Things will break in very bad ways. + Yes, it is a big glitch, and no, there are no easy workarounds. + see https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=1212 + This has been fixed for the upcoming Cyrus 2.3. + + o Either turn off logging of the DEBUG level, or don't complain about cyrus + verbosity on the logs. Don't ever ask in the mailing lists about messages + logged in the DEBUG level before reading the source code. + + o Watch out for your /dev/random bitbucket! SASL may use it, and if it + empties, it will hang the processes wrapped up by SASL. This means + just about every Cyrus service (lmtp, imap, pop3, sieve)... Disable + APOP in /etc/imapd.conf if you don't need it, as it is a serious draw + on randomness resources. + + o One extremely important point to notice is that saslauthd works ONLY + with plaintext. APOP, CRAM-MD5, OTP, DIGEST-MD5 and any other "auxprop" + SASL mech will *not* work through saslauthd. This can and will cause + serious issues in Cyrus murder environments. + + o When using ext3, Cyrus really wants data=journal. However, up to + kernel 2.4.20 there are dangerous bugs in that option, so you're better + off not using that. xfs is faster and better for Cyrus, anyway. + Please note that sarge was shipped with 2.4.27, and etch will not ship + any 2.4 kernels anymore." + + 2.4 kernels are NOT shipped with Debian Etch. + + o nscd users: nscd is highly incompatible with ldap, and somewhat buggy + otherwise. If you use nscd and Cyrus segfaults on you, try restarting + nscd, or disabling it. + + o "The Debian libldap2 and cyrus-imapd packages are both compiled using the + SASL library. If you use cyrus-imapd together with libnss-ldap, or + saslauthd together with libpam-ldap, the resulting double calls to SASL + library functions can trigger a double-free bug which may cause the calling + process to crash. To avoid such a crash, you must recompile the libldap2 + package --without-cyrus-sasl." -- http://bugs.debian.org/145766 [!@#$%!!! + I didn't expect SASL 2.1 to still have this annoying problem] + + o The lmtp service (allocated in Debian Woody to port 2003, and non-existent + on Debian Sarge and Etch) is non-standard. It has no port officially + allocated anywhere; it is usually run bound to the localhost interface, + unless one needs it for clustering and high-availability scenarios. If you + need it elsewhere, by all means move it -- you only need to edit + /etc/services, or change the port for the lmtp service in /etc/cyrus.conf. + + o The lmtp service will only allow Cyrus lmtp administrators to authenticate. + Set them in /etc/imapd.conf. + + o Cyrus can now use two different namespaces (the standard one, where all + subfolders are children of INBOX, and one where they are all in the same + hierarchical level). + + See /usr/share/doc/cyrus-doc-2.2/html/altnamespace.html for details. If + you deal with a large population of winboze users, this option can save + you some headaches. + + o One can also chose between netnews-style notation for folders + (INBOX.subfolder), where the "." character is reserved to separate folders; + or UNIX-style notation (INBOX/subfolder), where dots are allowed in names, + and the slash separate folders (the "^" character is reserved in this + mode). + + See /usr/share/doc/cyrus-common-2.2/html/altnamespace.html for details. + + o When using SASL, do keep in mind that cyrus runs under user cyrus, and not + root. It cannot read shadow files (unless you add the user cyrus to group + shadow), or perform any root-only operations directly. You need to use the + saslauthd (or, if available, auxpropd) mechanism to authenticate against + root-only data. And that also means user cyrus must be able to talk to the + unix socket saslauthd uses (which is controlled by SASL, not Cyrus IMAPd). + + o Any of the SASL configure options can be inserted in imapd.conf, just + prefix it with "sasl_" (e.g.: sasl_mech_list: PLAIN). The list of SASL + options is in /usr/share/doc/libsasl2/options.html. + + o The services are tcp-wrapped. Their hosts.allow/hosts.deny id is the + service name in /etc/cyrus.conf. See hosts_access(5). + + o The PAM service names for use with SASL (via saslauthd) are: + "imap", "sieve", "lmtp", "pop", "mupdate". + + o You need to specify your admin users in /etc/imapd.conf before you can + add mailboxes, or deliver through authenticated lmtp. Do NOT use root. + We suggest user cyrus, which is already used by the system for all + things Cyrus IMAPd... but it need not be an existing user. As long as + SASL will authenticate against it, it will work. + + o Do NOT read your admin user's email via IMAP (see the FAQ for details). + + o Don't export your mail store over NFS or AFS (read the FAQ for more info). + You have been warned. You really want a journaled (as in journaling for the + metadata), local filesystem for the store. Failing that, you need + something with very strict and correct lock semantics, and full mmap + support. + + o Ext2 is slow on very large directories (right now), and sync metadata + writes enabled are a huge performance hit. If you need high IO throughput + from Cyrus, you will need to use ext3, reiserfs, xfs or something similar. + + o You may want to enable/disable synchronous metadata writes to your mail + store dirs (check /usr/share/doc/cyrus-doc-2.2/html/install.html for more + info, in package cyrus-docs-2.2). The cyrus-makedirs script tries to do the + right thing for ext2 and ext3 filesystems. Failure to correctly update the + metadata in the right order can completely screw up your Cyrus store on a + power-loss or another disk failure. + + o Try mounting the store and cyrus database filesystems with noatime for + performance gains. Load-balance the store using multiple partitions on + different physical devices for even better performance gains. + + o Cyrus IMAPd should be fed mail through LMTP. If at all possible, use + the Unix socket for that -- it automatically authenticates as user + postman and that will help wonders. cyrdeliver can also be used to + inject mail, but it will simply open an LMTP socket to cyrus and + deliver through that -- this is much slower than using LMTP directly. + The UNIX socket is in /var/run/cyrus/socket/lmtp. Use dpkg-statoverride + if you need to change the permissions of the socket directory. + + o You can use /usr/sbin/cyrus-makedirs to generate the needed directories + for cyrus partitions. It is run automatically by the package postinst, + and it knows to parse the /etc/imapd.conf file to verify if hash + subdirectories are needed or not. It cannot detect what kind of hashing + should be used yet. If you recompile the package with full hashing, + change it. + + o Refer to cyrus-utils.sourceforge.net and the info-cyrus mailinglist + for mailbox/imap to cyrus conversion scripts. + + o If you don't have pop3 or something else enabled by default in cyrus.conf, + installed, disable it. Otherwise, Cyrus master will log warnings that the + service could not be started. + + o If you want to run something that is not in /usr/lib/cyrus/bin in + cyrus.conf, just use the full path in cyrus.conf (e.g.: + cmd="/usr/sbin/squatter"). + + o Sieveshell is really lacking on auth capabilities, and timsieved is quite + strict on what auth capabilities it offers. So, pay attention to + sasl_minimum_layer, and see bug #151295 for more details + (http://bugs.debian.org/151295). Also, make sure you have the correct set + of SASL2 modules installed in in your system. + + o uw-mailutils has some nice utilities to migrate mail stores from/to imap + servers. You might find it quite useful to migrate a site to Cyrus. + +Known bugs +---------- + + Please see +http://bugs.debian.org/cgi-bin/pkgreport.cgi?which=src&data=cyrus-imapd-2.2& +archive=no&version= + for a list of any known bugs. + + +SNMP logging +------------ + +cyrmaster is an agentx SNMP subagent, and it can interface to a agentx SNMP +master. It will export data at OID .1.3.6.1.4.1.3.6.1 (cyrusMasterMIB). + +The ucd-snmp daemon (package snmpd) is NOT configured to work +as agentx master agent by default -- you have to do that manually, +by adding "master agentx" to the /etc/snmp/snmpd.conf file. + +cyrmaster will register with the snmp agentx master when it is started, +so if the snmp master is restarted after cyrmaster, it will not forward +the snmp requests to cyrmaster anymore. Check your system for any cron +scripts that might be restarting the snmp process if that happens. + +See /usr/share/snmp/mib/CYRUS-MASTER-MIB.txt for more details. + + +Backing up for rainy days +------------------------ + +Cyrus automatically checkpoints and backups some of its databases, using the +ctl_cyrusdb(8) utility (EVENTS in /etc/cyrus.conf). It is supposed to be also +capable of recovering automatically from these backups, and to attempt to do so +at startup. However, ctl_cyrusdb -r is NOT FULLY IMPLEMENTED YET... you are on +your own to recover from corrupt databases. + +This recovery can be done using the db3 utilities, and even by smart usage of +cvt_cyrusdb(8) and ctl_mboxlist(8). The automatic backups are useful, too, +even if they are not restored automatically. + +The database backups are stored at /var/lib/cyrus/db.backup*, you may want to +copy the files there to backup media in a cronjob, or something like that. You +can kill the TLS cache database, as long as Cyrus is stopped when you do it. +Loss of the delivery database is not very bad, it just means some users might +get duplicated messages. + +Cyrus does NOT backup the mail store automatically. To backup the mail store +partitions, you must stop Cyrus and dump the entire partition to your backup +media. The MH-like structure of the Cyrus store do make them suitable for +incremental backups. Hot-backups of the store can be made, but you risk losing +some non-critical metadata when the restore is done. + +You can backup all Cyrus non-text databases to a flat text file format using the +cvt_cyrusdb utility (and recover back from the flat text file format), but you +should stop Cyrus first. + +If you ever need to recover the mail store from backup, you should run +cyrreconstruct(8) to rebuild the mailbox indexes. + +A daily maintenance cronjob uses ctl_mboxlist(8) to dump the mailboxes database +to /var/backup. That backup copy can be used as a last-resort copy if the hot +backups become corrupted somehow. + + +Debian source package quirks +---------------------------- + +Patching is done using dpatch. Patches from upstream CVS are marked as such. + + +THANKS +------ + +Thanks go to the CMU crew for producing Cyrus IMAPd in the first place; +Michael-John Turner for maintaining the v1.5 branch and setting +the groundstones for the v2.1 package; David Parker and +David D. Kilzer for their huge help in getting +the v2.1 packages out-of-the-door, and the upgrade from v1.5 guide; Fabian +Fagerholm for stress testing the daemons, and useful +feedback; Gilles Bouthenot for good +feedback; and Henrique de Moraes Holschuh for maintaining the 2.1 branch. + + -- The Debian Cyrus Team + --- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian.database +++ cyrus-imapd-2.2-2.2.13/debian/README.Debian.database @@ -0,0 +1,134 @@ +Cyrus IMAP for Debian: Database backend conversion +$Id: README.Debian.database 728 2007-06-19 15:18:11Z astronut $ +-------------------------------------------------- + + "All systems administrators have their horror stories. For me, it was + setting up a HP Color Bubblejet under Linux using ghostscript before + linuxprinting.org was alive. Well that was a piece of cake compared + to what I am about to describe in this document." + -- "Hosting email for virtual domains using Postfix and Cyrus" + Haim Dimermanas, 2001-08-01 + + "I warned you to read all the documentation first, didn't I?" + -- Henrique M. Holschuh, 2002-10-01 + +For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/. +There is also Cyrus-HOWTO (Cyrus-IMAP.txt) available as part of the LDP HOWTO +collection. Upgrade hints are in UPGRADE.Debian. Outdated documentation will +cause you much grief, so beware of that when hunting anywhere else than the +Cyrus mailinglist for information. + + +Database backends +----------------- + +Cyrus can be compiled to use different types of database backends for each of +its databases. The package will warn you if you try to start Cyrus and the +database backends seem to have changed since the last active version. + +After converting all the mail stores and /var/lib/cyrus to use the proper +database backends using cvt_cyrusdb(8), remove +/usr/lib/cyrus/cyrus-db-types.active and run "dpkg-reconfigure cyrus-common-2.2" +once to reset the error trigger, and start cyrmaster. + +If cvt-cyrusdb locks up just at the beginning of the conversion, your databases +might be locked. Unlock them (i.e. REALLY stop Cyrus if it is still running, +use the db* utilities (from the older Berkeley DB version) to clean any stray +locks, or try a reboot). + +IMPORTANT: If you changed the type of any of the databases through imapd.conf, + cyrus-db-types.txt isn't updated to match those. Be sure to cross-check + imapd.conf if you did that. + + +Step-by-step conversion guide: + +1. Stop the Cyrus system + /etc/init.d/cyrus2.2 stop + +2. Find out which databases to convert: + diff -u /usr/lib/cyrus/cyrus-db-types.active \ + /usr/lib/cyrus/cyrus-db-types.txt + + The databases are these in the default install: + DUPLICATE /var/lib/cyrus/deliver.db + MBOX /var/lib/cyrus/mailboxes.db + TLS /var/lib/cyrus/tls_sessions.db + + Don't bother upgrading the TLS database, just delete it: the information + there is not reused when you stop Cyrus. + + If the BerkeleyDB version is what was changed, you need to use the + Berkeley DB upgrade utility in all db* databases. See the manpages for + db*_upgrade. Note that you need to use the db*_upgrade utility with the + same version as given on the DBENGINE line of cyrus-db-types.txt. + You should look for lines with 'berkeley' or 'berkeley_nosync' on + the right side. You can safely ignore lines with 'flat', 'skiplist' or + 'quotalegacy'. + + The SUBS and SEEN databases are different: there are many of them (one + for every user for SEEN and SUBS respectively) and you need to convert + every single one of them. + + SUBS /var/lib/cyrus/...../*.sub + SEEN /var/lib/cyrus/...../*.seen + + For Cyrus 1.x versions, these files are in /var/spool/cyrus/...../ + + SUBS contains the subscribed folders, and SEEN contains the seen state + of every mail in a folder. + + Types db3_nosync and db3 are the same for database conversion matters. + +2.1 Converting from DB* to SKIPLIST + + As user cyrus, do the following: + + cd / + /usr/sbin/cvt_cyrusdb db3 \ + /var/lib/cyrus/temp.db flat + rm -f + /usr/sbin/cvt_cyrusdb /var/lib/cyrus/temp.db flat \ + skiplist + chown cyrus:mail + rm -f /var/lib/cyrus/temp.db + +2.2 Converting from FLAT to SKIPLIST + + As user cyrus, do the following: + + cd / + mv .old + /usr/sbin/cvt_cyrusdb .old flat \ + skiplist + chown cyrus:mail + rm -f .old + +2.3 SUBS and SEEN databases + + I suggest using a small shell script and using "find" to mass-convert + the SEEN databases: + find /var/lib/cyrus -type f -name '*.seen' -exec myshellscript {} \; + + The "find" command above gives you the name of the database as "$1" + inside your shell script. + +3. Reset the database backend change system + rm /usr/lib/cyrus/cyrus-db-types.active + dpkg-reconfigure cyrus-common-2.2 + +4. Start Cyrus, if not started by step 3 + /etc/init.d/cyrus2.2 start + +WHY THERE IS NO AUTOMATED UPGRADE SCRIPT: Because I dislike people who do not +read docs, and one Debian user asked me exactly the wrong thing (about +cyrus21-imapd) while I was in the middle of writing said script AND I am quite +short on time lately: it is much faster to write a doc than to write and test +the script. So, now everyone will need to read the docs to get Cyrus working +again. I am not holding back the skiplist change for that script anymore. + +Maybe someday I will finish the upgrade script. Maybe someone else will write +one (I will certainly include it in the package, if it is good enough). Don't +hold your breath, though. + + -- Henrique de Moraes Holschuh --- cyrus-imapd-2.2-2.2.13.orig/debian/imap.pam +++ cyrus-imapd-2.2-2.2.13/debian/imap.pam @@ -0,0 +1,14 @@ +# PAM configuration file for Cyrus IMAP service +# $Id: imap.pam 5 2005-03-12 23:19:45Z sven $ +# +# If you want to use Cyrus in a setup where users don't have +# accounts on the local machine, you'll need to make sure +# you use something like pam_permit for account checking. +# +# Remember that SASL (and therefore Cyrus) accesses PAM +# modules through saslauthd, and that SASL can only deal with +# plaintext passwords if PAM is used. +# + +@include common-auth +@include common-account --- cyrus-imapd-2.2-2.2.13.orig/debian/deletable.files +++ cyrus-imapd-2.2-2.2.13/debian/deletable.files @@ -0,0 +1,98 @@ +doc/man/arbitron.8.html +doc/man/chk_cyrus.8.html +doc/man/ctl_cyrusdb.8.html +doc/man/ctl_deliver.8.html +doc/man/ctl_mboxlist.8.html +doc/man/cvt_cyrusdb.8.html +doc/man/cyr_expire.8.html +doc/man/cyradm.1.html +doc/man/cyrus.conf.5.html +doc/man/deliver.8.html +doc/man/fetchnews.8.html +doc/man/fud.8.html +doc/man/idled.8.html +doc/man/imapd.8.html +doc/man/imapd.conf.5.html +doc/man/imclient.3.html +doc/man/imtest.1.html +doc/man/installsieve.1.html +doc/man/ipurge.8.html +doc/man/krb.equiv.5.html +doc/man/lmtpd.8.html +doc/man/lmtptest.1.html +doc/man/master.8.html +doc/man/mbexamine.8.html +doc/man/mbpath.8.html +doc/man/mupdatetest.1.html +doc/man/nntpd.8.html +doc/man/nntptest.1.html +doc/man/notifyd.8.html +doc/man/pop3d.8.html +doc/man/pop3test.1.html +doc/man/quota.8.html +doc/man/reconstruct.8.html +doc/man/rmnews.8.html +doc/man/sieveshell.1.html +doc/man/sivtest.1.html +doc/man/smmapd.8.html +doc/man/smtptest.1.html +doc/man/squatter.8.html +doc/man/syncnews.8.html +doc/man/timsieved.8.html +doc/man/tls_prune.8.html +doc/man/w +doc/murder.png +doc/netnews.png +doc/text/altnamespace +doc/text/anoncvs +doc/text/bugs +doc/text/changes +doc/text/faq +doc/text/feedback +doc/text/index +doc/text/install +doc/text/install-admin-mb +doc/text/install-auth +doc/text/install-compile +doc/text/install-configure +doc/text/install-murder +doc/text/install-netnews +doc/text/install-perf +doc/text/install-prereq +doc/text/install-sieve +doc/text/install-snmpmon +doc/text/install-testing +doc/text/install-upgrade +doc/text/install-virtdomains +doc/text/mailing-list +doc/text/man +doc/text/notes +doc/text/os +doc/text/overview +doc/text/questions +doc/text/readme +doc/text/sieve +doc/text/sieve-protocol +doc/text/specs +imap/imap_err.c +imap/imap_err.h +imap/lmtpstats.c +imap/lmtpstats.h +imap/mupdate_err.c +imap/mupdate_err.h +imap/nntp_err.c +imap/nntp_err.h +imap/pushstats.c +imap/pushstats.h +lib/imapopts.c +lib/imapopts.h +man/imapd.conf.5 +man/sieveshell.1 +sieve/addr-lex.c +sieve/addr.c +sieve/addr.h +sieve/sieve-lex.c +sieve/sieve.c +sieve/sieve.h +sieve/sieve_err.c +sieve/sieve_err.h --- cyrus-imapd-2.2-2.2.13.orig/debian/mupdate.pam +++ cyrus-imapd-2.2-2.2.13/debian/mupdate.pam @@ -0,0 +1,14 @@ +# PAM configuration file for Cyrus Murder mupdate service +# $Id: mupdate.pam 5 2005-03-12 23:19:45Z sven $ +# +# If you want to use Cyrus in a setup where users don't have +# accounts on the local machine, you'll need to make sure +# you use something like pam_permit for account checking. +# +# Remember that SASL (and therefore Cyrus) accesses PAM +# modules through saslauthd, and that SASL can only deal with +# plaintext passwords if PAM is used. +# + +@include common-auth +@include common-account --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.cyrus22.cron.daily +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily @@ -0,0 +1,74 @@ +#!/bin/sh +# Cyrus IMAPd daily maintenance script +# Copyright (c) 2002,2003 by Henrique M. Holschuh +# $Id: cyrus-common-2.2.cyrus22.cron.daily 673 2006-10-25 13:24:13Z sven $ +# Distributed under the terms of the GNU General Public License version 2 +# +# This script: +# 1. Backups the mailbox database to the portable text format, +# and compresses the result. This backup can be used to restore +# the Cyrus mailbox database using ctl_mboxlist (after uncompressing +# the backup file). +# +# 2. Cleans up any leftover crap in .stage directories. +# +# 3. Runs chk_cyrus and outputs warning messages (so that cron +# sends them to the administrator) if any problems are detected. + +set -e + +# Make sure we get sane behaviour in broken locales +LC_ALL=C +export LC_ALL + +bak=/var/backups +bakfile=${bak}/cyrus-mboxlist.txt.gz +CONF=/etc/imapd.conf +CHKCYRUS=0 +[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2 +umask 022 + +# check wether ctl_mboxlist and cyrus-hardwired-config.txt exist +# exit cleanly if they don't +[ -x /usr/sbin/ctl_mboxlist ] \ +&& [ -f /usr/lib/cyrus/cyrus-hardwired-config.txt ] \ +|| exit 0 +# Check if Cyrus 2.2 is installed (vs. removed but not purged) +grep -qE '^PACKAGE_VERSION[[:blank:]]+2[.]2' \ + /usr/lib/cyrus/cyrus-hardwired-config.txt >/dev/null 2>&1 || exit 0 + +# 1. backup mailbox database +[ -d $bak ] || ( mkdir -p $bak ; chmod 600 $bak ) +[ -f $bakfile ] && mv ${bakfile} ${bakfile}.bak +# su "--command=/usr/sbin/ctl_mboxlist -d" - cyrus | ... +start-stop-daemon --start --exec /usr/sbin/ctl_mboxlist --quiet --chuid cyrus -- -d | gzip -9 >${bakfile} + +# 2. clean up all leftover .stage directories in all spools listed in +# the default config file +[ $CHKCYRUS -ne 0 ] && { + [ -r "$CONF" ] || { + echo $0: unable to read configuration file $CONF. Aborting... + exit 1 + } + partitions=$(sed --silent -e "/^[[:blank:]]*partition-[[:alnum:]]\+:/ { \ + s#^[[:blank:]]*partition-[[:alnum:]]\+:[[:blank:]]*## \ + p + } " < "$CONF" | sort | uniq | xargs) + for i in $partitions ; do + find "$i" -name '.stage' -type d -print0 | \ + xargs --null -n 1 -r -i'{1}' \ + find {1} -type f -ctime +1 -exec rm -f {} \; + done +} + +# 3. runs chk_cyrus +[ -x /usr/sbin/chk_cyrus ] && { + tmpfile=$(mktemp -t cyrus-daily-cronjob.XXXXXXXXXX) + trap 'rm -f "${tmpfile}"' 0 +# su "--command=/usr/sbin/chk_cyrus" - cyrus | ... + start-stop-daemon --start --exec /usr/sbin/chk_cyrus --quiet --chuid cyrus >"${tmpfile}" 2>&1 || cat "${tmpfile}" 1>&2 + rm -f "${tmpfile}" + trap '' 0 +} + +exit 0 --- cyrus-imapd-2.2-2.2.13.orig/debian/lmtp.pam +++ cyrus-imapd-2.2-2.2.13/debian/lmtp.pam @@ -0,0 +1,14 @@ +# PAM configuration file for Cyrus LMTP service +# $Id: lmtp.pam 5 2005-03-12 23:19:45Z sven $ +# +# If you want to use Cyrus in a setup where users don't have +# accounts on the local machine, you'll need to make sure +# you use something like pam_permit for account checking. +# +# Remember that SASL (and therefore Cyrus) accesses PAM +# modules through saslauthd, and that SASL can only deal with +# plaintext passwords if PAM is used. +# + +@include common-auth +@include common-account --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.linda +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.linda @@ -0,0 +1,2 @@ +Tag: postinst-db-input + --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.links +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.links @@ -0,0 +1,3 @@ +var/spool/sieve etc/sieve +usr/sbin/cyrreconstruct usr/lib/cyrus/bin/reconstruct +usr/sbin/cyrquota usr/lib/cyrus/bin/quota --- cyrus-imapd-2.2-2.2.13.orig/debian/sieve.pam +++ cyrus-imapd-2.2-2.2.13/debian/sieve.pam @@ -0,0 +1,14 @@ +# PAM configuration file for Cyrus SIEVE timsieved service +# $Id: sieve.pam 5 2005-03-12 23:19:45Z sven $ +# +# If you want to use Cyrus in a setup where users don't have +# accounts on the local machine, you'll need to make sure +# you use something like pam_permit for account checking. +# +# Remember that SASL (and therefore Cyrus) accesses PAM +# modules through saslauthd, and that SASL can only deal with +# plaintext passwords if PAM is used. +# + +@include common-auth +@include common-account --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.prerm +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.prerm @@ -0,0 +1,43 @@ +#! /bin/sh +# prerm script for cyrus-common-2.2 +# Copyright (c) 2002 by Henrique de Moraes Holschuh +# Distributed under the GNU General Public License version 2 +# $Id: cyrus-common-2.2.prerm 229 2005-12-08 23:26:29Z astronut $ +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) + # Call initscript, if it is there to stop the daemon + invoke-rc.d cyrus2.2 stop || true + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-doc-2.2.links +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-doc-2.2.links @@ -0,0 +1 @@ +usr/share/doc/cyrus-doc-2.2 usr/share/doc/cyrus-common-2.2/docs --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-doc-2.2.doc-base +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-doc-2.2.doc-base @@ -0,0 +1,10 @@ +Document: cyrus2.2-manual +Title: CMU Cyrus 2.2 Manual +Author: Carnegie Mellon University +Abstract: This manual describes how to configure and administer + the Cyrus POP/IMAP mail system, version 2.2 +Section: mail + +Format: HTML +Index: /usr/share/doc/cyrus-doc-2.2/html/index.html +Files: /usr/share/doc/cyrus-doc-2.2/html/*.html --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/70-allow-larger-buffers.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/70-allow-larger-buffers.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## allow-larger-buffers-dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to allow larger buffers (especially for list of UIDs). +## DP: Patch taken and "backported" to 2.2 from: +## DP: http://cyrus.brong.fastmail.fm/patches/cyrus-longwords-2.3.3.diff + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/imap/imapparse.c /tmp/dpep.G4uvjC/cyrus-imapd-2.2.13/imap/imapparse.c +--- cyrus-imapd-2.2.13/imap/imapparse.c 2007-02-25 21:39:04.000000000 +0100 ++++ /tmp/dpep.G4uvjC/cyrus-imapd-2.2.13/imap/imapparse.c 2007-02-25 21:40:19.830078835 +0100 +@@ -52,9 +52,9 @@ + #include "exitcodes.h" + + enum { +- MAXQUOTED = 32768, +- MAXWORD = 32768, +- MAXLITERAL = INT_MAX / 20 ++ MAXQUOTED = 524288, ++ MAXWORD = 524288, ++ MAXLITERAL = INT_MAX / 10 + }; + + void freebuf(struct buf *buf) --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/06-disable_runpath.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/06-disable_runpath.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06-disable_runpath.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: disable runpath + +@DPATCH@ +diff -urNad complete.dpatch/cmulocal/cyrus.m4 /tmp/dpep.1tmcI8/complete.dpatch/cmulocal/cyrus.m4 +--- complete.dpatch/cmulocal/cyrus.m4 2003-10-08 22:35:24.000000000 +0200 ++++ /tmp/dpep.1tmcI8/complete.dpatch/cmulocal/cyrus.m4 2005-11-10 18:33:44.832750394 +0100 +@@ -3,6 +3,7 @@ + dnl $Id: cyrus.m4,v 1.4 2003/10/08 20:35:24 rjs3 Exp $ + dnl tjs@andrew.cmu.edu 6-may-1998 + dnl ++dnl Debian fix (hmh@debian.org): We don't want runpath set in Debian + + dnl It would be good if ANDREW_ADD_LIBPATH could detect if something was + dnl already there and not redundantly add it if it is. +@@ -30,16 +31,8 @@ + ]) + + dnl runpath initialization ++dnl (disabled by hmh@debian.org + AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [ + # CMU GUESS RUNPATH SWITCH +- AC_CACHE_CHECK(for runpath switch, andrew_runpath_switch, [ +- # first, try -R +- SAVE_LDFLAGS="${LDFLAGS}" +- LDFLAGS="-R /usr/lib" +- AC_TRY_LINK([],[],[andrew_runpath_switch="-R"], [ +- LDFLAGS="-Wl,-rpath,/usr/lib" +- AC_TRY_LINK([],[],[andrew_runpath_switch="-Wl,-rpath,"], +- [andrew_runpath_switch="none"]) +- ]) +- LDFLAGS="${SAVE_LDFLAGS}" +- ])]) ++ andrew_runpath_switch="none" ++]) --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/10-fix_potential_overflows.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/10-fix_potential_overflows.dpatch @@ -0,0 +1,198 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10-fix_potential_overflows.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix potential buffer overflows + +@DPATCH@ +diff -urNad complete.dpatch/imap/ctl_mboxlist.c /tmp/dpep.8ZEecd/complete.dpatch/imap/ctl_mboxlist.c +--- complete.dpatch/imap/ctl_mboxlist.c 2004-05-22 05:45:48.000000000 +0200 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/ctl_mboxlist.c 2005-11-10 20:38:08.142040412 +0100 +@@ -479,7 +479,7 @@ + int r = 0; + char buf[16384]; + int line = 0; +- char last_commit[MAX_MAILBOX_NAME]; ++ char last_commit[MAX_MAILBOX_NAME+1]; + char *key=NULL, *data=NULL; + int keylen, datalen; + int untilCommit = PER_COMMIT; +diff -urNad complete.dpatch/imap/fud.c /tmp/dpep.8ZEecd/complete.dpatch/imap/fud.c +--- complete.dpatch/imap/fud.c 2004-12-17 17:32:07.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/fud.c 2005-11-10 20:38:44.863358638 +0100 +@@ -119,9 +119,9 @@ + + while(1) { + /* For safety */ +- memset(username,'\0',MAXLOGNAME + MAXDOMNAME); +- memset(mbox,'\0',MAX_MAILBOX_NAME+1); +- memset(buf, '\0', MAXLOGNAME + MAX_MAILBOX_NAME + 1); ++ memset(username,'\0', sizeof(username)); ++ memset(mbox,'\0', sizeof(mbox)); ++ memset(buf, '\0', sizeof(buf)); + + if (signals_poll() == SIGHUP) { + /* caught a SIGHUP, return */ +diff -urNad complete.dpatch/imap/global.c /tmp/dpep.8ZEecd/complete.dpatch/imap/global.c +--- complete.dpatch/imap/global.c 2004-11-23 18:40:15.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/global.c 2005-11-10 20:40:02.897537018 +0100 +@@ -467,7 +467,7 @@ + { + struct namespace namespace; + char *acl; +- char bufuser[MAX_MAILBOX_NAME], inboxname[MAX_MAILBOX_NAME]; ++ char bufuser[MAX_MAILBOX_NAME+1], inboxname[MAX_MAILBOX_NAME+1]; + int r; + + /* Set namespace */ +diff -urNad complete.dpatch/imap/idle_idled.c /tmp/dpep.8ZEecd/complete.dpatch/imap/idle_idled.c +--- complete.dpatch/imap/idle_idled.c 2003-10-22 22:05:11.000000000 +0200 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/idle_idled.c 2005-11-10 20:40:56.266272619 +0100 +@@ -109,11 +109,11 @@ + idle_remote.sun_family = AF_UNIX; + idle_sock = config_getstring(IMAPOPT_IDLESOCKET); + if (idle_sock) { +- strcpy(idle_remote.sun_path, idle_sock); ++ strlcpy(idle_remote.sun_path, idle_sock, sizeof(idle_remote.sun_path)); + } + else { +- strcpy(idle_remote.sun_path, config_dir); +- strcat(idle_remote.sun_path, FNAME_IDLE_SOCK); ++ strlcpy(idle_remote.sun_path, config_dir, sizeof(idle_remote.sun_path)); ++ strlcat(idle_remote.sun_path, FNAME_IDLE_SOCK, sizeof(idle_remote.sun_path)); + } + idle_remote_len = sizeof(idle_remote.sun_family) + + strlen(idle_remote.sun_path) + 1; +diff -urNad complete.dpatch/imap/index.c /tmp/dpep.8ZEecd/complete.dpatch/imap/index.c +--- complete.dpatch/imap/index.c 2005-02-14 17:42:08.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/index.c 2005-11-10 20:42:49.720157772 +0100 +@@ -3278,9 +3278,17 @@ + cur->from = get_localpart_addr(from + CACHE_ITEM_SIZE_SKIP); + break; + case SORT_SUBJECT: +- cur->xsubj = index_extract_subject(subj + CACHE_ITEM_SIZE_SKIP, +- CACHE_ITEM_LEN(subj), +- &cur->is_refwd); ++ { ++ int len = CACHE_ITEM_LEN(subj); ++ char *t = xmalloc(len+1); ++ ++ memcpy(t, subj + CACHE_ITEM_SIZE_SKIP, len); ++ t[len] = '\0'; ++ ++ cur->xsubj = index_extract_subject(t, len, &cur->is_refwd); ++ ++ free(t); ++ } + cur->xsubj_hash = strhash(cur->xsubj); + break; + case SORT_TO: +diff -urNad complete.dpatch/imap/mboxlist.h /tmp/dpep.8ZEecd/complete.dpatch/imap/mboxlist.h +--- complete.dpatch/imap/mboxlist.h 2004-03-17 19:07:49.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/mboxlist.h 2005-11-10 20:43:33.110906719 +0100 +@@ -73,7 +73,7 @@ + + /* each mailbox has the following data */ + struct mbox_entry { +- char name[MAX_MAILBOX_NAME]; ++ char name[MAX_MAILBOX_NAME+1]; + int mbtype; + char partition[MAX_PARTITION_LEN]; + /* holds remote machine for REMOTE mailboxes */ +diff -urNad complete.dpatch/imap/message.c /tmp/dpep.8ZEecd/complete.dpatch/imap/message.c +--- complete.dpatch/imap/message.c 2005-11-10 18:19:03.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/message.c 2005-11-10 20:44:17.400567516 +0100 +@@ -795,7 +795,7 @@ + /* Save header value */ + len = hdrend - hdr; + message_ibuf_ensure(ibuf, len+2); +- strncpy(ibuf->end, hdr, len); ++ strncpy(ibuf->end, hdr, len+1); + ibuf->end += len; + *(ibuf->end)++ = '\r'; + *(ibuf->end)++ = '\n'; +diff -urNad complete.dpatch/imap/mupdate.h /tmp/dpep.8ZEecd/complete.dpatch/imap/mupdate.h +--- complete.dpatch/imap/mupdate.h 2003-12-10 17:07:03.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/mupdate.h 2005-11-10 20:44:52.257152442 +0100 +@@ -70,8 +70,8 @@ + struct buf tag, cmd, arg1, arg2, arg3; + + /* For client side mupdate_find calls */ +- char mailbox_buf[MAX_MAILBOX_NAME]; +- char server_buf[MAX_MAILBOX_NAME]; ++ char mailbox_buf[MAX_MAILBOX_NAME+1]; ++ char server_buf[MAX_MAILBOX_NAME+1]; + char *acl_buf; + size_t acl_buf_len; + struct mupdate_mailboxdata mailboxdata_buf; +diff -urNad complete.dpatch/imap/proxyd.c /tmp/dpep.8ZEecd/complete.dpatch/imap/proxyd.c +--- complete.dpatch/imap/proxyd.c 2005-11-10 18:19:03.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/proxyd.c 2005-11-10 20:46:06.823846583 +0100 +@@ -1277,7 +1277,7 @@ + char **envp __attribute__((unused))) + { + socklen_t salen; +- char hbuf[NI_MAXHOST]; ++ char hbuf[NI_MAXHOST+1]; + struct sockaddr_storage proxyd_localaddr, proxyd_remoteaddr; + char localip[60], remoteip[60]; + int niflags; +diff -urNad complete.dpatch/imtest/imtest.c /tmp/dpep.8ZEecd/complete.dpatch/imtest/imtest.c +--- complete.dpatch/imtest/imtest.c 2005-11-10 18:19:03.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imtest/imtest.c 2005-11-10 20:47:18.417831766 +0100 +@@ -1225,7 +1225,7 @@ + + /* can't have this and a file for input */ + sunsock.sun_family = AF_UNIX; +- strcpy(sunsock.sun_path, output_socket); ++ strlcpy(sunsock.sun_path, output_socket, sizeof(sunsock.sun_path)); + unlink(output_socket); + + listen_sock = socket(AF_UNIX, SOCK_STREAM, 0); +diff -urNad complete.dpatch/master/master.c /tmp/dpep.8ZEecd/complete.dpatch/master/master.c +--- complete.dpatch/master/master.c 2005-11-10 18:19:03.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/master/master.c 2005-11-10 20:50:59.813138032 +0100 +@@ -222,13 +222,17 @@ + return result; + } + +-void get_prog(char *path, unsigned size, char *const *cmd) ++void get_prog(char *path, unsigned int size, char *const *cmd) + { + if (cmd[0][0] == '/') { + /* master lacks strlcpy, due to no libcyrus */ + snprintf(path, size, "%s", cmd[0]); ++ path[size-1] = '\0'; ++ } ++ else { ++ snprintf(path, size, "%s/%s", SERVICE_PATH, cmd[0]); ++ path[size-1] = '\0'; + } +- else snprintf(path, size, "%s/%s", SERVICE_PATH, cmd[0]); + } + + void get_statsock(int filedes[2]) +diff -urNad complete.dpatch/master/masterconf.c /tmp/dpep.8ZEecd/complete.dpatch/master/masterconf.c +--- complete.dpatch/master/masterconf.c 2003-11-25 18:37:19.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/master/masterconf.c 2005-11-10 20:53:17.940602394 +0100 +@@ -133,7 +133,7 @@ + } else { + /* one word */ + for (i = 0; i < 255; i++) { +- if (isspace((int) *p)) break; ++ if ((!*p) || (isspace((int) *p))) break; + v[i] = *p++; + } + } +diff -urNad complete.dpatch/notifyd/notifyd.c /tmp/dpep.8ZEecd/complete.dpatch/notifyd/notifyd.c +--- complete.dpatch/notifyd/notifyd.c 2004-12-17 17:32:25.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/notifyd/notifyd.c 2005-11-10 20:55:15.058125035 +0100 +@@ -143,7 +143,7 @@ + if (cp) nopt = strtol(cp, NULL, 10); + if (nopt < 0 || errno == ERANGE) cp = NULL; + +- if (cp && nopt && ++ if (cp && (nopt > 0) && + !(options = (char**) xrealloc(options, nopt * sizeof(char*)))) { + fatal("xmalloc(): can't allocate options", EC_OSERR); + } --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/15-munge_8bit.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/15-munge_8bit.dpatch @@ -0,0 +1,75 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_munge_8bit.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add support for munge8bit + +@DPATCH@ +diff -urNad complete.dpatch/imap/message.c /tmp/dpep.sh0ZiZ/complete.dpatch/imap/message.c +--- complete.dpatch/imap/message.c 2004-09-16 19:58:54.000000000 +0200 ++++ /tmp/dpep.sh0ZiZ/complete.dpatch/imap/message.c 2005-11-10 17:02:02.658034914 +0100 +@@ -227,6 +227,7 @@ + int n; + int sawcr = 0, sawnl; + int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT); ++ int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT); + int inheader = 1, blankline = 1; + + while (size) { +@@ -262,7 +263,7 @@ + /* We have been configured to reject all mail of this + form. */ + if (!r) r = IMAP_MESSAGE_CONTAINS8BIT; +- } else { ++ } else if (munge8bit) { + /* We have been configured to munge all mail of this + form. */ + *p = 'X'; +diff -urNad complete.dpatch/imap/spool.c /tmp/dpep.sh0ZiZ/complete.dpatch/imap/spool.c +--- complete.dpatch/imap/spool.c 2004-10-27 22:40:50.000000000 +0200 ++++ /tmp/dpep.sh0ZiZ/complete.dpatch/imap/spool.c 2005-11-10 17:02:02.658034914 +0100 +@@ -140,6 +140,7 @@ + state s = NAME_START; + int r = 0; + int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT); ++ int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT); + const char **skip = NULL; + + if (namelen == 0) { +@@ -266,7 +267,7 @@ + form. */ + r = IMAP_MESSAGE_CONTAINS8BIT; + goto ph_error; +- } else { ++ } else if (munge8bit) { + /* We have been configured to munge all mail of this + form. */ + c = 'X'; +diff -urNad complete.dpatch/lib/imapoptions /tmp/dpep.sh0ZiZ/complete.dpatch/lib/imapoptions +--- complete.dpatch/lib/imapoptions 2004-07-21 21:07:45.000000000 +0200 ++++ /tmp/dpep.sh0ZiZ/complete.dpatch/lib/imapoptions 2005-11-10 17:02:02.659034816 +0100 +@@ -458,6 +458,11 @@ + { "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "skiplist")} + /* The cyrusdb backend to use for the mailbox list. */ + ++{ "munge8bit", 1, SWITCH } ++/* If enabled, lmtpd changes 8-bit characters to `X'. Also see reject8bit. ++ (A proper soultion to non-ASCII characters in headers is offered by ++ RFC 2047 and its predecessors.) */ ++ + # xxx badly worded + { "mupdate_connections_max", 128, INT } + /* The max number of connections that a mupdate process will allow, this +@@ -670,9 +675,9 @@ + + { "reject8bit", 0, SWITCH } + /* If enabled, lmtpd rejects messages with 8-bit characters in the +- headers. Otherwise, 8-bit characters are changed to `X'. (A +- proper soultion to non-ASCII characters in headers is offered by +- RFC 2047 and its predecessors.) */ ++ headers. Also see munge8bit, which is only applied if reject8bit is ++ not activated. (A proper soultion to non-ASCII characters in headers ++ is offered by RFC 2047 and its predecessors.) */ + + { "rfc2046_strict", 0, SWITCH } + /* If enabled, imapd will be strict (per RFC 2046) when matching MIME --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch @@ -0,0 +1,56 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## filehHM2MA.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/imap/saslclient.c /tmp/dpep.8onULu/cyrus-imapd-2.2.13/imap/saslclient.c +--- cyrus-imapd-2.2.13/imap/saslclient.c 2007-02-27 05:01:09.000000000 +0100 ++++ /tmp/dpep.8onULu/cyrus-imapd-2.2.13/imap/saslclient.c 2007-02-27 05:03:11.579096512 +0100 +@@ -39,7 +39,7 @@ + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +-/* $Id: saslclient.c,v 1.13 2004/07/07 19:49:05 rjs3 Exp $ */ ++/* $Id: saslclient.c,v 1.14.2.1 2006/12/19 14:30:28 murch Exp $ */ + + #include + +@@ -217,21 +217,22 @@ + sprintf(cmdbuf, "%s %s", sasl_cmd->cmd, mech); + prot_printf(pout, "%s", cmdbuf); + +- if (clientout) { /* initial response */ +- if (!clientoutlen) { /* zero-length initial response */ +- prot_printf(pout, " ="); ++ if (!clientout) goto noinitresp; /* no initial response */ + +- clientout = NULL; +- } +- else if (!sendliteral && +- ((strlen(cmdbuf) + clientoutlen + 3) > sasl_cmd->maxlen)) { +- /* initial response is too long for auth command, +- so wait for a server challenge before sending it */ +- goto noinitresp; +- } +- else { /* full response -- encoded below */ +- prot_printf(pout, " "); +- } ++ /* initial response */ ++ if (!clientoutlen) { /* zero-length initial response */ ++ prot_printf(pout, " ="); ++ ++ clientout = NULL; ++ } ++ else if (!sendliteral && ++ ((strlen(cmdbuf) + clientoutlen + 3) > sasl_cmd->maxlen)) { ++ /* initial response is too long for auth command, ++ so wait for a server challenge before sending it */ ++ goto noinitresp; ++ } ++ else { /* full response -- encoded below */ ++ prot_printf(pout, " "); + } + + do { --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/11-fix_syslog_prefix.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/11-fix_syslog_prefix.dpatch @@ -0,0 +1,68 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11-fix_syslog_prefix.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make sure all programs log (to syslog) with "cyrus/" as the +## DP: log prefix. + +@DPATCH@ +diff -urNad complete.dpatch/imap/global.c /tmp/dpep.rKpUur/complete.dpatch/imap/global.c +--- complete.dpatch/imap/global.c 2005-11-11 13:12:47.000000000 +0100 ++++ /tmp/dpep.rKpUur/complete.dpatch/imap/global.c 2005-11-11 13:13:53.042398971 +0100 +@@ -93,6 +93,9 @@ + struct cyrusdb_backend *config_ptscache_db; + #endif + ++/* syslog prefix tag */ ++static char syslog_prefix[20]; ++ + /* Called before a cyrus application starts (but after command line parameters + * are read) */ + int cyrus_init(const char *alt_config, const char *ident, unsigned flags) +@@ -120,7 +123,9 @@ + + /* xxx we lose here since we can't have the prefix until we load the + * config file */ +- openlog(config_ident, LOG_PID, SYSLOG_FACILITY); ++ strncpy(syslog_prefix, "cyrus/", sizeof(syslog_prefix)); ++ strncat(syslog_prefix, ident, sizeof(syslog_prefix) - 7); ++ openlog(syslog_prefix, LOG_PID, SYSLOG_FACILITY); + + /* Load configuration file. This will set config_dir when it finds it */ + config_read(alt_config); +diff -urNad complete.dpatch/ptclient/ptexpire.c /tmp/dpep.rKpUur/complete.dpatch/ptclient/ptexpire.c +--- complete.dpatch/ptclient/ptexpire.c 2004-05-26 18:05:59.000000000 +0200 ++++ /tmp/dpep.rKpUur/complete.dpatch/ptclient/ptexpire.c 2005-11-11 13:15:41.839710005 +0100 +@@ -114,7 +114,7 @@ + + if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE); + +- openlog("ptexpire", LOG_PID, SYSLOG_FACILITY); ++ openlog("cyrus/ptexpire", LOG_PID, SYSLOG_FACILITY); + + while ((opt = getopt(argc, argv, "C:E:")) != EOF) { + switch (opt) { +diff -urNad complete.dpatch/ptclient/test.c /tmp/dpep.rKpUur/complete.dpatch/ptclient/test.c +--- complete.dpatch/ptclient/test.c 2003-10-22 20:50:29.000000000 +0200 ++++ /tmp/dpep.rKpUur/complete.dpatch/ptclient/test.c 2005-11-11 13:16:19.409019154 +0100 +@@ -57,7 +57,7 @@ + cacheid=cache; + } else + cacheid=NULL; +- openlog("pttest", LOG_PID, SYSLOG_FACILITY); ++ openlog("cyrus/pttest", LOG_PID, SYSLOG_FACILITY); + + if (!auth_setid(argv[1],cacheid)) + printf ("Auth_memberof(%s,%s) is %d\n", argv[1], argv[2], +diff -urNad complete.dpatch/ptclient/test2.c /tmp/dpep.rKpUur/complete.dpatch/ptclient/test2.c +--- complete.dpatch/ptclient/test2.c 2003-10-22 20:50:29.000000000 +0200 ++++ /tmp/dpep.rKpUur/complete.dpatch/ptclient/test2.c 2005-11-11 13:16:39.749020971 +0100 +@@ -46,7 +46,7 @@ + + int main(void) { + char cacheid[16]="4224423"; +- openlog("testr", LOG_PID, SYSLOG_FACILITY); ++ openlog("cyrus/testr", LOG_PID, SYSLOG_FACILITY); + + if (!auth_setid("cg2v@club.cc.cmu.edu",cacheid)) + printf ("Auth_memberof(cg2v,cg2v:me) is %d\n", --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/35-masssievec_remove_unused_variable.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/35-masssievec_remove_unused_variable.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 35_masssievec_remove_unused_variable.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove the $nosievedir variable which is set once but never used. + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.12/tools/masssievec /tmp/dpep.jwVgoT/cyrus-imapd-2.2.12/tools/masssievec +--- cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:52:49.000000000 +0200 ++++ /tmp/dpep.jwVgoT/cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:53:24.124865338 +0200 +@@ -86,7 +86,6 @@ + push @configs, $1; + } + if (/^sieveusehomedir:\s+(1|t|yes|on)/) { +- $nosievedir = 1; + print "you are storing sieve scripts in user's home directories, this script cannot deal with that\n"; + exit; + } --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0001-upstream-fix-segfault.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0001-upstream-fix-segfault.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix for imap/backend.c, upstream CVS edition 1.40 + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.NeVG3m/cyrus-imapd-2.2.13/imap/backend.c +--- cyrus-imapd-2.2.13/imap/backend.c 2006-04-22 17:18:39.000000000 +0200 ++++ /tmp/dpep.NeVG3m/cyrus-imapd-2.2.13/imap/backend.c 2006-05-02 22:08:32.024194651 +0200 +@@ -271,7 +271,7 @@ + /* need to (re)establish connection to server or create one */ + int sock = -1; + int r; +- int err = 0; ++ int err = -1; + struct addrinfo hints, *res0 = NULL, *res1 = NULL, *res; + struct sockaddr_un sunsock; + char buf[2048], *mechlist = NULL; --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch @@ -0,0 +1,92 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix a problem in ctl_mboxlist with remote mailboxes (it now also dumps +## DP: and undumps mailbox type flags) + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/doc/changes.html /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/doc/changes.html +--- cyrus-imapd-2.2.13/doc/changes.html 2006-05-03 17:19:51.000000000 +0200 ++++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/doc/changes.html 2006-05-03 17:26:24.115155499 +0200 +@@ -8,6 +8,12 @@ + + + ++

Changes to the Cyrus IMAP Server since 2.2.13

++
    ++
  • ctl_mboxlist now dumps/undumps the mailbox type flags, ++making it useful for remote mailboxes.
    • ++
++ +

Changes to the Cyrus IMAP Server since 2.2.12

+
    +
  • Allow sieve scripts to be run on shared mailboxes (via sieve +diff -urNad cyrus-imapd-2.2.13/imap/ctl_mboxlist.c /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/imap/ctl_mboxlist.c +--- cyrus-imapd-2.2.13/imap/ctl_mboxlist.c 2006-05-03 17:19:51.000000000 +0200 ++++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/imap/ctl_mboxlist.c 2006-05-03 17:26:24.129154183 +0200 +@@ -187,7 +187,7 @@ + switch (d->op) { + case DUMP: + if(!d->partition || !strcmp(d->partition, part)) { +- printf("%s\t%s\t%s\n", name, part, acl); ++ printf("%s\t%d %s\t%s\n", name, mbtype, part, acl); + if(d->purge) { + config_mboxlist_db->delete(mbdb, key, keylen, &(d->tid), 0); + } +@@ -490,7 +490,7 @@ + while (fgets(buf, sizeof(buf), stdin)) { + char *name, *partition, *acl; + char *p; +- int tries = 0; ++ int mbtype = 0, tries = 0; + + line++; + +@@ -501,6 +501,12 @@ + continue; + } + *p++ = '\0'; ++ if (isdigit((int) *p)) { ++ /* new style dump */ ++ mbtype = strtol(p, &p, 10); ++ /* skip trailing space */ ++ if (*p == ' ') p++; ++ } + partition = p; + for (; *p && *p != '\t'; p++) ; + if (!*p) { +@@ -523,7 +529,7 @@ + } + + key = name; keylen = strlen(key); +- data = mboxlist_makeentry(0, partition, acl); datalen = strlen(data); ++ data = mboxlist_makeentry(mbtype, partition, acl); datalen = strlen(data); + + tries = 0; + retry: +diff -urNad cyrus-imapd-2.2.13/man/ctl_mboxlist.8 /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/man/ctl_mboxlist.8 +--- cyrus-imapd-2.2.13/man/ctl_mboxlist.8 2006-05-03 17:19:51.000000000 +0200 ++++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/man/ctl_mboxlist.8 2006-05-03 17:26:24.125154559 +0200 +@@ -104,7 +104,9 @@ + .TP + .B \-d + Dump the contents of the database to standard output in a portable +-flat-text format. ++flat-text format. NOTE: In Cyrus versions 2.2.13 and earlier, the dump ++format did not include the mailbox type flags, breaking remote ++mailboxes (frontends, mupdate master) when undumped. + .TP + .B \-x + When performing a dump, remove the mailboxes dumped from the mailbox list +@@ -115,7 +117,9 @@ + .TP + .B \-u + Load the contents of the database from standard input. The input MUST +-be in the format output using the \fB\-d\fR option. ++be in the format output using the \fB\-d\fR option. NOTE: Both the ++old and new formats can be loaded, but the old format will break ++remote mailboxes. + .TP + .B \-m + For backend servers in the Cyrus Murder, synchronize the local mailbox list --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch @@ -0,0 +1,53 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09-kerberos-ipv4-ipv6-kludge-removal.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove a kludge which turned IPv4 addresses in IPv6 address space back +## DP: into real IPv4 addresses. + +@DPATCH@ +diff -urNad complete.dpatch/imap/pop3d.c /tmp/dpep.PeS97g/complete.dpatch/imap/pop3d.c +--- complete.dpatch/imap/pop3d.c 2005-11-11 00:11:13.000000000 +0100 ++++ /tmp/dpep.PeS97g/complete.dpatch/imap/pop3d.c 2005-11-11 00:15:17.166894681 +0100 +@@ -522,41 +522,6 @@ + } + + #ifdef HAVE_KRB +-/* translate IPv4 mapped IPv6 address to IPv4 address */ +-#ifdef IN6_IS_ADDR_V4MAPPED +-static void sockaddr_unmapped(struct sockaddr *sa, socklen_t *len) +-{ +- struct sockaddr_in6 *sin6; +- struct sockaddr_in *sin4; +- uint32_t addr; +- int port; +- +- if (sa->sa_family != AF_INET6) +- return; +- sin6 = (struct sockaddr_in6 *)sa; +- if (!IN6_IS_ADDR_V4MAPPED((&sin6->sin6_addr))) +- return; +- sin4 = (struct sockaddr_in *)sa; +- addr = *(uint32_t *)&sin6->sin6_addr.s6_addr[12]; +- port = sin6->sin6_port; +- memset(sin4, 0, sizeof(struct sockaddr_in)); +- sin4->sin_addr.s_addr = addr; +- sin4->sin_port = port; +- sin4->sin_family = AF_INET; +-#ifdef HAVE_SOCKADDR_SA_LEN +- sin4->sin_len = sizeof(struct sockaddr_in); +-#endif +- *len = sizeof(struct sockaddr_in); +-} +-#else +-static void sockaddr_unmapped(struct sockaddr *sa __attribute__((unused)), +- socklen_t *len __attribute__((unused))) +-{ +- return; +-} +-#endif +- +- + /* + * MIT's kludge of a kpop protocol + * Client does a krb_sendauth() first thing --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/75-update-imapd.conf-documentation.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch @@ -0,0 +1,42 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 75-update-imapd.conf-documentation.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: update imapd.conf option descriptions to be a bit more verbose about +## DP: supported option names + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.YhnBkx/cyrus-imapd-2.2.13/lib/imapoptions +--- cyrus-imapd-2.2.13/lib/imapoptions 2006-08-02 23:15:02.000000000 +0200 ++++ /tmp/dpep.YhnBkx/cyrus-imapd-2.2.13/lib/imapoptions 2006-08-02 23:17:59.362341706 +0200 +@@ -69,7 +69,10 @@ + \fB/etc/imapd.conf\fR file, and show each option's default value. + Some options have no default value, these are listed with + ``''. Some options default to the empty string, these +-are listed with ``''. ++are listed with ``''. It is also possible to override options by ++specifying them as _. One example is ``lmtp_admins'', ++which overrides ``admins'' just for the lmtp service. The is the ++one you specified in the \fB/etc/cyrus.conf\fR file. + */ + + # OPTIONS +@@ -122,7 +125,17 @@ + enabled when absolutely necessary. */ + + { "allowplaintext", 1, SWITCH } +-/* Allow the use of cleartext passwords on the wire. */ ++/* Allow the use of cleartext passwords on the wire. ++.PP ++ To disallow the use of plaintext passwords for authentication, you can ++ set ``allowplaintext: no'' in imapd.conf. This will still allow PLAIN ++ under TLS, but IMAP LOGIN commands will now fail. ++.PP ++ If you only list plaintext authentication mechanisms in ``sasl_mech_list'' ++ and set ``allowplaintext: no'', only users on encrypted sessions (TLS or ++ SSL) will be able to authenticate. On the other hand, if you list no ++ plaintext authentication options in ``sasl_mech_list'', ++ ``allowplaintext: yes'' would have no effect. */ + + { "allowusermoves", 0, SWITCH } + /* Allow moving user accounts (with associated meta-data) via RENAME --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch by Benjamin Seidenberg +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Upstream compatibility fix for SASL 2.1.22 + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13~/imtest/imtest.c cyrus-imapd-2.2.13/imtest/imtest.c +--- cyrus-imapd-2.2.13~/imtest/imtest.c 2006-05-05 21:04:25.000000000 -0400 ++++ cyrus-imapd-2.2.13/imtest/imtest.c 2006-05-25 17:49:37.000000000 -0400 +@@ -1,7 +1,7 @@ + /* imtest.c -- IMAP/POP3/NNTP/LMTP/SMTP/MUPDATE/MANAGESIEVE test client + * Ken Murchison (multi-protocol implementation) + * Tim Martin (SASL implementation) +- * $Id: imtest.c,v 1.107 2006/01/20 20:31:23 jeaton Exp $ ++ * $Id: imtest.c,v 1.108 2006/05/25 15:23:07 murch Exp $ + * + * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved. + * +@@ -886,6 +886,12 @@ + } + + if (*str != '\r') { ++ /* trim CRLF */ ++ char *p = str + strlen(str) - 1; ++ if (p >= str && *p == '\n') *p-- = '\0'; ++ if (p >= str && *p == '\r') *p-- = '\0'; ++ ++ /* alloc space for decoded response */ + len = strlen(str) + 1; + *line = malloc(len); + if ((*line) == NULL) { --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/65-sieveshell-enhancements.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch @@ -0,0 +1,258 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 65-sieveshell-enhancements.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds some enhancements to sieveshell and fixes some paths. + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm +--- cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm 2006-04-18 18:24:55.000000000 +0200 ++++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm 2006-04-18 18:26:19.796548250 +0200 +@@ -126,7 +126,7 @@ + [\&_sc_info, '[mailbox]', + 'display mailbox/server metadata'], + mboxcfg => +- [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|sieve|squat] value', ++ [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/] value', + 'configure mailbox'], + mboxconfig => 'mboxcfg', + reconstruct => +@@ -437,7 +437,7 @@ + # programs, as opposed to things expected from within a program.) + sub shell { + my ($server, $port, $authz, $auth, $systemrc, $userrc, $dorc, $mech, $pw) = +- ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/usr/local/etc/cyradmrc.pl', ++ ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/etc/cyradmrc.pl', + "$ENV{HOME}/.cyradmrc.pl", 1, undef, undef); + GetOptions('user|u=s' => \$auth, + 'authz|z=s' => \$authz, +@@ -467,7 +467,7 @@ + -rock => \$cyradm}); + $cyradm->authenticate(-authz => $authz, -user => $auth, + -mechanism => $mech, -password => $pw) +- or die "cyradm: cannot authenticate to server with $mech as $auth\n"; ++ or die "cyradm: cannot authenticate to server" . (defined($mech)?" with $mech":"") . " as $auth\n"; + } + my $fstk = [*STDIN, *STDOUT, *STDERR]; + if ($dorc && $systemrc ne '' && -f $systemrc) { +@@ -1400,7 +1400,7 @@ + while (defined ($opt = shift(@argv))) { + last if $opt eq '--'; + if ($opt =~ /^-/) { +- die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n"; ++ die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/] value\n"; + } + else { + push(@nargv, $opt); +@@ -1409,7 +1409,7 @@ + } + push(@nargv, @argv); + if (@nargv < 2) { +- die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n"; ++ die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/] value\n"; + } + if (!$cyrref || !$$cyrref) { + die "mboxconfig: no connection to server\n"; +diff -urNad cyrus-imapd-2.2.13/perl/sieve/lib/request.c /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/lib/request.c +--- cyrus-imapd-2.2.13/perl/sieve/lib/request.c 2006-04-18 18:24:55.000000000 +0200 ++++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/lib/request.c 2006-04-18 18:25:11.549208277 +0200 +@@ -560,7 +560,6 @@ + char **refer_to, char **errstrp) + { + int res; +- mystring_t *str=NULL; + mystring_t *errstr=NULL; + lexstate_t state; + int ret = 0; +diff -urNad cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl +--- cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl 2006-04-18 18:25:07.000000000 +0200 ++++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl 2006-04-18 18:25:11.550208179 +0200 +@@ -60,7 +60,9 @@ + my $username = $ENV{USER}; + my $authname = $ENV{USER}; + my $realm = ""; ++my $password; + my $ex = ""; ++my $exfile = ""; + my $help = 0; + my $man = 0; + my $ret; +@@ -68,7 +70,9 @@ + GetOptions("a|authname:s" => \$authname, + "u|username:s" => \$username, + "r|realm:s" => \$realm, ++ "p|password:s" => \$password, + "e|exec:s" => \$ex, ++ "f|execfile:s" => \$exfile, + "help|?" => \$help, + man => \$man) or pod2usage(2); + pod2usage(1) if $help; +@@ -83,20 +87,24 @@ + my $filehandle; + my $interactive; + +-if (! $ex eq "") { +- $filehandle = tempfile(); +- +- if (!$filehandle) { die "unable to open tmp file: $?"; } +- +- print $filehandle $ex; +- seek $filehandle, 0, 0; # rewind file ++if (! $exfile eq "") { ++ open(FILEH,"<$exfile") || die "unable to open file: $?"; ++ $filehandle = *FILEH; + $interactive = 0; + } else { +- $filehandle = *STDIN; +- $interactive = 1; +-} ++ if (! $ex eq "") { ++ $filehandle = tempfile(); + ++ if (!$filehandle) { die "unable to open tmp file: $?"; } + ++ print $filehandle $ex; ++ seek $filehandle, 0, 0; # rewind file ++ $interactive = 0; ++ } else { ++ $filehandle = *STDIN; ++ $interactive = 1; ++ } ++} + + sub list_cb { + +@@ -121,6 +129,8 @@ + return $authname; + } elsif (($type eq "realm") && (defined $realm)) { + return $realm; ++ } elsif (($type eq "password") && (defined $password)) { ++ return $password; + } + + my $ostty; +@@ -171,6 +181,8 @@ + + my $term = Term::ReadLine->new("sieveshell"); + ++my $exitcode = 0; ++ + $term->ornaments(0); + + while(defined($_ = ($interactive ? $term->readline('> ') : <$filehandle>))){ +@@ -197,6 +209,9 @@ + my $errstr = sieve_get_error($obj); + $errstr = "unknown error" if(!defined($errstr)); + print "upload failed: $errstr\n"; ++ $exitcode = 1; ++ } else { ++ $exitcode = 0; + } + } elsif (($words[0] eq "list") || + ($words[0] eq "l") || +@@ -206,6 +221,9 @@ + my $errstr = sieve_get_error($obj); + $errstr = "unknown error" if(!defined($errstr)); + print "list failed: $errstr\n"; ++ $exitcode = 1; ++ } else { ++ $exitcode = 0; + } + } elsif (($words[0] eq "activate") || + ($words[0] eq "a")) { +@@ -218,6 +236,9 @@ + my $errstr = sieve_get_error($obj); + $errstr = "unknown error" if(!defined($errstr)); + print "activate failed: $errstr\n"; ++ $exitcode = 1; ++ } else { ++ $exitcode = 0; + } + } elsif (($words[0] eq "deactivate") || + ($words[0] eq "da")) { +@@ -230,6 +251,9 @@ + my $errstr = sieve_get_error($obj); + $errstr = "unknown error" if(!defined($errstr)); + print "deactivate failed: $errstr\n"; ++ $exitcode = 1; ++ } else { ++ $exitcode = 0; + } + } elsif (($words[0] eq "delete") || + ($words[0] eq "d")) { +@@ -242,6 +266,9 @@ + my $errstr = sieve_get_error($obj); + $errstr = "unknown error" if(!defined($errstr)); + print "delete failed: $errstr\n"; ++ $exitcode = 1; ++ } else { ++ $exitcode = 0; + } + } elsif (($words[0] eq "get") || + ($words[0] eq "g")) { +@@ -255,25 +282,32 @@ + my $errstr = sieve_get_error($obj); + $errstr = "unknown error" if(!defined($errstr)); + print "get failed: $errstr\n"; ++ $exitcode = 1; + } else { + if ($words[2]) { + open (OUTPUT,">$words[2]") || die "Unable to open $words[2]"; + print OUTPUT $str; + close(OUTPUT); ++ $exitcode = 0; + } else { + print $str; ++ $exitcode = 0; + } + } + } elsif (($words[0] eq "quit") || ($words[0] eq "q")) { + sieve_logout($obj); +- exit 0; ++ exit $exitcode; + } elsif (($words[0] eq "help") || ($words[0] eq "?")) { + show_help(); ++ $exitcode = 0; + } else { + print "Invalid command: $words[0]\n"; ++ $exitcode = 1; + } + } + ++exit $exitcode; ++ + __END__ + + =head1 NAME +@@ -283,7 +317,8 @@ + =head1 SYNOPSIS + + sieveshell [B<--user>=I] [B<--authname>=I] +-[B<--realm>=I] [B<--exec>=I