From e304c4df6385484e95462be6b49a062abde9f130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= <jerome@maroufle.fr>
Date: Sun, 1 May 2016 16:41:29 +0200
Subject: [PATCH] [fix] Update composer.json for 1.1.5 and fix upgrade path

---
 scripts/upgrade            | 1 +
 sources/composer.json-dist | 1 +
 2 files changed, 2 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 37b6ce0..119a5bb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -17,6 +17,7 @@ dbuser=$app
 # Retrieve app settings
 domain=$(ynh_app_setting_get $app domain)
 path=$(ynh_app_setting_get $app path)
+path=${path%/}
 dbpass=$(ynh_app_setting_get $app mysqlpwd)
 
 # Check destination directory
diff --git a/sources/composer.json-dist b/sources/composer.json-dist
index 2b95243..b5af2a5 100644
--- a/sources/composer.json-dist
+++ b/sources/composer.json-dist
@@ -18,6 +18,7 @@
     ],
     "require": {
         "php": ">=5.3.7",
+        "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",