RELEASE 0.4.1

-------------
- Fix space-stuffing in format=flowed messages (#1487018)
- Fix msgexport.sh now using the new imap wrapper
- Avoid displaying password on shell (#1486947)
- Only lower-case user name if first login attempt failed (#1486393)
- Make alias setting in squirrelmail_usercopy plugin configurable (patch by pomm
i, #1487007)
- Prevent from saving a non-existing skin path in user prefs (#1486936)
- Improve handling of single-part messages with bogus BODYSTRUCTURE (#1486898)
- Fix path to SQL files when using pgsql/mysqli/sqlsrv drivers (#1486902)
- Fix upgrade script for SQLite (#1486903)
- Fixes in SQL init script + added update script for MSSQL database
- Remove redundant date in syslog messages (#1486945)
- Fix contacts list page controls when a group is selected (#1486946)
- Fix SMTP test in Installer (#1486952)
- Fix "Select all" causes message to be opened in folder with exactly one messag
e (#1486913)
- Fix Tab key doesn't work in HTML editor in Google Chrome (#1486925)
- Fix TinyMCE uses zh_CN when zh_TW locale is set (#1486929)
- Fix TinyMCE buttons are hidden in Opera (#1486922)
- Fix JS error on IE when trying to send HTML message with enabled spellchecker
(#1486940)
- Display inline images with known extensions and non-image content-type (#14869
34)
- Fix "Threaded" checkbox after subfolder creation (#1486928)
- Fix timezone string in sent mail (#1486961)
- Show disabled checkboxes for protected folders instead of dots (#1485498)
- Added fieldsets in Identity form, added 'identity_form' hook
- Re-added 'Close' button in upload form (#1486930, #1486823)
- Fix handling of charsets with LATIN-* label
- Fix messages background image handling in some cases (#1486990)
- Fix format=flowed handling (#1486989)
- Fix when IMAP connection fails in 'get' action session shouldn't be destroyed
(#1486995)
- Fix list_cols is not updated after column dragging (#1486999)
- Support %z variable in host configuration options (#1487003)

Oked by wiz@

4 files changed, 34 insertions, 16 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index d849fb61a92..7d68ad23df0 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/09/30 10:49:12 obache Exp $
+# $NetBSD: Makefile,v 1.29 2010/10/03 22:13:38 pettai Exp $
 #
 
 DISTNAME=	roundcubemail-${RCVERSION}-dep
 PKGNAME=	${DISTNAME:S/mail-${RCVERSION}-dep/-${VERSION}/}
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
 
@@ -15,7 +14,7 @@ LICENSE=	gnu-gpl-v2
 USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 NO_BUILD=	yes
-RCVERSION=	0.4
+RCVERSION=	0.4.1
 VERSION=	${RCVERSION:S/-//}
 
 PKG_DESTDIR_SUPPORT=  	user-destdir
diff --git a/mail/roundcube/PLIST b/mail/roundcube/PLIST
index 3afb33bf209..aab42590ceb 100644
--- a/mail/roundcube/PLIST
+++ b/mail/roundcube/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.17 2010/09/23 23:54:40 pettai Exp $
+@comment $NetBSD: PLIST,v 1.18 2010/10/03 22:13:38 pettai 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/mssql.upgrade.sql
 share/examples/roundcube/SQL/mysql.initial.sql
 share/examples/roundcube/SQL/mysql.update.sql
 share/examples/roundcube/SQL/postgres.initial.sql
@@ -51,6 +52,7 @@ share/roundcube/plugins/archive/localization/es_ES.inc
 share/roundcube/plugins/archive/localization/et_EE.inc
 share/roundcube/plugins/archive/localization/fr_FR.inc
 share/roundcube/plugins/archive/localization/ja_JP.inc
+share/roundcube/plugins/archive/localization/nl_NL.inc
 share/roundcube/plugins/archive/localization/pl_PL.inc
 share/roundcube/plugins/archive/localization/ru_RU.inc
 share/roundcube/plugins/archive/localization/sv_SE.inc
@@ -72,6 +74,7 @@ share/roundcube/plugins/help/content/about.html
 share/roundcube/plugins/help/content/license.html
 share/roundcube/plugins/help/help.php
 share/roundcube/plugins/help/localization/cs_CZ.inc
+share/roundcube/plugins/help/localization/de_DE.inc
 share/roundcube/plugins/help/localization/en_GB.inc
 share/roundcube/plugins/help/localization/en_US.inc
 share/roundcube/plugins/help/localization/es_ES.inc
@@ -104,10 +107,12 @@ share/roundcube/plugins/managesieve/localization/fi_FI.inc
 share/roundcube/plugins/managesieve/localization/fr_FR.inc
 share/roundcube/plugins/managesieve/localization/hu_HU.inc
 share/roundcube/plugins/managesieve/localization/it_IT.inc
+share/roundcube/plugins/managesieve/localization/ja_JP.inc
 share/roundcube/plugins/managesieve/localization/nb_NO.inc
 share/roundcube/plugins/managesieve/localization/nl_NL.inc
 share/roundcube/plugins/managesieve/localization/pl_PL.inc
 share/roundcube/plugins/managesieve/localization/pt_BR.inc
+share/roundcube/plugins/managesieve/localization/pt_PT.inc
 share/roundcube/plugins/managesieve/localization/ru_RU.inc
 share/roundcube/plugins/managesieve/localization/sk_SK.inc
 share/roundcube/plugins/managesieve/localization/sl_SI.inc
@@ -123,10 +128,12 @@ share/roundcube/plugins/managesieve/skins/default/templates/filteredit.html
 share/roundcube/plugins/managesieve/skins/default/templates/managesieve.html
 share/roundcube/plugins/managesieve/skins/default/templates/setedit.html
 share/roundcube/plugins/markasjunk/localization/cs_CZ.inc
+share/roundcube/plugins/markasjunk/localization/de_DE.inc
 share/roundcube/plugins/markasjunk/localization/en_US.inc
 share/roundcube/plugins/markasjunk/localization/es_AR.inc
 share/roundcube/plugins/markasjunk/localization/es_ES.inc
 share/roundcube/plugins/markasjunk/localization/et_EE.inc
+share/roundcube/plugins/markasjunk/localization/ja_JP.inc
 share/roundcube/plugins/markasjunk/localization/pl_PL.inc
 share/roundcube/plugins/markasjunk/localization/ru_RU.inc
 share/roundcube/plugins/markasjunk/localization/sv_SE.inc
@@ -143,8 +150,11 @@ share/roundcube/plugins/new_user_dialog/localization/en_US.inc
 share/roundcube/plugins/new_user_dialog/localization/es_ES.inc
 share/roundcube/plugins/new_user_dialog/localization/et_EE.inc
 share/roundcube/plugins/new_user_dialog/localization/it_IT.inc
+share/roundcube/plugins/new_user_dialog/localization/ja_JP.inc
+share/roundcube/plugins/new_user_dialog/localization/nl_NL.inc
 share/roundcube/plugins/new_user_dialog/localization/pl_PL.inc
 share/roundcube/plugins/new_user_dialog/localization/ru_RU.inc
+share/roundcube/plugins/new_user_dialog/localization/sl_SI.inc
 share/roundcube/plugins/new_user_dialog/localization/sv_SE.inc
 share/roundcube/plugins/new_user_dialog/localization/zh_TW.inc
 share/roundcube/plugins/new_user_dialog/new_user_dialog.php
@@ -155,6 +165,7 @@ share/roundcube/plugins/password/README
 share/roundcube/plugins/password/config.inc.php.dist
 share/roundcube/plugins/password/drivers/chgsaslpasswd.c
 share/roundcube/plugins/password/drivers/chgvirtualminpasswd.c
+share/roundcube/plugins/password/drivers/chpass-wrapper.py
 share/roundcube/plugins/password/drivers/chpasswd.php
 share/roundcube/plugins/password/drivers/cpanel.php
 share/roundcube/plugins/password/drivers/directadmin.php
@@ -168,6 +179,7 @@ share/roundcube/plugins/password/drivers/sql.php
 share/roundcube/plugins/password/drivers/virtualmin.php
 share/roundcube/plugins/password/drivers/vpopmaild.php
 share/roundcube/plugins/password/drivers/ximss.php
+share/roundcube/plugins/password/drivers/xmail.php
 share/roundcube/plugins/password/localization/bg_BG.inc
 share/roundcube/plugins/password/localization/ca_ES.inc
 share/roundcube/plugins/password/localization/cs_CZ.inc
@@ -206,6 +218,7 @@ share/roundcube/plugins/subscriptions_option/localization/de_DE.inc
 share/roundcube/plugins/subscriptions_option/localization/en_US.inc
 share/roundcube/plugins/subscriptions_option/localization/es_ES.inc
 share/roundcube/plugins/subscriptions_option/localization/et_EE.inc
+share/roundcube/plugins/subscriptions_option/localization/ja_JP.inc
 share/roundcube/plugins/subscriptions_option/localization/pl_PL.inc
 share/roundcube/plugins/subscriptions_option/localization/ru_RU.inc
 share/roundcube/plugins/subscriptions_option/localization/sv_SE.inc
@@ -243,6 +256,7 @@ share/roundcube/plugins/virtuser_file/virtuser_file.php
 share/roundcube/plugins/virtuser_query/virtuser_query.php
 share/roundcube/program/blank.gif
 share/roundcube/program/blocked.gif
+share/roundcube/program/include/clisetup.php
 share/roundcube/program/include/html.php
 share/roundcube/program/include/iniset.php
 share/roundcube/program/include/main.inc
@@ -636,6 +650,8 @@ share/roundcube/program/js/tiny_mce/plugins/spellchecker/css/content.css
 share/roundcube/program/js/tiny_mce/plugins/spellchecker/editor_plugin.js
 share/roundcube/program/js/tiny_mce/plugins/spellchecker/editor_plugin_src.js
 share/roundcube/program/js/tiny_mce/plugins/spellchecker/img/wline.gif
+share/roundcube/program/js/tiny_mce/plugins/tabfocus/editor_plugin.js
+share/roundcube/program/js/tiny_mce/plugins/tabfocus/editor_plugin_src.js
 share/roundcube/program/js/tiny_mce/plugins/table/cell.htm
 share/roundcube/program/js/tiny_mce/plugins/table/css/cell.css
 share/roundcube/program/js/tiny_mce/plugins/table/css/row.css
@@ -962,6 +978,8 @@ share/roundcube/program/localization/ja_JP/labels.inc
 share/roundcube/program/localization/ja_JP/messages.inc
 share/roundcube/program/localization/ka_GE/labels.inc
 share/roundcube/program/localization/ka_GE/messages.inc
+share/roundcube/program/localization/kh_KH/labels.inc
+share/roundcube/program/localization/kh_KH/messages.inc
 share/roundcube/program/localization/ko_KR/labels.inc
 share/roundcube/program/localization/ko_KR/messages.inc
 share/roundcube/program/localization/ku/labels.inc
@@ -1067,6 +1085,7 @@ share/roundcube/program/steps/utils/error.inc
 share/roundcube/program/steps/utils/html2text.inc
 share/roundcube/program/steps/utils/killcache.inc
 share/roundcube/program/steps/utils/modcss.inc
+share/roundcube/program/steps/utils/save_pref.inc
 share/roundcube/program/steps/utils/spell.inc
 share/roundcube/program/steps/utils/spell_googie.inc
 share/roundcube/program/steps/utils/spell_html_googie.inc
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index fc9967eb2c9..c068e6a23e8 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2010/09/23 23:54:40 pettai Exp $
+$NetBSD: distinfo,v 1.16 2010/10/03 22:13:38 pettai Exp $
 
-SHA1 (roundcubemail-0.4-dep.tar.gz) = 4e519c81a3c39b27d6468b35887f5f6ec501a1a4
-RMD160 (roundcubemail-0.4-dep.tar.gz) = 1d878e6a9c11f530bed44111cd26ae28ae8e0eb5
-Size (roundcubemail-0.4-dep.tar.gz) = 1650700 bytes
+SHA1 (roundcubemail-0.4.1-dep.tar.gz) = dbb4747ab499a3f057351801e2ee84aaba587a6c
+RMD160 (roundcubemail-0.4.1-dep.tar.gz) = 02de535041e592a64c77d78e1aecc8d140c6ae43
+Size (roundcubemail-0.4.1-dep.tar.gz) = 1663086 bytes
 SHA1 (patch-aa) = 517a6be7f9d4037e01088cab9ec31a44acf543ad
 SHA1 (patch-ab) = 397b14ed10158094eebcdf43be73884098ff6dbd
 SHA1 (patch-ac) = 33e85bd1577f3554213c0f1da55500761967026a
-SHA1 (patch-af) = 9b08e16cd8ebfe934a98e8074feba9efd22cacc2
+SHA1 (patch-af) = 51f5774aa4397310b15d2d357ed028498f01437c
diff --git a/mail/roundcube/patches/patch-af b/mail/roundcube/patches/patch-af
index a791ec334f7..78de02af73f 100644
--- a/mail/roundcube/patches/patch-af
+++ b/mail/roundcube/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.3 2010/09/23 23:54:40 pettai Exp $
+$NetBSD: patch-af,v 1.4 2010/10/03 22:13:38 pettai Exp $
 
---- program/include/iniset.php.orig	2010-08-07 09:44:38.000000000 +0000
+--- program/include/iniset.php.orig	2010-09-29 10:04:09.000000000 +0000
 +++ program/include/iniset.php
-@@ -45,7 +45,7 @@ if (!defined('INSTALL_PATH')) {
-     define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
+@@ -46,7 +46,7 @@ if (!defined('INSTALL_PATH')) {
  }
  
--define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
-+define('RCMAIL_CONFIG_DIR', '@PKG_SYSCONFDIR@');
+ if (!defined('RCMAIL_CONFIG_DIR')) {
+-    define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
++    define('RCMAIL_CONFIG_DIR', '@PKG_SYSCONFDIR@');
+ }
  
  // make sure path_separator is defined
- if (!defined('PATH_SEPARATOR')) {