pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1105419 from graphics

Browse Source 
- version update to 7.1.1.15
  * upstream changelog:
  https://github.com/ImageMagick/Website/blob/main/ChangeLog.md#711-15---2023-07-30
- modified patches
  % ImageMagick-library-installable-in-parallel.patch (refreshed)
- deleted patches
  - ImageMagick-CVE-2023-3428.patch (upstreamed)

OBS-URL: https://build.opensuse.org/request/show/1105419
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=278
This commit is contained in:
Ana Guerrero 2023-08-28 15:11:00 +00:00 committed by Git OBS Bridge
commit 3d82917720
8 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ImageMagick-7.1.1-12.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a761aa8c3b0690910600ba838d15379b676820f1ed912382d31c9b5da1ca1878
size 10197236

16
ImageMagick-7.1.1-12.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmSY0TYACgkQiatj1IJ3
N3paEQ//XtBcUOXIaaEFQPYWjOicVQff4Uq9NQxxhdwzRGtSytfqv7SrQo1+3ZNG
DjQ1hY5xMRUL/+2pmpuLgc5WAtGQ0LxOFAsW1f8gPo2XxfCQlXkCq0HaX3JzvngH
ZSSu+y1YtG+YkZtEUVyQwyJCCfS1FptDjOQkq208mxbn8P4C0DqV4Yl6ap2Lpehd
sqL1ssUVC0l9z4TELlcZCnUl7sf8L5Ya0JdQ+vZzNykr5sB+9PiXv8lAT4Gs2Xo6
5IGC2cBJn4n/L3dcSCWJ3we9ypXZpMYzsCSYI97qlvHXB789br6J6m5Hohlp0uFN
5iH0ztXH3dqlKflKX3WA1w/dlqZ0Z93q0mKmFJNe6wBK7We//3FbeqWzbrn3zNq7
EQBdfH72LBypw2tHdnpAnk3m77IxAUQ8XLd5j9kJquunihUBGNkO6Yag7CaehCtG
bvaWjuDBZ3tfUPzhKpg8Shpg7GQTltmblsFU+HalL6FlbiUdt4P5S40mdoDXJ7xe
RbZOEpD7GyuTRKDf11GTQ6pvGvwdjEMy8EQWnK9JxNhaa8REQdH9sOmwPqoVcV3i
qLML7P6Xb5ADfuLILlz6vqagkQD7Hr2FvymD4SdCFMESL6+CSxKWG1mWd93Vs5LR
0nHTfd61ub1F/JZlpw8jy3SGuzQz38jD5Mhlmd66T/6FgXvKXD4=
=j99y
-----END PGP SIGNATURE-----

BIN
ImageMagick-7.1.1-15.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

16
ImageMagick-7.1.1-15.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmTGad0ACgkQiatj1IJ3
N3q70A//VACuhnStqbXC+miIR0u7kOzip6uCszmV+X5w7L4ePCdke6Hp7CoSLATo
/BJUt+CU2K8a6exHwx4tTTtNm9ALASFfubL9aUCjKCh+83H6dnHgI5NpS2gSsNMD
i+FRlmm0yKKYTZZqwgWkTYDWJvnHhEEtVX+C1vgAyljlusjb+bSmEVGYPdh+EXca
rMF2bnOT3GG+MiLvI93wJAqhIGz1Zh85Ywf+wzSRaRby2z3cvH6RUMbfQXD1bOQL
l3BT+vtEsw6+GV37iWzqhVwFMWBYNzJDZUsUN6V9HmcnLdKVpPLT9a1jDZhBBDzc
kH5f4iaseG3jp7rz9BbXYQGMC8iRpZv+Ty3ew+EzjZ5Bt7ThxXVl/VnfofXOI6de
m2qj2SnLF/G3BFctpfTVYO4SWiED1/aNt5k8S0KHuYRKmGzjGf3vBV0LBIMKXs4y
VTpCm1p+RcUjHD9MKEcRpsGi6KGyLH4dZlKDwXhQ/Vcj8hg7DvvS+O2uPq/QjXPg
Dzlp0JkdRHAIMWR7Jf1XEVe1IPfl4lrxQnQkX1SxVMQExa/vXflQR91el9ijeVTv
2EEMx6hzzp07ZmQvFBCruY/gliPwyZdCY2/BmwHJ0hMekg9Z4p8NLcna+rtEMaBJ
E7IjHdHcXXxwDPCNGpeiNLSdO/oi3Il+Z0nVFqw0pI3AbojUde8=
=0QMW
-----END PGP SIGNATURE-----

14
ImageMagick-CVE-2023-3428.patch
View File

@ -1,14 +0,0 @@
diff --git a/coders/tiff.c b/coders/tiff.c
index 9e0d0b1201..df4274cacd 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2010,7 +2010,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
number_pixels=(MagickSizeType) columns*rows;
if (HeapOverflowSanityCheck(rows,sizeof(*tile_pixels)) != MagickFalse)
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
- extent=4*(samples_per_pixel+1)*MagickMax(rows*TIFFTileRowSize(tiff),
+ extent=4*(samples_per_pixel+1)*MagickMax((rows+1)*TIFFTileRowSize(tiff),
TIFFTileSize(tiff));
tile_pixels=(unsigned char *) AcquireQuantumMemory(extent,
sizeof(*tile_pixels));

8
ImageMagick-library-installable-in-parallel.patch
View File

@ -1,8 +1,8 @@
Index: ImageMagick-7.1.1-11/configure
Index: ImageMagick-7.1.1-15/configure
===================================================================
--- ImageMagick-7.1.1-11.orig/configure
+++ ImageMagick-7.1.1-11/configure
@@ -35205,7 +35205,9 @@ fi
--- ImageMagick-7.1.1-15.orig/configure
+++ ImageMagick-7.1.1-15/configure
@@ -35317,7 +35317,9 @@ fi
# Subdirectory to place architecture-dependent configuration files

11
ImageMagick.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Aug 22 13:11:14 UTC 2023 - pgajdos@suse.com
- version update to 7.1.1.15
* upstream changelog:
https://github.com/ImageMagick/Website/blob/main/ChangeLog.md#711-15---2023-07-30
- modified patches
% ImageMagick-library-installable-in-parallel.patch (refreshed)
- deleted patches
- ImageMagick-CVE-2023-3428.patch (upstreamed)
-------------------------------------------------------------------
Thu Jun 29 09:17:27 UTC 2023 - pgajdos@suse.com

5
ImageMagick.spec
View File

@ -20,7 +20,7 @@
%define asan_build 0
%define maj 7
%define mfr_version %{maj}.1.1
%define mfr_revision 12
%define mfr_revision 15
%define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision}
%define clibver 10
@ -55,8 +55,6 @@ Patch2: ImageMagick-library-installable-in-parallel.patch
Patch4: ImageMagick-filter.t-disable-Contrast.patch
#%%endif
#%%endif
# CVE-2023-3428 [bsc#1212847], heap-buffer-overflow in coders/tiff.c
Patch5: ImageMagick-CVE-2023-3428.patch
BuildRequires: chrpath
BuildRequires: dejavu-fonts
BuildRequires: fdupes
@ -299,7 +297,6 @@ preserved.
%patch4 -p1
%endif
%endif
%patch5 -p1
%build
# bsc#1088463