Patches from schmonz@ for 0.1-stable

Notes:
First "stable" release ever. Introduces an install script, some new features and many bug fixes.

Changes:
- Added interactive installer script
- Allow to send mail with BCC recipients only
- Remember decision to display images for a certain message during session
- Remember search results
- Add Received header on outgoing mail
- Implement Message-Disposition-Notification (Receipts)
- Don't create default folders by default
- Fixed some potential security risks (audited by Andris)
- Filter linked/imported CSS files
- Improve message compose screen

and many bug fixes. See http://trac.roundcube.net/wiki/Changelog for details.

5 files changed, 119 insertions, 19 deletions

diff --git a/mail/roundcube/MESSAGE b/mail/roundcube/MESSAGE
index 81998e3a50f..902d65f227d 100644
--- a/mail/roundcube/MESSAGE
+++ b/mail/roundcube/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2007/11/08 23:35:33 adrianp Exp $
+$NetBSD: MESSAGE,v 1.4 2008/03/15 13:54:58 adrianp Exp $
 
 Please refer to the following file on how to setup your RoundCube
 installation.
@@ -10,7 +10,7 @@ For pkgsrc installations the RoundCube package is installed in
 non-default locations.
 
 	Configuration files:	${PKG_SYSCONFDIR}/roundcube/
-	Log files:		${VARBASE}/roundcube/log/
+	Log files:		${VARBASE}/log/roundcube/
 	Document root:		${PREFIX}/share/roundcube/
 
 You will also need to make RoundCube accessible through your HTTP server.
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 206691779fa..5e4fac6da54 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2008/01/10 20:17:57 ghen Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/15 13:54:59 adrianp Exp $
 #
 
-DISTNAME=	roundcubemail-0.1-rc2
-PKGNAME=	roundcube-0.1rc2
-PKGREVISION=	1
+DISTNAME=	roundcubemail-0.1
+PKGNAME=	${DISTNAME:S/mail//}
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
 
diff --git a/mail/roundcube/PLIST b/mail/roundcube/PLIST
index 98e9c91eb19..4ee96bf30ea 100644
--- a/mail/roundcube/PLIST
+++ b/mail/roundcube/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2007/11/08 23:35:33 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/03/15 13:54:59 adrianp Exp $
 share/doc/roundcube/INSTALL
 share/doc/roundcube/LICENSE
 share/doc/roundcube/README
 share/doc/roundcube/UPGRADING
 share/examples/roundcube/SQL/mssql.initial.sql
 share/examples/roundcube/SQL/mysql.initial.sql
+share/examples/roundcube/SQL/mysql.update-0.1a.sql
 share/examples/roundcube/SQL/mysql.update.sql
 share/examples/roundcube/SQL/mysql5.initial.sql
 share/examples/roundcube/SQL/postgres.initial.sql
@@ -20,6 +21,7 @@ share/roundcube/program/blank.gif
 share/roundcube/program/blocked.gif
 share/roundcube/program/include/bugs.inc
 share/roundcube/program/include/rcube_html.inc
+share/roundcube/program/include/rcube_user.inc
 share/roundcube/program/include/main.inc
 share/roundcube/program/include/rcmail_template.inc
 share/roundcube/program/include/rcube_contacts.inc
@@ -34,6 +36,7 @@ share/roundcube/program/include/session.inc
 share/roundcube/program/js/app.js
 share/roundcube/program/js/common.js
 share/roundcube/program/js/editor.js
+share/roundcube/program/js/editor_images.js
 share/roundcube/program/js/googiespell.js
 share/roundcube/program/js/list.js
 share/roundcube/program/js/tiny_mce/blank.htm
@@ -146,6 +149,7 @@ share/roundcube/program/js/tiny_mce/themes/advanced/about.htm
 share/roundcube/program/js/tiny_mce/themes/advanced/anchor.htm
 share/roundcube/program/js/tiny_mce/themes/advanced/charmap.htm
 share/roundcube/program/js/tiny_mce/themes/advanced/color_picker.htm
+share/roundcube/program/js/tiny_mce/themes/advanced/css/editor_popup.css
 share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/about.htm
 share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/common_buttons.htm
 share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/create_accessible_content.htm
@@ -272,6 +276,46 @@ share/roundcube/program/lib/DB/sybase.php
 share/roundcube/program/lib/Mail/mime.php
 share/roundcube/program/lib/Mail/mimeDecode.php
 share/roundcube/program/lib/Mail/mimePart.php
+share/roundcube/program/lib/MDB2.php
+share/roundcube/program/lib/MDB2/Date.php
+share/roundcube/program/lib/MDB2/Driver/Datatype/Common.php
+share/roundcube/program/lib/MDB2/Driver/Datatype/mssql.php
+share/roundcube/program/lib/MDB2/Driver/Datatype/mysql.php
+share/roundcube/program/lib/MDB2/Driver/Datatype/mysqli.php
+share/roundcube/program/lib/MDB2/Driver/Datatype/pgsql.php
+share/roundcube/program/lib/MDB2/Driver/Datatype/sqlite.php
+share/roundcube/program/lib/MDB2/Driver/Function/Common.php
+share/roundcube/program/lib/MDB2/Driver/Function/mssql.php
+share/roundcube/program/lib/MDB2/Driver/Function/mysql.php
+share/roundcube/program/lib/MDB2/Driver/Function/mysqli.php
+share/roundcube/program/lib/MDB2/Driver/Function/pgsql.php
+share/roundcube/program/lib/MDB2/Driver/Function/sqlite.php
+share/roundcube/program/lib/MDB2/Driver/Manager/Common.php
+share/roundcube/program/lib/MDB2/Driver/Manager/mssql.php
+share/roundcube/program/lib/MDB2/Driver/Manager/mysql.php
+share/roundcube/program/lib/MDB2/Driver/Manager/mysqli.php
+share/roundcube/program/lib/MDB2/Driver/Manager/pgsql.php
+share/roundcube/program/lib/MDB2/Driver/Manager/sqlite.php
+share/roundcube/program/lib/MDB2/Driver/Native/Common.php
+share/roundcube/program/lib/MDB2/Driver/Native/mssql.php
+share/roundcube/program/lib/MDB2/Driver/Native/mysql.php
+share/roundcube/program/lib/MDB2/Driver/Native/mysqli.php
+share/roundcube/program/lib/MDB2/Driver/Native/pgsql.php
+share/roundcube/program/lib/MDB2/Driver/Native/sqlite.php
+share/roundcube/program/lib/MDB2/Driver/Reverse/Common.php
+share/roundcube/program/lib/MDB2/Driver/Reverse/mssql.php
+share/roundcube/program/lib/MDB2/Driver/Reverse/mysql.php
+share/roundcube/program/lib/MDB2/Driver/Reverse/mysqli.php
+share/roundcube/program/lib/MDB2/Driver/Reverse/pgsql.php
+share/roundcube/program/lib/MDB2/Driver/Reverse/sqlite.php
+share/roundcube/program/lib/MDB2/Driver/mssql.php
+share/roundcube/program/lib/MDB2/Driver/mysql.php
+share/roundcube/program/lib/MDB2/Driver/mysqli.php
+share/roundcube/program/lib/MDB2/Driver/pgsql.php
+share/roundcube/program/lib/MDB2/Driver/sqlite.php
+share/roundcube/program/lib/MDB2/Extended.php
+share/roundcube/program/lib/MDB2/Iterator.php
+share/roundcube/program/lib/MDB2/LOB.php
 share/roundcube/program/lib/Net/SMTP.php
 share/roundcube/program/lib/Net/Socket.php
 share/roundcube/program/lib/PEAR.php
@@ -300,14 +344,46 @@ share/roundcube/program/lib/encoding/ISO-8859-6.map
 share/roundcube/program/lib/encoding/ISO-8859-7.map
 share/roundcube/program/lib/encoding/ISO-8859-8.map
 share/roundcube/program/lib/encoding/ISO-8859-9.map
+share/roundcube/program/lib/encoding/KSC5601.map
 share/roundcube/program/lib/enriched.inc
 share/roundcube/program/lib/html2text.inc
 share/roundcube/program/lib/icl_commons.inc
 share/roundcube/program/lib/imap.inc
+share/roundcube/program/lib/magic
 share/roundcube/program/lib/mime.inc
 share/roundcube/program/lib/rc_mail_mime.inc
 share/roundcube/program/lib/utf7.inc
 share/roundcube/program/lib/utf8.class.php
+share/roundcube/program/localization/bs_BA/labels.inc
+share/roundcube/program/localization/bs_BA/messages.inc
+share/roundcube/program/localization/ge/labels.inc
+share/roundcube/program/localization/ge/messages.inc
+share/roundcube/program/localization/he/labels.inc
+share/roundcube/program/localization/he/messages.inc
+share/roundcube/program/localization/hi/labels.inc
+share/roundcube/program/localization/hi/messages.inc
+share/roundcube/program/localization/id_ID/labels.inc
+share/roundcube/program/localization/id_ID/messages.inc
+share/roundcube/program/localization/is/labels.inc
+share/roundcube/program/localization/is/messages.inc
+share/roundcube/program/localization/kr/labels.inc
+share/roundcube/program/localization/kr/messages.inc
+share/roundcube/program/localization/ne/labels.inc
+share/roundcube/program/localization/ne/messages.inc
+share/roundcube/program/localization/nl_BE/labels.inc
+share/roundcube/program/localization/nl_BE/messages.inc
+share/roundcube/program/localization/nn_NO/labels.inc
+share/roundcube/program/localization/nn_NO/messages.inc
+share/roundcube/program/localization/sq_AL/labels.inc
+share/roundcube/program/localization/sq_AL/messages.inc
+share/roundcube/program/localization/sr_cyrillic/labels.inc
+share/roundcube/program/localization/sr_cyrillic/messages.inc
+share/roundcube/program/localization/sr_latin/labels.inc
+share/roundcube/program/localization/sr_latin/messages.inc
+share/roundcube/program/localization/th_TH/labels.inc
+share/roundcube/program/localization/th_TH/messages.inc
+share/roundcube/program/localization/vn/labels.inc
+share/roundcube/program/localization/vn/messages.inc
 share/roundcube/program/localization/am/labels.inc
 share/roundcube/program/localization/am/messages.inc
 share/roundcube/program/localization/ar/labels.inc
@@ -419,6 +495,7 @@ share/roundcube/program/steps/mail/quotadisplay.inc
 share/roundcube/program/steps/mail/rss.inc
 share/roundcube/program/steps/mail/search.inc
 share/roundcube/program/steps/mail/sendmail.inc
+share/roundcube/program/steps/mail/sendmdn.inc
 share/roundcube/program/steps/mail/show.inc
 share/roundcube/program/steps/mail/spell.inc
 share/roundcube/program/steps/mail/upload.inc
@@ -434,7 +511,6 @@ share/roundcube/skins/default/addresses.css
 share/roundcube/skins/default/colorpicker.css
 share/roundcube/skins/default/common.css
 share/roundcube/skins/default/editor_content.css
-share/roundcube/skins/default/editor_popup.css
 share/roundcube/skins/default/editor_ui.css
 share/roundcube/skins/default/googiespell.css
 share/roundcube/skins/default/images/blank.gif
@@ -490,6 +566,7 @@ share/roundcube/skins/default/images/buttons/logout.gif
 share/roundcube/skins/default/images/buttons/logout.png
 share/roundcube/skins/default/images/buttons/mail.gif
 share/roundcube/skins/default/images/buttons/mail.png
+share/roundcube/skins/default/images/buttons/markread_act.png
 share/roundcube/skins/default/images/buttons/next_act.png
 share/roundcube/skins/default/images/buttons/next_pas.png
 share/roundcube/skins/default/images/buttons/next_sel.png
@@ -533,7 +610,6 @@ share/roundcube/skins/default/images/icons/abcard.png
 share/roundcube/skins/default/images/icons/attachment.png
 share/roundcube/skins/default/images/icons/deleted.png
 share/roundcube/skins/default/images/icons/dot.png
-share/roundcube/skins/default/images/icons/edit.png
 share/roundcube/skins/default/images/icons/flagged.png
 share/roundcube/skins/default/images/icons/folder-closed.png
 share/roundcube/skins/default/images/icons/folder-drafts.png
@@ -545,6 +621,7 @@ share/roundcube/skins/default/images/icons/folder-trash.png
 share/roundcube/skins/default/images/icons/forwarded.png
 share/roundcube/skins/default/images/icons/plus.gif
 share/roundcube/skins/default/images/icons/remove-attachment.png
+share/roundcube/skins/default/images/icons/rename.png
 share/roundcube/skins/default/images/icons/replied.png
 share/roundcube/skins/default/images/icons/reset.gif
 share/roundcube/skins/default/images/icons/silhouette.png
@@ -593,6 +670,7 @@ share/roundcube/skins/default/templates/printmessage.html
 share/roundcube/skins/default/templates/settings.html
 share/roundcube/skins/default/templates/showcontact.html
 share/roundcube/skins/default/watermark.html
+@dirrm share/doc/roundcube
 @dirrm share/roundcube/skins/default/templates
 @dirrm share/roundcube/skins/default/includes
 @dirrm share/roundcube/skins/default/images/icons
@@ -649,9 +727,31 @@ share/roundcube/skins/default/watermark.html
 @dirrm share/roundcube/program/localization/bg
 @dirrm share/roundcube/program/localization/ar
 @dirrm share/roundcube/program/localization/am
+@dirrm share/roundcube/program/localization/vn
+@dirrm share/roundcube/program/localization/th_TH
+@dirrm share/roundcube/program/localization/sr_latin
+@dirrm share/roundcube/program/localization/sr_cyrillic
+@dirrm share/roundcube/program/localization/sq_AL
+@dirrm share/roundcube/program/localization/nn_NO
+@dirrm share/roundcube/program/localization/nl_BE
+@dirrm share/roundcube/program/localization/ne
+@dirrm share/roundcube/program/localization/kr
+@dirrm share/roundcube/program/localization/is
+@dirrm share/roundcube/program/localization/id_ID
+@dirrm share/roundcube/program/localization/hi
+@dirrm share/roundcube/program/localization/he
+@dirrm share/roundcube/program/localization/ge
+@dirrm share/roundcube/program/localization/bs_BA
 @dirrm share/roundcube/program/localization
 @dirrm share/roundcube/program/lib/encoding
 @dirrm share/roundcube/program/lib/Net
+@dirrm share/roundcube/program/lib/MDB2/Driver/Reverse
+@dirrm share/roundcube/program/lib/MDB2/Driver/Native
+@dirrm share/roundcube/program/lib/MDB2/Driver/Manager
+@dirrm share/roundcube/program/lib/MDB2/Driver/Function
+@dirrm share/roundcube/program/lib/MDB2/Driver/Datatype
+@dirrm share/roundcube/program/lib/MDB2/Driver
+@dirrm share/roundcube/program/lib/MDB2
 @dirrm share/roundcube/program/lib/Mail
 @dirrm share/roundcube/program/lib/DB
 @dirrm share/roundcube/program/lib/Auth/SASL
@@ -665,6 +765,7 @@ share/roundcube/skins/default/watermark.html
 @dirrm share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/images
 @dirrm share/roundcube/program/js/tiny_mce/themes/advanced/docs/en
 @dirrm share/roundcube/program/js/tiny_mce/themes/advanced/docs
+@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/css
 @dirrm share/roundcube/program/js/tiny_mce/themes/advanced
 @dirrm share/roundcube/program/js/tiny_mce/themes
 @dirrm share/roundcube/program/js/tiny_mce/plugins/visualchars/langs
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 1b0c9387ced..a5fcde82bb3 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2007/11/08 23:35:33 adrianp Exp $
+$NetBSD: distinfo,v 1.5 2008/03/15 13:54:59 adrianp Exp $
 
-SHA1 (roundcubemail-0.1-rc2.tar.gz) = c6bcdf1d5192fe58402ace5ee5ae16e5c71dc3fe
-RMD160 (roundcubemail-0.1-rc2.tar.gz) = 904bd5aa189cce462de6d287fec908f301af3da9
-Size (roundcubemail-0.1-rc2.tar.gz) = 915025 bytes
+SHA1 (roundcubemail-0.1.tar.gz) = 8b5b516b41bad98c3bbaf0da0e70b0db82580424
+RMD160 (roundcubemail-0.1.tar.gz) = 225b3a37c70bcf3b471b7d650233aec30dae2f76
+Size (roundcubemail-0.1.tar.gz) = 1406854 bytes
 SHA1 (patch-aa) = 621204db27874a799e5190e2cc00c3187cb3c61a
-SHA1 (patch-ab) = 15ed0f903072be25eaf1d0edac8ddbe8cca8ac25
+SHA1 (patch-ab) = 5379ccb823a8abf89e39498907730160d1fc517d
diff --git a/mail/roundcube/patches/patch-ab b/mail/roundcube/patches/patch-ab
index 7d929c06bc5..74b90e8e9ab 100644
--- a/mail/roundcube/patches/patch-ab
+++ b/mail/roundcube/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2007/05/11 11:51:05 schmonz Exp $
+$NetBSD: patch-ab,v 1.2 2008/03/15 13:54:59 adrianp Exp $
 
---- program/include/main.inc.orig	2007-05-08 05:22:23.000000000 -0400
+--- program/include/main.inc.orig	2008-02-27 08:39:22.000000000 -0500
 +++ program/include/main.inc
-@@ -107,7 +107,7 @@ function rcmail_load_config()
+@@ -134,7 +134,7 @@ function rcmail_load_config()
    global $INSTALL_PATH;
  
    // load config file
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1 2007/05/11 11:51:05 schmonz Exp $
    $conf = is_array($rcmail_config) ? $rcmail_config : array();
  
    // load host-specific configuration
-@@ -116,7 +116,7 @@ function rcmail_load_config()
+@@ -143,7 +143,7 @@ function rcmail_load_config()
    $conf['skin_path'] = $conf['skin_path'] ? unslashify($conf['skin_path']) : 'skins/default';
  
    // load db conf
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.1 2007/05/11 11:51:05 schmonz Exp $
    $conf = array_merge($conf, $rcmail_config);
  
    if (empty($conf['log_dir']))
-@@ -149,9 +149,9 @@ function rcmail_load_host_config(&$confi
+@@ -181,9 +181,9 @@ function rcmail_load_host_config(&$confi
    else if (!empty($config['include_host_config']))
      $fname = preg_replace('/[^a-z0-9\.\-_]/i', '', $_SERVER['HTTP_HOST']) . '.inc.php';