Fri Sep 13 11:13:49 2013 UTC ()
Update roundcubemail to 0.9.4.

pkgsrc changes:
	* Make installer work.
	* Add various dependency to PHP extensions.

RELEASE 0.9.4
-------------
- Make identities matching case insensitive (#1485480)
- Fix issue where too big message data was stored in cache causing sql errors
  (#1489316)
- Fix iframe scrollbars on webkit desktop browsers (#1489306)
- Fix issue where legacy config was overriden by default config (#1489288)
- Fix newmail_notifier issue where favicon wasn't changed back to default
  (#1489313)
- Fix setting of Junk and NonJunk flags by markasjunk plugin (#1489285)
- Fix lack of Reply-To address in header of forwarded message body (#1489298)
- Fix bugs when invoking contact creation form when read-only addressbook is
  selected (#1489296)
- Fix identity selection on reply (#1489291)
- Fix so additional headers are added to all messages sent (#1489284)
- Fix display issue after moving folder in Folder Manager (#1489293)
- Fix handling of non-default date formats (#1489294)
- Fix unquoted path in PREG expression on Windows (#1489290)
- Fix Junk folder icon alignment when it's nested in inbox folder (#1489292)
- Fix wrong close tag in /template/mail.html (#1489295)


(taca)
diff -r1.58 -r1.59 pkgsrc/mail/roundcube/Makefile
diff -r1.32 -r1.33 pkgsrc/mail/roundcube/distinfo
diff -r1.7 -r1.8 pkgsrc/mail/roundcube/patches/patch-ac
diff -r0 -r1.1 pkgsrc/mail/roundcube/patches/patch-installer_check.php
diff -r0 -r1.3 pkgsrc/mail/roundcube/patches/patch-installer_rcube__install.php
cvs diff -r1.58 -r1.59 pkgsrc/mail/roundcube/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/Makefile 2013/08/22 17:08:10 1.58
+++ pkgsrc/mail/roundcube/Makefile 2013/09/13 11:13:49 1.59
@@ -1,28 +1,31 @@ @@ -1,28 +1,31 @@
1# $NetBSD: Makefile,v 1.58 2013/08/22 17:08:10 taca Exp $ 1# $NetBSD: Makefile,v 1.59 2013/09/13 11:13:49 taca Exp $
2 2
3DISTNAME= roundcubemail-0.9.3-dep 3DISTNAME= roundcubemail-0.9.4-dep
4PKGNAME= ${DISTNAME:S/mail-/-/:S/-dep//} 4PKGNAME= ${DISTNAME:S/mail-/-/:S/-dep//}
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
7 7
8MAINTAINER= taca@NetBSD.org 8MAINTAINER= taca@NetBSD.org
9HOMEPAGE= http://roundcube.net/ 9HOMEPAGE= http://roundcube.net/
10COMMENT= Browser-based multilingual IMAP client 10COMMENT= Browser-based multilingual IMAP client
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom 13DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
14DEPENDS+= ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json 14DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
15DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=4.3.1:../../security/php-mcrypt 15DEPENDS+= ${PHP_PKG_PREFIX}-dom>=${PHP_BASE_VERS}:../../textproc/php-dom
 16DEPENDS+= ${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
 17DEPENDS+= ${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json
 18DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=${PHP_BASE_VERS}:../../security/php-mcrypt
16 19
17DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.4.2:../../net/pear-Net_SMTP 20DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.4.2:../../net/pear-Net_SMTP
18DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_IDNA2>=0.1.1:../../net/pear-Net_IDNA2 21DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_IDNA2>=0.1.1:../../net/pear-Net_IDNA2
19DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.8.1:../../mail/pear-Mail_Mime 22DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.8.1:../../mail/pear-Mail_Mime
20DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_mimeDecode>=1.5.5:../../mail/pear-Mail_mimeDecode 23DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_mimeDecode>=1.5.5:../../mail/pear-Mail_mimeDecode
21DEPENDS+= ${PHP_PKG_PREFIX}-pear-Auth_SASL>=1.0.3:../../mail/pear-Auth_SASL 24DEPENDS+= ${PHP_PKG_PREFIX}-pear-Auth_SASL>=1.0.3:../../mail/pear-Auth_SASL
22 25
23USE_LANGUAGES= # none 26USE_LANGUAGES= # none
24USE_TOOLS+= pax 27USE_TOOLS+= pax
25NO_BUILD= yes 28NO_BUILD= yes
26 29
27INSTALLATION_DIRS= ${RCDIR}/plugins ${RCDIR}/program ${RCDIR}/skins 30INSTALLATION_DIRS= ${RCDIR}/plugins ${RCDIR}/program ${RCDIR}/skins
28INSTALLATION_DIRS+= ${RCDIR}/bin ${RCDIR}/SQL ${DOCDIR} ${EGDIR} 31INSTALLATION_DIRS+= ${RCDIR}/bin ${RCDIR}/SQL ${DOCDIR} ${EGDIR}
@@ -69,30 +72,31 @@ CONF_FILES_PERMS+= ${EGDIR}/main.inc.php @@ -69,30 +72,31 @@ CONF_FILES_PERMS+= ${EGDIR}/main.inc.php
69 ${PKG_SYSCONFDIR}/main.inc.php \ 72 ${PKG_SYSCONFDIR}/main.inc.php \
70 ${WWW_USER} ${WWW_GROUP} 0640 73 ${WWW_USER} ${WWW_GROUP} 0640
71 74
72.for f in ${CONF_PLUGINS} 75.for f in ${CONF_PLUGINS}
73CONF_FILES_PERMS+= ${EGDIR}/plugins/${f}/config.inc.php \ 76CONF_FILES_PERMS+= ${EGDIR}/plugins/${f}/config.inc.php \
74 ${RCDIR}/plugins/${f}/config.inc.php \ 77 ${RCDIR}/plugins/${f}/config.inc.php \
75 ${WWW_USER} ${WWW_GROUP} 0640 78 ${WWW_USER} ${WWW_GROUP} 0640
76.endfor 79.endfor
77 80
78SUBST_CLASSES+= files 81SUBST_CLASSES+= files
79SUBST_STAGE.files= do-configure 82SUBST_STAGE.files= do-configure
80SUBST_FILES.files= roundcube.conf 83SUBST_FILES.files= roundcube.conf
81SUBST_FILES.files+= config/main.inc.php.dist 84SUBST_FILES.files+= config/main.inc.php.dist
82SUBST_FILES.files+= installer/index.php 85SUBST_FILES.files+= installer/index.php installer/rcube_install.php
83SUBST_FILES.files+= program/include/iniset.php 86SUBST_FILES.files+= program/include/iniset.php
84SUBST_SED.files= -e "s|@RCDIR@|${RCDIR}|g" 87SUBST_SED.files= -e "s|@RCDIR@|${RCDIR}|g"
85SUBST_SED.files+= -e "s|@VARBASE@|${VARBASE}|g" 88SUBST_SED.files+= -e "s|@VARBASE@|${VARBASE}|g"
 89SUBST_SED.files+= -e "s|@PKG_EXAMPLES@|${PREFIX}/share/examples/roundcube|g"
86SUBST_SED.files+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" 90SUBST_SED.files+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
87SUBST_MESSAGE.files= Fixing configuration files. 91SUBST_MESSAGE.files= Fixing configuration files.
88 92
89REPLACE_INTERPRETER+= php 93REPLACE_INTERPRETER+= php
90REPLACE.php.old= /usr/bin/env php 94REPLACE.php.old= /usr/bin/env php
91REPLACE.php.new= ${PREFIX}/bin/php 95REPLACE.php.new= ${PREFIX}/bin/php
92REPLACE_FILES.php= bin/cleandb.sh bin/decrypt.sh bin/indexcontacts.sh 96REPLACE_FILES.php= bin/cleandb.sh bin/decrypt.sh bin/indexcontacts.sh
93REPLACE_FILES.php+= bin/installto.sh bin/moduserprefs.sh bin/msgexport.sh 97REPLACE_FILES.php+= bin/installto.sh bin/moduserprefs.sh bin/msgexport.sh
94REPLACE_FILES.php+= bin/msgimport.sh bin/update.sh bin/updatecss.sh 98REPLACE_FILES.php+= bin/msgimport.sh bin/update.sh bin/updatecss.sh
95REPLACE_FILES.php+= bin/updatedb.sh 99REPLACE_FILES.php+= bin/updatedb.sh
96 100
97REPLACE_PYTHON= plugins/password/helpers/chpass-wrapper.py 101REPLACE_PYTHON= plugins/password/helpers/chpass-wrapper.py
98 102
cvs diff -r1.32 -r1.33 pkgsrc/mail/roundcube/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/distinfo 2013/08/22 17:08:10 1.32
+++ pkgsrc/mail/roundcube/distinfo 2013/09/13 11:13:49 1.33
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1$NetBSD: distinfo,v 1.32 2013/08/22 17:08:10 taca Exp $ 1$NetBSD: distinfo,v 1.33 2013/09/13 11:13:49 taca Exp $
2 2
3SHA1 (roundcubemail-0.9.3-dep.tar.gz) = 060d3c2939ab8964c3c71d5ec1e18e940570ec90 3SHA1 (roundcubemail-0.9.4-dep.tar.gz) = 66acb337b422940d7d79ed942a866d238d628960
4RMD160 (roundcubemail-0.9.3-dep.tar.gz) = 3d210e715ebead32655fe651e80d5d0233217d7c 4RMD160 (roundcubemail-0.9.4-dep.tar.gz) = dc6c2aa2ab5217e130d996bf6dbc522f4a0e3c92
5Size (roundcubemail-0.9.3-dep.tar.gz) = 3408855 bytes 5Size (roundcubemail-0.9.4-dep.tar.gz) = 3410013 bytes
6SHA1 (patch-aa) = 2391f0ddb6b9ba6026f9db6d7050f3412d02e160 6SHA1 (patch-aa) = 2391f0ddb6b9ba6026f9db6d7050f3412d02e160
7SHA1 (patch-ab) = 19b62d4a24d9b1ccc476f8d3fbe5f386faf6c553 7SHA1 (patch-ab) = 19b62d4a24d9b1ccc476f8d3fbe5f386faf6c553
8SHA1 (patch-ac) = ea60a00f8d53f36e069f4b61962ff97c980edb20 8SHA1 (patch-ac) = 8ab62bdbcce807c76f1929546ade88a128db2fff
9SHA1 (patch-af) = 1f95a7005569207469563aa37ff48da0383b7668 9SHA1 (patch-af) = 1f95a7005569207469563aa37ff48da0383b7668
 10SHA1 (patch-installer_check.php) = e37c25f073fad9c9fc319722116e0316924a7010
 11SHA1 (patch-installer_rcube__install.php) = b81f04c050a7e507dc202501f22b77a3817ec9dd
cvs diff -r1.7 -r1.8 pkgsrc/mail/roundcube/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/patches/Attic/patch-ac 2013/06/15 16:08:09 1.7
+++ pkgsrc/mail/roundcube/patches/Attic/patch-ac 2013/09/13 11:13:49 1.8
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ac,v 1.7 2013/06/15 16:08:09 taca Exp $ 1$NetBSD: patch-ac,v 1.8 2013/09/13 11:13:49 taca Exp $
2 2
3Honor PKG_SYSCONFDIR. 3Honor PKG_SYSCONFDIR.
4 4
5--- installer/index.php.orig 2013-04-15 20:42:59.000000000 +0000 5--- installer/index.php.orig 2013-04-15 20:42:59.000000000 +0000
6+++ installer/index.php 6+++ installer/index.php
7@@ -41,7 +41,7 @@ ini_set('display_errors', 1); 7@@ -41,7 +41,7 @@ ini_set('display_errors', 1);
8  8
9 define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/'); 9 define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
10 define('RCUBE_INSTALL_PATH', INSTALL_PATH); 10 define('RCUBE_INSTALL_PATH', INSTALL_PATH);
11-define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/'); 11-define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/');
12+define('RCMAIL_CONFIG_DIR', '@PKG_SYSCONFDIR@'); 12+define('RCUBE_CONFIG_DIR', '@PKG_SYSCONFDIR@');
13  13
14 $include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; 14 $include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
15 $include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR; 15 $include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
File Added: pkgsrc/mail/roundcube/patches/Attic/patch-installer_check.php
$NetBSD: patch-installer_check.php,v 1.1 2013/09/13 11:13:49 taca Exp $

Roundcube dosen't use php-exif.

--- installer/check.php.orig	2013-09-06 12:20:52.000000000 +0000
+++ installer/check.php
@@ -24,7 +24,6 @@ $optional_php_exts = array(
     'OpenSSL'   => 'openssl',
     'Mcrypt'    => 'mcrypt',
     'Intl'      => 'intl',
-    'Exif'      => 'exif',
 );
 
 $required_libs = array(
File Added: pkgsrc/mail/roundcube/patches/Attic/patch-installer_rcube__install.php
$NetBSD: patch-installer_rcube__install.php,v 1.3 2013/09/13 11:13:49 taca Exp $

Use template from examples dir.

--- installer/rcube_install.php.orig	2013-09-06 12:20:52.000000000 +0000
+++ installer/rcube_install.php
@@ -147,7 +147,7 @@ class rcube_install
    */
   function create_config($which, $force = false)
   {
-    $out = @file_get_contents(RCUBE_CONFIG_DIR . $which . '.inc.php.dist');
+    $out = @file_get_contents('@PKG_EXAMPLES@/' . $which . '.inc.php.dist');
 
     if (!$out)
       return '[Warning: could not read the config template file]';