Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2019-03-01 20:27:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7"
Fri Mar 1 20:27:04 2019 rev:57 rq:680160 version:7.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/php7/php7.changes 2019-02-24
17:05:30.408620208 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.28833/php7.changes 2019-03-01
20:27:13.862043067 +0100
@@ -1,0 +2,51 @@
+Thu Feb 28 15:38:40 UTC 2019 - Tomáš Chvátal <tchva...@suse.com>
+
+- Disable tests that do deadlock now with curl update, this is
+ fixed in next release 7.3.3 thus reenable here when released
+
+-------------------------------------------------------------------
+Thu Feb 28 08:53:18 UTC 2019 - pgaj...@suse.com
+
+- rename php7-*.patch to more general php-#1.patch
+ why: this aligns with maintenance patch names, which are in
+ changelogs comfortably copied over php72, php7, php5, php53;
+ moreover, php$N prefix causes issues when package is renamed,
+ e. g. php7 to php72
+- deleted patches
+ - php7-crypt-tests.patch (upstreamed)
+ - php7-date-regenerate-lexers.patch (upstreamed)
+ - php7-embed.patch (upstreamed)
+ - php7-fix_net-snmp_disable_MD5.patch (upstreamed)
+ - php7-ini.patch (upstreamed)
+ - php7-no-build-date.patch (upstreamed)
+ - php7-odbc-cmp-int-cast.patch (upstreamed)
+ - php7-openssl.patch (upstreamed)
+ - php7-php-config.patch (upstreamed)
+ - php7-phpize.patch (upstreamed)
+ - php7-pts.patch (upstreamed)
+ - php7-systemd-unit.patch (upstreamed)
+ - php7-systzdata-v17.patch (upstreamed)
+- added patches
+ + php-crypt-tests.patch
+ + php-date-regenerate-lexers.patch
+ + php-embed.patch
+ + php-fix_net-snmp_disable_MD5.patch
+ + php-ini.patch
+ + php-no-build-date.patch
+ + php-odbc-cmp-int-cast.patch
+ + php-openssl.patch
+ + php-php-config.patch
+ + php-phpize.patch
+ + php-pts.patch
+ + php-systemd-unit.patch
+ + php-systzdata-v17.patch
+
+-------------------------------------------------------------------
+Mon Feb 25 11:15:56 UTC 2019 - pgaj...@suse.com
+
+- fix wrongly ported patch, using the one from remirepo (Thanks!)
+ [bsc#1126449]
+- modified patches
+ % php7-systzdata-v17.patch
+
+-------------------------------------------------------------------
Old:
----
php7-crypt-tests.patch
php7-date-regenerate-lexers.patch
php7-embed.patch
php7-fix_net-snmp_disable_MD5.patch
php7-ini.patch
php7-no-build-date.patch
php7-odbc-cmp-int-cast.patch
php7-openssl.patch
php7-php-config.patch
php7-phpize.patch
php7-pts.patch
php7-systemd-unit.patch
php7-systzdata-v17.patch
New:
----
php-crypt-tests.patch
php-date-regenerate-lexers.patch
php-embed.patch
php-fix_net-snmp_disable_MD5.patch
php-ini.patch
php-no-build-date.patch
php-odbc-cmp-int-cast.patch
php-openssl.patch
php-php-config.patch
php-phpize.patch
php-pts.patch
php-systemd-unit.patch
php-systzdata-v17.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php7.spec ++++++
--- /var/tmp/diff_new_pack.WbKq9B/_old 2019-03-01 20:27:14.858042826 +0100
+++ /var/tmp/diff_new_pack.WbKq9B/_new 2019-03-01 20:27:14.862042826 +0100
@@ -38,7 +38,7 @@
%if %{?suse_version} >= 1500
%define build_argon2 1
%endif
-%bcond_without make_test
+%bcond_with make_test
Name: php7
Version: 7.3.2
Release: 0
@@ -56,28 +56,28 @@
Source11: php7.rpmlintrc
Source100: build-test.sh
## SUSE specific patches
-Patch0: php7-phpize.patch
-Patch2: php7-php-config.patch
-Patch3: php7-ini.patch
-Patch4: php7-no-build-date.patch
-Patch5: php7-pts.patch
-Patch6: php7-openssl.patch
-Patch7: php7-systzdata-v17.patch
-Patch8: php7-systemd-unit.patch
-Patch10: php7-embed.patch
+Patch0: php-phpize.patch
+Patch2: php-php-config.patch
+Patch3: php-ini.patch
+Patch4: php-no-build-date.patch
+Patch5: php-pts.patch
+Patch6: php-openssl.patch
+Patch7: php-systzdata-v17.patch
+Patch8: php-systemd-unit.patch
+Patch10: php-embed.patch
## Bugfix patches
# following patch is to fix configure tests for crypt; the aim is to have php
# built against glibc's crypt; problem is, that our glibc doesn't support
extended
# DES, so as soon as upstream fixes this, don't forgot to remove extended DES
# from their checking as I indicated in crypt-tests.patch yet, or php will
# silently use his own implementation again
-Patch12: php7-crypt-tests.patch
+Patch12: php-crypt-tests.patch
# https://bugs.php.net/bug.php?id=53007
-Patch14: php7-odbc-cmp-int-cast.patch
+Patch14: php-odbc-cmp-int-cast.patch
# https://bugs.php.net/bug.php?id=70461
-Patch15: php7-fix_net-snmp_disable_MD5.patch
+Patch15: php-fix_net-snmp_disable_MD5.patch
# should be upstreamed, will do later
-Patch17: php7-date-regenerate-lexers.patch
+Patch17: php-date-regenerate-lexers.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel
BuildRequires: autoconf
++++++ php-crypt-tests.patch ++++++
Index: php-7.2.12/ext/standard/config.m4
===================================================================
--- php-7.2.12.orig/ext/standard/config.m4 2018-11-06 11:48:33.000000000
+0100
+++ php-7.2.12/ext/standard/config.m4 2018-11-09 16:35:10.505160977 +0100
@@ -242,7 +242,7 @@ int main() {
dnl
dnl If one of them is missing, use our own implementation, portable code is
then possible
dnl
-if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" ||
test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test
"$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test
"x$php_crypt_r" = "x0"; then
+if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" ||
test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test
"$ac_cv_crypt_sha256" = "no" || test "x$ac_cv_lib_crypt_crypt_r" = "x0"; then
dnl
dnl Check for __alignof__ support in the compiler
++++++ php-date-regenerate-lexers.patch ++++++
Index: php-7.1.7/ext/date/config0.m4
===================================================================
--- php-7.1.7.orig/ext/date/config0.m4 2017-07-06 11:30:06.000000000 +0200
+++ php-7.1.7/ext/date/config0.m4 2017-07-21 13:56:15.183675982 +0200
@@ -10,6 +10,8 @@ timelib_sources="lib/astro.c lib/dow.c l
PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS)
+PHP_ADD_MAKEFILE_FRAGMENT()
+
PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1)
PHP_ADD_INCLUDE([$ext_builddir/lib])
PHP_ADD_INCLUDE([$ext_srcdir/lib])
Index: php-7.1.7/ext/date/Makefile.frag
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ php-7.1.7/ext/date/Makefile.frag 2017-07-21 13:58:51.986357906 +0200
@@ -0,0 +1,6 @@
+$(srcdir)/lib/parse_date.c: $(srcdir)/lib/parse_date.re
+ @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) -b --no-generation-date -o
ext/date/lib/parse_date.c ext/date/lib/parse_date.re)
+
+$(srcdir)/lib/parse_iso_intervals.c: $(srcdir)/lib/parse_iso_intervals.re
+ @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) -b --no-generation-date -o
ext/date/lib/parse_iso_intervals.c ext/date/lib/parse_iso_intervals.re)
+
++++++ php-embed.patch ++++++
--- php-7.1.10/sapi/embed/config.m4.embed
+++ php-7.1.10/sapi/embed/config.m4
@@ -12,7 +12,7 @@ if test "$PHP_EMBED" != "no"; then
case "$PHP_EMBED" in
yes|shared)
PHP_EMBED_TYPE=shared
- INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib;
\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
+ INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL)
--mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET)
\$(INSTALL_ROOT)\$(libdir)"
;;
static)
PHP_EMBED_TYPE=static
++++++ php-fix_net-snmp_disable_MD5.patch ++++++
Index: ext/snmp/snmp.c
===================================================================
--- ext/snmp/snmp.c.orig 2015-09-08 12:33:18.057282498 +0200
+++ ext/snmp/snmp.c 2015-09-08 12:35:01.717693824 +0200
@@ -1256,14 +1256,17 @@
Set the authentication protocol in the snmpv3 session */
static int netsnmp_session_set_auth_protocol(struct snmp_session *s, char
*prot)
{
+#ifndef DISABLE_MD5
if (!strcasecmp(prot, "MD5")) {
s->securityAuthProto = usmHMACMD5AuthProtocol;
s->securityAuthProtoLen = USM_AUTH_PROTO_MD5_LEN;
- } else if (!strcasecmp(prot, "SHA")) {
+ } else
+#endif
+ if (!strcasecmp(prot, "SHA")) {
s->securityAuthProto = usmHMACSHA1AuthProtocol;
s->securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN;
} else {
- php_error_docref(NULL, E_WARNING, "Unknown authentication
protocol '%s'", prot);
+ php_error_docref(NULL, E_WARNING, "Unknown or unsupported
authentication protocol '%s'", prot);
return (-1);
}
return (0);
++++++ php-ini.patch ++++++
Index: php-7.3.1/php.ini-production
===================================================================
--- php-7.3.1.orig/php.ini-production 2019-01-08 14:55:52.000000000 +0100
+++ php-7.3.1/php.ini-production 2019-02-07 09:28:59.154542260 +0100
@@ -729,7 +729,7 @@ default_charset = "UTF-8"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
+include_path = ".:/usr/share/php7:/usr/share/php7/PEAR"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
@@ -954,7 +954,7 @@ cli_server.color = On
[Date]
; Defines the default timezone used by the date functions
; http://php.net/date.timezone
-;date.timezone =
+date.timezone = 'UTC'
; http://php.net/date.default-latitude
;date.default_latitude = 31.7667
@@ -1026,6 +1026,7 @@ cli_server.color = On
; Enables or disables JIT compilation of patterns. This requires the PCRE
; library to be compiled with JIT support.
;pcre.jit=1
+pcre.jit=0
[Pdo]
; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off"
@@ -1161,7 +1162,7 @@ mysqli.max_persistent = -1
; Allow or prevent persistent links.
; http://php.net/mysqli.allow-persistent
-mysqli.allow_persistent = On
+mysqli.allow_persistent = Off
; Maximum number of links. -1 means no limit.
; http://php.net/mysqli.max-links
@@ -1354,7 +1355,7 @@ session.save_handler = files
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
; http://php.net/session.save-path
-;session.save_path = "/tmp"
+session.save_path = "/var/lib/php7"
; Whether to use strict session mode.
; Strict session mode does not accept an uninitialized session ID, and
++++++ php-no-build-date.patch ++++++
Index: php-7.3.0/ext/standard/info.c
===================================================================
--- php-7.3.0.orig/ext/standard/info.c 2018-12-04 17:12:26.000000000 +0100
+++ php-7.3.0/ext/standard/info.c 2018-12-10 09:59:20.182517410 +0100
@@ -822,7 +822,7 @@ PHPAPI void php_print_info(int flag)
php_info_print_box_end();
php_info_print_table_start();
php_info_print_table_row(2, "System", ZSTR_VAL(php_uname));
- php_info_print_table_row(2, "Build Date", __DATE__ " "
__TIME__);
+ /*php_info_print_table_row(2, "Build Date", __DATE__ " "
__TIME__);*/
#ifdef COMPILER
php_info_print_table_row(2, "Compiler", COMPILER);
#endif
@@ -830,7 +830,7 @@ PHPAPI void php_print_info(int flag)
php_info_print_table_row(2, "Architecture", ARCHITECTURE);
#endif
#ifdef CONFIGURE_COMMAND
- php_info_print_table_row(2, "Configure Command",
CONFIGURE_COMMAND );
+ /* php_info_print_table_row(2, "Configure Command",
CONFIGURE_COMMAND ); */
#endif
if (sapi_module.pretty_name) {
Index: php-7.3.0/sapi/cli/php_cli.c
===================================================================
--- php-7.3.0.orig/sapi/cli/php_cli.c 2018-12-04 17:12:21.000000000 +0100
+++ php-7.3.0/sapi/cli/php_cli.c 2018-12-10 09:59:20.182517410 +0100
@@ -683,8 +683,8 @@ static int do_cli(int argc, char **argv)
goto out;
case 'v': /* show php version & quit */
- php_printf("PHP %s (%s) (built: %s %s) (
%s)\nCopyright (c) 1997-2018 The PHP Group\n%s",
- PHP_VERSION, cli_sapi_module.name,
__DATE__, __TIME__,
+ php_printf("PHP %s (%s) ( %s)\nCopyright (c)
1997-2018 The PHP Group\n%s",
+ PHP_VERSION, cli_sapi_module.name,
#if ZTS
"ZTS "
#else
Index: php-7.3.0/sapi/cgi/cgi_main.c
===================================================================
--- php-7.3.0.orig/sapi/cgi/cgi_main.c 2018-12-04 17:12:20.000000000 +0100
+++ php-7.3.0/sapi/cgi/cgi_main.c 2018-12-10 09:59:20.182517410 +0100
@@ -2391,9 +2391,9 @@ parent_loop_end:
SG(headers_sent) = 1;
SG(request_info).no_headers = 1;
#if ZEND_DEBUG
- php_printf("PHP %s (%s)
(built: %s %s) (DEBUG)\nCopyright (c) 1997-2018 The PHP Group\n%s",
PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s)
(DEBUG)\nCopyright (c) 1997-2018 The PHP Group\n%s", PHP_VERSION,
sapi_module.name, get_zend_version());
#else
- php_printf("PHP %s (%s)
(built: %s %s)\nCopyright (c) 1997-2018 The PHP Group\n%s", PHP_VERSION,
sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s)
\nCopyright (c) 1997-2018 The PHP Group\n%s", PHP_VERSION, sapi_module.name,
get_zend_version());
#endif
php_request_shutdown((void *) 0);
fcgi_shutdown();
Index: php-7.3.0/configure.ac
===================================================================
--- php-7.3.0.orig/configure.ac 2018-12-04 17:12:20.000000000 +0100
+++ php-7.3.0/configure.ac 2018-12-10 09:59:20.182517410 +0100
@@ -1323,13 +1323,12 @@ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLA
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
# SOURCE_DATE_EPOCH for reproducible builds
https://reproducible-builds.org/specs/source-date-epoch/
-PHP_BUILD_DATE=`date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}"
+%Y-%m-%d 2>/dev/null`
-if test $? -ne 0 ; then
-PHP_BUILD_DATE=`date -u +%Y-%m-%d`
-fi
+#totally fake, not used anywhere in userspace
+PHP_BUILD_DATE="1970-01-01"
AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
-PHP_UNAME=`uname -a | xargs`
+dnl Totally fake, it wasnt and will never be reliable anyway.
+PHP_UNAME="Linux suse 2.6.36 #1 SMP 2011-02-21 10:34:10 +0100 x86_64 x86_64
x86_64 GNU/Linux"
AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
PHP_OS=`uname | xargs`
AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
Index: php-7.3.0/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php-7.3.0.orig/sapi/fpm/fpm/fpm_main.c 2018-12-04 17:12:21.000000000
+0100
+++ php-7.3.0/sapi/fpm/fpm/fpm_main.c 2018-12-10 09:59:20.182517410 +0100
@@ -1728,9 +1728,9 @@ int main(int argc, char *argv[])
SG(request_info).no_headers = 1;
#if ZEND_DEBUG
- php_printf("PHP %s (%s) (built: %s %s)
(DEBUG)\nCopyright (c) 1997-2018 The PHP Group\n%s", PHP_VERSION,
sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) (DEBUG)\nCopyright (c)
1997-2018 The PHP Group\n%s", PHP_VERSION, sapi_module.name,
get_zend_version());
#else
- php_printf("PHP %s (%s) (built: %s
%s)\nCopyright (c) 1997-2018 The PHP Group\n%s", PHP_VERSION, sapi_module.name,
__DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) \nCopyright (c)
1997-2018 The PHP Group\n%s", PHP_VERSION, sapi_module.name,
get_zend_version());
#endif
php_request_shutdown((void *) 0);
fcgi_shutdown();
++++++ php-odbc-cmp-int-cast.patch ++++++
https://bugs.php.net/bug.php?id=53007
Index: php-7.3.0/ext/odbc/php_odbc.c
===================================================================
--- php-7.3.0.orig/ext/odbc/php_odbc.c 2018-12-04 17:12:22.000000000 +0100
+++ php-7.3.0/ext/odbc/php_odbc.c 2018-12-10 10:19:02.668378553 +0100
@@ -1804,7 +1804,7 @@ static void php_odbc_fetch_hash(INTERNAL
if (rc == SQL_SUCCESS_WITH_INFO) {
ZVAL_STRINGL(&tmp, buf,
result->longreadlen);
- } else if (result->values[i].vallen ==
SQL_NULL_DATA) {
+ } else if ((int)result->values[i].vallen ==
(int)SQL_NULL_DATA) {
ZVAL_NULL(&tmp);
break;
} else {
@@ -1813,7 +1813,7 @@ static void php_odbc_fetch_hash(INTERNAL
break;
default:
- if (result->values[i].vallen == SQL_NULL_DATA) {
+ if ((int)result->values[i].vallen ==
(int)SQL_NULL_DATA) {
ZVAL_NULL(&tmp);
break;
}
@@ -1956,7 +1956,7 @@ PHP_FUNCTION(odbc_fetch_into)
}
if (rc == SQL_SUCCESS_WITH_INFO) {
ZVAL_STRINGL(&tmp, buf,
result->longreadlen);
- } else if (result->values[i].vallen ==
SQL_NULL_DATA) {
+ } else if ((int)result->values[i].vallen ==
(int)SQL_NULL_DATA) {
ZVAL_NULL(&tmp);
break;
} else {
@@ -1965,7 +1965,7 @@ PHP_FUNCTION(odbc_fetch_into)
break;
default:
- if (result->values[i].vallen == SQL_NULL_DATA) {
+ if ((int)result->values[i].vallen ==
(int)SQL_NULL_DATA) {
ZVAL_NULL(&tmp);
break;
}
@@ -2193,7 +2193,7 @@ PHP_FUNCTION(odbc_result)
RETURN_FALSE;
}
- if (result->values[field_ind].vallen == SQL_NULL_DATA) {
+ if ((int)result->values[field_ind].vallen ==
(int)SQL_NULL_DATA) {
zend_string_efree(field_str);
RETURN_NULL();
} else if (rc == SQL_NO_DATA_FOUND) {
@@ -2202,7 +2202,7 @@ PHP_FUNCTION(odbc_result)
}
/* Reduce fieldlen by 1 if we have char data. One day
we might
have binary strings... */
- if ((result->values[field_ind].coltype ==
SQL_LONGVARCHAR)
+ if (((int)result->values[field_ind].coltype ==
(int)SQL_LONGVARCHAR)
#if defined(ODBCVER) && (ODBCVER >= 0x0300)
|| (result->values[field_ind].coltype ==
SQL_WLONGVARCHAR)
#endif
@@ -2219,7 +2219,7 @@ PHP_FUNCTION(odbc_result)
break;
default:
- if (result->values[field_ind].vallen == SQL_NULL_DATA) {
+ if ((int)result->values[field_ind].vallen ==
(int)SQL_NULL_DATA) {
RETURN_NULL();
} else {
RETURN_STRINGL(result->values[field_ind].value,
result->values[field_ind].vallen);
@@ -2352,7 +2352,7 @@ PHP_FUNCTION(odbc_result_all)
}
if (rc == SQL_SUCCESS_WITH_INFO) {
PHPWRITE(buf,
result->longreadlen);
- } else if (result->values[i].vallen ==
SQL_NULL_DATA) {
+ } else if
((int)result->values[i].vallen == (int)SQL_NULL_DATA) {
php_printf("<td>NULL</td>");
break;
} else {
@@ -2361,7 +2361,7 @@ PHP_FUNCTION(odbc_result_all)
php_printf("</td>");
break;
default:
- if (result->values[i].vallen ==
SQL_NULL_DATA) {
+ if ((int)result->values[i].vallen ==
(int)SQL_NULL_DATA) {
php_printf("<td>NULL</td>");
} else {
php_printf("<td>%s</td>",
result->values[i].value);
++++++ php-openssl.patch ++++++
Index: ext/openssl/openssl.c
===================================================================
--- ext/openssl/openssl.c 2017-01-17 21:44:41.000000000 +0100
+++ ext/openssl/openssl.c 2017-02-13 15:25:42.219789317 +0100
@@ -1388,6 +1388,7 @@ PHP_MINIT_FUNCTION(openssl)
OpenSSL_add_all_ciphers();
OpenSSL_add_all_digests();
OpenSSL_add_all_algorithms();
+ OPENSSL_config(NULL);
#if !defined(OPENSSL_NO_AES) && defined(EVP_CIPH_CCM_MODE) &&
OPENSSL_VERSION_NUMBER < 0x100020000
EVP_add_cipher(EVP_aes_128_ccm());
Index: ext/openssl/xp_ssl.c
===================================================================
--- ext/openssl/xp_ssl.c 2017-02-13 15:25:42.219789317 +0100
+++ ext/openssl/xp_ssl.c 2017-02-13 15:33:47.520365579 +0100
@@ -1518,6 +1518,10 @@ int php_openssl_setup_crypto(php_stream
return FAILURE;
}
+#ifdef SSL_MODE_RELEASE_BUFFERS
+ SSL_CTX_set_mode(sslsock->ctx, SSL_MODE_RELEASE_BUFFERS);
+#endif
+
if (GET_VER_OPT("no_ticket") && zend_is_true(val)) {
ssl_ctx_options |= SSL_OP_NO_TICKET;
}
++++++ php-php-config.patch ++++++
---
scripts/php-config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: scripts/php-config.in
===================================================================
--- scripts/php-config.in.orig
+++ scripts/php-config.in
@@ -6,7 +6,7 @@ datarootdir="@datarootdir@"
exec_prefix="@exec_prefix@"
version="@PHP_VERSION@"
vernum="@PHP_VERSION_ID@"
-include_dir="@includedir@/php"
+include_dir="@includedir@/php7"
includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM
-I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
ldflags="@PHP_LDFLAGS@"
libs="@EXTRA_LIBS@"
++++++ php-phpize.patch ++++++
---
scripts/Makefile.frag | 4 ++--
scripts/phpize.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Index: scripts/Makefile.frag
===================================================================
--- scripts/Makefile.frag.orig
+++ scripts/Makefile.frag
@@ -3,8 +3,8 @@
# Build environment install
#
-phpincludedir = $(includedir)/php
-phpbuilddir = $(libdir)/build
+phpincludedir = $(includedir)/php7
+phpbuilddir = $(datadir)/build
BUILD_FILES = \
scripts/phpize.m4 \
Index: scripts/phpize.in
===================================================================
--- scripts/phpize.in.orig
+++ scripts/phpize.in
@@ -4,8 +4,8 @@
prefix='@prefix@'
datarootdir='@datarootdir@'
exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
-includedir="`eval echo @includedir@`/php"
+phpdir="`eval echo @datadir@`/build"
+includedir="`eval echo @includedir@`/php7"
builddir="`pwd`"
SED="@SED@"
++++++ php-pts.patch ++++++
Index: ext/standard/proc_open.c
===================================================================
--- ext/standard/proc_open.c.orig
+++ ext/standard/proc_open.c
@@ -56,7 +56,7 @@
* */
#ifdef PHP_CAN_SUPPORT_PROC_OPEN
-#if 0 && HAVE_PTSNAME && HAVE_GRANTPT && HAVE_UNLOCKPT && HAVE_SYS_IOCTL_H &&
HAVE_TERMIOS_H
+#if HAVE_PTSNAME && HAVE_GRANTPT && HAVE_UNLOCKPT && HAVE_SYS_IOCTL_H &&
HAVE_TERMIOS_H
# include <sys/ioctl.h>
# include <termios.h>
# define PHP_CAN_DO_PTS 1
@@ -636,14 +636,18 @@ PHP_FUNCTION(proc_open)
#if PHP_CAN_DO_PTS
if (dev_ptmx == -1) {
/* open things up */
- dev_ptmx = open("/dev/ptmx", O_RDWR);
+ dev_ptmx = open("/dev/ptmx",
O_RDWR|O_NOCTTY);
if (dev_ptmx == -1) {
php_error_docref(NULL,
E_WARNING, "failed to open /dev/ptmx, errno %d", errno);
goto exit_fail;
}
grantpt(dev_ptmx);
unlockpt(dev_ptmx);
+#ifdef TIOCGPTPEER
+ slave_pty = ioctl(dev_ptmx,
TIOCGPTPEER, O_RDWR);
+#else
slave_pty = open(ptsname(dev_ptmx),
O_RDWR);
+#endif
if (slave_pty == -1) {
php_error_docref(NULL,
E_WARNING, "failed to open slave pty, errno %d", errno);
++++++ php-systemd-unit.patch ++++++
Index: php-7.1.1/sapi/fpm/php-fpm.service.in
===================================================================
--- php-7.1.1.orig/sapi/fpm/php-fpm.service.in 2017-02-13 16:20:23.157202901
+0100
+++ php-7.1.1/sapi/fpm/php-fpm.service.in 2017-02-13 16:22:31.527501287
+0100
@@ -5,13 +5,15 @@
[Unit]
Description=The PHP FastCGI Process Manager
After=network.target
+Before=apache2.service nginx.service lighttpd.service
[Service]
Type=@php_fpm_systemd@
-PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid
ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config
@EXPANDED_SYSCONFDIR@/php-fpm.conf
ExecReload=/bin/kill -USR2 $MAINPID
+ExecStop=/bin/kill -QUIT $MAINPID
PrivateTmp=true
+KillMode=mixed
[Install]
WantedBy=multi-user.target
++++++ php-systzdata-v17.patch ++++++
++++ 652 lines (skipped)
