diff options
| -rw-r--r-- | 173.patch | 29 | ||||
| -rw-r--r-- | 174.patch | 21 | ||||
| -rw-r--r-- | php-pecl-xlswriter.spec | 11 |
3 files changed, 5 insertions, 56 deletions
diff --git a/173.patch b/173.patch deleted file mode 100644 index ee1071f..0000000 --- a/173.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a30311cd401221eef7be3bc5b25bf247a134383e Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 20 Sep 2019 08:08:28 +0200 -Subject: [PATCH] fix stack mashing using proper format - ---- - kernel/read.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kernel/read.c b/kernel/read.c -index cd28916..18d66a6 100644 ---- a/kernel/read.c -+++ b/kernel/read.c -@@ -96,7 +96,7 @@ void data_to_custom_type(const char *string_value, zend_ulong type, zval *zv_res - - zend_long _long_value; - -- sscanf(string_value, "%" PRIi64, &_long_value); -+ sscanf(string_value, ZEND_LONG_FMT, &_long_value); - - if (Z_TYPE_P(zv_result_t) == IS_ARRAY) { - add_next_index_long(zv_result_t, _long_value); -@@ -268,4 +268,4 @@ void load_sheet_all_data(xlsxioreadersheet sheet_t, zval *zv_type_t, zval *zv_re - add_next_index_zval(zv_result_t, &_zv_tmp_row); - } - } --/* }}} */ -\ No newline at end of file -+/* }}} */ diff --git a/174.patch b/174.patch deleted file mode 100644 index ec1355a..0000000 --- a/174.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 3a075e77c614c2b701a359ff0eb651fbb529b51e Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 20 Sep 2019 08:47:16 +0200 -Subject: [PATCH] add missing init - ---- - kernel/read.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kernel/read.c b/kernel/read.c -index 18d66a6..a272fee 100644 ---- a/kernel/read.c -+++ b/kernel/read.c -@@ -229,6 +229,7 @@ int sheet_cell_callback (size_t row, size_t col, const char *value, void *callba - } - } - -+ ZVAL_NULL(&args[2]); - data_to_custom_type(value, _type, &args[2]); - } - diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec index ab6a284..3565f46 100644 --- a/php-pecl-xlswriter.spec +++ b/php-pecl-xlswriter.spec @@ -30,14 +30,11 @@ Summary: An efficient and fast xlsx file export extension Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.2.9 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -Patch0: https://patch-diff.githubusercontent.com/raw/viest/php-ext-excel-export/pull/173.patch -Patch1: https://patch-diff.githubusercontent.com/raw/viest/php-ext-excel-export/pull/174.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear @@ -112,8 +109,6 @@ sed -e 's/role="test"/role="src"/' \ cd NTS # we use the system libraries rm -r library -%patch0 -p1 -b .pr173 -%patch1 -p1 -b .pr174 # Sanity check, really often broken extver=$(sed -n '/#define PHP_XLSWRITER_VERSION/{s/.* "//;s/".*$//;p}' php_xlswriter.h) @@ -257,6 +252,10 @@ cd .. %changelog +* Fri Sep 20 2019 Remi Collet <remi@remirepo.net> - 1.2.9-2 +- update to 1.2.9 (new tag) +- drop patches merged upstream + * Fri Sep 20 2019 Remi Collet <remi@remirepo.net> - 1.2.9-1 - update to 1.2.9 - drop patch merged upstream |