up to php-7.3.0RC

The PHP team is glad to announce the presumably last PHP 7.3.0
pre-release, PHP 7.3.0RC6.

diff --git a/php.spec b/php.spec
index f3e2053d089925aac4cc06cc8d5719e61fc71b28..89637a78c1fd13a053bf14c6d8d5c94c0b295306 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -144,7 +144,7 @@
 %undefine      with_filter
 %endif
 
-%define                subver RC5
+%define                subver RC6
 %define                orgname php
 %define                ver_suffix 73
 %define                php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -165,7 +165,7 @@ License:    PHP 3.01 and Zend and BSD
 Group:         Libraries
 #Source0:      https://php.net/distributions/%{orgname}-%{version}.tar.xz
 Source0:       https://downloads.php.net/~cmb/php-%{version}%{subver}.tar.xz
-# Source0-md5: 9cc3c9f146b86e813f42555528a27cfe
+# Source0-md5: 2d2e6e1a0faaa9275db519e031b4288c
 Source1:       opcache.ini
 Source2:       %{orgname}-mod_php.conf
 Source3:       %{orgname}-cgi-fcgi.ini
@@ -222,7 +222,6 @@ Patch68:    php-mysql-ssl-context.patch
 Patch70:       mysqlnd-ssl.patch
 Patch71:       libdb-info.patch
 Patch72:       phar-hash-shared.patch
-Patch73:       x32.patch
 URL:           http://php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:  aspell-devel >= 2:0.50.0}
@@ -2026,7 +2025,6 @@ cp -p php.ini-production php.ini
 %patch70 -p1
 %patch71 -p1
 %patch72 -p1 -b .phar-shared
-%patch73 -p1
 
 %{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
 

diff --git a/x32.patch b/x32.patch
deleted file mode 100644 (file)
index 05b080a..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/php/php-src/pull/3665
-
---- php-7.3.0RC3/Zend/zend_string.c~   2018-10-09 11:26:41.000000000 +0200
-+++ php-7.3.0RC3/Zend/zend_string.c    2018-10-24 22:05:01.639560148 +0200
-@@ -392,7 +392,7 @@
- }
- #endif
- 
--#elif defined(__GNUC__) && defined(__x86_64__)
-+#elif defined(__GNUC__) && defined(__x86_64__) && !defined(__ILP32__)
- ZEND_API zend_bool ZEND_FASTCALL zend_string_equal_val(zend_string *s1, zend_string *s2)
- {
-       char *ptr = ZSTR_VAL(s1);
---- php-7.3.0RC5/Zend/zend_string.h~   2018-11-06 12:22:56.000000000 +0200
-+++ php-7.3.0RC5/Zend/zend_string.h    2018-11-12 13:32:37.350520375 +0200
-@@ -294,7 +294,7 @@
-       }
- }
- 
--#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-+#if defined(__GNUC__) && (defined(__i386__) || (defined(__x86_64__) && !defined(__ILP32__)))
- BEGIN_EXTERN_C()
- ZEND_API zend_bool ZEND_FASTCALL zend_string_equal_val(zend_string *s1, zend_string *s2);
- END_EXTERN_C()
---- php-7.3.0RC3/ext/opcache/zend_accelerator_util_funcs.c~    2018-10-09 11:26:32.000000000 +0200
-+++ php-7.3.0RC3/ext/opcache/zend_accelerator_util_funcs.c     2018-10-24 22:15:44.849117508 +0200
-@@ -719,7 +719,7 @@
-               : "r"(delta)
-               : "cc", "memory", "%xmm0", "%xmm1", "%xmm1", "%xmm2");
- }
--# elif defined(__GNUC__) && defined(__x86_64__)
-+# elif defined(__GNUC__) && defined(__x86_64__) && !defined(__ILP32__)
- static zend_always_inline void fast_memcpy(void *dest, const void *src, size_t size)
- {
-       size_t delta = (char*)dest - (char*)src;