From 86bc1f95ea66ba17f90882813ad79f4508fc63eb Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 28 Mar 2016 07:38:02 -0400
Subject: [PATCH] Require Net_Socket >= 1.0.12 (because of timeout=0 bugfix)
---
INSTALL | 3 ++-
program/lib/Roundcube/README.md | 3 ++-
composer.json-dist | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/INSTALL b/INSTALL
index 5fe304d..4063bd6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,7 +18,8 @@
- OpenSSL, Fileinfo, Mcrypt, mbstring (optional)
* PEAR packages distributed with Roundcube or external:
- Mail_Mime 1.9.0 or newer
- - Net_SMTP (latest from https://github.com/pear/Net_SMTP/)
+ - Net_SMTP 1.7.1 or newer
+ - Net_Socket 1.0.12 or newer
- Net_IDNA2 0.1.1 or newer
- Auth_SASL 1.0.6 or newer
- Net_Sieve 1.3.2 or newer (for managesieve plugin)
diff --git a/composer.json-dist b/composer.json-dist
index 3af2473..fd32eb0 100644
--- a/composer.json-dist
+++ b/composer.json-dist
@@ -19,6 +19,7 @@
"require": {
"php": ">=5.3.7",
"roundcube/plugin-installer": "~0.1.6",
+ "pear-pear.php.net/net_socket": "~1.0.12",
"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",
diff --git a/program/lib/Roundcube/README.md b/program/lib/Roundcube/README.md
index 646dd4b..2965cf2 100644
--- a/program/lib/Roundcube/README.md
+++ b/program/lib/Roundcube/README.md
@@ -23,7 +23,8 @@
one or multiple of the following [PEAR][pear] libraries:
- Mail_Mime 1.8.1 or newer
-- Net_SMTP (latest from https://github.com/pear/Net_SMTP/)
+- Net_SMTP 1.7.1 or newer
+- Net_Socket 1.0.12 or newer
- Net_IDNA2 0.1.1 or newer
- Auth_SASL 1.0.6 or newer
--
Gitblit v1.9.1