Hello community,
here is the log from the commit of package phpMyAdmin for openSUSE:Factory
checked in at 2017-11-30 12:44:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old)
and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin"
Thu Nov 30 12:44:37 2017 rev:144 rq:545753 version:4.7.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2017-10-25
17:47:17.612056619 +0200
+++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes
2017-11-30 12:44:38.311560945 +0100
@@ -1,0 +2,9 @@
+Sun Nov 26 18:14:24 UTC 2017 - suse+bu...@de-korte.org
+
+- fix for boo#1057661
+ * no longer require php_mod_any (recommend it instead)
+ * only enable php5 / php7 if running Apache prefork MPM
+- fix %post
+ * use sed instead of grep/awk to determine PHP version
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
--- /var/tmp/diff_new_pack.pZP36t/_old 2017-11-30 12:44:39.359522847 +0100
+++ /var/tmp/diff_new_pack.pZP36t/_new 2017-11-30 12:44:39.367522556 +0100
@@ -50,7 +50,6 @@
BuildRequires: python-devel
BuildRequires: xz
#
-Requires: mod_php_any >= 5.5
Requires: php-bz2
Requires: php-gd
Requires: php-gettext
@@ -66,6 +65,7 @@
PreReq: grep
PreReq: pwgen
PreReq: sed
+Recommends: mod_php_any >= 5.5
Recommends: php-curl
Recommends: php-zip
### will be removed with php >= 7.2
@@ -169,11 +169,11 @@
-e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s
-1 46`'/" %{pma_config}
# enable required apache modules
if [ -x /usr/sbin/a2enmod ]; then
- # get installed php_version (5 or 7)
- php_version=$(php -v | grep '(cli)' | awk '{print $2}' | awk -F'.' '{print
$1}')
- if [[ -n ${php_version} ]]; then
- a2enmod -q php${php_version} || a2enmod php${php_version}
a2enmod -q version || a2enmod version
+ # get installed php_version (5 or 7)
+ php_version=$(php -v | sed -n 's/^PHP\ \([[:digit:]]\+\)\..*$/\1/p')
+ if [[ -n ${php_version} ]] && start_apache2 -V | grep -q prefork; then
+ a2enmod -q "php${php_version}" || a2enmod "php${php_version}"
fi
fi
%if 0%{?suse_version} < 1310
