From 8e97681a0ecf755a1031ff452b3dfdb97782ca66 Mon Sep 17 00:00:00 2001 From: frju365 Date: Thu, 28 Dec 2017 15:37:07 +0100 Subject: [PATCH 1/5] [Enh] Update to 4.7.7 --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 021b984..bee909a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/phpmyadmin/phpmyadmin/archive/RELEASE_4_7_4.tar.gz -SOURCE_SUM=c3b49600af094ec09c9098588973a8afbaa76e334bb47b072e70adf8d5c12704 +SOURCE_URL=https://github.com/phpmyadmin/phpmyadmin/archive/RELEASE_4_7_7.tar.gz +SOURCE_SUM=f8af08bb9e90c4c18b634626e6ab525d066d8e1a6fcf6a19cb0e14b29344adc8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From 1c6338147d0cc2f4bfa84c7d17963a8de5808e0b Mon Sep 17 00:00:00 2001 From: frju365 Date: Thu, 28 Dec 2017 16:11:55 +0100 Subject: [PATCH 2/5] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index fe755ba..566747d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -28,5 +28,5 @@ init_composer() { # update dependencies to create composer.lock exec_composer "$destdir" install --no-dev \ - || ynh_die "Unable to update Roundcube core dependencies" + || ynh_die "Unable to update PhpMyAdmin core dependencies" } From 920e91ab98c76028a0f50a894f471d3e63c8af1d Mon Sep 17 00:00:00 2001 From: frju365 Date: Thu, 4 Jan 2018 19:37:55 +0100 Subject: [PATCH 3/5] [Fix] Dep version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 48b1dc5..29fcb4e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Manage MySQL databases over the web", "fr": "Application web de gestion des bases de données MySQL" }, - "version": "4.7.4", + "version": "4.7.7", "url": "http://www.phpmyadmin.net", "license": "GPL-2", "maintainer": { From 09ad01673cdfb9f893c138d92fce3bc965f5f8ed Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 5 Jan 2018 18:20:10 +0100 Subject: [PATCH 4/5] Force php5 for composer --- scripts/_common.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index 566747d..431d2c2 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -26,6 +26,9 @@ init_composer() { php -- --quiet --install-dir="$destdir" \ || ynh_die "Unable to install Composer" + # Force the dependance to php 5.6 + exec_composer "$destdir" config -g platform.php 5.6 + exec_composer "$destdir" update --no-dev # update dependencies to create composer.lock exec_composer "$destdir" install --no-dev \ || ynh_die "Unable to update PhpMyAdmin core dependencies" From 29e57125b402569bb3a644c53365ac48035881e8 Mon Sep 17 00:00:00 2001 From: JimboJoe Date: Sun, 7 Jan 2018 10:05:38 +0100 Subject: [PATCH 5/5] Typo --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 431d2c2..1dcc1ac 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -26,7 +26,7 @@ init_composer() { php -- --quiet --install-dir="$destdir" \ || ynh_die "Unable to install Composer" - # Force the dependance to php 5.6 + # Force the dependence to PHP 5.6 exec_composer "$destdir" config -g platform.php 5.6 exec_composer "$destdir" update --no-dev # update dependencies to create composer.lock