From f5c64e65a3e33b86fdcfa33f303c7dea8def772fb47df8dbc07af86ef4682f84 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Sat, 2 May 2020 23:46:46 +0000 Subject: [PATCH] Accepting request 799642 from home:adkorte:branches:server:php:applications - Don't expand @FQDN@ from /etc/HOSTNAME (this used to set $cfg['PmaAbsoluteUri'] parameter, but this variable is no longer in the config.sample.ini file) OBS-URL: https://build.opensuse.org/request/show/799642 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=353 --- phpMyAdmin.changes | 7 +++++++ phpMyAdmin.spec | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes index 65d1e5a..14309f0 100644 --- a/phpMyAdmin.changes +++ b/phpMyAdmin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat May 2 10:54:11 UTC 2020 - Arjen de Korte + +- Don't expand @FQDN@ from /etc/HOSTNAME (this used to set + $cfg['PmaAbsoluteUri'] parameter, but this variable is no longer + in the config.sample.ini file) + ------------------------------------------------------------------- Thu Apr 23 11:04:19 UTC 2020 - Dominique Leuenberger diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 94295d0..54d9bdd 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -181,8 +181,7 @@ fi # on `rpm -ivh` PARAM is 1 # on `rpm -Uvh` PARAM is 2 # set PmaAbsoluteUri ### generate blowfish secret -sed -i -e "s,@FQDN@,$(cat %{_sysconfdir}/HOSTNAME)," \ - -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config} +sed -i -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config} # enable required apache modules if [ -x %{_sbindir}/a2enmod ]; then a2enmod -q version || a2enmod version