diff options
Diffstat (limited to 'mail/imp/files')
| -rw-r--r-- | mail/imp/files/patch-ab | 25 | ||||
| -rw-r--r-- | mail/imp/files/patch-config::conf.xml | 18 | ||||
| -rw-r--r-- | mail/imp/files/pkg-message.in | 6 |
3 files changed, 21 insertions, 28 deletions
diff --git a/mail/imp/files/patch-ab b/mail/imp/files/patch-ab index 0ef811fa652d..70f53f65a58c 100644 --- a/mail/imp/files/patch-ab +++ b/mail/imp/files/patch-ab @@ -1,16 +1,14 @@ ---- config/servers.php.dist.orig Sun Dec 12 07:36:51 2004 -+++ config/servers.php.dist Fri Dec 24 00:27:59 2004 -@@ -47,7 +47,7 @@ - * - * folders: The folder path for the IMAP server. - * Common values: -- * UW-IMAP 'mail/' (note the trailing slash) -+ * UW-IMAP 'Mail/' (note the trailing slash) - * Cyrus, Courier-IMAP 'INBOX.' (note the trailing dot) - * dovecot '' - * -@@ -174,14 +174,16 @@ +--- config/servers.php.dist.orig Tue Feb 7 08:50:24 2006 ++++ config/servers.php.dist Wed Mar 8 22:01:53 2006 +@@ -204,14 +204,21 @@ + /* Example configurations: */ + ++/* FreeBSD port note: see also ++<http://wiki.horde.org/ImpUWIMAPNamespaces> ++<http://wiki.horde.org/ImpImapConfig> ++*/ ++ $servers['imap'] = array( 'name' => 'IMAP Server', - 'server' => 'imap.example.com', @@ -19,11 +17,8 @@ 'hordeauth' => false, - 'protocol' => 'imap/notls', - 'port' => 143, -- 'folders' => 'mail/', + 'protocol' => '%%PROTOCOL%%', + 'port' => %%IMAPPORT%%, -+ 'folders' => 'Mail/', - 'namespace' => '', 'maildomain' => 'example.com', - 'smtphost' => 'smtp.example.com', +// 'smtphost' => 'smtp.example.com', diff --git a/mail/imp/files/patch-config::conf.xml b/mail/imp/files/patch-config::conf.xml index 225acb1a99c1..314c47ed5500 100644 --- a/mail/imp/files/patch-config::conf.xml +++ b/mail/imp/files/patch-config::conf.xml @@ -1,5 +1,5 @@ ---- config/conf.xml.orig Mon Nov 22 09:40:29 2004 -+++ config/conf.xml Mon Nov 29 11:51:54 2004 +--- config/conf.xml.orig Sat Jan 14 17:52:34 2006 ++++ config/conf.xml Sun Mar 12 18:24:46 2006 @@ -6,11 +6,11 @@ <configheader>External Utilities</configheader> <configstring name="spellchecker" required="false" desc="Enter the location @@ -14,12 +14,12 @@ <configmultienum name="gnupg_keyserver" required="false" desc="The address of the public PGP keyserver(s) to use.">wwwkeys.pgp.net <values> -@@ -23,7 +23,7 @@ - connecting to the PGP keyserver. Timeouts are not supported on all - systems.">10</configstring> +@@ -25,7 +25,7 @@ <configstring name="openssl_cafile" required="false" desc="The location of -- the root certificates bundle.">/somewhere/ca-bundle.crt</configstring> -+ the root certificates bundle.">/usr/local/etc/ssl.crt/ca-bundle.crt</configstring> + the root certificates bundle, e.g. /etc/ssl/certs. See + http://www.php.net/manual/en/ref.openssl.php#openssl.cert.verification for +- details."/> ++ details.">/usr/local/etc/ssl.crt/ca-bundle.crt</configstring> <configstring name="openssl_binary" required="false" desc="The location of - the OpenSSL binary on your system. This program is REQUIRED to import - personal S/MIME certificate information, as there is no native PHP function + the OpenSSL binary on your system, e.g. /usr/bin/openssl. This program is + REQUIRED to import personal S/MIME certificate information, as there is no diff --git a/mail/imp/files/pkg-message.in b/mail/imp/files/pkg-message.in index 78a666232a4a..1e77290035f9 100644 --- a/mail/imp/files/pkg-message.in +++ b/mail/imp/files/pkg-message.in @@ -11,10 +11,8 @@ Then, you might have to tune the configuration files located in Then, you must login to Horde as a Horde Administrator to finish the configuration. Please read %%DOCSDIR%%/INSTALL. -Warning: the filter system of IMP 3.x has been replaced by a separate -******** application => check the port mail/ingo. Ingo provides a script - to migrate the existing filter rules from IMP 3.x, see Ingo's - documentation. +Warning: if you are upgrading from IMP 4.0.x, please read +%%DOCSDIR%%/UPGRADING. To protect your configuration files, you have to restart Apache. |