From 135b7be12e8bcf9a8fb04830935b09e643875d6b Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 14 Mar 2022 20:07:08 +0100
Subject: [PATCH 1/3] Update nginx.conf

---
 conf/nginx.conf | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index b776c9b..d8ad16b 100755
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -7,13 +7,8 @@ location __PATH__/ {
   index index.php;
  
   client_max_body_size 100M;
-  #try_files $uri /index.php$is_args$args; 
 
   rewrite ^__PATH__/(vendor|translations|build)/.* /index.php break;
-  
-  #if (!-e $request_filename) {
-  #  rewrite ^__PATH__/(.*)$ __PATH__/index.php?q=$1 last;
-  #}
 
   try_files $uri $uri/ index.php;
   location ~ [^/]\.php(/|$) {
@@ -46,14 +41,14 @@ location __PATH__/ {
   location = __PATH__/mtc.js {
     expires off;
     default_type "application/javascript";
-    try_files $uri $uri/ /index.php$is_args$args;
+    try_files $uri $uri/ __PATH__/index.php;
   }
 
   # Embedded forms
   location = __PATH__/form/generate.js {
     expires off;
     default_type "application/javascript";
-    try_files $uri $uri/ /index.php$is_args$args;
+    try_files $uri $uri/ __PATH__/index.php;
   }
 
   # Include SSOWAT user panel.

From 8de45975237bfdfcb3b22f81f0fe7998f1826d22 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 14 Mar 2022 20:24:14 +0100
Subject: [PATCH 2/3] 4.2

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

diff --git a/conf/app.src b/conf/app.src
index 97182fc..c183a9b 100755
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/mautic/mautic/releases/download/4.1.2/4.1.2.zip
-SOURCE_SUM=50c978301ef8d2ab9aab4ef60e0692667b72fcfd233d431c083e6422cf1778eb
+SOURCE_URL=https://github.com/mautic/mautic/releases/download/4.2.0/4.2.0.zip
+SOURCE_SUM=9f087e3c889381cc4abbcf080abd3379986d378b5c2461f01d172d31a5d14a5d
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
diff --git a/conf/nginx.conf b/conf/nginx.conf
index d8ad16b..dd3a965 100755
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -34,7 +34,7 @@ location __PATH__/ {
       gzip off;
       default_type "image/gif";
       more_set_headers "Access-Control-Allow-Origin: *";
-      try_files $uri /index.php?$args;
+      try_files $uri __PATH__/index.php;
   }
 
   # Mautic tracking code
diff --git a/manifest.json b/manifest.json
index b33b30d..f62dfe5 100755
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Open Source Marketing Automation Software",
         "fr": "Logiciel d'automatisation marketing open source"
     },
-    "version": "4.1.2~ynh1",
+    "version": "4.2.0~ynh1",
     "url": "https://www.mautic.org/",
     "upstream": {
         "license": "GPL-3.0-only",
@@ -26,7 +26,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.3-fpm",
+        "php7.4-fpm",
         "mysql"
     ],
     "arguments": {

From 1ebd969e925955a90a2db867378d5f4383c568b4 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Mon, 14 Mar 2022 19:24:18 +0000
Subject: [PATCH 3/3] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e09177e..274ace0 100755
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Open Source Marketing Automation Software
 
-**Shipped version:** 4.1.2~ynh1
+**Shipped version:** 4.2.0~ynh1
 
 **Demo:** https://www.mautic.org/demo
 
diff --git a/README_fr.md b/README_fr.md
index f406068..5e7d52a 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Logiciel d'automatisation marketing open source
 
-**Version incluse :** 4.1.2~ynh1
+**Version incluse :** 4.2.0~ynh1
 
 **Démo :** https://www.mautic.org/demo