From 3e75ec94a9db78ca8e5ea4a50c844b188f6a8fc1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Jul 2014 17:04:07 +0200 Subject: PHP 5.6.0RC3 --- php-man.patch | 26 ----------- php-syslog.patch | 30 ------------- php-systemd.patch | 132 ------------------------------------------------------ php56.spec | 13 ++---- 4 files changed, 4 insertions(+), 197 deletions(-) delete mode 100644 php-man.patch delete mode 100644 php-syslog.patch delete mode 100644 php-systemd.patch diff --git a/php-man.patch b/php-man.patch deleted file mode 100644 index 60ab16d..0000000 --- a/php-man.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 07d227229771015600789ae36e3b12ce29b1f339 Mon Sep 17 00:00:00 2001 -From: Andy Thompson -Date: Sat, 5 Jul 2014 13:05:05 +0100 -Subject: [PATCH] Fix phpdbg.1 man page installation when build != src - directory - ---- - Makefile.frag | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.frag b/Makefile.frag -index b276aaa..36c7512 100644 ---- a/sapi/phpdbg/Makefile.frag -+++ b/sapi/phpdbg/Makefile.frag -@@ -28,7 +28,7 @@ install-phpdbg: $(BUILD_BINARY) - @$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT) - @echo "Installing phpdbg man page: $(INSTALL_ROOT)$(mandir)/man1/" - @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 -- @$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1 -+ @$(INSTALL_DATA) $(srcdir)/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1 - - clean-phpdbg: - @echo "Cleaning phpdbg object files ..." --- -1.9.2 - diff --git a/php-syslog.patch b/php-syslog.patch deleted file mode 100644 index 3fdbc98..0000000 --- a/php-syslog.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a0ecb3794f00e65cd2a073b2073e32d6c2fb7180 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 27 Jun 2014 09:45:53 +0200 -Subject: [PATCH] Fix Bug #67530 error_log=syslog ignored - -As for Bug #64915 -Systemd use --nodaemonize but need to error_log to file or syslog to be honoured ---- - sapi/fpm/fpm/fpm_stdio.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c -index d81e101..769d3a6 100644 ---- a/sapi/fpm/fpm/fpm_stdio.c -+++ b/sapi/fpm/fpm/fpm_stdio.c -@@ -268,7 +268,11 @@ int fpm_stdio_open_error_log(int reopen) /* {{{ */ - if (!strcasecmp(fpm_global_config.error_log, "syslog")) { - openlog(fpm_global_config.syslog_ident, LOG_PID | LOG_CONS, fpm_global_config.syslog_facility); - fpm_globals.error_log_fd = ZLOG_SYSLOG; -+#if HAVE_UNISTD_H -+ if (fpm_global_config.daemonize || (!isatty(STDERR_FILENO) && !fpm_globals.force_stderr)) { -+#else - if (fpm_global_config.daemonize) { -+#endif - zlog_set_fd(fpm_globals.error_log_fd); - } - return 0; --- -1.9.2 - diff --git a/php-systemd.patch b/php-systemd.patch deleted file mode 100644 index 4821d3e..0000000 --- a/php-systemd.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 7b6031567251ad47132de23f47eb57951fd9b563 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Sat, 19 Jul 2014 18:40:20 +0200 -Subject: [PATCH] Fixed bug #67635 php links to systemd libraries without using - pkg-config - -Patch from pacho at gentoo dot org - -Rely on pkg-config for systemd >= 209 -Failback on old check ---- - sapi/fpm/config.m4 | 18 +++++++++++++++--- - 1 file changed, 15 insertions(+), 3 deletions(-) - -diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 -index bd6d649..e1c740d 100644 ---- a/sapi/fpm/config.m4 -+++ b/sapi/fpm/config.m4 -@@ -584,14 +584,26 @@ if test "$PHP_FPM" != "no"; then - [ --with-fpm-systemd Activate systemd integration], no, no) - - if test "$PHP_FPM_SYSTEMD" != "no" ; then -- AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon") -- AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"]) -+ if test -z "$PKG_CONFIG"; then -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ fi -+ unset SYSTEMD_LIBS -+ unset SYSTEMD_INCS -+ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd; then -+ SYSTEMD_LIBS=`$PKG_CONFIG --libs libsystemd` -+ SYSTEMD_INCS=`$PKG_CONFIG --cflags-only-I libsystemd` -+ HAVE_SD_DAEMON_H="yes" -+ else -+ AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon") -+ AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"]) -+ fi - if test $HAVE_SD_DAEMON_H = "no" || test -z "${SYSTEMD_LIBS}"; then - AC_MSG_ERROR([Your system does not support systemd.]) - else - AC_DEFINE(HAVE_SYSTEMD, 1, [FPM use systemd integration]) - PHP_FPM_SD_FILES="fpm/fpm_systemd.c" -- PHP_ADD_LIBRARY(systemd-daemon) -+ PHP_EVAL_LIBLINE($SYSTEMD_LIBS) -+ PHP_EVAL_INCLINE($SYSTEMD_INCS) - php_fpm_systemd=notify - fi - else --- -1.9.2 - -From 144a08395408506fa700c71e74c360160da3bd99 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Sat, 19 Jul 2014 18:42:40 +0200 -Subject: [PATCH] improve previous, add message during configure - ---- - sapi/fpm/config.m4 | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 -index e1c740d..96b0edf 100644 ---- a/sapi/fpm/config.m4 -+++ b/sapi/fpm/config.m4 -@@ -590,9 +590,12 @@ if test "$PHP_FPM" != "no"; then - unset SYSTEMD_LIBS - unset SYSTEMD_INCS - if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd; then -+ AC_MSG_CHECKING([for libsystemd]) - SYSTEMD_LIBS=`$PKG_CONFIG --libs libsystemd` - SYSTEMD_INCS=`$PKG_CONFIG --cflags-only-I libsystemd` -+ SYSTEMD_VERS=`$PKG_CONFIG --modversion libsystemd` - HAVE_SD_DAEMON_H="yes" -+ AC_MSG_RESULT([version $SYSTEMD_VERS]) - else - AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon") - AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"]) --- -1.9.2 - -From 658f7d77f9eb447ecc2f9812d46b4c07bb99b16d Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Sun, 20 Jul 2014 11:14:43 +0200 -Subject: [PATCH] See bug #67635 - -Improve previous fix: -- also rely on pkg-config for systemd < 209 -- always check for header -- comments ---- - sapi/fpm/config.m4 | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 -index 96b0edf..6db5e3b 100644 ---- a/sapi/fpm/config.m4 -+++ b/sapi/fpm/config.m4 -@@ -589,17 +589,29 @@ if test "$PHP_FPM" != "no"; then - fi - unset SYSTEMD_LIBS - unset SYSTEMD_INCS -+ - if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd; then -+ dnl systemd version >= 209 provides libsystemd - AC_MSG_CHECKING([for libsystemd]) - SYSTEMD_LIBS=`$PKG_CONFIG --libs libsystemd` - SYSTEMD_INCS=`$PKG_CONFIG --cflags-only-I libsystemd` - SYSTEMD_VERS=`$PKG_CONFIG --modversion libsystemd` -- HAVE_SD_DAEMON_H="yes" - AC_MSG_RESULT([version $SYSTEMD_VERS]) -+ -+ elif test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd-daemon; then -+ dnl systemd version < 209 provides libsystemd-daemon -+ AC_MSG_CHECKING([for libsystemd-daemon]) -+ SYSTEMD_LIBS=`$PKG_CONFIG --libs libsystemd-daemon` -+ SYSTEMD_INCS=`$PKG_CONFIG --cflags-only-I libsystemd-daemon` -+ SYSTEMD_VERS=`$PKG_CONFIG --modversion libsystemd-daemon` -+ AC_MSG_RESULT([version $SYSTEMD_VERS]) -+ - else -+ dnl failback when no pkg-config - AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon") -- AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"]) - fi -+ -+ AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"]) - if test $HAVE_SD_DAEMON_H = "no" || test -z "${SYSTEMD_LIBS}"; then - AC_MSG_ERROR([Your system does not support systemd.]) - else --- -1.9.2 - diff --git a/php56.spec b/php56.spec index 4c51fe8..25a216d 100644 --- a/php56.spec +++ b/php56.spec @@ -112,13 +112,13 @@ %endif #global snapdate 201405061030 -%global rcver RC2 +%global rcver RC3 Summary: PHP scripting language for creating dynamic web sites Name: php Version: 5.6.0 %if 0%{?snapdate:1}%{?rcver:1} -Release: 0.19.%{?snapdate}%{?rcver}%{?dist} +Release: 0.20.%{?snapdate}%{?rcver}%{?dist} %else Release: 1%{?dist} %endif @@ -181,8 +181,6 @@ Patch48: php-5.6.0-mock.patch Patch91: php-5.3.7-oci8conf.patch # Upstream fixes (100+) -Patch100: php-man.patch -Patch101: php-syslog.patch # Security fixes (200+) @@ -193,7 +191,6 @@ Patch301: php-5.6.0-oldpcre.patch Patch302: php-5.6.0-noNO.patch # WIP -Patch400: php-systemd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -883,8 +880,6 @@ rm -rf ext/json %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .manpath -%patch101 -p1 -b .syslog # security patches @@ -898,7 +893,6 @@ rm -rf ext/json %patch302 -p0 -b .971416 # WIP patch -%patch400 -p1 -b .systemd # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -1838,7 +1832,8 @@ fi %changelog -* Wed Jul 30 2014 Remi Collet 5.6.0-0.19.RC2 +* Wed Jul 30 2014 Remi Collet 5.6.0-0.20.RC3 +- php 5.6.0RC3 - fix license handling - fix zts-php-config --php-binary output #1124605 - cleanup with_libmysql -- cgit