From d3823fe0a0083b779cdf2fa81b80cf6ed445f57e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 08 Sep 2015 14:38:52 -0400
Subject: [PATCH] Use Net_SMTP-1.7.x and Net_Sieve-1.5.x (Roundcube fork), update changelog (#1490416)
---
CHANGELOG | 1 +
composer.json-dist | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index f28a95d..7eaa2ff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- PHP7 compatibility fixes (#1490416)
- Security: Improve randomness of security tokens (#1490529)
- Security: Use random security tokens instead of hashes based on encryption key (#1490404)
- Security: Improved encrypt/decrypt methods with option to choose the cipher_method (#1489719)
diff --git a/composer.json-dist b/composer.json-dist
index 3709fe6..b6d4fba 100644
--- a/composer.json-dist
+++ b/composer.json-dist
@@ -13,6 +13,10 @@
},
{
"type": "vcs",
+ "url": "https://github.com/roundcube/Net_Sieve.git"
+ },
+ {
+ "type": "vcs",
"url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git"
}
],
@@ -21,10 +25,10 @@
"roundcube/plugin-installer": "~0.1.6",
"pear-pear.php.net/auth_sasl": "~1.0.6",
"pear-pear.php.net/net_idna2": "~0.1.1",
- "pear-pear.php.net/net_sieve": "~1.3.4",
"pear-pear.php.net/mail_mime": "~1.9.0",
- "pear-pear.php.net/net_smtp": "~1.6.3",
- "pear-pear.php.net/crypt_gpg": "*"
+ "pear-pear.php.net/net_smtp": "~1.7.1",
+ "pear-pear.php.net/crypt_gpg": "*",
+ "roundcube/net_sieve": "~1.5.0"
},
"require-dev": {
"phpunit/phpunit": "*"
--
Gitblit v1.9.1