Require Net_Socket >= 1.0.12 (because of timeout=0 bugfix)

Conflicts:
	INSTALL

INSTALL

@@ -18,7 +18,8 @@ REQUIREMENTS
    - 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)

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",

program/lib/Roundcube/README.md

@@ -23,7 +23,8 @@ include_path directory of your webserver. Some classes of the framework require
 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