diff --git a/ImageMagick-infinite-resource-time-limit.patch b/ImageMagick-infinite-resource-time-limit.patch new file mode 100644 index 0000000..3f4ec60 --- /dev/null +++ b/ImageMagick-infinite-resource-time-limit.patch @@ -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) + { diff --git a/ImageMagick.changes b/ImageMagick.changes index de7e508..79aae62 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -8,6 +8,10 @@ Mon Nov 13 10:09:38 UTC 2023 - pgajdos@suse.com % ImageMagick-s390x-disable-tests.patch (refreshed) - deleted patches - 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 diff --git a/ImageMagick.spec b/ImageMagick.spec index 537811b..11d585e 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -55,7 +55,10 @@ 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: -strace BuildRequires: chrpath BuildRequires: dejavu-fonts BuildRequires: fdupes @@ -355,6 +358,7 @@ policy plus disable few other coders for reading and/or writing. %ifarch s390x %patch5 -p1 %endif +%patch6 -p1 %build # bsc#1088463