From: Marcin Krol Date: Sun, 6 Dec 2020 00:12:00 +0000 (+0100) Subject: - updated to 8.0.0, merged patch updates from PLD X-Git-Url: https://git.tld-linux.org/?p=packages%2Fphp.git;a=commitdiff_plain;h=e6f864f5174ab28692308e6e022a3babf7d3f5c1 - updated to 8.0.0, merged patch updates from PLD --- diff --git a/libdb-info.patch b/libdb-info.patch index ee25732..f2fcdfb 100644 --- a/libdb-info.patch +++ b/libdb-info.patch @@ -1,16 +1,16 @@ ---- php-7.0.0beta1/ext/dba/dba.c.libdb 2015-07-08 02:24:59.119020904 +0200 -+++ php-7.0.0beta1/ext/dba/dba.c 2015-07-08 07:01:43.158767655 +0200 -@@ -52,6 +52,10 @@ - #include "php_qdbm.h" - #include "php_tcadb.h" +--- php-8.0.0rc1/ext/dba/dba.c~ 2020-10-09 19:00:25.000000000 +0300 ++++ php-8.0.0rc1/ext/dba/dba.c 2020-10-09 19:01:14.638869747 +0300 +@@ -50,6 +50,10 @@ + #include "php_lmdb.h" + #include "dba_arginfo.h" +#ifdef DB4_INCLUDE_FILE +#include DB4_INCLUDE_FILE +#endif + - /* {{{ arginfo */ - ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2) - ZEND_ARG_INFO(0, path) + PHP_MINIT_FUNCTION(dba); + PHP_MSHUTDOWN_FUNCTION(dba); + PHP_MINFO_FUNCTION(dba); @@ -545,6 +549,10 @@ PHP_MINFO_FUNCTION(dba) php_info_print_table_start(); diff --git a/opcache.ini b/opcache.ini index b2931f6..67c0381 100644 --- a/opcache.ini +++ b/opcache.ini @@ -40,6 +40,11 @@ ; size of the optimized code. ;opcache.save_comments=1 +; If enabled, compilation warnings (including notices and deprecations) will +; be recorded and replayed each time a file is included. Otherwise, compilation +; warnings will only be emitted when the file is first cached. +;opcache.record_warnings=0 + ; Allow file existence override (file_exists, etc.) performance feature. ;opcache.enable_file_override=0 diff --git a/php-both-apxs.patch b/php-both-apxs.patch index 3cba2ae..21260e6 100644 --- a/php-both-apxs.patch +++ b/php-both-apxs.patch @@ -1,15 +1,15 @@ ---- php-5.2.4/build/Makefile.global~ 2007-08-31 19:35:54.000000000 +0300 -+++ php-5.2.4/build/Makefile.global 2007-08-31 19:40:18.287528480 +0300 -@@ -21,6 +21,12 @@ - $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ +--- php-8.0.0beta4/build/Makefile.global~ 2020-10-03 12:59:22.000000000 +0300 ++++ php-8.0.0beta4/build/Makefile.global 2020-10-03 13:02:40.788491363 +0300 +@@ -23,6 +23,12 @@ + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 +$(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS) -+ $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ ++ $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ + -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 + +libtool-sapi: $(LIBTOOL_SAPI) + - libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) - $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp$(PHP_MAJOR_VERSION).so + libs/libphp.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) + $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp.so diff --git a/php-ini.patch b/php-ini.patch index 00b1381..d3b5ecb 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -1,5 +1,5 @@ ---- php-7.4.1/php.ini 2019-12-17 17:35:58.000000000 +0100 -+++ php-7.4.1/php.ini 2019-12-22 17:27:40.860000000 +0100 +--- php-8.0.0/php.ini 2020-11-24 18:04:03.000000000 +0100 ++++ php-8.0.0/php.ini 2020-12-05 23:44:57.718592809 +0100 @@ -82,6 +82,16 @@ ; much more verbose when it comes to errors. We recommend using the ; development version only in development environments, as errors shown to @@ -10,14 +10,14 @@ +; It is based mainly on php.ini-production, but with some changes made with +; security in mind (http://php.net/manual/en/security.php). +; -+; Please note, that in TLD Linux file /etc/php74/php.ini contains global ++; Please note, that in TLD Linux file /etc/php80/php.ini contains global +; settings for all SAPIs (cgi, cli, apache...), and after reading this file +; SAPI-specific file is included so you don't have to duplicate whole large +; file to override only few options. ; This is the php.ini-production INI file. -@@ -144,7 +154,7 @@ +@@ -145,7 +155,7 @@ ; Production Value: 5 ; short_open_tag @@ -26,7 +26,7 @@ ; Development Value: Off ; Production Value: Off -@@ -160,7 +170,7 @@ +@@ -171,7 +181,7 @@ ;user_ini.filename = ".user.ini" ; To disable this feature set this option to an empty value @@ -35,7 +35,7 @@ ; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes) ;user_ini.cache_ttl = 300 -@@ -180,7 +190,7 @@ +@@ -191,7 +201,7 @@ ; documents, however this remains supported for backward compatibility reasons. ; Note that this directive does not control the default_user = NULL; - mysqli_globals->default_pw = NULL; - mysqli_globals->default_socket = NULL; -+ mysqli_globals->connect_charset = NULL; - mysqli_globals->reconnect = 0; - mysqli_globals->report_mode = 0; - mysqli_globals->report_ht = 0; ---- php-7.0.1/ext/mysqli/mysqli_nonapi.c 2015-12-16 10:42:03.000000000 +0000 -+++ php-7.0.1/ext/mysqli/mysqli_nonapi.c 2015-12-28 15:23:36.769443158 +0000 -@@ -56,7 +56,7 @@ void mysqli_common_connect(INTERNAL_FUNC - zval *object = getThis(); - char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL, - *ssl_key = NULL, *ssl_cert = NULL, *ssl_ca = NULL, *ssl_capath = NULL, -- *ssl_cipher = NULL; -+ *ssl_cipher = NULL, *connect_charset = NULL; - size_t hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0; - zend_bool persistent = FALSE, ssl = FALSE; - zend_long port = 0, flags = 0; -@@ -257,6 +257,12 @@ void mysqli_common_connect(INTERNAL_FUNC - } - #endif - -+ connect_charset = MyG(connect_charset); -+ -+ if (connect_charset != NULL) { -+ mysql_options(mysql->mysql, MYSQL_SET_CHARSET_NAME, connect_charset); -+ } -+ - #if !defined(MYSQLI_USE_MYSQLND) - /* BC for prior to bug fix #53425 */ - flags |= CLIENT_MULTI_RESULTS; ---- php-7.0.1/ext/mysqli/php_mysqli_structs.h 2015-12-28 15:16:20.870443158 +0000 -+++ php-7.0.1/ext/mysqli/php_mysqli_structs.h 2015-12-28 15:23:04.136443158 +0000 -@@ -330,6 +330,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli) - char *default_user; - char *default_socket; - char *default_pw; -+ char *connect_charset; - zend_long reconnect; - zend_long allow_local_infile; - zend_long strict; diff --git a/php-pdo_mysql-charsetphpini.patch b/php-pdo_mysql-charsetphpini.patch deleted file mode 100644 index 36a7c95..0000000 --- a/php-pdo_mysql-charsetphpini.patch +++ /dev/null @@ -1,66 +0,0 @@ -This is damn ugly patch if you need to update it, see PHP_5_2 branch version to -understand what this patch is supposed to do as in 5.3 the ini section is -enabled only if mysqlnd driver is enabled which makes the contexts really -small. - ---- php-5.3.1/ext/pdo_mysql/mysql_driver.c~ 2010-02-20 01:08:04.000000000 +0200 -+++ php-5.3.1/ext/pdo_mysql/mysql_driver.c 2010-02-20 01:08:52.982186037 +0200 -@@ -436,6 +436,7 @@ - pdo_mysql_db_handle *H; - int i, ret = 0; - char *host = NULL, *unix_socket = NULL; -+ char *connect_charset = NULL; - unsigned int port = 3306; - char *dbname; - struct pdo_data_src_parser vars[] = { -@@ -731,6 +731,12 @@ - password_len = strlen(dbh->password); - } - -+ connect_charset = PDO_MYSQL_G(connect_charset); -+ -+ if (connect_charset != NULL) { -+ mysql_options(H->server, MYSQL_SET_CHARSET_NAME, connect_charset); -+ } -+ - if (mysqlnd_connect(H->server, host, dbh->username, dbh->password, password_len, dbname, dbname_len, - port, unix_socket, connect_opts, PDO_MYSQL_G(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL) { - #else ---- php-5.3.3/ext/pdo_mysql/pdo_mysql.c~ 2010-07-24 19:23:14.000000000 +0300 -+++ php-5.3.3/ext/pdo_mysql/pdo_mysql.c 2010-07-24 19:24:48.363581841 +0300 -@@ -56,6 +56,7 @@ - #if PDO_DBG_ENABLED - STD_PHP_INI_ENTRY("pdo_mysql.debug", NULL, PHP_INI_SYSTEM, OnUpdateString, debug, zend_pdo_mysql_globals, pdo_mysql_globals) - #endif -+ STD_PHP_INI_ENTRY("pdo_mysql.connect_charset", NULL, PHP_INI_ALL, OnUpdateString, connect_charset, zend_pdo_mysql_globals, pdo_mysql_globals) - PHP_INI_END() - /* }}} */ - -@@ -89,9 +90,7 @@ - static PHP_MSHUTDOWN_FUNCTION(pdo_mysql) - { - php_pdo_unregister_driver(&pdo_mysql_driver); --#if PDO_USE_MYSQLND - UNREGISTER_INI_ENTRIES(); --#endif - - return SUCCESS; - } -@@ -161,6 +161,7 @@ - pdo_mysql_globals->debug = NULL; /* The actual string */ - pdo_mysql_globals->dbg = NULL; /* The DBG object*/ - #endif -+ pdo_mysql_globals->connect_charset = NULL; - } - /* }}} */ - ---- php-5.3.2RC3/ext/pdo_mysql/php_pdo_mysql_int.h~ 2010-02-04 11:37:38.000000000 +0200 -+++ php-5.3.2RC3/ext/pdo_mysql/php_pdo_mysql_int.h 2010-02-26 19:11:47.484055898 +0200 -@@ -69,6 +69,7 @@ - char *debug; /* The actual string */ - MYSQLND_DEBUG *dbg; /* The DBG object */ - #endif -+ char *connect_charset; - #if defined(PHP_WIN32) && !PDO_DBG_ENABLED - /* dummy member so we get at least one member in the struct - * and avoids build errors. diff --git a/php-readline.patch b/php-readline.patch deleted file mode 100644 index 01a0578..0000000 --- a/php-readline.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-5.4.0alpha2/sapi/cli/config.m4~ 2011-08-05 12:59:18.000000000 +0300 -+++ php-5.4.0alpha2/sapi/cli/config.m4 2011-08-05 13:23:40.356628679 +0300 -@@ -31,7 +31,7 @@ - BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)" - ;; - *) -- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" -+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) \$(READLINE_SHARED_LIBADD) -o \$(SAPI_CLI_PATH)" - ;; - esac - diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch index 598be44..5da800a 100644 --- a/php-sapi-ini-file.patch +++ b/php-sapi-ini-file.patch @@ -25,22 +25,20 @@ $ php -r 'var_dump(array(get_cfg_var("cfg_file_path"),php_ini_loaded_file()));' https://github.com/pld-linux/php/commit/762ec2e -diff --git a/main/php_ini.c b/main/php_ini.c -index d508c13b50..2cf28eb7f5 100644 ---- a/main/php_ini.c -+++ b/main/php_ini.c -@@ -410,6 +410,11 @@ static void php_load_zend_extension_cb(void *arg) { } - #endif - /* }}} */ +--- php-8.0.0rc1/main/php_ini.c~ 2020-10-09 18:15:48.000000000 +0300 ++++ php-8.0.0rc1/main/php_ini.c 2020-10-09 18:42:20.087488856 +0300 +@@ -65,6 +65,11 @@ + PHPAPI char *php_ini_scanned_path=NULL; + PHPAPI char *php_ini_scanned_files=NULL; +static int php_csort(const struct dirent **a, const struct dirent **b) +{ + return strcmp((*a)->d_name,(*b)->d_name); +} + - /* {{{ php_init_config - */ - int php_init_config(void) + /* {{{ php_ini_displayer_cb */ + static ZEND_COLD void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type) + { @@ -661,12 +666,14 @@ int php_init_config(void) zend_llist scanned_ini_list; zend_llist_element *element; diff --git a/php-shared.patch b/php-shared.patch index ac15661..92129ee 100644 --- a/php-shared.patch +++ b/php-shared.patch @@ -10,45 +10,45 @@ dnl Checks for some support/generator progs. PHP_PROG_AWK PHP_PROG_BISON([3.0.0]) ---- php-7.4.0RC3/build/Makefile.global~ 2019-10-04 16:11:24.000000000 +0300 -+++ php-7.4.0RC3/build/Makefile.global 2019-10-09 15:21:11.198544363 +0300 +--- php-8.0.0beta4/build/Makefile.global~ 2020-09-28 07:54:00.000000000 +0300 ++++ php-8.0.0beta4/build/Makefile.global 2020-09-28 07:54:42.203157017 +0300 @@ -13,8 +13,12 @@ build-modules: $(PHP_MODULES) --libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) -- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ +-libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) +- $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ +libphp_common.la: $(PHP_GLOBAL_OBJS) -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION) ++ $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION) + -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 + -+libphp$(PHP_MAJOR_VERSION).la: libphp_common.la $(PHP_SAPI_OBJS) ++libphp.la: libphp_common.la $(PHP_SAPI_OBJS) + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) -@@ -25,10 +29,10 @@ +@@ -31,10 +31,10 @@ install-sapi: $(OVERALL_TARGET) @echo "Installing PHP SAPI module: $(PHP_SAPI)" -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) -- -@if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \ +- -@if test ! -r $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME); then \ + -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); then \ for i in 0.0.0 0.0 0; do \ -- if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \ -- $(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \ +- if test -r $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ +- $(LN_S) $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME); \ + if test -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ + $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); \ break; \ fi; \ done; \ ---- php-7.4.0RC2/sapi/cgi/config9.m4~ 2019-09-17 19:37:54.000000000 +0300 -+++ php-7.4.0RC2/sapi/cgi/config9.m4 2019-09-20 13:43:03.654012130 +0300 +--- php-8.0.0beta4/sapi/cgi/config9.m4~ 2020-09-15 21:36:33.000000000 +0300 ++++ php-8.0.0beta4/sapi/cgi/config9.m4 2020-09-28 08:00:34.341402924 +0300 @@ -55,7 +55,7 @@ - BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" + BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" ;; *) -- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" -+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" +- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" ++ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" ;; esac @@ -62,14 +62,14 @@ $(BUILD_CGI) install-cgi: $(SAPI_CGI_PATH) ---- php-7.4.0RC2/sapi/cli/config.m4~ 2019-09-17 19:37:55.000000000 +0300 -+++ php-7.4.0RC2/sapi/cli/config.m4 2019-09-20 13:44:29.124988912 +0300 +--- php-8.0.0beta4/sapi/cli/config.m4~ 2020-09-15 21:36:33.000000000 +0300 ++++ php-8.0.0beta4/sapi/cli/config.m4 2020-09-28 10:50:26.427391375 +0300 @@ -42,7 +42,7 @@ - BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" + BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ;; *) -- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" -+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" +- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ++ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) \$(READLINE_SHARED_LIBADD) -o \$(SAPI_CLI_PATH)" ;; esac @@ -98,16 +98,16 @@ $(BUILD_PHPDBG) %.c: %.y ---- php-7.4.0RC2/sapi/phpdbg/config.m4~ 2019-09-20 13:45:42.000000000 +0300 -+++ php-7.4.0RC2/sapi/phpdbg/config.m4 2019-09-20 13:53:08.504534283 +0300 +--- php-8.0.0beta4/sapi/phpdbg/config.m4~ 2020-10-02 16:05:45.000000000 +0300 ++++ php-8.0.0beta4/sapi/phpdbg/config.m4 2020-10-02 17:29:48.820717591 +0300 @@ -63,7 +63,7 @@ BUILD_PHPDBG="\$(LIBTOOL) --mode=link \ \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ -- \$(PHP_GLOBAL_OBJS) \ +- \$(PHP_GLOBAL_OBJS:.lo=.o) \ + libphp_common.la \ - \$(PHP_BINARY_OBJS) \ - \$(PHP_PHPDBG_OBJS) \ + \$(PHP_BINARY_OBJS:.lo=.o) \ + \$(PHP_PHPDBG_OBJS:.lo=.o) \ \$(EXTRA_LIBS) \ @@ -50,7 +50,7 @@ @@ -128,25 +128,25 @@ $(BUILD_LITESPEED) install-litespeed: $(SAPI_LITESPEED_PATH) ---- php-7.4.0RC2/sapi/litespeed/config.m4~ 2019-09-17 19:37:55.000000000 +0300 -+++ php-7.4.0RC2/sapi/litespeed/config.m4 2019-09-20 13:55:12.834143941 +0300 +--- php-8.0.0beta4/sapi/litespeed/config.m4~ 2020-09-15 21:36:33.000000000 +0300 ++++ php-8.0.0beta4/sapi/litespeed/config.m4 2020-10-02 17:31:51.010389005 +0300 @@ -18,7 +18,7 @@ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" ;; *) -- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" -+ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" +- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" ++ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" ;; esac ---- php-7.4.0RC2/sapi/fpm/config.m4~ 2019-09-17 19:37:55.000000000 +0300 -+++ php-7.4.0RC2/sapi/fpm/config.m4 2019-09-20 13:56:34.351592384 +0300 -@@ -660,7 +660,7 @@ - BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_FPM_OBJS) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" +--- php-8.0.0beta4/sapi/fpm/config.m4~ 2020-09-15 21:36:33.000000000 +0300 ++++ php-8.0.0beta4/sapi/fpm/config.m4 2020-10-02 17:33:05.217571527 +0300 +@@ -659,7 +659,7 @@ + BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" ;; *) -- BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" -+ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" +- BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" ++ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" ;; esac diff --git a/php-systzdata.patch b/php-systzdata.patch index eac3cc3..902d3ce 100644 --- a/php-systzdata.patch +++ b/php-systzdata.patch @@ -5,6 +5,7 @@ Add support for use of the system timezone database, rather than embedding a copy. Discussed upstream but was not desired. History: +r19: adapt for timelib 2020.02 (in 8.0.0beta2) r18: adapt for autotool change in 7.3.3RC1 r17: adapt for timelib 2018.01 (in 7.3.2RC1) r16: adapt for timelib 2017.06 (in 7.2.3RC1) @@ -29,10 +30,10 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) r2: add filesystem trawl to set up name alias index r1: initial revision -diff -up php-7.3.3RC1/ext/date/config0.m4.systzdata php-7.3.3RC1/ext/date/config0.m4 ---- php-7.3.3RC1/ext/date/config0.m4.systzdata 2019-02-19 14:57:51.314601701 +0100 -+++ php-7.3.3RC1/ext/date/config0.m4 2019-02-19 14:58:29.050812587 +0100 -@@ -9,6 +9,19 @@ io.h +diff -up php-8.0.0beta3/ext/date/config0.m4.systzdata php-8.0.0beta3/ext/date/config0.m4 +--- php-8.0.0beta3/ext/date/config0.m4.systzdata 2020-09-01 19:13:26.000000000 +0200 ++++ php-8.0.0beta3/ext/date/config0.m4 2020-09-02 08:07:51.039979873 +0200 +@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h]) dnl Check for strtoll, atoll AC_CHECK_FUNCS(strtoll atoll) @@ -52,10 +53,10 @@ diff -up php-7.3.3RC1/ext/date/config0.m4.systzdata php-7.3.3RC1/ext/date/config PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1" timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" -diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/lib/parse_tz.c ---- php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata 2019-02-19 12:18:27.000000000 +0100 -+++ php-7.3.3RC1/ext/date/lib/parse_tz.c 2019-02-19 14:57:20.397428931 +0100 -@@ -25,8 +25,21 @@ +diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/date/lib/parse_tz.c +--- php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata 2020-09-01 19:13:26.000000000 +0200 ++++ php-8.0.0beta3/ext/date/lib/parse_tz.c 2020-09-02 08:07:51.039979873 +0200 +@@ -26,8 +26,21 @@ #include "timelib.h" #include "timelib_private.h" @@ -77,7 +78,7 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) # if defined(__LITTLE_ENDIAN__) -@@ -87,6 +100,11 @@ static int read_php_preamble(const unsig +@@ -94,6 +107,11 @@ static int read_php_preamble(const unsig { uint32_t version; @@ -89,11 +90,11 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li /* read ID */ version = (*tzf)[3] - '0'; *tzf += 4; -@@ -411,7 +429,429 @@ void timelib_dump_tzinfo(timelib_tzinfo +@@ -418,7 +436,429 @@ void timelib_dump_tzinfo(timelib_tzinfo } } --static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) +-static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb) +#ifdef HAVE_SYSTEM_TZDATA + +#ifdef HAVE_SYSTEM_TZDATA_PREFIX @@ -516,15 +517,15 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li + +#endif + -+static int inmem_seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) ++static int inmem_seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb) { int left = 0, right = tzdb->index_size - 1; -@@ -437,9 +877,48 @@ static int seek_to_tz_position(const uns +@@ -444,9 +884,48 @@ static int seek_to_tz_position(const uns return 0; } -+static int seek_to_tz_position(const unsigned char **tzf, char *timezone, ++static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, + char **map, size_t *maplen, + const timelib_tzdb *tzdb) +{ @@ -569,8 +570,8 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li } const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count) -@@ -451,7 +930,30 @@ const timelib_tzdb_index_entry *timelib_ - int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) +@@ -458,7 +937,30 @@ const timelib_tzdb_index_entry *timelib_ + int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb) { const unsigned char *tzf; - return (seek_to_tz_position(&tzf, timezone, tzdb)); @@ -601,8 +602,8 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li } static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) -@@ -493,12 +995,14 @@ static timelib_tzinfo* timelib_tzinfo_ct - timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code) +@@ -500,12 +1002,14 @@ static timelib_tzinfo* timelib_tzinfo_ct + timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code) { const unsigned char *tzf; + char *memmap = NULL; @@ -617,7 +618,7 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li tmp = timelib_tzinfo_ctor(timezone); version = read_preamble(&tzf, tmp, &type); -@@ -537,11 +1041,36 @@ timelib_tzinfo *timelib_parse_tzfile(cha +@@ -540,11 +1044,36 @@ timelib_tzinfo *timelib_parse_tzfile(con } skip_posix_string(&tzf, tmp); diff --git a/php-use-prog_sendmail.patch b/php-use-prog_sendmail.patch index 017b100..dafbcd5 100644 --- a/php-use-prog_sendmail.patch +++ b/php-use-prog_sendmail.patch @@ -1,6 +1,6 @@ ---- php-7.4.7/build/php.m4.orig 2020-06-26 16:43:50.784451000 +0200 -+++ php-7.4.7/build/php.m4 2020-06-26 16:45:13.716451000 +0200 -@@ -1732,8 +1732,10 @@ +--- php-8.0.0rc1/build/php.m4~ 2020-10-09 18:56:11.000000000 +0300 ++++ php-8.0.0rc1/build/php.m4 2020-10-09 18:58:11.039360902 +0300 +@@ -1710,8 +1710,10 @@ dnl Search for the sendmail binary. dnl AC_DEFUN([PHP_PROG_SENDMAIL], [ diff --git a/php-zlib-for-getimagesize.patch b/php-zlib-for-getimagesize.patch index 50a3ec3..a72a4fa 100644 --- a/php-zlib-for-getimagesize.patch +++ b/php-zlib-for-getimagesize.patch @@ -2,8 +2,8 @@ make compressed .swf parsing possible, link core php with -lz for getimagesize() see also http://bugs.php.net/bug.php?id=29611 ---- php-7.0/ext/standard/image.c~ 2015-05-21 23:10:45.000000000 +0300 -+++ php-7.0/ext/standard/image.c 2015-05-21 23:11:22.424948534 +0300 +--- php-8.0.0rc1/ext/standard/image.c~ 2020-10-09 18:50:01.000000000 +0300 ++++ php-8.0.0rc1/ext/standard/image.c 2020-10-09 18:53:44.278879164 +0300 @@ -31,7 +31,7 @@ #endif #include "php_image.h" @@ -22,15 +22,15 @@ see also http://bugs.php.net/bug.php?id=29611 REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT); #endif REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT); -@@ -184,7 +184,7 @@ +@@ -186,7 +186,7 @@ } /* }}} */ -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) +#if HAVE_ZLIB - /* {{{ php_handle_swc - */ - static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC) + /* {{{ php_handle_swc */ + static struct gfxinfo *php_handle_swc(php_stream * stream) + { @@ -1321,7 +1321,7 @@ result = php_handle_swf(stream); break; diff --git a/php.spec b/php.spec index d0ef890..0ec5a9d 100644 --- a/php.spec +++ b/php.spec @@ -1,6 +1,6 @@ # Conditional build: # - General options: -%bcond_without embed # disable building Embedded API +%bcond_with embed # disable building Embedded API %bcond_with gcov # Enable Code coverage reporting %bcond_without kerberos5 # without Kerberos5 support %bcond_with systemtap # systemtap/DTrace support @@ -33,7 +33,6 @@ %bcond_without iconv # without iconv extension module %bcond_without imap # without IMAP extension module %bcond_without intl # without Intl extension module -%bcond_without json # without json extension module %bcond_without ldap # without LDAP extension module %bcond_without mbstring # without mbstring extension module %bcond_without mhash # without mhash extension (supported by hash extension) @@ -64,7 +63,6 @@ %bcond_without sqlite2 # without SQLite extension module %bcond_without sqlite3 # without SQLite3 extension module %bcond_without tidy # without Tidy extension module -%bcond_without xmlrpc # without XML-RPC extension module %bcond_without xsl # without xsl extension module %bcond_without zip # without zip extension module # extensions options @@ -117,7 +115,7 @@ %endif %define orgname php -%define php_suffix 74 +%define php_suffix 80 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -125,7 +123,7 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 7.4.13 +Version: 8.0.0 Release: 1 Epoch: 4 # All files licensed under PHP version 3.01, except @@ -134,7 +132,7 @@ Epoch: 4 License: PHP 3.01 and Zend and BSD Group: Libraries Source0: http://php.net/distributions/%{orgname}-%{version}.tar.xz -# Source0-md5: ccf5b33ab267b742c408d589934a143d +# Source0-md5: 52ad70ea64968d6095c6e38139533d57 Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini @@ -154,7 +152,6 @@ Patch9: libtool-tag.patch Patch10: %{orgname}-ini.patch Patch11: embed.patch Patch14: %{orgname}-no_pear_install.patch -Patch17: %{orgname}-readline.patch Patch18: %{orgname}-nohttpd.patch Patch21: %{orgname}-dba-link.patch Patch22: %{orgname}-both-apxs.patch @@ -164,8 +161,6 @@ Patch25: %{orgname}-stupidapache_version.patch Patch27: %{orgname}-config-dir.patch Patch29: %{orgname}-fcgi-graceful.patch Patch31: %{orgname}-fcgi-error_log-no-newlines.patch -Patch37: %{orgname}-mysqli-charsetphpini.patch -Patch38: %{orgname}-pdo_mysql-charsetphpini.patch Patch39: %{orgname}-use-prog_sendmail.patch Patch41: %{orgname}-fpm-config.patch Patch43: %{orgname}-silent-session-cleanup.patch @@ -243,7 +238,6 @@ BuildRequires: tar >= 1:1.22 %{?with_tidy:BuildRequires: tidy-devel} BuildRequires: tokyocabinet-devel %{?with_odbc:BuildRequires: unixODBC-devel} -%{?with_xmlrpc:BuildRequires: xmlrpc-epi-devel >= 0.54.1} BuildRequires: xz BuildRequires: zlib-devel >= 1.2.0.4 %if %{with apache2} @@ -259,9 +253,9 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sysconfdir %{php_sysconfdir} # must be in sync with source. extra check ensuring that it is so is done in %%build -%define php_api_version 20190902 -%define zend_module_api 20190902 -%define zend_extension_api 320190902 +%define php_api_version 20200930 +%define zend_module_api 20200930 +%define zend_extension_api 420200930 %define php_pdo_api_version 20170320 # Extension versions @@ -273,7 +267,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define jsonver %{version} %define pharver %{version} %define sqlite3ver %{version} -%define zipver 1.15.6 +%define zipver 1.19.1 %define phpdbgver %{version} %define sodiumver %{version} @@ -980,24 +974,6 @@ interfejsem do biblioteki ICU, pozwalającym programistom PHP na wykonywanie w skryptach porównań zgodnych z UCA oraz formatowania daty/czasu/walut. -%package json -Summary: PHP C extension for JSON serialization -Summary(pl.UTF-8): Rozszerzenie C PHP dla serializacji JSON -Group: Libraries -URL: http://php.net/manual/en/book.json.php -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Provides: php(json) = %{jsonver} -Obsoletes: php-json < 4:5.3.28-7 -Obsoletes: php-pecl-json < %{jsonver} - -%description json -php-json is an extremely fast PHP C extension for JSON (JavaScript -Object Notation) serialisation. - -%description json -l pl.UTF-8 -php-json to bardzo szybkie rozszerzenie C PHP dla serializacji JSON -(JavaScript Object Notation). - %package ldap Summary: LDAP extension module for PHP Summary(pl.UTF-8): Moduł LDAP dla PHP @@ -1718,23 +1694,6 @@ Moduł PHP umożliwiający analizę plików XML w trybie Pull. Czytnik działa jako kursor przechodzący przez strumień dokumentu i zatrzymujący się na każdym węźle po drodze. -%package xmlrpc -Summary: xmlrpc extension module for PHP -Summary(pl.UTF-8): Moduł xmlrpc dla PHP -Group: Libraries -URL: http://php.net/manual/en/book.xmlrpc.php -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-xml = %{epoch}:%{version}-%{release} -Provides: php(xmlrpc) -Obsoletes: php-xmlrpc < 4:5.3.28-7 - -%description xmlrpc -This is a dynamic shared object (DSO) for PHP that will add XMLRPC -support. - -%description xmlrpc -l pl.UTF-8 -Moduł PHP dodający obsługę XMLRPC. - %package xmlwriter Summary: Fast, non-cached, forward-only means to write XML data Summary(pl.UTF-8): Szybka, nie cachowana metoda zapisu danych w formacie XML @@ -1819,7 +1778,6 @@ cp -p php.ini-production php.ini %patch9 -p1 %patch10 -p1 %patch14 -p1 -%patch17 -p1 %patch18 -p1 %patch21 -p1 %patch22 -p1 @@ -1829,8 +1787,6 @@ cp -p php.ini-production php.ini %patch27 -p1 %patch29 -p1 %patch31 -p1 -%patch37 -p1 -%patch38 -p1 %patch39 -p1 %if %{with fpm} %patch41 -p1 @@ -1845,8 +1801,6 @@ cp -p php.ini-production php.ini %patch67 -p1 %patch71 -p1 -%{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 - # cleanup backups after patching find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f @@ -1854,7 +1808,6 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f %{__rm} -r ext/com_dotnet # remove all bundled libraries not to link with them accidentally -%{__rm} -r ext/xmlrpc/libxmlrpc %{__rm} ext/date/lib/timezonedb.h cp -pf Zend/LICENSE{,.Zend} @@ -2041,8 +1994,7 @@ if [ ! -f _built-conf ]; then touch _built-conf fi export PROG_SENDMAIL="/usr/lib/sendmail" -export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP %{rpmcppflags} \ - -I%{_includedir}/xmlrpc-epi" +export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP %{rpmcppflags}" # This should be detected by configure and set there, # but looks like the build system is hosed on 7.3 @@ -2137,7 +2089,6 @@ for sapi in $sapis; do --enable-mbregex \ %{__enable_disable pcntl pcntl shared} \ %{__enable_disable pdo pdo shared} \ - %{__enable_disable json json shared} \ --enable-xmlwriter=shared \ %if %{with fpm} --with-fpm-user=http \ @@ -2206,7 +2157,6 @@ for sapi in $sapis; do %{__with_without sqlite3 sqlite3 shared} \ %{?with_tidy:--with-tidy=shared} \ %{?with_odbc:--with-unixODBC=shared} \ - %{__with_without xmlrpc xmlrpc shared,/usr} \ %{?with_xsl:--with-xsl=shared} \ --with-zlib=shared \ %{?with_zip:--with-zip=shared} \ @@ -2230,7 +2180,7 @@ cp -af Makefile.cli Makefile MYSQLND_SHARED_LIBADD="-lssl -lcrypto" %if %{with apache2} -%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache2handler/libphp7.la -f Makefile.apxs2 +%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache2handler/libphp8.la -f Makefile.apxs2 %endif %if %{with litespeed} @@ -2238,7 +2188,7 @@ cp -af Makefile.cli Makefile %endif %if %{with embed} -%{__make} -f Makefile.embed libphp7.la +%{__make} -f Makefile.embed libphp8.la %endif %if %{with phpdbg} @@ -2346,10 +2296,10 @@ v=$(echo %{version} | cut -d. -f1-2) # install Apache2 DSO module %if %{with apache2} # versioned libphp -libtool --mode=install install -p sapi/apache2handler/libphp7.la $RPM_BUILD_ROOT%{_libdir}/apache -%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache/libphp7.la $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.la -%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache/libphp7.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.so -sed -i -e "s|libphp7|libphp%{php_suffix}|g" $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.la +libtool --mode=install install -p sapi/apache2handler/libphp8.la $RPM_BUILD_ROOT%{_libdir}/apache +%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache/libphp8.la $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.la +%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache/libphp8.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.so +sed -i -e "s|libphp8|libphp%{php_suffix}|g" $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.la ln -s libphp%{php_suffix}.so $RPM_BUILD_ROOT%{_libdir}/apache/mod_php.so %endif @@ -2413,7 +2363,7 @@ touch $RPM_BUILD_ROOT%{_sbindir}/php-fpm # we could use install-headers from Makefile.embed, but that would reinstall all headers # install-sapi installs to wrong dir, so just do it all manually install -d $RPM_BUILD_ROOT%{_includedir}/php/php%{php_suffix}/sapi/embed -install -p libs/libphp7.so $RPM_BUILD_ROOT%{_libdir}/libphp%{php_suffix}.so +install -p libs/libphp8.so $RPM_BUILD_ROOT%{_libdir}/libphp%{php_suffix}.so cp -p sapi/embed/php_embed.h $RPM_BUILD_ROOT%{_includedir}/php/php%{php_suffix}/sapi/embed %endif @@ -2621,7 +2571,6 @@ fi \ %extension_scripts iconv %extension_scripts imap %extension_scripts intl -%extension_scripts json %extension_scripts ldap %extension_scripts mbstring %extension_scripts mysqli @@ -2657,7 +2606,6 @@ fi \ %extension_scripts tokenizer %extension_scripts xml %extension_scripts xmlreader -%extension_scripts xmlrpc %extension_scripts xmlwriter %extension_scripts xsl %extension_scripts zip @@ -2919,14 +2867,6 @@ fi %attr(755,root,root) %{php_extensiondir}/intl.so %endif -%if %{with json} -%files json -%defattr(644,root,root,755) -%doc ext/json/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_json.ini -%attr(755,root,root) %{php_extensiondir}/json.so -%endif - %if %{with ldap} %files ldap %defattr(644,root,root,755) @@ -3223,14 +3163,6 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_xmlreader.ini %attr(755,root,root) %{php_extensiondir}/xmlreader.so -%if %{with xmlrpc} -%files xmlrpc -%defattr(644,root,root,755) -%doc ext/xmlrpc/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_xmlrpc.ini -%attr(755,root,root) %{php_extensiondir}/xmlrpc.so -%endif - %files xmlwriter %defattr(644,root,root,755) %doc ext/xmlwriter/CREDITS diff --git a/skip-tests.sh b/skip-tests.sh index 0180e32..d378d72 100644 --- a/skip-tests.sh +++ b/skip-tests.sh @@ -83,15 +83,6 @@ mv ext/standard/tests/general_functions/proc_nice_basic.phpt{,.skip} mv ext/standard/tests/general_functions/proc_open02.phpt{,.skip} # Test setlocale() function : usage variations - Setting all available locales in the platform mv ext/standard/tests/strings/setlocale_variation2.phpt{,.skip} -# xmlrpc_encode_request() and various arguments -mv ext/xmlrpc/tests/002.phpt{,.skip} -# Bug #40576 (double values are truncated to 6 decimal digits when encoding) -$ix86 mv ext/xmlrpc/tests/bug40576.phpt{,.skip} -$x8664 mv ext/xmlrpc/tests/bug40576_64bit.phpt{,.skip} -# Bug #45555 (Segfault with invalid non-string as register_introspection_callback) -mv ext/xmlrpc/tests/bug45555.phpt{,.skip} -# Bug #45556 (Return value from callback isn't freed) -mv ext/xmlrpc/tests/bug45556.phpt{,.skip} # apache_request_headers() stack overflow. mv sapi/cgi/tests/apache_request_headers.phpt{,.skip} # show information about extension