Update to 0.5-beta release:

- add LICENSE
- install scripts
- install web configurator

9 files changed, 93 insertions, 73 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 9206e10b854b..e79c2e149551 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -6,32 +6,32 @@
 #
 
 PORTNAME=	roundcube
-DISTVERSION=	0.4.2
+DISTVERSION=	0.5-beta
 PORTEPOCH=	1
 CATEGORIES?=	mail www
-MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail/${DISTVERSION}
+MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail-beta/${DISTVERSION}
 DISTNAME=	${PORTNAME}mail-${DISTVERSION}
 
 MAINTAINER?=	ale@FreeBSD.org
 COMMENT=	Fully skinnable XHTML/CSS webmail written in PHP
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 NO_BUILD=	yes
 CONFLICTS=	ja-roundcube-[0-9]*
 
-RCUBECOMP=	SQL config index.php logs plugins program robots.txt skins temp
-PORTDOCS=	CHANGELOG INSTALL LICENSE README UPGRADING
+RCUBECOMP=	.htaccess SQL config index.php installer logs plugins program robots.txt skins temp
+PORTDOCS=	CHANGELOG INSTALL README UPGRADING
 
 SCRIPTS_ENV=	SHAREOWN=${SHAREOWN} SHAREGRP=${SHAREGRP} \
 		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} \
 		WWWDIR=${WWWDIR}
 
 WANT_PHP_WEB=	yes
-USE_PHP=	pcre mbstring session iconv dom xml json
+USE_PHP=	pcre mbstring session iconv dom xml json intl
 IGNORE_WITH_PHP=4
 
-SUB_FILES=	pkg-install
-PKGDEINSTALL=	${PKGINSTALL}
-
 REINPLACE_ARGS=	-i ""
 .if defined(WITH_REPLACE_MAIL_URL) && !empty(WITH_REPLACE_MAIL_URL)
 MAIL=		${WITH_REPLACE_MAIL_URL}
@@ -46,8 +46,7 @@ OPTIONS=	MYSQL "Use MySQL backend" on \
 		SSL "Enable SSL support (imaps or google spellcheck)" off \
 		LDAP "Enable LDAP support (address book)" off \
 		PSPELL "Enable PSpell support (internal spellcheck)" off \
-		NSC "Install network spellchecker" off \
-		AUTOCOMP "Enable autocomplete in login form" off
+		NSC "Install network spellchecker" off
 
 .include <bsd.port.pre.mk>
 
@@ -94,10 +93,6 @@ post-extract:
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -type f -delete
-.if defined(WITH_AUTOCOMP)
-	@${REINPLACE_CMD} "s/ autocomplete=\"off\"//g" \
-		${WRKSRC}/skins/default/templates/login.html
-.endif
 .if defined(WITH_REPLACE_MAIL_URL)
 	@${REINPLACE_CMD} "s/'mail'/'${MAIL}'/g" ${WRKSRC}/index.php \
 		${WRKSRC}/plugins/*/*.php \
@@ -133,6 +128,7 @@ post-patch:
 
 do-install:
 	-${MKDIR} ${WWWDIR}
+	@cd ${WRKSRC} && ${COPYTREE_BIN} bin ${WWWDIR}
 .for i in ${RCUBECOMP}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${WWWDIR}
 .endfor
@@ -142,14 +138,13 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
 .endfor
 .endif
-	@(cd ${WRKSRC}; ${FIND} ${RCUBECOMP} -not -type d) | ${SORT} | \
+	@(cd ${WRKSRC}; ${FIND} bin ${RCUBECOMP} -not -type d) | ${SORT} | \
 		${SED} -ne 's,^,${WWWDIR_REL}/,p' >> ${TMPPLIST}
-	@(cd ${WRKSRC}; ${FIND} ${RCUBECOMP} -type d) | ${SORT} -r | \
+	@(cd ${WRKSRC}; ${FIND} bin ${RCUBECOMP} -type d) | ${SORT} -r | \
 		${SED} -ne 's,^,@dirrm ${WWWDIR_REL}/,p' >> ${TMPPLIST}
 	@${ECHO_CMD} '@dirrm ${WWWDIR_REL}' >> ${TMPPLIST}
 
 post-install:
-	@${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 821e0ab03676..5e7499115cc8 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,3 +1,2 @@
-MD5 (roundcubemail-0.4.2.tar.gz) = d28417f0f16ff2a251a964be153c967a
-SHA256 (roundcubemail-0.4.2.tar.gz) = 0863ef8324d77033142d66a997bcd9b0c6d675320e9f4a926cb3e03d624d93e4
-SIZE (roundcubemail-0.4.2.tar.gz) = 2172565
+SHA256 (roundcubemail-0.5-beta.tar.gz) = be776122b447674d90bd792073d32e11e0ffb18598d82f42e5478dac5faf6f07
+SIZE (roundcubemail-0.5-beta.tar.gz) = 2239455
diff --git a/mail/roundcube/files/patch-INSTALL b/mail/roundcube/files/patch-INSTALL
new file mode 100644
index 000000000000..b56d02d04f54
--- /dev/null
+++ b/mail/roundcube/files/patch-INSTALL
@@ -0,0 +1,10 @@
+--- INSTALL.orig	2010-12-13 17:37:36.000000000 +0100
++++ INSTALL	2010-12-13 17:37:44.000000000 +0100
+@@ -25,7 +25,6 @@
+    - file_uploads enabled (for attachment upload features)
+    - session.auto_start disabled
+    - zend.ze1_compatibility_mode disabled
+-   - suhosin.session.encrypt disabled
+    - mbstring.func_overload disabled
+ * PHP compiled with OpenSSL to connect to IMAPS and to use the spell checker
+ * A MySQL (4.0.8 or newer), PostgreSQL, MSSQL database engine
diff --git a/mail/roundcube/files/patch-UPGRADING b/mail/roundcube/files/patch-UPGRADING
new file mode 100644
index 000000000000..4d8f65aeee40
--- /dev/null
+++ b/mail/roundcube/files/patch-UPGRADING
@@ -0,0 +1,9 @@
+--- UPGRADING.orig	2010-12-13 17:35:44.000000000 +0100
++++ UPGRADING	2010-12-13 17:35:52.000000000 +0100
+@@ -22,6 +22,4 @@
+    ./SQL/[yourdbtype].update.sql that are superscribed with the
+    currently installed version number.
+ 5. Make sure 'enable_installer' is set to false again.
+-6. IMPORTANT: clear all records from the sessions table in your database.
+-   The session storage format has changed so all existing data cannot be read anymore.
+ 
diff --git a/mail/roundcube/files/patch-installer_check.php b/mail/roundcube/files/patch-installer_check.php
new file mode 100644
index 000000000000..8aa157c9cda2
--- /dev/null
+++ b/mail/roundcube/files/patch-installer_check.php
@@ -0,0 +1,10 @@
+--- installer/check.php.orig	2010-12-13 17:38:24.000000000 +0100
++++ installer/check.php	2010-12-13 17:38:36.000000000 +0100
+@@ -37,7 +37,6 @@
+     'session.auto_start'            => 0,
+     'zend.ze1_compatibility_mode'   => 0,
+     'mbstring.func_overload'        => 0,
+-    'suhosin.session.encrypt'       => 0,
+ );
+ 
+ $optional_checks = array(
diff --git a/mail/roundcube/files/patch-program_include_rcube_message.php b/mail/roundcube/files/patch-program_include_rcube_message.php
index 952a0911b58e..d5396549aa92 100644
--- a/mail/roundcube/files/patch-program_include_rcube_message.php
+++ b/mail/roundcube/files/patch-program_include_rcube_message.php
@@ -1,10 +1,12 @@
---- program/include/rcube_message.php.orig	2010-08-06 15:22:20.000000000 +0200
-+++ program/include/rcube_message.php	2010-08-24 12:42:33.000000000 +0200
-@@ -427,7 +427,7 @@
+--- program/include/rcube_message.php.orig	2010-11-26 13:41:16.000000000 +0100
++++ program/include/rcube_message.php	2010-12-13 17:20:59.000000000 +0100
+@@ -452,9 +452,7 @@
                  }
                  // part is a file/attachment
                  else if (preg_match('/^(inline|attach)/', $mail_part->disposition) ||
--                    $mail_part->headers['content-id'] || (empty($mail_part->disposition) && $mail_part->filename)
+-                    $mail_part->headers['content-id'] ||
+-                    ($mail_part->filename &&
+-                        (empty($mail_part->disposition) || preg_match('/^[a-z0-9!#$&.+^_-]+$/i', $mail_part->disposition)))
 +                    $mail_part->headers['content-id'] || $mail_part->filename
                  ) {
                      // skip apple resource forks
diff --git a/mail/roundcube/files/patch-program_include_rcube_session.php b/mail/roundcube/files/patch-program_include_rcube_session.php
index 8faaa7188db5..8422702fd8ea 100644
--- a/mail/roundcube/files/patch-program_include_rcube_session.php
+++ b/mail/roundcube/files/patch-program_include_rcube_session.php
@@ -1,6 +1,6 @@
---- program/include/rcube_session.php.orig	2010-04-26 14:50:34.000000000 +0200
-+++ program/include/rcube_session.php	2010-04-26 15:02:46.000000000 +0200
-@@ -25,7 +25,6 @@
+--- program/include/rcube_session.php.orig	2010-11-27 14:59:05.000000000 +0100
++++ program/include/rcube_session.php	2010-12-13 17:50:47.000000000 +0100
+@@ -32,7 +32,6 @@
    private $db;
    private $ip;
    private $changed;
@@ -8,43 +8,60 @@
    private $gc_handlers = array();
    private $start;
    private $vars = false;
-@@ -100,13 +99,6 @@
+@@ -82,7 +81,7 @@
+     if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+       $this->changed = $sql_arr['changed'];
+       $this->ip      = $sql_arr['ip'];
+-      $this->vars    = base64_decode($sql_arr['vars']);
++      $this->vars    = $sql_arr['vars'];
+       $this->key     = $key;
+ 
+       if (!empty($this->vars))
+@@ -107,17 +106,6 @@
      }
-     
+ 
      if ($oldvars !== false) {
--      $a_oldvars = $this->unserialize($oldvars); 
--      foreach ((array)$this->unsets as $k)
--        unset($a_oldvars[$k]);
+-      $a_oldvars = $this->unserialize($oldvars);
+-      if (is_array($a_oldvars)) {
+-        foreach ((array)$this->unsets as $k)
+-          unset($a_oldvars[$k]);
 -
--      $newvars = $this->serialize(array_merge(
--        (array)$a_oldvars, (array)$this->unserialize($vars)));
+-        $newvars = $this->serialize(array_merge(
+-          (array)$a_oldvars, (array)$this->unserialize($vars)));
+-      }
+-      else
+-        $newvars = $vars;
 -
-       if ($this->keep_alive>0) {
- 	$timeout = min($this->lifetime * 0.5, 
- 		       $this->lifetime - $this->keep_alive);
-@@ -114,11 +106,11 @@
- 	$timeout = 0;
+       if (!$this->lifetime) {
+         $timeout = 600;
+       }
+@@ -127,11 +115,11 @@
+         $timeout = 0;
        }
  
 -      if (!($newvars === $oldvars) || ($ts - $this->changed > $timeout)) {
 +      if (!($vars === $oldvars) || ($ts - $this->changed > $timeout)) {
          $this->db->query(
- 	  sprintf("UPDATE %s SET vars = ?, changed = %s WHERE sess_id = ?",
- 	    get_table_name('session'), $now),
--	  $newvars, $key);
-+	  $vars, $key);
+           sprintf("UPDATE %s SET vars = ?, changed = %s WHERE sess_id = ?",
+             get_table_name('session'), $now),
+-          base64_encode($newvars), $key);
++          $vars, $key);
        }
      }
      else {
-@@ -129,7 +121,6 @@
-         $key, $vars, (string)$_SERVER['REMOTE_ADDR']);
+@@ -139,10 +127,9 @@
+         sprintf("INSERT INTO %s (sess_id, vars, ip, created, changed) ".
+           "VALUES (?, ?, ?, %s, %s)",
+           get_table_name('session'), $now, $now),
+-        $key, base64_encode($vars), (string)$_SERVER['REMOTE_ADDR']);
++        $key, $vars, (string)$_SERVER['REMOTE_ADDR']);
      }
  
 -    $this->unsets = array();
      return true;
    }
  
-@@ -199,112 +190,12 @@
+@@ -212,112 +199,12 @@
      if (empty($var))
        return $this->destroy(session_id());
  
diff --git a/mail/roundcube/files/pkg-install.in b/mail/roundcube/files/pkg-install.in
deleted file mode 100644
index b7ad0d082885..000000000000
--- a/mail/roundcube/files/pkg-install.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-WWWDIR=%%WWWDIR%%
-
-case $2 in
-
-POST-INSTALL)
-	for i in ${WWWDIR}/config/db.inc.php ${WWWDIR}/config/main.inc.php; do
-		[ -f ${i} ] || cp ${i}.dist ${i}
-	done
-	chown -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/
-	;;
-DEINSTALL)
-	for i in ${WWWDIR}/config/db.inc.php ${WWWDIR}/config/main.inc.php; do
-		if cmp -s ${i} ${i}.dist; then rm ${i}; fi
-	done
-	;;
-esac
-
-exit 0
diff --git a/mail/roundcube/pkg-message b/mail/roundcube/pkg-message
index 535487fcbf80..307097806ccb 100644
--- a/mail/roundcube/pkg-message
+++ b/mail/roundcube/pkg-message
@@ -1,14 +1,12 @@
-------------------------------------------------------------------
+---------------------------------------------------------------------
 FIRST INSTALLATION
 
-. Create a new database and a database user for RoundCube
-. Create database tables using the queries in file
-   'SQL/*.initial.sql'
-. Modify the files in config/* to suit your local environment
-. Don't forget to set db.inc.php mode to 660.
+If this is a first installation of RoundCube you have to create
+a new database and a db user. Read INSTALL for detailed instructions.
 
 UPGRADING
 
 If you already had a previous version of RoundCube installed,
 you should check your config files and DB schema are up-to-date.
-------------------------------------------------------------------
+Read UPGRADING for detailed instructions.
+---------------------------------------------------------------------