commit php5 for openSUSE:Factory
Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2016-06-29 15:09:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-06-05 14:18:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2016-06-29 15:09:32.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jun 28 09:06:36 UTC 2016 - pgajdos@suse.com + +- updated to 5.6.23: Several bugs were fixed in this release, + including security-related ones. + +------------------------------------------------------------------- +Mon Jun 20 11:40:13 UTC 2016 - pgajdos@suse.com + +- systemd unit: remove syslog.target from After [bsc#983938] + +------------------------------------------------------------------- Old: ---- php-5.6.22.tar.xz php-5.6.22.tar.xz.asc New: ---- php-5.6.23.tar.xz php-5.6.23.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.BlEdmm/_old 2016-06-29 15:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.BlEdmm/_new 2016-06-29 15:09:33.000000000 +0200 @@ -46,7 +46,7 @@ %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) Name: php5 -Version: 5.6.22 +Version: 5.6.23 Release: 0 Summary: PHP5 Core Files License: PHP-3.01 @@ -76,11 +76,11 @@ Patch7: php5-systzdata-r12.patch Patch8: php5-systemd-unit.patch Patch9: php5-depdb-path.patch +Patch10: php5-mbstring-missing-return.patch ## Bugfix patches # this is from https://raw.github.com/NewEraCracker/suhosin-patches/, check for official # one from suhosin git -Patch10: php5-mbstring-missing-return.patch Patch11: php5-BNC-457056.patch Patch12: php5-cloexec.patch Patch13: php5-missing-extdeps.patch @@ -1017,7 +1017,7 @@ %patch5 %patch6 %patch7 -%patch8 +%patch8 -p1 %patch10 %if %{need_libxml2_hack} echo "*** APPLY LIBXML2.7 FIX ***" ++++++ build-test.sh ++++++ --- /var/tmp/diff_new_pack.BlEdmm/_old 2016-06-29 15:09:34.000000000 +0200 +++ /var/tmp/diff_new_pack.BlEdmm/_new 2016-06-29 15:09:34.000000000 +0200 @@ -28,7 +28,7 @@ if [ ! -z "$apiurl" ]; then apiurl="-A $apiurl" fi -osc $apiurl build $@ --no-verify --with make_test php5.spec +osc $apiurl build $@ --no-verify --with make_test -x valgrind php5.spec if [ $? -ne 0 ]; then echo "ERROR: build failed. See $OSC_BUILD_ROOT/.build.log for details." exit 1 ++++++ php-5.6.22.tar.xz -> php-5.6.23.tar.xz ++++++ /work/SRC/openSUSE:Factory/php5/php-5.6.22.tar.xz /work/SRC/openSUSE:Factory/.php5.new/php-5.6.23.tar.xz differ: char 41, line 2 ++++++ php5-mbstring-missing-return.patch ++++++ --- /var/tmp/diff_new_pack.BlEdmm/_old 2016-06-29 15:09:34.000000000 +0200 +++ /var/tmp/diff_new_pack.BlEdmm/_new 2016-06-29 15:09:34.000000000 +0200 @@ -1,16 +1,3 @@ -Index: ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c -=================================================================== ---- ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c.orig 2013-09-18 07:48:57.000000000 +0200 -+++ ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c 2013-09-25 11:59:19.925758346 +0200 -@@ -672,6 +672,8 @@ - CK(mbfl_filt_conv_illegal_output(c, filter)); - } - } -+ -+ return c; - } - - int Index: ext/mbstring/libmbfl/filters/mbfilter_utf8.c =================================================================== --- ext/mbstring/libmbfl/filters/mbfilter_utf8.c.orig 2013-09-18 07:48:57.000000000 +0200 ++++++ php5-systemd-unit.patch ++++++ --- /var/tmp/diff_new_pack.BlEdmm/_old 2016-06-29 15:09:34.000000000 +0200 +++ /var/tmp/diff_new_pack.BlEdmm/_new 2016-06-29 15:09:34.000000000 +0200 @@ -1,9 +1,12 @@ ---- sapi/fpm/php-fpm.service.in.orig -+++ sapi/fpm/php-fpm.service.in +Index: php-5.6.22/sapi/fpm/php-fpm.service.in +=================================================================== +--- php-5.6.22.orig/sapi/fpm/php-fpm.service.in 2016-05-26 03:08:57.000000000 +0200 ++++ php-5.6.22/sapi/fpm/php-fpm.service.in 2016-06-20 13:39:39.790849850 +0200 @@ -1,12 +1,15 @@ [Unit] Description=The PHP FastCGI Process Manager - After=syslog.target network.target +-After=syslog.target network.target ++After=network.target +Before=apache2.service nginx.service lighttpd.service [Service]
participants (1)
-
root@hilbert.suse.de