From a2f6c24755d4bb2939daccad0bea4558ba8d4226 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Feb 2020 14:35:14 +0100 Subject: v6.3.4 --- 7dbdfa405123c2fbca4864d87a143f7977403767.patch | 36 -------------------------- composer.json | 4 +-- php-tcpdf.spec | 10 +++---- 3 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 7dbdfa405123c2fbca4864d87a143f7977403767.patch diff --git a/7dbdfa405123c2fbca4864d87a143f7977403767.patch b/7dbdfa405123c2fbca4864d87a143f7977403767.patch deleted file mode 100644 index b422e37..0000000 --- a/7dbdfa405123c2fbca4864d87a143f7977403767.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7dbdfa405123c2fbca4864d87a143f7977403767 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Vojta=20Mat=C4=9Bjka?= -Date: Sun, 20 Oct 2019 15:30:04 +0200 -Subject: [PATCH] Problem with imagekeys undefined or unlinked - -PR #136 removed problem with undefined `$imagekeys`, but the solution skipped cleaning files in `$imagekeys`. -The problem about this is that `_destroy` function is called 3 times (from `Close` function, as `shutdown_handler` and from `__desctruct` function). Only first time is called as `destroyall == false`, but unset `$imagekeys`. My solution is to preserve `$imagekeys` to be cleaned by call with `$imagekeys == true`. ---- - tcpdf.php | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/tcpdf.php b/tcpdf.php -index 0ee30bc0..a38edfcc 100644 ---- a/tcpdf.php -+++ b/tcpdf.php -@@ -7796,10 +7796,8 @@ public function _destroy($destroyall=false, $preserve_objcopy=false) { - } - closedir($handle); - } -- if (isset($this->imagekeys)) { -- foreach($this->imagekeys as $file) { -- unlink($file); -- } -+ foreach($this->imagekeys as $file) { -+ unlink($file); - } - } - $preserve = array( -@@ -7809,6 +7807,7 @@ public function _destroy($destroyall=false, $preserve_objcopy=false) { - 'bufferlen', - 'buffer', - 'cached_files', -+ 'imagekeys', - 'sign', - 'signature_data', - 'signature_max_length', diff --git a/composer.json b/composer.json index 70416fd..839f60b 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnickcom/tcpdf", - "version": "6.3.2", + "version": "6.3.4", "homepage": "http://www.tcpdf.org/", "type": "library", "description": "TCPDF is a PHP class for generating PDF documents and barcodes.", @@ -13,7 +13,7 @@ "pdf417", "barcodes" ], - "license": "LGPL-3.0", + "license": "LGPL-3.0-only", "authors": [ { "name": "Nicola Asuni", diff --git a/php-tcpdf.spec b/php-tcpdf.spec index 537aac7..471650b 100644 --- a/php-tcpdf.spec +++ b/php-tcpdf.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # see https://github.com/tecnickcom/TCPDF/releases -%global gh_commit 185eb13f216179b3107d51f954059f33ff1b1cf3 +%global gh_commit 510070b5e068e10d97b8cb0e25295e54755ec09d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner tecnickcom %global gh_project TCPDF @@ -15,7 +15,7 @@ Name: php-tcpdf Summary: PHP class for generating PDF documents and barcodes -Version: 6.3.3 +Version: 6.3.4 Release: 1%{?dist} URL: http://www.tcpdf.org @@ -25,8 +25,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Disable opcache cahing for font metadata which may consume up to 90MB Source1: %{name}.blacklist -Patch0: https://github.com/tecnickcom/TCPDF/commit/7dbdfa405123c2fbca4864d87a143f7977403767.patch - BuildArch: noarch BuildRequires: php-cli BuildRequires: php-fedora-autoloader-devel @@ -201,7 +199,6 @@ This package allow to use system GNU FreeFont serif font faces in TCPDF. %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -R : remove bundled fonts rm -rf fonts/dejavu-fonts-ttf* fonts/freefont-* fonts/ae_fonts_* @@ -316,6 +313,9 @@ php -r 'require "%{buildroot}%{_datadir}/php/%{real_name}/autoload.php"; %changelog +* Wed Feb 12 2020 Remi Collet - 6.3.4-1 +- update to 6.3.4 + * Wed Feb 12 2020 Remi Collet - 6.3.3-1 - update to 6.3.3 - revert 1 upstream commit breaking 7.4 -- cgit