diff --git a/ImageMagick-7.1.1-21.tar.xz b/ImageMagick-7.1.1-21.tar.xz deleted file mode 100644 index b9cf8d4..0000000 --- a/ImageMagick-7.1.1-21.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e44faec8bf603e8c894a7c039fb1b4bb83dc0c429c79c74577e73ceefe4a238 -size 10220848 diff --git a/ImageMagick-7.1.1-21.tar.xz.asc b/ImageMagick-7.1.1-21.tar.xz.asc deleted file mode 100644 index 04c28c1..0000000 --- a/ImageMagick-7.1.1-21.tar.xz.asc +++ /dev/null @@ -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----- diff --git a/ImageMagick-7.1.1-23.tar.xz b/ImageMagick-7.1.1-23.tar.xz new file mode 100644 index 0000000..31a648a --- /dev/null +++ b/ImageMagick-7.1.1-23.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efd2e82910c7ce0a363760c73774b5f0645e3d9c56dcb05580514b726fa2f740 +size 10562660 diff --git a/ImageMagick-7.1.1-23.tar.xz.asc b/ImageMagick-7.1.1-23.tar.xz.asc new file mode 100644 index 0000000..1d8fc0b --- /dev/null +++ b/ImageMagick-7.1.1-23.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmV2UkYACgkQiatj1IJ3 +N3qxdQ//WFGgrhQItKkWdV1DmyX4mXSZ+PTzr6J3ZDJOTjJVfOxi7nicHypIhruc +iB1s+FFa1Gs07qI3gZzoq8L8EDkDEZmxNg+vguD8y5R2Bl+M7ID5TZr8t46RdRVg +PybcYGvJ8C/S/Y9glfoemDDceAyp1kMjNk86CIboB65GW1+ACtWh3xRglLxXlYno +BYFM9FfS5AzLsja1cjx3jWUEK9pZyGnIEzymZoXh4s+HSg4Hm25DlPPsDHZ2o0hl +T5u+hhSlr8vhKIAodr3NyZXDfKSVTCdhHwpcWSM5d5zHVErpAJknQPA/9xFvw7qh +TAYuNRiE6cwkAATjifcf0hlHPL+tXGi8++u46qrV0RN/wuGgZs+XQwe63FanCl4v +a37wrcM3reWvJ0Kxr6nD0/nW2Q09Jy1L7E8fYnNAzfebNdsNIj8BUrMclO+kq6Kz +Mb7pVAZuf7eKz8MqSRPHrzO++AZs69hdsZb9HTEpALzPCurRVlvDyEiKDB8JWhvg +y/uD71LA+NG8whYY80kmd6e7qQqSkJXD8VA4qlpefToqoMoTSABxTIEJ5znoggWn +zLOy837yByXgSMUR33oKnp5fwDkhPNUHX+hJURDz7yyMUxUIwxIJ/pVw8wtOuYvy +vN6cwBJ7OTNWNyeKtxdbMK2eJm209nzKwQyR3oe9oaYYq4exiag= +=c62F +-----END PGP SIGNATURE----- diff --git a/ImageMagick-infinite-resource-time-limit.patch b/ImageMagick-infinite-resource-time-limit.patch deleted file mode 100644 index 3f4ec60..0000000 --- a/ImageMagick-infinite-resource-time-limit.patch +++ /dev/null @@ -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) - { diff --git a/ImageMagick-library-installable-in-parallel.patch b/ImageMagick-library-installable-in-parallel.patch index 5624892..46235e6 100644 --- a/ImageMagick-library-installable-in-parallel.patch +++ b/ImageMagick-library-installable-in-parallel.patch @@ -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 diff --git a/ImageMagick.changes b/ImageMagick.changes index 79aae62..9e76fa8 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 diff --git a/ImageMagick.spec b/ImageMagick.spec index 5fc0d1b..c624283 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.1.1 -%define mfr_revision 21 +%define mfr_revision 23 %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