From owner-svn-ports-all@freebsd.org Tue Mar 1 14:49:07 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 229BBABDB27; Tue, 1 Mar 2016 14:49:07 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E85BC1949; Tue, 1 Mar 2016 14:49:06 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u21En64e008641; Tue, 1 Mar 2016 14:49:06 GMT (envelope-from gahr@FreeBSD.org) Received: (from gahr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u21En5eU008639; Tue, 1 Mar 2016 14:49:05 GMT (envelope-from gahr@FreeBSD.org) Message-Id: <201603011449.u21En5eU008639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gahr set sender to gahr@FreeBSD.org using -f From: Pietro Cerutti Date: Tue, 1 Mar 2016 14:49:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409873 - in head/mail/roundcube: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2016 14:49:07 -0000 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