updated to v1.7.18

3 files changed, 18 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4c7bc1ca682d..2908d36e0521 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = grav
 	pkgdesc = Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS
-	pkgver = 1.7.17
+	pkgver = 1.7.18
 	pkgrel = 1
 	url = https://getgrav.org
 	install = grav.install
@@ -16,7 +16,7 @@ pkgbase = grav
 	provides = grav
 	backup = etc/webapps/grav/config/site.yaml
 	backup = etc/webapps/grav/config/system.yaml
-	source = grav-1.7.17.zip::https://github.com/getgrav/grav/releases/download/1.7.17/grav-v1.7.17.zip
+	source = grav-1.7.18.zip::https://github.com/getgrav/grav/releases/download/1.7.18/grav-v1.7.18.zip
 	source = grav.patch
 	source = grav.user.readme
 	source = grav.sysusers.conf
@@ -25,8 +25,8 @@ pkgbase = grav
 	source = grav.php-fpm.ini
 	source = grav.php-fpm.d.grav.conf
 	source = grav.php-fpm.service.d.override.conf
-	sha256sums = d21bffc8443092ab57e9305c3889931a03f1e7f4f2c210ec771fa3d9ba101ef6
-	sha256sums = c93008057d3c3f224ecebc93b5b835c5b46c4b16f0caf821c75fcac4b7c20d4f
+	sha256sums = 9ff938590e82bdd48907f87e066dda2cec5c357a1f521280693851afb8964932
+	sha256sums = 379304b0112e3c5c0573568739fabaa27c197490da0974d59dc3257b371644db
 	sha256sums = 125e08820ed477582d7ae716dac6495bca4eac485fa4d4263b11f2505fc355db
 	sha256sums = ced168231a98be4816afc0a1928b54218c4ce4081be7b49acd704e2a9325f9db
 	sha256sums = ca7197a1e73fec939ea25ee8f3cc05db2117463aa9db8b2911f889e647974228
@@ -38,4 +38,3 @@ pkgbase = grav
 pkgname = grav
 	depends = php>=7.3.6
 	depends = php-gd
-
diff --git a/PKGBUILD b/PKGBUILD
index 3177f2585062..3be52d0576bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Nils Czernia <nils at czserver dot de>
 
 pkgname=grav
-pkgver=1.7.17
+pkgver=1.7.18
 pkgrel=1
 pkgdesc='Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS'
 arch=('any')
@@ -28,8 +28,8 @@ source=("${pkgname}-${pkgver}.zip::https://github.com/getgrav/grav/releases/down
         "grav.php-fpm.ini"
         "grav.php-fpm.d.grav.conf"
         "grav.php-fpm.service.d.override.conf")
-sha256sums=('d21bffc8443092ab57e9305c3889931a03f1e7f4f2c210ec771fa3d9ba101ef6'
-            'c93008057d3c3f224ecebc93b5b835c5b46c4b16f0caf821c75fcac4b7c20d4f'
+sha256sums=('9ff938590e82bdd48907f87e066dda2cec5c357a1f521280693851afb8964932'
+            '379304b0112e3c5c0573568739fabaa27c197490da0974d59dc3257b371644db'
             '125e08820ed477582d7ae716dac6495bca4eac485fa4d4263b11f2505fc355db'
             'ced168231a98be4816afc0a1928b54218c4ce4081be7b49acd704e2a9325f9db'
             'ca7197a1e73fec939ea25ee8f3cc05db2117463aa9db8b2911f889e647974228'
diff --git a/grav.patch b/grav.patch
index 04c3b10797f5..d176fbd1975c 100644
--- a/grav.patch
+++ b/grav.patch
@@ -13,6 +13,17 @@
  // PHP minimum requirement
  if (!defined('GRAV_PHP_MIN')) {
      define('GRAV_PHP_MIN', '7.3.6');
+--- a/system/src/Grav/Common/GPM/GPM.php        2021-07-19 20:17:55.000000000 +0200
++++ b/system/src/Grav/Common/GPM/GPM.php        2021-07-21 21:38:55.442615622 +0200
+@@ -60,7 +60,7 @@
+     {
+         parent::__construct();
+
+-        Folder::create(GRAV_ROOT . '/cache/gpm');
++        Folder::create(GRAV_CACHE_PATH . '/gpm');
+
+         $this->cache = [];
+         $this->installed = new Local\Packages();
 --- a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php	2021-04-15 20:04:58.000000000 +0200
 +++ b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php	2021-04-21 21:14:16.576531405 +0200
 @@ -94,6 +94,10 @@