pool/phpMyAdmin
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 799642 from home:adkorte:branches:server:php:applications

Browse Source 
- 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
This commit is contained in:
Christian Wittmer 2020-05-02 23:46:46 +00:00 committed by Git OBS Bridge
parent dd077342c3
commit f5c64e65a3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpMyAdmin.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat May 2 10:54:11 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>
- 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 <dimstar@opensuse.org> Thu Apr 23 11:04:19 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

3
phpMyAdmin.spec
View File

@ -181,8 +181,7 @@ fi
# on `rpm -ivh` PARAM is 1 # on `rpm -ivh` PARAM is 1
# on `rpm -Uvh` PARAM is 2 # on `rpm -Uvh` PARAM is 2
# set PmaAbsoluteUri ### generate blowfish secret # set PmaAbsoluteUri ### generate blowfish secret
sed -i -e "s,@FQDN@,$(cat %{_sysconfdir}/HOSTNAME)," \ sed -i -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config}
-e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config}
# enable required apache modules # enable required apache modules
if [ -x %{_sbindir}/a2enmod ]; then if [ -x %{_sbindir}/a2enmod ]; then
a2enmod -q version || a2enmod version a2enmod -q version || a2enmod version