Permalink
Browse files

Changes 0.5:

- Fix double-login/session issue
- Wrap HTML parts with <html><body> and add Doctype declaration
- Make rcube_autoload silently skip unknown classes
- Fix charset detection in vcards with encoded values
- Better CSS cursors for splitters
- Show the same message only once
- Fix namespaces handling
- Add handling of multifolder METADATA/ANNOTATION responses
- Fix handling of INBOX when personal namespace prefix is non-empty
- Fix handling square brackets in links
- Add description of 'use_https' option in main.inc.php.dist file
  • Loading branch information...
adam
adam committed Jan 13, 2011
1 parent 394bcfb commit 7617f7d0cd10ea57692d8c59e11d2d08ca1ae0d3
Showing with 61 additions and 42 deletions.
  1. +18 −20 mail/roundcube/Makefile
  2. +32 −11 mail/roundcube/PLIST
  3. +5 −5 mail/roundcube/distinfo
  4. +6 −6 mail/roundcube/patches/patch-aa
View
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2010/10/06 21:40:35 pettai Exp $
-#
+# $NetBSD: Makefile,v 1.31 2011/01/13 12:19:19 adam Exp $
-DISTNAME= roundcubemail-${RCVERSION}-dep
-PKGNAME= ${DISTNAME:S/mail-${RCVERSION}-dep/-${VERSION}/}
+DISTNAME= roundcubemail-0.5-dep
+PKGNAME= ${DISTNAME:S/mail-/-/:S/-dep//}
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
@@ -14,40 +13,39 @@ LICENSE= gnu-gpl-v2
USE_TOOLS+= pax
USE_LANGUAGES= # none
NO_BUILD= yes
-RCVERSION= 0.4.2
-VERSION= ${RCVERSION:S/-//}
-PKG_DESTDIR_SUPPORT= user-destdir
+PKG_DESTDIR_SUPPORT= user-destdir
INSTALLATION_DIRS= ${RCDIR}/plugins ${RCDIR}/program ${RCDIR}/skins
INSTALLATION_DIRS+= ${EGDIR}/SQL ${DOCDIR} ${RCDIR}/bin
.include "../../mk/bsd.prefs.mk"
.include "../../lang/php/phpversion.mk"
+DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_IDNA2>=0.1.0:../../net/pear-Net_IDNA2
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.4.2:../../net/pear-Net_SMTP
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.7:../../mail/pear-Mail_Mime
DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2>=2.5.0:../../databases/pear-MDB2
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Auth_SASL-[0-9]*:../../mail/pear-Auth_SASL
DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
DEPENDS+= ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
-PKG_SYSCONFSUBDIR?= roundcube
+PKG_SYSCONFSUBDIR= roundcube
WWW_USER?= ${APACHE_USER}
WWW_GROUP?= ${APACHE_GROUP}
PKG_GROUPS_VARS+= WWW_GROUP
-PKG_USERS_VARS+= WWW_USER
+PKG_USERS_VARS= WWW_USER
BUILD_DEFS+= VARBASE WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP
RCDIR= ${PREFIX}/share/roundcube
EGDIR= ${PREFIX}/share/examples/roundcube
DOCDIR= ${PREFIX}/share/doc/roundcube
PAX_DIRS= plugins program skins installer bin
-MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-MESSAGE_SUBST+= VARBASE=${VARBASE:Q} RCDIR=${RCDIR:Q}
-FILES_SUBST+= RCDIR=${RCDIR:Q}
+MESSAGE_SUBST+= DOCDIR=${DOCDIR} PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+MESSAGE_SUBST+= VARBASE=${VARBASE} RCDIR=${RCDIR}
+FILES_SUBST+= RCDIR=${RCDIR}
OWN_DIRS+= ${PKG_SYSCONFDIR}
OWN_DIRS_PERMS+= ${VARBASE}/log/roundcube \
@@ -112,13 +110,13 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist \
${DESTDIR}${EGDIR}/main.inc.php.dist
-. for i in ${PAX_DIRS}
- cd ${WRKSRC}/${i} && ${PAX} -rw . ${DESTDIR}${RCDIR}/${i}
- ${FIND} ${DESTDIR}${RCDIR}/${i} -type f | \
- ${XARGS} ${CHMOD} ${SHAREMODE}
- ${FIND} ${DESTDIR}${RCDIR}/${i} -type d | \
- ${XARGS} ${CHMOD} ${PKGDIRMODE}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${RCDIR}/${i}
-. endfor
+.for i in ${PAX_DIRS}
+ cd ${WRKSRC}/${i} && ${PAX} -rw . ${DESTDIR}${RCDIR}/${i}
+ ${FIND} ${DESTDIR}${RCDIR}/${i} -type f | \
+ ${XARGS} ${CHMOD} ${SHAREMODE}
+ ${FIND} ${DESTDIR}${RCDIR}/${i} -type d | \
+ ${XARGS} ${CHMOD} ${PKGDIRMODE}
+ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${RCDIR}/${i}
+.endfor
.include "../../mk/bsd.pkg.mk"
View
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2010/10/03 22:13:38 pettai Exp $
+@comment $NetBSD: PLIST,v 1.19 2011/01/13 12:19:19 adam Exp $
share/doc/roundcube/INSTALL
share/doc/roundcube/LICENSE
share/doc/roundcube/README
@@ -40,6 +40,7 @@ share/roundcube/installer/test.php
share/roundcube/installer/utils.php
share/roundcube/installer/welcome.html
share/roundcube/plugins/additional_message_headers/additional_message_headers.php
+share/roundcube/plugins/additional_message_headers/config.inc.php.dist
share/roundcube/plugins/additional_message_headers/package.xml
share/roundcube/plugins/archive/archive.js
share/roundcube/plugins/archive/archive.php
@@ -74,6 +75,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/da_DK.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
@@ -128,6 +130,7 @@ 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/da_DK.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
@@ -136,6 +139,7 @@ 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/sk_SK.inc
share/roundcube/plugins/markasjunk/localization/sv_SE.inc
share/roundcube/plugins/markasjunk/localization/zh_TW.inc
share/roundcube/plugins/markasjunk/markasjunk.js
@@ -149,11 +153,15 @@ share/roundcube/plugins/new_user_dialog/localization/de_DE.inc
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/gl_ES.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/pt_BR.inc
+share/roundcube/plugins/new_user_dialog/localization/pt_PT.inc
share/roundcube/plugins/new_user_dialog/localization/ru_RU.inc
+share/roundcube/plugins/new_user_dialog/localization/sk_SK.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
@@ -180,6 +188,7 @@ 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/az_AZ.inc
share/roundcube/plugins/password/localization/bg_BG.inc
share/roundcube/plugins/password/localization/ca_ES.inc
share/roundcube/plugins/password/localization/cs_CZ.inc
@@ -202,6 +211,7 @@ share/roundcube/plugins/password/localization/pl_PL.inc
share/roundcube/plugins/password/localization/pt_BR.inc
share/roundcube/plugins/password/localization/pt_PT.inc
share/roundcube/plugins/password/localization/ru_RU.inc
+share/roundcube/plugins/password/localization/sk_SK.inc
share/roundcube/plugins/password/localization/sl_SI.inc
share/roundcube/plugins/password/localization/sv_SE.inc
share/roundcube/plugins/password/localization/tr_TR.inc
@@ -225,6 +235,7 @@ share/roundcube/plugins/subscriptions_option/localization/sv_SE.inc
share/roundcube/plugins/subscriptions_option/localization/zh_TW.inc
share/roundcube/plugins/subscriptions_option/subscriptions_option.php
share/roundcube/plugins/userinfo/localization/cs_CZ.inc
+share/roundcube/plugins/userinfo/localization/da_DK.inc
share/roundcube/plugins/userinfo/localization/de_CH.inc
share/roundcube/plugins/userinfo/localization/en_US.inc
share/roundcube/plugins/userinfo/localization/es_ES.inc
@@ -243,13 +254,15 @@ share/roundcube/plugins/vcard_attachments/localization/de_DE.inc
share/roundcube/plugins/vcard_attachments/localization/en_US.inc
share/roundcube/plugins/vcard_attachments/localization/es_ES.inc
share/roundcube/plugins/vcard_attachments/localization/et_EE.inc
+share/roundcube/plugins/vcard_attachments/localization/it_IT.inc
share/roundcube/plugins/vcard_attachments/localization/ja_JP.inc
share/roundcube/plugins/vcard_attachments/localization/pl_PL.inc
share/roundcube/plugins/vcard_attachments/localization/ru_RU.inc
share/roundcube/plugins/vcard_attachments/localization/sv_SE.inc
share/roundcube/plugins/vcard_attachments/localization/zh_TW.inc
share/roundcube/plugins/vcard_attachments/package.xml
-share/roundcube/plugins/vcard_attachments/vcard_add_contact.png
+share/roundcube/plugins/vcard_attachments/skins/default/vcard.png
+share/roundcube/plugins/vcard_attachments/skins/default/vcard_add_contact.png
share/roundcube/plugins/vcard_attachments/vcard_attachments.php
share/roundcube/plugins/vcard_attachments/vcardattach.js
share/roundcube/plugins/virtuser_file/virtuser_file.php
@@ -1068,17 +1081,20 @@ share/roundcube/program/steps/mail/headers.inc
share/roundcube/program/steps/mail/list.inc
share/roundcube/program/steps/mail/mark.inc
share/roundcube/program/steps/mail/move_del.inc
+share/roundcube/program/steps/mail/pagenav.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/viewsource.inc
share/roundcube/program/steps/settings/delete_identity.inc
+share/roundcube/program/steps/settings/edit_folder.inc
share/roundcube/program/steps/settings/edit_identity.inc
share/roundcube/program/steps/settings/edit_prefs.inc
+share/roundcube/program/steps/settings/folders.inc
share/roundcube/program/steps/settings/func.inc
share/roundcube/program/steps/settings/identities.inc
-share/roundcube/program/steps/settings/manage_folders.inc
+share/roundcube/program/steps/settings/save_folder.inc
share/roundcube/program/steps/settings/save_identity.inc
share/roundcube/program/steps/settings/save_prefs.inc
share/roundcube/program/steps/utils/error.inc
@@ -1108,6 +1124,7 @@ share/roundcube/skins/default/images/buttons/add_pas.png
share/roundcube/skins/default/images/buttons/add_sel.png
share/roundcube/skins/default/images/buttons/bg.gif
share/roundcube/skins/default/images/cleardot.png
+share/roundcube/skins/default/images/dbutton.png
share/roundcube/skins/default/images/dimple.png
share/roundcube/skins/default/images/display/icons.gif
share/roundcube/skins/default/images/display/icons.png
@@ -1118,7 +1135,6 @@ share/roundcube/skins/default/images/googiespell/change_lang.gif
share/roundcube/skins/default/images/googiespell/indicator.gif
share/roundcube/skins/default/images/googiespell/ok.gif
share/roundcube/skins/default/images/googiespell/spellc.gif
-share/roundcube/skins/default/images/icons/abcard.png
share/roundcube/skins/default/images/icons/attachment.png
share/roundcube/skins/default/images/icons/blank.gif
share/roundcube/skins/default/images/icons/collapsed.png
@@ -1159,11 +1175,14 @@ share/roundcube/skins/default/images/mailbox_list.gif
share/roundcube/skins/default/images/mailbox_selected.gif
share/roundcube/skins/default/images/messageactions.gif
share/roundcube/skins/default/images/messageactions.png
+share/roundcube/skins/default/images/messageicons.gif
+share/roundcube/skins/default/images/messageicons.png
share/roundcube/skins/default/images/pagenav.gif
share/roundcube/skins/default/images/quota.gif
share/roundcube/skins/default/images/roundcube_logo.png
share/roundcube/skins/default/images/searchfield.gif
-share/roundcube/skins/default/images/tabs.gif
+share/roundcube/skins/default/images/tabs-left.gif
+share/roundcube/skins/default/images/tabs-right.gif
share/roundcube/skins/default/images/taskbar.gif
share/roundcube/skins/default/images/taskbar.png
share/roundcube/skins/default/images/taskicons.gif
@@ -1173,6 +1192,7 @@ share/roundcube/skins/default/images/watermark.gif
share/roundcube/skins/default/includes/header.html
share/roundcube/skins/default/includes/links.html
share/roundcube/skins/default/includes/messagemenu.html
+share/roundcube/skins/default/includes/replyallmenu.html
share/roundcube/skins/default/includes/settingstabs.html
share/roundcube/skins/default/includes/taskbar.html
share/roundcube/skins/default/mail.css
@@ -1181,24 +1201,25 @@ share/roundcube/skins/default/print.css
share/roundcube/skins/default/safari.css
share/roundcube/skins/default/settings.css
share/roundcube/skins/default/splitter.js
-share/roundcube/skins/default/templates/addcontact.html
share/roundcube/skins/default/templates/addressbook.html
share/roundcube/skins/default/templates/compose.html
-share/roundcube/skins/default/templates/editcontact.html
-share/roundcube/skins/default/templates/editidentity.html
+share/roundcube/skins/default/templates/contact.html
+share/roundcube/skins/default/templates/contactadd.html
+share/roundcube/skins/default/templates/contactedit.html
share/roundcube/skins/default/templates/error.html
+share/roundcube/skins/default/templates/folderedit.html
+share/roundcube/skins/default/templates/folders.html
share/roundcube/skins/default/templates/identities.html
+share/roundcube/skins/default/templates/identityedit.html
share/roundcube/skins/default/templates/importcontacts.html
share/roundcube/skins/default/templates/login.html
share/roundcube/skins/default/templates/mail.html
-share/roundcube/skins/default/templates/managefolders.html
share/roundcube/skins/default/templates/message.html
share/roundcube/skins/default/templates/messageerror.html
share/roundcube/skins/default/templates/messagepart.html
share/roundcube/skins/default/templates/messagepreview.html
+share/roundcube/skins/default/templates/messageprint.html
share/roundcube/skins/default/templates/plugin.html
-share/roundcube/skins/default/templates/printmessage.html
share/roundcube/skins/default/templates/settings.html
share/roundcube/skins/default/templates/settingsedit.html
-share/roundcube/skins/default/templates/showcontact.html
share/roundcube/skins/default/watermark.html
View
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2010/10/06 21:40:35 pettai Exp $
+$NetBSD: distinfo,v 1.18 2011/01/13 12:19:19 adam Exp $
-SHA1 (roundcubemail-0.4.2-dep.tar.gz) = 81ba56f1d341edcb5c67a685cf9ca55bae36c750
-RMD160 (roundcubemail-0.4.2-dep.tar.gz) = 48aa87574859771164f8bebc913562ab7c186ca4
-Size (roundcubemail-0.4.2-dep.tar.gz) = 1664855 bytes
-SHA1 (patch-aa) = 517a6be7f9d4037e01088cab9ec31a44acf543ad
+SHA1 (roundcubemail-0.5-dep.tar.gz) = 415f0a8b2a7d02776d33fd5e5f915bc8686c7546
+RMD160 (roundcubemail-0.5-dep.tar.gz) = 38dcc19787d729fde547f476c7644f6177f93c68
+Size (roundcubemail-0.5-dep.tar.gz) = 1734771 bytes
+SHA1 (patch-aa) = 5acb8f2a021c374c752647d6aea55b37c4586c1c
SHA1 (patch-ab) = 397b14ed10158094eebcdf43be73884098ff6dbd
SHA1 (patch-ac) = 33e85bd1577f3554213c0f1da55500761967026a
SHA1 (patch-af) = 51f5774aa4397310b15d2d357ed028498f01437c
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2010/09/23 23:54:40 pettai Exp $
+$NetBSD: patch-aa,v 1.8 2011/01/13 12:19:19 adam Exp $
---- config/main.inc.php.dist.orig 2010-06-23 09:55:08.000000000 +0000
+--- config/main.inc.php.dist.orig 2011-01-12 08:13:40.000000000 +0000
+++ config/main.inc.php.dist
-@@ -135,10 +135,10 @@ $rcmail_config['enable_installer'] = fal
+@@ -163,10 +163,10 @@ $rcmail_config['enable_installer'] = fal
// use this folder to store log files (must be writeable for apache user)
// This is used by the 'file' log driver.
@@ -15,10 +15,10 @@ $NetBSD: patch-aa,v 1.7 2010/09/23 23:54:40 pettai Exp $
// enable caching of messages and mailbox data in the local database.
// this is recommended if the IMAP server does not run on the same machine
-@@ -560,3 +560,6 @@ $rcmail_config['delete_always'] = false;
+@@ -626,3 +626,6 @@ $rcmail_config['dsn_default'] = 0;
+ $rcmail_config['reply_same_folder'] = false;
// end of config file
-
-+include_once('main-local.inc.php');
+
++include_once('main-local.inc.php');
+?>

0 comments on commit 7617f7d

Please sign in to comment.