diff options
| -rw-r--r-- | failed.txt | 2 | ||||
| -rw-r--r-- | php-upstream.patch | 49 | ||||
| -rw-r--r-- | php.spec | 7 |
3 files changed, 5 insertions, 53 deletions
@@ -1,4 +1,4 @@ -===== 8.1.0alpha1 (2021-06-10) +===== 8.1.0alpha2 (2021-06-24) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log diff --git a/php-upstream.patch b/php-upstream.patch deleted file mode 100644 index b5a46d3..0000000 --- a/php-upstream.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b83bfb2c5444865515673ff5da939b5f75604128 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 22 Jun 2021 18:42:43 +0200 -Subject: [PATCH] make new API public (#7185) - ---- - ext/standard/crc32.c | 4 ++-- - ext/standard/crc32.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c -index c492a9602c3b5..8b4fa085058a3 100644 ---- a/ext/standard/crc32.c -+++ b/ext/standard/crc32.c -@@ -89,7 +89,7 @@ static uint32_t crc32_aarch64(uint32_t crc, char *p, size_t nr) { - # endif - #endif - --uint32_t crc32_bulk_update(uint32_t crc, const char *p, size_t nr) -+PHPAPI uint32_t crc32_bulk_update(uint32_t crc, const char *p, size_t nr) - { - #if HAVE_AARCH64_CRC32 - if (has_crc32_insn()) { -@@ -112,7 +112,7 @@ uint32_t crc32_bulk_update(uint32_t crc, const char *p, size_t nr) - return crc; - } - --int crc32_stream_bulk_update(uint32_t *crc, php_stream *fp, size_t nr) -+PHPAPI int crc32_stream_bulk_update(uint32_t *crc, php_stream *fp, size_t nr) - { - size_t handled = 0, n; - char buf[1024]; -diff --git a/ext/standard/crc32.h b/ext/standard/crc32.h -index 262713fd5ec8c..1de234208aa9e 100644 ---- a/ext/standard/crc32.h -+++ b/ext/standard/crc32.h -@@ -23,10 +23,10 @@ - - #define CRC32(crc, ch) (crc = (crc >> 8) ^ crc32tab[(crc ^ (ch)) & 0xff]) - --uint32_t crc32_bulk_update(uint32_t crc, const char *p, size_t nr); -+PHPAPI uint32_t crc32_bulk_update(uint32_t crc, const char *p, size_t nr); - - /* Return FAILURE if stream reading fail */ --int crc32_stream_bulk_update(uint32_t *crc, php_stream *fp, size_t nr); -+PHPAPI int crc32_stream_bulk_update(uint32_t *crc, php_stream *fp, size_t nr); - - /* generated using the AUTODIN II polynomial - * x^32 + x^26 + x^23 + x^22 + x^16 + @@ -113,7 +113,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}} -Release: 0%{?dist} +Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -177,7 +177,6 @@ Patch47: php-8.1.0-phpinfo.patch Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) -Patch100: php-upstream.patch # Security fixes (200+) @@ -950,7 +949,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 # security patches @@ -1821,6 +1819,9 @@ fi %changelog +* Tue Jun 22 2021 Remi Collet <remi@remirepo.net> - 8.1.0~alpha2-1 +- update to 8.1.0alpha2 + * Tue Jun 22 2021 Remi Collet <remi@remirepo.net> - 8.1.0~alpha2-0 - test build for upcoming 8.1.0alpha2 - fix build for missing public API using patch from |