Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2020-05-03 22:47:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin" Sun May 3 22:47:29 2020 rev:167 rq:799854 version:4.9.5 Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2020-04-28 22:33:04.509832658 +0200 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new.2738/phpMyAdmin.changes 2020-05-03 22:47:35.423198129 +0200 @@ -1,0 +2,13 @@ +Sun May 3 15:22:25 UTC 2020 - [email protected] + +- fix for boo#1170743 + phpMyAdmin installation wipes it's sysconfig apache_server_flag entry + +------------------------------------------------------------------- +Sat May 2 10:54:11 UTC 2020 - Arjen de Korte <[email protected]> + +- 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) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.oq1n9r/_old 2020-05-03 22:47:37.199201742 +0200 +++ /var/tmp/diff_new_pack.oq1n9r/_new 2020-05-03 22:47:37.199201742 +0200 @@ -167,22 +167,25 @@ # removing tmp/twig before ap_docroot change # a new one will be created anyway in new ap_docroot (like after a clean install) if [ -d "%{ap_docroot_old}/%{name}/tmp" ]; then - echo "removing %{ap_docroot_old}/%{name}/tmp for ap_docroot change" + echo "info: removing %{ap_docroot_old}/%{name}/tmp for ap_docroot change" rm -rf "%{ap_docroot_old}/%{name}/tmp" || : fi %preun if [ $1 -eq 0 ]; then - echo "removing %{ap_docroot}/%{name}/tmp for clean uninstall" +if [ -d "%{ap_docroot}/%{name}/tmp" ]; then + echo "info: removing %{ap_docroot}/%{name}/tmp for clean uninstall" rm -rf "%{ap_docroot}/%{name}/tmp" || : fi +fi %post -# on `rpm -ivh` PARAM is 1 -# on `rpm -Uvh` PARAM is 2 +# FIRST_ARG values on +# uninstall: 0 +# install: 1 +# update: 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 @@ -191,6 +194,7 @@ # php_version=$(awk -F[." "] '/cli/ {print $2}' <<< $(php -v)) php_version=$(php -v | sed -n 's/^PHP\ \([[:digit:]]\+\)\..*$/\1/p') if [[ -n ${php_version} ]] && start_apache2 -V | grep -q prefork; then + echo "info: adding php${php_version} to APACHE_MODULES" a2enmod -q "php${php_version}" || a2enmod "php${php_version}" fi fi @@ -198,6 +202,7 @@ if [ -x %{_sbindir}/a2enflag ]; then flag_find=$(grep -cw /etc/sysconfig/apache2 -e "^APACHE_SERVER_FLAGS=.*%{name}.*") if [ $flag_find -eq 0 ]; then + echo "info: adding %{name} to APACHE_SERVER_FLAGS" a2enflag %{name} fi fi @@ -217,13 +222,17 @@ #systemctl try-restart apache2 &>/dev/null %postun +# only do on uninstall, not on update +if [ $1 -eq 0 ]; then # disable phpMyAdmin flag if [ -x %{_sbindir}/a2enflag ]; then flag_find=$(grep -cw /etc/sysconfig/apache2 -e "^APACHE_SERVER_FLAGS=.*%{name}.*") if [ $flag_find -eq 1 ]; then + echo "info: removing %{name} from APACHE_SERVER_FLAGS" a2enflag -d %{name} fi fi +fi %restart_on_update apache2 #systemctl try-restart apache2 &>/dev/null
