svn commit: r409873 - in head/mail/roundcube: . files

[Pietro Cerutti]

Author: gahr
Date: Tue Mar  1 14:49:05 2016
New Revision: 409873
URL: https://svnweb.freebsd.org/changeset/ports/409873

Log:
  mail/roundcube: chase PHP Warning: array_merge(): Argument #1 is not an array
  
  Obtained from:  https://github.com/roundcube/Net_Sieve/commit/47419a26b6

Added:
  head/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php   (contents, props changed)
Modified:
  head/mail/roundcube/Makefile

Modified: head/mail/roundcube/Makefile
==============================================================================
--- head/mail/roundcube/Makefile	Tue Mar  1 14:46:48 2016	(r409872)
+++ head/mail/roundcube/Makefile	Tue Mar  1 14:49:05 2016	(r409873)
@@ -2,6 +2,7 @@
 
 PORTNAME=	roundcube
 DISTVERSION=	1.1.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES?=	mail www
 MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail/${DISTVERSION:tu}

Added: head/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php	Tue Mar  1 14:49:05 2016	(r409873)
@@ -0,0 +1,11 @@
+--- vendor/pear-pear.php.net/Net_Sieve/Net/Sieve.php.orig	2016-03-01 14:32:07 UTC
++++ vendor/pear-pear.php.net/Net_Sieve/Net/Sieve.php
+@@ -229,7 +229,7 @@ class Net_Sieve
+         $this->_sock              = new Net_Socket();
+         $this->_bypassAuth        = $bypassAuth;
+         $this->_useTLS            = $useTLS;
+-        $this->_options           = $options;
++        $this->_options           = (array)$options;
+         $this->setDebug($debug, $handler);
+ 
+         /* Try to include the Auth_SASL package.  If the package is not