From 07a175b29f0292f10169439f4d5aa563f32e1799 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 23 Mar 2018 20:41:55 -0400 Subject: [PATCH 1/2] [Composer] Downgrade paragonie/constant_time_encoding to PHP 5.6 compatible version --- composer.lock | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index 8e5a7f163a..20b89bfbef 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "7d90cfe4354cd5ca36b74a3ecc471eeb", + "content-hash": "0811acc361f70e08cce3ec09940cbf2d", "packages": [ { "name": "asika/simple-console", @@ -1261,23 +1261,24 @@ }, { "name": "paragonie/constant_time_encoding", - "version": "v2.2.2", + "version": "v1.0.2", "source": { "type": "git", "url": "https://github.com/paragonie/constant_time_encoding.git", - "reference": "eccf915f45f911bfb189d1d1638d940ec6ee6e33" + "reference": "6111a38faf6fdebc14e36652d22036f379ba58d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/eccf915f45f911bfb189d1d1638d940ec6ee6e33", - "reference": "eccf915f45f911bfb189d1d1638d940ec6ee6e33", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/6111a38faf6fdebc14e36652d22036f379ba58d3", + "reference": "6111a38faf6fdebc14e36652d22036f379ba58d3", "shasum": "" }, "require": { - "php": "^7" + "php": "^5.3|^7" }, "require-dev": { - "phpunit/phpunit": "^6|^7", + "paragonie/random_compat": "^1|^2", + "phpunit/phpunit": "4.*|5.*", "vimeo/psalm": "^1" }, "type": "library", @@ -1319,7 +1320,7 @@ "hex2bin", "rfc4648" ], - "time": "2018-03-10T19:47:49+00:00" + "time": "2018-03-10T19:46:06+00:00" }, { "name": "paragonie/random_compat", From 4e33f7f45856f2ed49d627e09f8a3b5dff6562ba Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 23 Mar 2018 20:47:58 -0400 Subject: [PATCH 2/2] Restore executable permissions in bin/ --- bin/auth_ejabberd.php | 0 bin/composer.phar | Bin bin/daemon.php | 0 bin/run_xgettext.sh | 0 bin/worker.php | 0 5 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/auth_ejabberd.php mode change 100644 => 100755 bin/composer.phar mode change 100644 => 100755 bin/daemon.php mode change 100644 => 100755 bin/run_xgettext.sh mode change 100644 => 100755 bin/worker.php diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php old mode 100644 new mode 100755 diff --git a/bin/composer.phar b/bin/composer.phar old mode 100644 new mode 100755 diff --git a/bin/daemon.php b/bin/daemon.php old mode 100644 new mode 100755 diff --git a/bin/run_xgettext.sh b/bin/run_xgettext.sh old mode 100644 new mode 100755 diff --git a/bin/worker.php b/bin/worker.php old mode 100644 new mode 100755