| 12
 3
 4
 5
 6
 7
 8
 9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 
 | From: =?utf-8?b?TWljaGFsIMSMaWhhxZk=?= <nijel@debian.org>
Date: Tue, 24 Sep 2019 22:34:33 +0200
Subject: Adjust phpMyAdmin vendor configuration to match Debian needs -
 configuration is in /etc/phpmyadmin - documentation is in /usr/share/doc -
 config file consists of several included files,
 so we skip mtime check - tempdir is in /var/lib/phpmyadmin/tmp
Origin: vendor
Forwarded: not-needed
Acked-by: William Desportes <williamdes@wdes.fr>
---
 libraries/vendor_config.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php
index 62e1c13..5a20e34 100644
--- a/libraries/vendor_config.php
+++ b/libraries/vendor_config.php
@@ -17,23 +17,23 @@ return [
     /**
      * Path to vendor autoload file. Useful when you want to have vendor dependencies somewhere else.
      */
-    'autoloadFile' => ROOT_PATH . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php',
+    'autoloadFile' => ROOT_PATH . DIRECTORY_SEPARATOR . 'autoload.php',
 
     /**
      * Directory where cache files are stored.
      */
-    'tempDir' => ROOT_PATH . 'tmp' . DIRECTORY_SEPARATOR,
+    'tempDir' => '/var/lib/phpmyadmin/tmp/',
 
     /**
      * Path to changelog file, can be gzip compressed.
      * Useful when you want to have documentation somewhere else, e.g. /usr/share/doc.
      */
-    'changeLogFile' => ROOT_PATH . 'ChangeLog',
+    'changeLogFile' => '/usr/share/doc/phpmyadmin/changelog.gz',
 
     /**
      * Path to license file. Useful when you want to have documentation somewhere else, e.g. /usr/share/doc.
      */
-    'licenseFile' => ROOT_PATH . 'LICENSE',
+    'licenseFile' => '/usr/share/doc/phpmyadmin/copyright',
 
     /**
      * Directory where SQL scripts to create/upgrade configuration storage reside.
@@ -43,7 +43,7 @@ return [
     /**
      * Filename of a configuration file.
      */
-    'configFile' => ROOT_PATH . 'config.inc.php',
+    'configFile' => '/etc/phpmyadmin/config.inc.php',
 
     /**
      * Filename of custom header file.
@@ -58,7 +58,7 @@ return [
     /**
      * Default value for check for version upgrades.
      */
-    'versionCheckDefault' => true,
+    'versionCheckDefault' => false,
 
     /**
      * Path to files with compiled locales (*.mo)
 |