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

- added patches

Browse Source 
8f3c56fabc
  3a7b915d9a
  + ImageMagick-infinite-resource-time-limit.patch

OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=686
This commit is contained in:
Petr Gajdos 2023-11-13 11:09:55 +00:00 committed by Git OBS Bridge
parent 158d599a1a
commit e35e190432
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,31 @@
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)
{

4
ImageMagick.changes
View File

@ -8,6 +8,10 @@ Mon Nov 13 10:09:38 UTC 2023 - pgajdos@suse.com
% ImageMagick-s390x-disable-tests.patch (refreshed) % ImageMagick-s390x-disable-tests.patch (refreshed)
- deleted patches - deleted patches
- ImageMagick-correct-time-to-live.patch (upstreamed) - ImageMagick-correct-time-to-live.patch (upstreamed)
- added patches
https://github.com/ImageMagick/ImageMagick/commit/8f3c56fabc619c1672865257e5aafe33cbfaaf3e
https://github.com/ImageMagick/ImageMagick/commit/3a7b915d9a810ce742987b37c935f6ae8b36df10
+ ImageMagick-infinite-resource-time-limit.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 13 10:35:49 UTC 2023 - pgajdos@suse.com Fri Oct 13 10:35:49 UTC 2023 - pgajdos@suse.com

4
ImageMagick.spec
View File

@ -55,7 +55,10 @@ Patch4: ImageMagick-filter.t-disable-Contrast.patch
#%%endif #%%endif
#%%ifarch s390x #%%ifarch s390x
Patch5: ImageMagick-s390x-disable-tests.patch 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 #%%endif
BuildRequires: -strace
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: dejavu-fonts BuildRequires: dejavu-fonts
BuildRequires: fdupes BuildRequires: fdupes
@ -355,6 +358,7 @@ policy plus disable few other coders for reading and/or writing.
%ifarch s390x %ifarch s390x
%patch5 -p1 %patch5 -p1
%endif %endif
%patch6 -p1
%build %build
# bsc#1088463 # bsc#1088463