Hello community,
here is the log from the commit of package php5 for openSUSE:Factory checked in
at 2015-07-05 18:01:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php5 (Old)
and /work/SRC/openSUSE:Factory/.php5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/php5/php5.changes 2015-06-16
14:04:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2015-07-05
18:01:34.000000000 +0200
@@ -1,0 +2,24 @@
+Thu Jun 25 04:01:44 UTC 2015 - crrodrig...@opensuse.org
+
+- php5-systemd-unit.patch: set Killmode=mixed in order
+ to ensure fpm and children forked by script can terminate
+ cleanly.
+
+-------------------------------------------------------------------
+Wed Jun 24 07:32:15 UTC 2015 - pgaj...@suse.com
+
+- mod_php5.so executable
+
+-------------------------------------------------------------------
+Thu Jun 18 09:49:11 UTC 2015 - pgaj...@suse.com
+
+- use apache-rpm-macros
+
+-------------------------------------------------------------------
+Thu Jun 18 09:47:53 UTC 2015 - pgaj...@suse.com
+
+- updated to 5.6.10: Several bugs have been fixed as well as several
+ security issues into some bundled libraries (CVE-2015-3414,
+ CVE-2015-3415, CVE-2015-3416, CVE-2015-2325 and CVE-2015-2326).
+
+-------------------------------------------------------------------
Old:
----
php-5.6.9.tar.xz
php-5.6.9.tar.xz.asc
New:
----
php-5.6.10.tar.xz
php-5.6.10.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5.spec ++++++
--- /var/tmp/diff_new_pack.3gjPRl/_old 2015-07-05 18:01:35.000000000 +0200
+++ /var/tmp/diff_new_pack.3gjPRl/_new 2015-07-05 18:01:35.000000000 +0200
@@ -27,6 +27,7 @@
%define pkg_name php5
%define with_spell 1
+BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel
BuildRequires: autoconf
BuildRequires: bison
@@ -106,17 +107,8 @@
%define peardir %{_datadir}/%{pkg_name}/PEAR
%define php_sysconf %{_sysconfdir}/%{pkg_name}
%define _x11prefix %(pkg-config --variable=prefix xft)
-########################################
-# apache macros
-########################################
-%define apxs2 %{_sbindir}/apxs2
-%define apache2_mmn %(MMN=$(%{apxs2} -q LIBEXECDIR)_MMN; test -x $MMN
&& $MMN)
-%define apache2_libexecdir %(%{apxs2} -q LIBEXECDIR)
-%define apache2_sysconfdir %(%{apxs2} -q SYSCONFDIR)
-%define apache2_includedir %(%{apxs2} -q INCLUDEDIR)
-%define apache2_serverroot %(%{apxs2} -q PREFIX)
%define need_libxml2_hack %(if [ -e %{_includedir}/libxml/parser.h ]; then if
grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h;then echo 1; else echo
0; fi; else echo 0; fi)
-Version: 5.6.9
+Version: 5.6.10
Release: 0
Provides: php
Provides: php-api = %{apiver}
@@ -274,7 +266,7 @@
%package -n apache2-mod_php5
Summary: PHP5 Module for Apache 2.0
Group: Productivity/Networking/Web/Servers
-Requires: %{apache2_mmn}
+Requires: %{apache_mmn}
Requires: %{name} = %{version}
Requires: apache2-prefork
PreReq: apache2
@@ -1306,7 +1298,7 @@
See http://www.php.net/credits.php for more details
%prep
-echo %{apache2_mmn}
+echo %{apache_mmn}
%setup -q -n php-%{version} -a 1
%{__tar} xf %{S:2} -C ext
%{__mv} ext/suhosin-%{suhosin_version} ext/suhosin
@@ -1455,7 +1447,7 @@
# perform all builds
# apache2 sapi
Build apache2 \
- --with-apxs2=%{apxs2} \
+ --with-apxs2=%{apache_apxs} \
--disable-all \
--disable-cli \
# fast-cgi sapi
@@ -1617,7 +1609,7 @@
# do the actual installation
Install apache2
#need it for yast module
-%{__mv} %{buildroot}%{apache2_libexecdir}/libphp5.so
%{buildroot}%{apache2_libexecdir}/mod_php5.so
+%{__mv} %{buildroot}%{apache_libexecdir}/libphp5.so
%{buildroot}%{apache_libexecdir}/mod_php5.so
Install fastcgi
Install cli
Install fpm
@@ -1661,8 +1653,8 @@
# update readme
%{__sed}
"s=@EXTERN_MODULES@=$extern_modules=;s=@BUILTIN_MODULES@=$builtin_modules="
php-suse-addons/README.SUSE > README.SUSE
# apache configuration
-%{__mkdir_p} %{buildroot}%{apache2_sysconfdir}/conf.d
-%{__install} -m 644 php-suse-addons/sysconfig.apache2
%{buildroot}/%{apache2_sysconfdir}/conf.d/%{pkg_name}.conf
+%{__mkdir_p} %{buildroot}%{apache_sysconfdir}/conf.d
+%{__install} -m 644 php-suse-addons/sysconfig.apache2
%{buildroot}/%{apache_sysconfdir}/conf.d/%{pkg_name}.conf
# directory for sessions
%{__install} -d %{buildroot}/var/lib/%{pkg_name}
# documentation
@@ -1808,11 +1800,11 @@
%endif
%files -n apache2-mod_php5
-%defattr(644,root,root,755)
-%{apache2_libexecdir}/mod_php5.so
+%defattr(-,root,root)
+%{apache_libexecdir}/mod_php5.so
%dir %{php_sysconf}/apache2
%config(noreplace) %{php_sysconf}/apache2/php.ini
-%config(noreplace) %{apache2_sysconfdir}/conf.d/%{pkg_name}.conf
+%config(noreplace) %{apache_sysconfdir}/conf.d/%{pkg_name}.conf
%files bcmath
%defattr(644,root,root,755)
++++++ php-5.6.9.tar.xz -> php-5.6.10.tar.xz ++++++
/work/SRC/openSUSE:Factory/php5/php-5.6.9.tar.xz
/work/SRC/openSUSE:Factory/.php5.new/php-5.6.10.tar.xz differ: char 26, line 1
++++++ php5-systemd-unit.patch ++++++
--- /var/tmp/diff_new_pack.3gjPRl/_old 2015-07-05 18:01:35.000000000 +0200
+++ /var/tmp/diff_new_pack.3gjPRl/_new 2015-07-05 18:01:35.000000000 +0200
@@ -1,6 +1,6 @@
--- sapi/fpm/php-fpm.service.in.orig
+++ sapi/fpm/php-fpm.service.in
-@@ -1,12 +1,14 @@
+@@ -1,12 +1,15 @@
[Unit]
Description=The PHP FastCGI Process Manager
After=syslog.target network.target
@@ -14,6 +14,7 @@
ExecReload=/bin/kill -USR2 $MAINPID
+ExecStop=/bin/kill -QUIT $MAINPID
+PrivateTmp=true
++KillMode=mixed
[Install]
WantedBy=multi-user.target
