From dee7b325a739d2bc8e7a40946ea002274280a7a9 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Wed, 22 Aug 2018 22:13:36 +0200
Subject: [PATCH 1/3] Upgrade to upstream version 4.8.3

---
 conf/app.src  | 4 ++--
 manifest.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 3255e6e..dd9921e 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/phpmyadmin/phpmyadmin/archive/RELEASE_4_8_0_1.tar.gz
-SOURCE_SUM=0014d662093e032916286bbd90bf587d112a3b13d6cb7d52b31b567c34474c01
+SOURCE_URL=https://github.com/phpmyadmin/phpmyadmin/archive/RELEASE_4_8_3.tar.gz
+SOURCE_SUM=7c62e10d37d35f9206b40b25dd47dc56175940a691cd3ede2c39df2992b84a92
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index e815c5d..a736eb2 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.8.0.1~ynh1",
+    "version": "4.8.3~ynh1",
     "url": "http://www.phpmyadmin.net",
     "license": "GPL-2.0-only",
     "maintainer": {

From 0bd3d18f03165efcb82925747905aa3ca3f2ffe0 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Fri, 5 Oct 2018 21:04:30 +0200
Subject: [PATCH 2/3] Fix error about tmp not accessible

Yolomerge in testing, that's just a micro fix !
---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index bb5c34b..c34ca74 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -172,7 +172,7 @@ chown root:$app $final_path/config.inc.php
 chmod 640 $final_path/config.inc.php
 # Setup phpMyAdmin temporary folder
 mkdir -p $final_path/tmp
-chown $app: $final_path/tmp
+chown -R $app: $final_path/tmp
 
 #=================================================
 # SETUP SSOWAT

From eca1758565254fa066280a00f0fe3eb9ba517a8d Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Fri, 14 Dec 2018 22:31:22 +0100
Subject: [PATCH 3/3] Upgrade to upstream version 4.8.4

---
 conf/app.src  | 4 ++--
 manifest.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index dd9921e..cb6f826 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/phpmyadmin/phpmyadmin/archive/RELEASE_4_8_3.tar.gz
-SOURCE_SUM=7c62e10d37d35f9206b40b25dd47dc56175940a691cd3ede2c39df2992b84a92
+SOURCE_URL=https://github.com/phpmyadmin/phpmyadmin/archive/RELEASE_4_8_4.tar.gz
+SOURCE_SUM=ed87f930a9d73d43b2a006e2f03507dff8a0f593e1cd1351e68ad1d0e0d65729
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index a736eb2..a18346f 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.8.3~ynh1",
+    "version": "4.8.4~ynh1",
     "url": "http://www.phpmyadmin.net",
     "license": "GPL-2.0-only",
     "maintainer": {