pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/roundcube Update to 0.1.1



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8fc514bc7063
branches:  trunk
changeset: 542133:8fc514bc7063
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sun May 04 16:34:03 2008 +0000

description:
Update to 0.1.1

pkgsrc changes:
- Use the 'dep' version to install roundcube with no included dependencies
  and instead manage it all through pkgsrc - suggestion from schmonz@
- Move the config files to ${PREFIX}/share/roundcube/config as it was
  becomming difficult to manage them under ${PKG_SYSCONFDIR}
- Add the GUI installer scripts to the install so users can use it for the
  initial setup and generation of the configuration files.
- Add a note to the roundcube.conf file about protection of the
  installer directory once initially used.
- Don't assume apache is the only supported web server (because it's not)
  we don't support any additional ones now but this will make integration
  down the track easier if we do.
- Increased PKG_SUGGESTED_OPTIONS based on documentation in the INSTALL file.
- Add more required PHP options to roundcube.conf

Thanks to Dan Engholm for feedback on the package.

>From the ChangeLog:
* Clear selection when selecting single item (1484942)
* Remove hard-coded image size in skin templates (1484893)
* Database schema improvements (dropped unnecessary indexes)
* Fixed creating a new folder with a comma in its name (1484681)
* Fixed sorting of messages when default mailbox is empty (1484317)
* Improve message previewpane - less loading (1484316)
* Fixed login form autocompletion (1484839)
* Fixed virtuser_query option for mdb2 backend (1484874)
* Fixed attachment resoting from Drafts when message body was empty (1484506)
* Fixed usage of ob_gzhandler (1484851)
* Fixed message part window in IE6 (1484610)
* Fixed decoding of mime-encoded strings (1484191)
* Fixed some iconv/mb_string problems (1484598)
* Correctly quote mailbox name when using in URL (1484313)
* Fixed "headers already sent" errors (1484860)

diffstat:

 mail/roundcube/MESSAGE              |    9 +-
 mail/roundcube/Makefile             |   88 +++++++-----
 mail/roundcube/PLIST                |  254 +++++++++++------------------------
 mail/roundcube/distinfo             |   11 +-
 mail/roundcube/files/roundcube.conf |   22 ++-
 mail/roundcube/options.mk           |   37 ++++-
 mail/roundcube/patches/patch-ab     |   34 ----
 mail/roundcube/patches/patch-ac     |   22 +++
 mail/roundcube/patches/patch-ad     |   13 +
 9 files changed, 234 insertions(+), 256 deletions(-)

diffs (truncated from 798 to 300 lines):

diff -r 42c40c28ca7c -r 8fc514bc7063 mail/roundcube/MESSAGE
--- a/mail/roundcube/MESSAGE    Sun May 04 12:09:33 2008 +0000
+++ b/mail/roundcube/MESSAGE    Sun May 04 16:34:03 2008 +0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2008/03/15 13:54:58 adrianp Exp $
+$NetBSD: MESSAGE,v 1.5 2008/05/04 16:34:03 adrianp Exp $
 
 Please refer to the following file on how to setup your RoundCube
 installation.
@@ -9,7 +9,7 @@
 For pkgsrc installations the RoundCube package is installed in
 non-default locations.
 
-       Configuration files:    ${PKG_SYSCONFDIR}/roundcube/
+       Configuration files:    ${RCDIR}/config/
        Log files:              ${VARBASE}/log/roundcube/
        Document root:          ${PREFIX}/share/roundcube/
 
@@ -19,4 +19,9 @@
 
        Include ${PKG_SYSCONFDIR}/roundcube.conf
 
+NOTE: As of version 0.1.1 the location of some of the roundcube
+configuration files have changed.  In addition to this please read the
+note in the ${PKG_SYSCONFDIR}/roundcube.conf file about the
+protection of the installer directory.
+
 ===========================================================================
diff -r 42c40c28ca7c -r 8fc514bc7063 mail/roundcube/Makefile
--- a/mail/roundcube/Makefile   Sun May 04 12:09:33 2008 +0000
+++ b/mail/roundcube/Makefile   Sun May 04 16:34:03 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2008/03/15 13:54:59 adrianp Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/04 16:34:03 adrianp Exp $
 #
 
-DISTNAME=      roundcubemail-0.1
-PKGNAME=       ${DISTNAME:S/mail//}
+DISTNAME=      roundcubemail-${VERSION}-dep
+PKGNAME=       ${DISTNAME:S/mail-${VERSION}-dep/-${VERSION}/}
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
 
@@ -12,49 +12,54 @@
 
 USE_LANGUAGES= # none
 NO_BUILD=      yes
+VERSION=       0.1.1
 
 .include "../../mk/bsd.prefs.mk"
+.include "../../lang/php/phpversion.mk"
 
-PKG_SYSCONFSUBDIR?=    httpd
+DEPENDS+=      ${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.2.10:../../net/pear-Net_SMTP
+DEPENDS+=      ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.3:../../mail/pear-Mail_Mime
+DEPENDS+=      ${PHP_PKG_PREFIX}-pear-MDB2>=2.4.1:../../databases/pear-MDB2
+DEPENDS+=      ${PHP_PKG_PREFIX}-pear-Auth_SASL-[0-9]*:../../mail/pear-Auth_SASL
 
-PKG_GROUPS_VARS+=      APACHE_GROUP
-PKG_USERS_VARS+=       APACHE_USER
-BUILD_DEFS+=           VARBASE APACHE_USER APACHE_GROUP
+PKG_SYSCONFSUBDIR?=    roundcube
 
-RCDIR=         ${PREFIX}/share/roundcube
-EGDIR=         ${PREFIX}/share/examples/roundcube
-DOCDIR=                ${PREFIX}/share/doc/roundcube
-PAX_DIRS=      program skins
+WWW_USER?=             ${APACHE_USER}
+WWW_GROUP?=            ${APACHE_GROUP}
+
+PKG_GROUPS_VARS+=      WWW_GROUP
+PKG_USERS_VARS+=       WWW_USER
+BUILD_DEFS+=           VARBASE WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP
 
-MESSAGE_SUBST+=        DOCDIR=${DOCDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-MESSAGE_SUBST+=        VARBASE=${VARBASE:Q}
-FILES_SUBST+=  RCDIR=${RCDIR:Q}
+RCDIR=                 ${PREFIX}/share/roundcube
+EGDIR=                 ${PREFIX}/share/examples/roundcube
+DOCDIR=                        ${PREFIX}/share/doc/roundcube
+PAX_DIRS=              program skins installer
 
-OWN_DIRS+=     ${PKG_SYSCONFDIR}/roundcube
-OWN_DIRS_PERMS+=${VARBASE}/log/roundcube ${APACHE_USER} ${APACHE_GROUP} 0755
-OWN_DIRS_PERMS+=${VARBASE}/tmp/roundcube ${APACHE_USER} ${APACHE_GROUP} 0755
+MESSAGE_SUBST+=                DOCDIR=${DOCDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MESSAGE_SUBST+=                VARBASE=${VARBASE:Q} RCDIR=${RCDIR:Q}
+FILES_SUBST+=          RCDIR=${RCDIR:Q}
 
-CONF_FILES=    ${EGDIR}/roundcube.conf ${PKG_SYSCONFDIR}/roundcube.conf
-CONF_FILES_PERMS+=     \
-       ${EGDIR}/db.inc.php ${PKG_SYSCONFDIR}/roundcube/db.inc.php \
-               ${ROOT_USER} ${APACHE_GROUP} 0640 \
-       ${EGDIR}/main.inc.php ${PKG_SYSCONFDIR}/roundcube/main.inc.php \
-               ${ROOT_USER} ${APACHE_GROUP} 0640
+OWN_DIRS_PERMS+=       ${VARBASE}/log/roundcube \
+                       ${WWW_USER} ${WWW_GROUP} 0755
+OWN_DIRS_PERMS+=       ${VARBASE}/tmp/roundcube \
+                       ${WWW_USER} ${WWW_GROUP} 0755
+
+CONF_FILES=            ${EGDIR}/roundcube.conf \
+                       ${PKG_SYSCONFDIR}/roundcube.conf
 
 SUBST_CLASSES+=                files
 SUBST_STAGE.files=     do-configure
 SUBST_FILES.files=     roundcube.conf
 SUBST_FILES.files+=    config/main.inc.php.dist
-SUBST_FILES.files+=    program/include/main.inc
 SUBST_SED.files=       -e "s|@RCDIR@|${RCDIR}|g"
 SUBST_SED.files+=      -e "s|@VARBASE@|${VARBASE}|g"
-SUBST_SED.files+=      -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.files=   Fixing configuration files.
 
 INSTALLATION_DIRS=     ${RCDIR}/program ${RCDIR}/skins ${EGDIR}/SQL ${DOCDIR}
 
+.include "../../mk/apache.mk"
 .include "options.mk"
-.include "../../mk/apache.mk"
 
 post-extract:
        ${CP} ${FILESDIR}/roundcube.conf ${WRKSRC}/roundcube.conf
@@ -63,6 +68,7 @@
        ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
 do-install:
+       ${INSTALL_DATA_DIR} ${RCDIR}/config
        ${INSTALL_DATA} ${WRKSRC}/roundcube.conf ${EGDIR}/roundcube.conf
        ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCDIR}
@@ -72,17 +78,27 @@
        ${INSTALL_DATA} ${WRKSRC}/SQL/*.sql ${EGDIR}/SQL/
 
        ${INSTALL_DATA} ${WRKSRC}/.htaccess ${RCDIR}/
-
        ${INSTALL_DATA} ${WRKSRC}/index.php ${RCDIR}/
-
-       ${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist ${EGDIR}/db.inc.php
-       ${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist ${EGDIR}/main.inc.php
+       ${INSTALL_DATA} ${WRKSRC}/robots.txt ${RCDIR}/
 
-.for i in ${PAX_DIRS}
-       cd ${WRKSRC}/${i} && ${PAX} -rw . ${RCDIR}/${i}
-       ${FIND} ${RCDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
-       ${FIND} ${RCDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${RCDIR}/${i}
-.endfor
+       ${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist \
+               ${EGDIR}/db.inc.php.dist
+       ${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist \
+               ${EGDIR}/main.inc.php.dist
+       ${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist \
+               ${RCDIR}/config/db.inc.php.dist
+       ${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist \
+               ${RCDIR}/config/main.inc.php.dist
+
+       ${CHMOD} ${PKGDIRMODE} ${RCDIR}/config
+       ${CHOWN} ${WWW_USER}:${WWW_GROUP} ${RCDIR}/config
+       ${CHOWN} ${WWW_USER}:${WWW_GROUP} ${RCDIR}/config/*.dist
+
+.      for i in ${PAX_DIRS}
+               cd ${WRKSRC}/${i} && ${PAX} -rw . ${RCDIR}/${i}
+               ${FIND} ${RCDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
+               ${FIND} ${RCDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+               ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${RCDIR}/${i}
+.      endfor
 
 .include "../../mk/bsd.pkg.mk"
diff -r 42c40c28ca7c -r 8fc514bc7063 mail/roundcube/PLIST
--- a/mail/roundcube/PLIST      Sun May 04 12:09:33 2008 +0000
+++ b/mail/roundcube/PLIST      Sun May 04 16:34:03 2008 +0000
@@ -1,37 +1,51 @@
-@comment $NetBSD: PLIST,v 1.5 2008/03/15 13:54:59 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/05/04 16:34:03 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
 share/examples/roundcube/SQL/postgres.update.sql
 share/examples/roundcube/SQL/sqlite.initial.sql
 share/examples/roundcube/SQL/sqlite.update.sql
-share/examples/roundcube/db.inc.php
-share/examples/roundcube/main.inc.php
+share/examples/roundcube/db.inc.php.dist
+share/examples/roundcube/main.inc.php.dist
 share/examples/roundcube/roundcube.conf
 share/roundcube/.htaccess
 share/roundcube/index.php
+share/roundcube/config/db.inc.php.dist
+share/roundcube/config/main.inc.php.dist
+share/roundcube/installer/check.php
+share/roundcube/installer/client.js
+share/roundcube/installer/config.php
+share/roundcube/installer/images/add.png
+share/roundcube/installer/images/banner_bg.gif
+share/roundcube/installer/images/banner_logo.gif
+share/roundcube/installer/images/banner_right.gif
+share/roundcube/installer/images/delete.png
+share/roundcube/installer/index.php
+share/roundcube/installer/rcube_install.php
+share/roundcube/installer/styles.css
+share/roundcube/installer/test.php
+share/roundcube/installer/welcome.html
 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
 share/roundcube/program/include/rcube_db.inc
+share/roundcube/program/include/rcube_html.inc
 share/roundcube/program/include/rcube_imap.inc
 share/roundcube/program/include/rcube_ldap.inc
 share/roundcube/program/include/rcube_mdb2.inc
 share/roundcube/program/include/rcube_shared.inc
 share/roundcube/program/include/rcube_smtp.inc
 share/roundcube/program/include/rcube_sqlite.inc
+share/roundcube/program/include/rcube_user.inc
 share/roundcube/program/include/session.inc
 share/roundcube/program/js/app.js
 share/roundcube/program/js/common.js
@@ -149,6 +163,7 @@
 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_content.css
 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
@@ -250,101 +265,6 @@
 share/roundcube/program/js/tiny_mce/utils/mclayer.js
 share/roundcube/program/js/tiny_mce/utils/mctabs.js
 share/roundcube/program/js/tiny_mce/utils/validate.js
-share/roundcube/program/lib/Auth/SASL.php
-share/roundcube/program/lib/Auth/SASL/Anonymous.php
-share/roundcube/program/lib/Auth/SASL/Common.php
-share/roundcube/program/lib/Auth/SASL/CramMD5.php
-share/roundcube/program/lib/Auth/SASL/DigestMD5.php
-share/roundcube/program/lib/Auth/SASL/Login.php
-share/roundcube/program/lib/Auth/SASL/Plain.php
-share/roundcube/program/lib/DB.php
-share/roundcube/program/lib/DB/common.php
-share/roundcube/program/lib/DB/dbase.php
-share/roundcube/program/lib/DB/fbsql.php
-share/roundcube/program/lib/DB/ibase.php
-share/roundcube/program/lib/DB/ifx.php
-share/roundcube/program/lib/DB/msql.php
-share/roundcube/program/lib/DB/mssql.php
-share/roundcube/program/lib/DB/mysql.php
-share/roundcube/program/lib/DB/mysqli.php
-share/roundcube/program/lib/DB/oci8.php
-share/roundcube/program/lib/DB/odbc.php
-share/roundcube/program/lib/DB/pgsql.php
-share/roundcube/program/lib/DB/sqlite.php
-share/roundcube/program/lib/DB/storage.php
-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



Home | Main Index | Thread Index | Old Index