Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-imagick/, dev-php/pecl-imagick/files/
Date: Wed, 05 Jun 2019 12:35:02
Message-Id: 1559738083.0c53b02794259f83b7a1a9e57c54bc3d8f183bdd.grknight@gentoo
1 commit: 0c53b02794259f83b7a1a9e57c54bc3d8f183bdd
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 5 12:34:43 2019 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 5 12:34:43 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c53b027
7
8 dev-php/pecl-imagick: Drop vulnerable versions
9
10 Bug: https://bugs.gentoo.org/687030
11 Package-Manager: Portage-2.3.67, Repoman-2.3.13
12 Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
13
14 dev-php/pecl-imagick/Manifest | 2 --
15 .../pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch | 18 ------------
16 dev-php/pecl-imagick/pecl-imagick-3.4.3.ebuild | 25 -----------------
17 .../pecl-imagick-3.4.3_p20181129.ebuild | 32 ----------------------
18 4 files changed, 77 deletions(-)
19
20 diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
21 index c4c62dbc90c..1f064c2a8fe 100644
22 --- a/dev-php/pecl-imagick/Manifest
23 +++ b/dev-php/pecl-imagick/Manifest
24 @@ -1,3 +1 @@
25 -DIST imagick-3.4.3.tgz 245410 BLAKE2B 778c3b8ad3ad5e698044a832d71409eea220a82041544abeb88b59370d4b719388ce13b277d7aad84e67e40fcbbfa06d66a2458d4d9e8d33bb7358ab46368230 SHA512 2cb2b856cf83a78d3542cdf7c69554dcc063a0541e9092b24e5e1fbd8928066a4a3de154049d0202c35addbc5055ccfbb5910ae92f2f13da80ddfc025340ddcd
26 DIST imagick-3.4.4.tgz 253434 BLAKE2B 73ce21547881b60733dbc19ae83cd2e60135dbb4052ea723f1ee10b3759ce12065a0cab2a7e4923b78e9e68b12fd7b875c7d1bd7b2a14ce4e4d7ff5b9c7fbc06 SHA512 73145a1f095849c32760db2dfc4acc13c57d99a037d65eca9b0ddf8f8e81cf6d28a50f2614e44bae1d90b4f881a2e9a64926e0e3b9403e491fd903ffeb30c4b7
27 -DIST pecl-imagick-3.4.3_p20181129.tar.gz 260443 BLAKE2B 43d30514f5faeeaa5894e2eb51d5b2ebbe2940728c7770eec60c41c9f01f86f7423d87a71a9ad2068e388f3994c31e499940c2042994846a6b6ab66542c7ea53 SHA512 7f3719118849857d19b9a35a63de68d4e992780fd41231a041d6d152ab2f0abd3d8215ab2362a998f8fe6a733c087d3c3e5d09fa826480d621739e92f5aeabf2
28
29 diff --git a/dev-php/pecl-imagick/files/pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch b/dev-php/pecl-imagick/files/pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch
30 deleted file mode 100644
31 index ff0a1eb3888..00000000000
32 --- a/dev-php/pecl-imagick/files/pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch
33 +++ /dev/null
34 @@ -1,18 +0,0 @@
35 -https://github.com/mkoppanen/imagick/issues/264
36 -
37 ---- a/imagick_file.c
38 -+++ b/imagick_file.c
39 -@@ -160,11 +160,13 @@ static
40 - int php_imagick_read_image_using_imagemagick(php_imagick_object *intern, struct php_imagick_file_t *file, ImagickOperationType type TSRMLS_DC)
41 - {
42 -
43 -+#ifdef ZTS
44 - #ifndef ZEND_ENGINE_3
45 - #if PHP_VERSION_ID >= 50600
46 - // This suppresses an 'unused parameter' warning.
47 - (void)tsrm_ls;
48 - #endif
49 -+#endif
50 - #endif
51 -
52 - if (type == ImagickReadImage) {
53
54 diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.3.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.3.ebuild
55 deleted file mode 100644
56 index 2552562115d..00000000000
57 --- a/dev-php/pecl-imagick/pecl-imagick-3.4.3.ebuild
58 +++ /dev/null
59 @@ -1,25 +0,0 @@
60 -# Copyright 1999-2017 Gentoo Foundation
61 -# Distributed under the terms of the GNU General Public License v2
62 -
63 -EAPI=6
64 -
65 -MY_PV="${PV/rc/RC}"
66 -
67 -USE_PHP="php5-6 php7-0 php7-1 php7-2"
68 -
69 -inherit php-ext-pecl-r3
70 -
71 -KEYWORDS="amd64 x86"
72 -
73 -DESCRIPTION="PHP wrapper for the ImageMagick library"
74 -LICENSE="PHP-3.01"
75 -SLOT="0"
76 -IUSE="examples test"
77 -
78 -# imagemagick[-openmp] is needed wrt bug 547922 and upstream
79 -# https://github.com/mkoppanen/imagick#openmp
80 -RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
81 -DEPEND="${RDEPEND}
82 - test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] )"
83 -
84 -PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr"
85
86 diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild
87 deleted file mode 100644
88 index e1c86fc7343..00000000000
89 --- a/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild
90 +++ /dev/null
91 @@ -1,32 +0,0 @@
92 -# Copyright 1999-2019 Gentoo Authors
93 -# Distributed under the terms of the GNU General Public License v2
94 -
95 -EAPI="6"
96 -PHP_EXT_NAME="imagick"
97 -
98 -MY_COMMIT="d57a444766a321fa226266f51f1f42ee2cc29cc7"
99 -
100 -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
101 -
102 -S="${WORKDIR}/imagick-${MY_COMMIT}"
103 -
104 -inherit php-ext-source-r3
105 -
106 -KEYWORDS="~amd64 ~x86"
107 -
108 -DESCRIPTION="PHP wrapper for the ImageMagick library"
109 -HOMEPAGE="https://pecl.php.net/imagick https://github.com/mkoppanen/imagick"
110 -SRC_URI="https://github.com/mkoppanen/imagick/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
111 -LICENSE="PHP-3.01"
112 -SLOT="0"
113 -IUSE="examples test"
114 -
115 -# imagemagick[-openmp] is needed wrt bug 547922 and upstream
116 -# https://github.com/mkoppanen/imagick#openmp
117 -RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
118 -DEPEND="${RDEPEND}
119 - test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] )"
120 -
121 -PATCHES=( "${FILESDIR}"/${PN}-3.4.3-tsrm_ls-is-undeclared.patch )
122 -
123 -PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX%/}/usr"