From 74e34846876e793de9526651537ef142ef5abe8bb97f2605e7511bdc25dc2cd3 Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Wed, 11 Apr 2018 22:40:21 +0000
Subject: [PATCH] Accepting request 595798 from home:ecsos:server

- fix wrong require /usr/bin/bash to /bin/bash so phpMyAdmin could
  install
- insert missing templates dir in htaccess
  See https://docs.phpmyadmin.net/de/latest/setup.html#securing-your-phpmyadmin-installation
- create tmp dir and insert this in htaccess to fix the errormessage
  after login

OBS-URL: https://build.opensuse.org/request/show/595798
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=313
---
 phpMyAdmin.changes | 10 ++++++++++
 phpMyAdmin.http    | 39 +++++++++++++++++++++++++++++++++++++++
 phpMyAdmin.spec    |  5 ++++-
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index 6246961..37fd0fc 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Apr 11 20:02:26 UTC 2018 - ecsos@opensuse.org
+
+- fix wrong require /usr/bin/bash to /bin/bash so phpMyAdmin could
+  install
+- insert missing templates dir in htaccess
+  See https://docs.phpmyadmin.net/de/latest/setup.html#securing-your-phpmyadmin-installation
+- create tmp dir and insert this in htaccess to fix the errormessage 
+  after login
+
 -------------------------------------------------------------------
 Wed Apr 11 17:45:44 UTC 2018 - javier@opensuse.org
 
diff --git a/phpMyAdmin.http b/phpMyAdmin.http
index 9400ce2..1ff610b 100644
--- a/phpMyAdmin.http
+++ b/phpMyAdmin.http
@@ -1,4 +1,5 @@
 <Directory @ap_docroot@/@name@>
+
     Options FollowSymLinks
     AllowOverride None
 
@@ -13,6 +14,7 @@
     </IfModule>
 
 </Directory>
+
 <Directory @ap_docroot@/@name@/libraries>
 
     <IfVersion < 2.4>
@@ -32,3 +34,40 @@
 
 </Directory>
 
+<Directory @ap_docroot@/@name@/templates>
+
+    <IfVersion < 2.4>
+        Order allow,deny
+        Deny from all
+    </IfVersion>
+
+    <IfVersion >= 2.4>
+        <IfModule !mod_access_compat.c>
+            Require all denied
+        </IfModule>
+        <IfModule mod_access_compat.c>
+            Order deny,allow
+            Deny from all
+        </IfModule>
+    </IfVersion>
+
+</Directory>
+
+<Directory @ap_docroot@/@name@/tmp>
+
+    <IfVersion < 2.4>
+        Order allow,deny
+        Deny from all
+    </IfVersion>
+
+    <IfVersion >= 2.4>
+        <IfModule !mod_access_compat.c>
+            Require all denied
+        </IfModule>
+        <IfModule mod_access_compat.c>
+            Order deny,allow
+            Deny from all
+        </IfModule>
+    </IfVersion>
+
+</Directory>
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 4c244ac..4860139 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -126,7 +126,7 @@ done
 
 # set proper shebang
 sed -i 's/env php/php/' vendor/phpmyadmin/sql-parser/bin/*-query
-sed -i 's/env bash/bash/' vendor/paragonie/random_compat/*.sh
+sed -i 's|\/usr\/bin\/env bash|\/bin\/bash|g' vendor/paragonie/random_compat/*.sh
 
 # permissions
 find . -type d -exec chmod 755 {} \;
@@ -142,6 +142,8 @@ cp -dR *.css *.php *.ico js libraries locale themes templates vendor \
 # install config to config dir
 install -D -m0640 %{buildroot}%{ap_docroot}/%{name}/config.sample.inc.php \
  %{buildroot}%{_sysconfdir}/%{name}/config.inc.php
+# install TempDir
+install -d -m0770 %{buildroot}%{ap_docroot}/%{name}/tmp
 
 # fix libraries/vendor_config.php
 sed -i -e "s,@docdir@,%{_docdir}/%{name},g" -e "s,@sysconfdir@,%{_sysconfdir}/%{name},g" \
@@ -189,6 +191,7 @@ fi
 %doc LICENSE README RELEASE-DATE*
 %doc examples doc sql
 %dir %attr(0750,root,%{ap_grp}) %{_sysconfdir}/%{name}
+%dir %attr(0770,root,%{ap_grp}) %{ap_docroot}/%{name}/tmp
 %config(noreplace) %{_sysconfdir}/%{name}/config.inc.php
 %dir %{ap_docroot}/%{name}
 %config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf