- install SQL update scripts used by installer for upgrading DB schemas;

- change rights for the spool, log and tmp directories from 0755 to 0750,
  they contain sensitive information depending on configuration;
- fix the default paths of potential mime.types files;
- change config.inc.php to respect pkgsrc paths especially VARBASE;

No regression expected. Bump rev.

ok taca@.

5 files changed, 129 insertions, 6 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 8d44c2674bc..b434321159a 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2015/03/19 15:46:26 taca Exp $
+# $NetBSD: Makefile,v 1.71 2015/05/24 14:48:54 jym Exp $
 
 DISTNAME=	roundcubemail-1.1.1
 PKGNAME=	${DISTNAME:S/mail-/-/}
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
 
@@ -47,6 +48,7 @@ RCDIR=			${PREFIX}/share/roundcube
 EGDIR=			${PREFIX}/share/examples/roundcube
 DOCDIR=			${PREFIX}/share/doc/roundcube
 PAX_DIRS=		plugins program skins installer
+SQL_DIRS=		mssql mysql oracle postgres sqlite
 
 CONF_PLUGINS=		acl additional_message_headers help \
 			http_authentication jqueryui managesieve \
@@ -59,9 +61,11 @@ FILES_SUBST+=		RCDIR=${RCDIR}
 
 OWN_DIRS+=		${PKG_SYSCONFDIR}
 OWN_DIRS_PERMS+=	${VARBASE}/log/roundcube \
-			${WWW_USER} ${WWW_GROUP} 0755
+			${WWW_USER} ${WWW_GROUP} 0750
 OWN_DIRS_PERMS+=	${VARBASE}/spool/roundcube \
-			${WWW_USER} ${WWW_GROUP} 0755
+			${WWW_USER} ${WWW_GROUP} 0750
+OWN_DIRS_PERMS+=	${VARBASE}/tmp/roundcube \
+			${WWW_USER} ${WWW_GROUP} 0750
 
 CONF_FILES=		${EGDIR}/roundcube.conf \
 			${PKG_SYSCONFDIR}/roundcube.conf
@@ -86,11 +90,14 @@ SUBST_CLASSES+=		files
 SUBST_STAGE.files=	do-configure
 SUBST_MESSAGE.files=	Fixing configuration files.
 SUBST_FILES.files=	roundcube.conf
-SUBST_FILES.files+=	installer/index.php installer/rcube_install.php
+SUBST_FILES.files+=	config/config.inc.php.sample
+SUBST_FILES.files+=	installer/index.php
 SUBST_FILES.files+=	program/include/iniset.php
+SUBST_FILES.files+=	program/lib/Roundcube/rcube_mime.php
 SUBST_SED.files=	-e "s|@RCDIR@|${RCDIR}|g"
 SUBST_SED.files+=	-e "s|@VARBASE@|${VARBASE}|g"
 SUBST_SED.files+=	-e "s|@PKG_EXAMPLES@|${PREFIX}/share/examples/roundcube|g"
+SUBST_SED.files+=	-e "s|@PKG_SYSCONFBASE@|${PKG_SYSCONFBASE}|g"
 SUBST_SED.files+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 .if ${PKG_APACHE} == "apache24"
 SUBST_SED.files+=	-e "/Order allow,deny/d"
@@ -118,7 +125,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/.htaccess ${DESTDIR}${RCDIR}/
 	${INSTALL_DATA} ${WRKSRC}/index.php ${DESTDIR}${RCDIR}/
 	${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${RCDIR}/
+
 	${INSTALL_DATA} ${WRKSRC}/SQL/*.sql ${DESTDIR}${RCDIR}/SQL/
+.for i in ${SQL_DIRS}
+	${INSTALL_DATA_DIR} ${DESTDIR}${RCDIR}/SQL/${i}
+	${INSTALL_DATA} ${WRKSRC}/SQL/${i}/*.sql ${DESTDIR}${RCDIR}/SQL/${i}
+.endfor
 
 	${INSTALL_DATA} ${WRKSRC}/roundcube.conf \
 		${DESTDIR}${EGDIR}/roundcube.conf
diff --git a/mail/roundcube/PLIST b/mail/roundcube/PLIST
index 1a7172c6100..ca943926a2b 100644
--- a/mail/roundcube/PLIST
+++ b/mail/roundcube/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2015/03/19 15:46:26 taca Exp $
+@comment $NetBSD: PLIST,v 1.36 2015/05/24 14:48:54 jym Exp $
 share/doc/roundcube/INSTALL
 share/doc/roundcube/LICENSE
 share/doc/roundcube/README.md
@@ -20,10 +20,81 @@ share/examples/roundcube/plugins/zipdownload/config.inc.php
 share/examples/roundcube/roundcube.conf
 share/roundcube/.htaccess
 share/roundcube/SQL/mssql.initial.sql
+share/roundcube/SQL/mssql/2009103100.sql
+share/roundcube/SQL/mssql/2010100600.sql
+share/roundcube/SQL/mssql/2011011200.sql
+share/roundcube/SQL/mssql/2011092800.sql
+share/roundcube/SQL/mssql/2011111600.sql
+share/roundcube/SQL/mssql/2011121400.sql
+share/roundcube/SQL/mssql/2012051800.sql
+share/roundcube/SQL/mssql/2012080700.sql
+share/roundcube/SQL/mssql/2013011000.sql
+share/roundcube/SQL/mssql/2013042700.sql
+share/roundcube/SQL/mssql/2013052500.sql
+share/roundcube/SQL/mssql/2013061000.sql
+share/roundcube/SQL/mssql/2014042900.sql
+share/roundcube/SQL/mssql/2015030800.sql
 share/roundcube/SQL/mysql.initial.sql
+share/roundcube/SQL/mysql/2008030300.sql
+share/roundcube/SQL/mysql/2008040500.sql
+share/roundcube/SQL/mysql/2008060900.sql
+share/roundcube/SQL/mysql/2008092100.sql
+share/roundcube/SQL/mysql/2009090400.sql
+share/roundcube/SQL/mysql/2009103100.sql
+share/roundcube/SQL/mysql/2010042300.sql
+share/roundcube/SQL/mysql/2010100600.sql
+share/roundcube/SQL/mysql/2011011200.sql
+share/roundcube/SQL/mysql/2011092800.sql
+share/roundcube/SQL/mysql/2011111600.sql
+share/roundcube/SQL/mysql/2011121400.sql
+share/roundcube/SQL/mysql/2012080700.sql
+share/roundcube/SQL/mysql/2013011000.sql
+share/roundcube/SQL/mysql/2013042700.sql
+share/roundcube/SQL/mysql/2013052500.sql
+share/roundcube/SQL/mysql/2013061000.sql
+share/roundcube/SQL/mysql/2014042900.sql
+share/roundcube/SQL/mysql/2015030800.sql
 share/roundcube/SQL/oracle.initial.sql
+share/roundcube/SQL/oracle/2015030800.sql
 share/roundcube/SQL/postgres.initial.sql
+share/roundcube/SQL/postgres/2008030300.sql
+share/roundcube/SQL/postgres/2008060900.sql
+share/roundcube/SQL/postgres/2008092100.sql
+share/roundcube/SQL/postgres/2009090400.sql
+share/roundcube/SQL/postgres/2009103100.sql
+share/roundcube/SQL/postgres/2010042300.sql
+share/roundcube/SQL/postgres/2010100600.sql
+share/roundcube/SQL/postgres/2011011200.sql
+share/roundcube/SQL/postgres/2011092800.sql
+share/roundcube/SQL/postgres/2011111600.sql
+share/roundcube/SQL/postgres/2011121400.sql
+share/roundcube/SQL/postgres/2012080700.sql
+share/roundcube/SQL/postgres/2013011000.sql
+share/roundcube/SQL/postgres/2013042700.sql
+share/roundcube/SQL/postgres/2013052500.sql
+share/roundcube/SQL/postgres/2013061000.sql
+share/roundcube/SQL/postgres/2014042900.sql
+share/roundcube/SQL/postgres/2015030800.sql
 share/roundcube/SQL/sqlite.initial.sql
+share/roundcube/SQL/sqlite/2008030300.sql
+share/roundcube/SQL/sqlite/2008060900.sql
+share/roundcube/SQL/sqlite/2008092100.sql
+share/roundcube/SQL/sqlite/2009090400.sql
+share/roundcube/SQL/sqlite/2009103100.sql
+share/roundcube/SQL/sqlite/2010042300.sql
+share/roundcube/SQL/sqlite/2010100600.sql
+share/roundcube/SQL/sqlite/2011011200.sql
+share/roundcube/SQL/sqlite/2011092800.sql
+share/roundcube/SQL/sqlite/2011111600.sql
+share/roundcube/SQL/sqlite/2011121400.sql
+share/roundcube/SQL/sqlite/2012080700.sql
+share/roundcube/SQL/sqlite/2013011000.sql
+share/roundcube/SQL/sqlite/2013011700.sql
+share/roundcube/SQL/sqlite/2013042700.sql
+share/roundcube/SQL/sqlite/2013052500.sql
+share/roundcube/SQL/sqlite/2013061000.sql
+share/roundcube/SQL/sqlite/2014042900.sql
+share/roundcube/SQL/sqlite/2015030800.sql
 share/roundcube/bin/cleandb.sh
 share/roundcube/bin/cssshrink.sh
 share/roundcube/bin/decrypt.sh
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 317739d71cd..e4224a68513 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.42 2015/03/19 15:46:26 taca Exp $
+$NetBSD: distinfo,v 1.43 2015/05/24 14:48:54 jym Exp $
 
 SHA1 (roundcubemail-1.1.1.tar.gz) = 08222f382a8dd89bba7dbbad595f48443bec0aa2
 RMD160 (roundcubemail-1.1.1.tar.gz) = 5681101e618f035a52c6b99fdba4ae80d3fb6e46
 Size (roundcubemail-1.1.1.tar.gz) = 3182916 bytes
 SHA1 (patch-ac) = 235116580665d5d58edc218c063b41171a2d9227
 SHA1 (patch-af) = 1f95a7005569207469563aa37ff48da0383b7668
+SHA1 (patch-config.inc.php) = 20a71b7fd9fbf0a1e097bd17428b9a1a2bed638d
+SHA1 (patch-rcube_mime_default) = 5cf58d8cbba63f97ddd8baaa7f1603aeff6bcb0d
diff --git a/mail/roundcube/patches/patch-config.inc.php b/mail/roundcube/patches/patch-config.inc.php
new file mode 100644
index 00000000000..7195e701519
--- /dev/null
+++ b/mail/roundcube/patches/patch-config.inc.php
@@ -0,0 +1,15 @@
+$NetBSD: patch-config.inc.php,v 1.1 2015/05/24 14:48:54 jym Exp $
+Add default paths for log, tmp and MIME types.
+--- config/config.inc.php.sample	2015-03-16 20:54:49.000000000 +0000
++++ config/config.inc.php.sample.18555.sample
+@@ -83,3 +83,10 @@ $config['plugins'] = array(
+ 
+ // skin name: folder from skins/
+ $config['skin'] = 'larry';
++
++// use this folder to store log files (must be writeable for apache user)
++// This is used by the 'file' log driver.
++$config['log_dir'] = '@VARBASE@/log/roundcube/';
++
++// use this folder to store temp files (must be writeable for apache user)
++$config['temp_dir'] = '@VARBASE@/tmp/roundcube/';
diff --git a/mail/roundcube/patches/patch-rcube_mime_default b/mail/roundcube/patches/patch-rcube_mime_default
new file mode 100644
index 00000000000..a10bbf5642b
--- /dev/null
+++ b/mail/roundcube/patches/patch-rcube_mime_default
@@ -0,0 +1,23 @@
+$NetBSD: patch-rcube_mime_default,v 1.1 2015/05/24 14:48:54 jym Exp $
+Fix path to /etc/.
+--- program/lib/Roundcube/rcube_mime.php.orig	2015-03-16 20:54:50.000000000 +0000
++++ program/lib/Roundcube/rcube_mime.php
+@@ -807,12 +807,12 @@ class rcube_mime
+             $file_paths[] = 'C:/xampp/apache/conf/mime.types.';
+         }
+         else {
+-            $file_paths[] = '/etc/mime.types';
+-            $file_paths[] = '/etc/httpd/mime.types';
+-            $file_paths[] = '/etc/httpd2/mime.types';
+-            $file_paths[] = '/etc/apache/mime.types';
+-            $file_paths[] = '/etc/apache2/mime.types';
+-            $file_paths[] = '/etc/nginx/mime.types';
++            $file_paths[] = '@PKG_SYSCONFBASE@/mime.types';
++            $file_paths[] = '@PKG_SYSCONFBASE@/httpd/mime.types';
++            $file_paths[] = '@PKG_SYSCONFBASE@/httpd2/mime.types';
++            $file_paths[] = '@PKG_SYSCONFBASE@/apache/mime.types';
++            $file_paths[] = '@PKG_SYSCONFBASE@/apache2/mime.types';
++            $file_paths[] = '@PKG_SYSCONFBASE@/nginx/mime.types';
+             $file_paths[] = '/usr/local/etc/httpd/conf/mime.types';
+             $file_paths[] = '/usr/local/etc/apache/conf/mime.types';
+         }