From 9e64dc2debfa1c7410f82bf71f4d10856751e258 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 20 May 2016 08:36:45 -0400
Subject: [PATCH] Remove application/x-tar file extension test as it might not exist in nginx config (#5253)

---
 composer.json-dist |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/composer.json-dist b/composer.json-dist
index cfa825a..f14541c 100644
--- a/composer.json-dist
+++ b/composer.json-dist
@@ -1,35 +1,42 @@
 {
     "name": "roundcube/roundcubemail",
     "description": "The Roundcube Webmail suite",
-    "license": "GPL-3.0",
+    "license": "GPL-3.0+",
     "repositories": [
         {
-            "type": "composer",
-            "url": "http://plugins.roundcube.net/"
-        },
-        {
             "type": "pear",
-            "url": "http://pear.php.net/"
+            "url": "https://pear.php.net/"
         },
         {
-            "type": "package",
-            "package": {
-                "name": "Net_SMTP",
-                "version": "dev-master",
-                "source": {
-                    "url": "http://github.com/pear/Net_SMTP",
-                    "type": "git",
-                    "reference": "master"
-                }
-            }
+            "type": "composer",
+            "url": "https://plugins.roundcube.net/"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/roundcube/Net_Sieve.git"
+        },
+        {
+            "type": "vcs",
+            "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git"
         }
     ],
-    "require" : {
-        "pear-pear/Mail_Mime": ">=1.8.1",
-        "pear-pear/Mail_mimeDecode": ">=1.5.5",
-        "Net_SMTP": "dev-master",
-        "pear-pear/Net_IDNA2": ">=0.1.1",
-        "pear-pear/Auth_SASL": ">=1.0.6"
+    "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/mail_mime": "~1.10.0",
+        "pear-pear.php.net/net_smtp": "~1.7.1",
+        "pear-pear.php.net/crypt_gpg": "~1.4.1",
+        "roundcube/net_sieve": "~1.5.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "*"
+    },
+    "suggest": {
+        "pear-pear.php.net/net_ldap2": "~2.2.0 required for connecting to LDAP address books",
+        "kolab/Net_LDAP3": "dev-master required for connecting to LDAP address books"
     },
     "minimum-stability": "dev"
 }

--
Gitblit v1.9.1