From c88ab3d8f74b7f02e93829e226af643cc4f49dde Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 29 Apr 2023 08:48:21 +0200 Subject: update to 0.12.3 drop patch merged upstream --- PHPINFO | 2 +- REFLECTION | 2 +- php-zstd.spec | 13 +++++---- zstd-pr57.patch | 90 --------------------------------------------------------- 4 files changed, 9 insertions(+), 98 deletions(-) delete mode 100644 zstd-pr57.patch diff --git a/PHPINFO b/PHPINFO index 9a68f60..30f555f 100644 --- a/PHPINFO +++ b/PHPINFO @@ -2,6 +2,6 @@ zstd Zstd support => enabled -Extension Version => 0.12.2 +Extension Version => 0.12.3 Interface Version => 1.5.5 APCu serializer ABI => 0 diff --git a/REFLECTION b/REFLECTION index 82c8cc7..294e3e2 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #108 zstd version 0.12.2 ] { +Extension [ extension #108 zstd version 0.12.3 ] { - Dependencies { Dependency [ apcu (Optional) ] diff --git a/php-zstd.spec b/php-zstd.spec index 92519d9..eec64bb 100644 --- a/php-zstd.spec +++ b/php-zstd.spec @@ -25,7 +25,7 @@ Summary: Zstandard extension Name: %{?scl_prefix}php-%{pecl_name} -Version: 0.12.2 +Version: 0.12.3 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %if %{with libzstd} License: MIT @@ -36,8 +36,6 @@ License: MIT AND BSD-3-Clause URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -Patch0: %{pecl_name}-pr57.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 %if %{with apcu} @@ -85,14 +83,13 @@ mv %{pecl_name}-%{version} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS -%patch -P0 -p1 -b .pr57 - -cp zstd/LICENSE LICENSE-libzstd %if %{with libzstd} # Use the system library rm -r zstd sed -e '\:"zstd/:d' -i ../package.xml +%else +cp zstd/LICENSE LICENSE-libzstd %endif # Sanity check, really often broken @@ -244,6 +241,10 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ %changelog +* Sat Apr 29 2023 Remi Collet - 0.12.3-1 +- update to 0.12.3 +- drop patch merged upstream + * Fri Apr 28 2023 Remi Collet - 0.12.2-1 - update to 0.12.2 - fix extension version and build warnings, using patch from diff --git a/zstd-pr57.patch b/zstd-pr57.patch deleted file mode 100644 index 92ed1ef..0000000 --- a/zstd-pr57.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 206c1042ed7f813a717d81217fd325c1d15e91f2 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 28 Apr 2023 08:01:46 +0200 -Subject: [PATCH 1/3] fix [-Wunused-variable] - ---- - zstd.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/zstd.c b/zstd.c -index 06e0549..81694a0 100644 ---- a/zstd.c -+++ b/zstd.c -@@ -592,7 +592,6 @@ static size_t php_zstd_comp_write(php_stream *stream, const char *buf, size_t co - #else - static ssize_t php_zstd_comp_write(php_stream *stream, const char *buf, size_t count) - { -- ssize_t ret = 0; - #endif - - STREAM_DATA_FROM_STREAM(); - -From 3a37d5417c08e640629b2558da5829bf3609e960 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 28 Apr 2023 08:02:26 +0200 -Subject: [PATCH 2/3] fix [-Wpointer-sign] - ---- - zstd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/zstd.c b/zstd.c -index 81694a0..6c1310a 100644 ---- a/zstd.c -+++ b/zstd.c -@@ -855,7 +855,7 @@ static int APC_SERIALIZER_NAME(zstd)(APC_SERIALIZER_ARGS) - } - - size = ZSTD_compressBound(ZSTR_LEN(var.s)); -- *buf = (char*) emalloc(size + 1); -+ *buf = emalloc(size + 1); - - *buf_len = ZSTD_compress(*buf, size, ZSTR_VAL(var.s), ZSTR_LEN(var.s), - DEFAULT_COMPRESS_LEVEL); - -From ee6c47a34616c69af7bc0c27a7f4a3b948c461df Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 28 Apr 2023 08:05:21 +0200 -Subject: [PATCH 3/3] use normalized macro name - ---- - php_zstd.h | 2 +- - zstd.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/php_zstd.h b/php_zstd.h -index 731ae23..8aca8f8 100644 ---- a/php_zstd.h -+++ b/php_zstd.h -@@ -24,7 +24,7 @@ - #ifndef PHP_ZSTD_H - #define PHP_ZSTD_H - --#define PHP_ZSTD_EXT_VERSION "0.12.1" -+#define PHP_ZSTD_VERSION "0.12.2" - #define PHP_ZSTD_NS "Zstd" - - extern zend_module_entry zstd_module_entry; -diff --git a/zstd.c b/zstd.c -index 6c1310a..924df38 100644 ---- a/zstd.c -+++ b/zstd.c -@@ -955,7 +955,7 @@ ZEND_MINFO_FUNCTION(zstd) - { - php_info_print_table_start(); - php_info_print_table_row(2, "Zstd support", "enabled"); -- php_info_print_table_row(2, "Extension Version", PHP_ZSTD_EXT_VERSION); -+ php_info_print_table_row(2, "Extension Version", PHP_ZSTD_VERSION); - php_info_print_table_row(2, "Interface Version", ZSTD_VERSION_STRING); - #if defined(HAVE_APCU_SUPPORT) - php_info_print_table_row(2, "APCu serializer ABI", APC_SERIALIZER_ABI); -@@ -1023,7 +1023,7 @@ zend_module_entry zstd_module_entry = { - NULL, - NULL, - ZEND_MINFO(zstd), -- PHP_ZSTD_EXT_VERSION, -+ PHP_ZSTD_VERSION, - STANDARD_MODULE_PROPERTIES - }; - -- cgit