diff options
| author | gahr <gahr@FreeBSD.org> | 2016-03-01 22:49:05 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2016-03-01 22:49:05 +0800 |
| commit | 2d396e740fff4183015f75393fe6e59796180b7c (patch) | |
| tree | 72cf65edeb858cf48b6a0fb2d471437027481beb /mail | |
| parent | d5bbe43806138861e98634aa5f305e12f4faa72f (diff) | |
| download | freebsd-ports-gnome-2d396e740fff4183015f75393fe6e59796180b7c.tar.gz freebsd-ports-gnome-2d396e740fff4183015f75393fe6e59796180b7c.tar.zst freebsd-ports-gnome-2d396e740fff4183015f75393fe6e59796180b7c.zip | |
mail/roundcube: chase PHP Warning: array_merge(): Argument #1 is not an array
Obtained from: https://github.com/roundcube/Net_Sieve/commit/47419a26b6
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/roundcube/Makefile | 1 | ||||
| -rw-r--r-- | mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile index f207e71e7c2a..264930d39e4b 100644 --- a/mail/roundcube/Makefile +++ b/mail/roundcube/Makefile @@ -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} diff --git a/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php b/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php new file mode 100644 index 000000000000..2719754475ed --- /dev/null +++ b/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php @@ -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 |