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

Accepting request 1136432 from graphics

Browse Source 
- version update to 7.1.1.25
  https://github.com/ImageMagick/Website/blob/main/ChangeLog.md

- update to 7.1.1.24:
  * Added extra check for rare case when ImageMagick is build without
    any delegates.
  * Corrected order to fix invalid matches.
  * only fill the alpha channel for alpha floodfill
  * Make sure we use the lt_ methods like we do elsewhere.
  * support dng:max-raw-memory define (ImageMagick/ImageMagick#6922)
  * properly export YUV JP2 images (ImageMagick/ImageMagick#6943)
  * use : specifier
  * correct display program name
  * check for corrupt DJVU images
  * support UTF-8 comments (ImageMagick/ImageMagick#6949)
  * do not prefix iTxt key with 'png:'
  * enhance sampling factor parser (ImageMagick/ImageMagick#6943)
  * Switch to ubuntu 20.04 in the app-image build.
  * Corrected packages that need to be install due to ubuntu upgrade.
  * improve accuracy of image statistics
  * fx calculations of skewness and kurtosis
  * Only write comments as itxt when the string contains non ansi
    chars.
  * check if the string contains non-Latin1 characters
  * Corrected patch to check for non-Latin1 characters.
  * invalid JSON with -ping (ImageMagick/ImageMagick#6966)
  * throw exception if # of meta channels exceed max
    https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-hx5j-pxvh-rj7r
  * multiplication result converted to larger type
  * invalid HTTPS certificates are no longer ignored

OBS-URL: https://build.opensuse.org/request/show/1136432
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=286
This commit is contained in:
Dominique Leuenberger 2024-01-04 14:57:05 +00:00 committed by Git OBS Bridge
commit 9831cf8521
8 changed files with 147 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ImageMagick-7.1.1-21.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmU0f0MACgkQiatj1IJ3
N3qD5A//Wn6lXGgyL6rLFtiHxGvCEmW6iZG2gvNTHRMEshnVIix41xvpDMn/Oduh
o+rJ8KID+dPnOUzOhgX5dl0JYxUQg1Qd5OwbtMOqJf6DtiHLKGGyKK9+iu1GX3pW
MRimmkEZWJj4ro28SCdlk/694VWJG9QynbE4opoj3a0HF63RPvHdG9FEb86tGMJs
B61gT4jkLMiEVEBN7pDDSCxcveabEG0QRB0CwcQKg3LEcqgHmf69qmCSDvXgxN8F
LOWvwP2kt7Gqh9OOruR4by+91SrV5Y+ckh0zS18wbQL7k346prqP0lUaa/oUCuDT
LszX9hXG6tK0T2kl25kct6fFOP5FCsy5pV5BoUu7GAVgz4ISC+/FzxHecdx2lLTg
YePZPdWG21/1FvLiX5YTCC1FLaiPGs6Fg9n21kskxKZZHXfXWwLkDNUXolSH+DLQ
92xBEDYTePmemD7cf7dduOUt5UgtQcHhLoaHKFvM1AWTBh7PoWlWF4OeinmPONC3
+R2cGlXEVtpzo8bGVgx4epYAmbvHtLJXT9ckl32p5kow6fVc+f5hsaP2cKSzAEW+
UJlgfOFk0sKX1k3RZLgnWu9co0r5gsi2ZWZbyqlmWZlJfR9FxFfM4zni+ipe4HTp
Z59bCP+z1NMCUyOI4mc/i2L8Fd9YItCG0scweuw8fugsPs/EN1w=
=8EVl
-----END PGP SIGNATURE-----

3
ImageMagick-7.1.1-25.tar.xz Normal file
View File

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmWQkM0ACgkQiatj1IJ3
N3pDRQ/+I9Nj435SDXKK0TS0SGKjrcLbezcMRfwlWMmI7fdz5g9O47tjozps77Fb
5cHm5b44cnytjlDXI/PsNr8wjji03zLpGNATRekbpKe7DJie+Roa4dHuRG3JbuY/
WDYev+hVXi9ZJo9l1SuDfKMD10AYRtWwe4hgwTCmLZ4BSta7Lu1k1O/1KEg8bFv8
3JEO/uzbfsjfXoAz+0hEMbGH/8hJ5xbN3diAKvk6oDe/X7wQ9LqF6J/r4shS0x6/
gicdPac9VLwQ6pYIZU5IiWjP16mVO5QTCYxE8WhL/+19IbruOIY7jdQotT/kKwnY
CXVIN2s9Zl/qL5K+ovlFIhph306lhvms4nbQyLaSyj3NBXANJQS8GqHY+wEK1pDF
sed+7IfBo6JJ/UYVp4et3N9zUjUkVB7w/7Gcuccj72FGrWwZqyPeqb27+TNoVqdQ
fHhbGN9dDbVN5SlqSc+Z5y7c23u0gy04V1b1zfzooB/517CXUoPWaxjSZF3956TI
0u8TpOuTmG59X9kxOBcpa8ktCeRyyZimInx0kgpRk6hXa36ar6wxYV10X12NRIJR
2WC2n9CD0yppfYWpI2Ww3xv67jpRVvVTWvy89nFnSWeIHZC5Xgqg/GGVI79OBuxT
wcrnYVs8dglgYsFbfSmL79NcjW9kTvKaivxts24IfnFvDOde/BQ=
=r12e
-----END PGP SIGNATURE-----

31
ImageMagick-infinite-resource-time-limit.patch
View File

@ -1,31 +0,0 @@
Index: ImageMagick-7.1.1-21/MagickCore/resource.c
===================================================================
--- ImageMagick-7.1.1-21.orig/MagickCore/resource.c
+++ ImageMagick-7.1.1-21/MagickCore/resource.c
@@ -136,7 +136,7 @@ static ResourceInfo
MagickULLConstant(768), /* file limit */
MagickULLConstant(1), /* thread limit */
MagickULLConstant(0), /* throttle limit */
- MagickResourceInfinity /* time limit */
+ INT_MAX /* time limit */
};
static SemaphoreInfo
@@ -971,7 +971,7 @@ MagickExport MagickBooleanType ListMagic
(void) FormatMagickSize(resource_info.disk_limit,MagickTrue,"B",
MagickFormatExtent,disk_limit);
(void) CopyMagickString(time_limit,"unlimited",MagickFormatExtent);
- if (resource_info.time_limit != MagickResourceInfinity)
+ if (resource_info.time_limit != INT_MAX)
FormatTimeToLive(resource_info.time_limit,time_limit);
(void) FormatLocaleFile(file,"Resource limits:\n");
(void) FormatLocaleFile(file," Width: %s\n",width_limit);
@@ -1333,7 +1333,7 @@ MagickPrivate MagickBooleanType Resource
limit,100.0));
limit=DestroyString(limit);
}
- (void) SetMagickResourceLimit(TimeResource,MagickResourceInfinity);
+ (void) SetMagickResourceLimit(TimeResource,INT_MAX);
limit=GetEnvironmentValue("MAGICK_TIME_LIMIT");
if (limit != (char *) NULL)
{

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

@ -1,8 +1,8 @@
Index: ImageMagick-7.1.1-17/configure
Index: ImageMagick-7.1.1-23/configure
===================================================================
--- ImageMagick-7.1.1-17.orig/configure
+++ ImageMagick-7.1.1-17/configure
@@ -34840,7 +34840,9 @@ fi
--- ImageMagick-7.1.1-23.orig/configure
+++ ImageMagick-7.1.1-23/configure
@@ -34846,7 +34846,9 @@ fi
# Subdirectory to place architecture-dependent configuration files

52
ImageMagick.changes
View File

@ -1,3 +1,55 @@
-------------------------------------------------------------------
Wed Jan 3 09:22:56 UTC 2024 - pgajdos@suse.com
- version update to 7.1.1.25
https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
-------------------------------------------------------------------
Sat Dec 30 16:28:50 UTC 2023 - Dirk Müller <dmueller@suse.com>
- update to 7.1.1.24:
* Added extra check for rare case when ImageMagick is build without
any delegates.
* Corrected order to fix invalid matches.
* only fill the alpha channel for alpha floodfill
* Make sure we use the lt_ methods like we do elsewhere.
* support dng:max-raw-memory define (ImageMagick/ImageMagick#6922)
* properly export YUV JP2 images (ImageMagick/ImageMagick#6943)
* use : specifier
* correct display program name
* check for corrupt DJVU images
* support UTF-8 comments (ImageMagick/ImageMagick#6949)
* do not prefix iTxt key with 'png:'
* enhance sampling factor parser (ImageMagick/ImageMagick#6943)
* Switch to ubuntu 20.04 in the app-image build.
* Corrected packages that need to be install due to ubuntu upgrade.
* improve accuracy of image statistics
* fx calculations of skewness and kurtosis
* Only write comments as itxt when the string contains non ansi
chars.
* check if the string contains non-Latin1 characters
* Corrected patch to check for non-Latin1 characters.
* invalid JSON with -ping (ImageMagick/ImageMagick#6966)
* throw exception if # of meta channels exceed max
https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-hx5j-pxvh-rj7r
* multiplication result converted to larger type
* invalid HTTPS certificates are no longer ignored
https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-3r24-6m6q-vxmr
* multiplication result converted to larger type
* eliminate compiler warning
* don't include the index channel in the overall image statistics
* multiplication result converted to larger type
-------------------------------------------------------------------
Thu Dec 21 10:13:14 UTC 2023 - pgajdos@suse.com
- version update to 7.1.1.23
https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
- modified patches
% ImageMagick-library-installable-in-parallel.patch (refreshed)
- deleted patches
- ImageMagick-infinite-resource-time-limit.patch (upstreamed)
-------------------------------------------------------------------
Mon Nov 13 10:09:38 UTC 2023 - pgajdos@suse.com

7
ImageMagick.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ImageMagick
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
%define asan_build 0
%define maj 7
%define mfr_version %{maj}.1.1
%define mfr_revision 21
%define mfr_revision 25
%define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision}
%define clibver 10
@ -55,8 +55,6 @@ Patch4: ImageMagick-filter.t-disable-Contrast.patch
#%%endif
#%%ifarch s390x
Patch5: ImageMagick-s390x-disable-tests.patch
# https://github.com/ImageMagick/ImageMagick/commit/8f3c56fabc619c1672865257e5aafe33cbfaaf3e https://github.com/ImageMagick/ImageMagick/commit/3a7b915d9a810ce742987b37c935f6ae8b36df10
Patch6: ImageMagick-infinite-resource-time-limit.patch
#%%endif
BuildRequires: chrpath
BuildRequires: dejavu-fonts
@ -357,7 +355,6 @@ policy plus disable few other coders for reading and/or writing.
%ifarch s390x
%patch5 -p1
%endif
%patch6 -p1
%build
# bsc#1088463