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

Accepting request 1127688 from graphics

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1127688
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=285
This commit is contained in:
Ana Guerrero 2023-11-21 20:31:21 +00:00 committed by Git OBS Bridge
commit 2069558e78
9 changed files with 69 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmUjLmEACgkQiatj1IJ3
N3qRGg//Vnl6iNX8nNWyCqQR/Ook5cpYe+ufQ3gUbgOZyVGa5TYXni/6Ew2PJtmb
o/J4J7lne838bm6r187+OoDuU63HHFIdKHURR0e4L287j3VNdYkBFMgS3WRnDj0y
xP70MIAt/Wgei4hlSZhsv0+fitQli3vMvw0YlMZioF5ax32hLHSKS/j0UeIZYDRK
Imnuw/aT3fsGbcCl1yNwMTXy+O1U9oYUWqTaERy+HNnno+Muaz0uC29N+LyOmFJ0
0SQnnfwrgHgP5qBT/5FE5LIYApXbjSNSk48/majORXjEWtfJZKCbUCkZDZh9iRo1
1YDC9PEJcniLf5hGpHXrDzNVU2/svyL7zcbG7PAAxPxLhEKu26fq0HbhL/1LNqtp
i4+LE6AvExaGCuRLMBinOVLMkFpBdQDh1XAX/ihDQKtFpTmo9ZBf+C+ZykqRKW7W
n2CA6b1SR1w3v3FZF6X+I1CVzvJPu+/Wj58aOqe5+2haiDlM/Z6corUJA/ah5I34
m92LZOcgf3SmHA7DgpV8z00Q+v4xmS6l/vIo37RmV5r6OCvMikZ99Va6UcRBJOfz
wq6sERsgxQeO7X/N9/+iJ+8yRkRHYVHwd2dLL3JEeTWmxHSsud7/+uBj2GgUNxuY
PuZITiAwhlFRa/+owbCFHXKq6mfXyEmb9ZbpLttD/+E+o8thli4=
=UhjU
-----END PGP SIGNATURE-----

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

Binary file not shown.

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

@ -0,0 +1,16 @@
-----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-----

24
ImageMagick-correct-time-to-live.patch
View File

@ -1,24 +0,0 @@
diff --git a/MagickCore/timer.c b/MagickCore/timer.c
index 5a6576e67a..d33f2d374a 100644
--- a/MagickCore/timer.c
+++ b/MagickCore/timer.c
@@ -367,7 +367,8 @@ MagickExport time_t GetMagickTime(void)
time_t
epoch;
- epoch=(time_t) StringToDouble(source_date_epoch,(char **) NULL);
+ epoch=(time_t) CastDoubleToLong(StringToDouble(source_date_epoch,
+ (char **) NULL));
if ((epoch > 0) && (epoch <= time((time_t *) NULL)))
constant_magick_time=epoch;
}
@@ -409,7 +410,7 @@ MagickPrivate MagickOffsetType GetMagickTTL(void)
magick_epoch=time((time_t *) NULL);
}
return((MagickOffsetType) GetMagickResourceLimit(TimeResource)-
- (GetMagickTime()-magick_epoch));
+ (time((time_t *) NULL)-magick_epoch));
}
/*

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)
{

21
ImageMagick-s390x-disable-tests.patch
View File

@ -1,24 +1,3 @@
Index: ImageMagick-7.1.1-18/PerlMagick/t/montage.t
===================================================================
--- ImageMagick-7.1.1-18.orig/PerlMagick/t/montage.t
+++ ImageMagick-7.1.1-18/PerlMagick/t/montage.t
@@ -133,7 +133,7 @@ testMontage( q/bordercolor=>'blue', matt
testMontage( q/bordercolor=>'blue', mattecolor=>'red'/,
q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
borderwidth=>'0', gravity=>'Center', shadow=>'True',background=>'gray'/,
- '420aecbcab063e2735156a2b4d0b96e89d1b89dd84d3b2f217c9cf980f25939c',
+ 'daa470eef4373e34d09e687dead7090ba350d10a0e24055524900ba44c11ed12',
'51b8db221299cea2bea84b11247bfa4b41a0cc3a9af27ff4c20f9c23ee7f2117',
'9899c23919efd2e3ac51a60cb62a780d114ecdab40478bed21c40a2b1c9832b9');
@@ -144,7 +144,7 @@ testMontage( q/bordercolor=>'blue', matt
testMontage( q/bordercolor=>'blue', mattecolor=>'red'/,
q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
borderwidth=>'0', gravity=>'Center', shadow=>'True', texture=>'granite:'/,
- 'c10b9d30b4a3312df15f4a55c195992670dd22d59dbf2c4e3436ad730d647ed2',
+ 'b0d8e368155704da7dcc405a387f27a8fd5b86a93388b38417271d0a9d679558',
'e2fe0b56decf6fd791813e99d7b0f40646a479589e7519d97e2f92969dd17a1e',
'e9882a3ad383424e5bf803ec1522c61cfdd0b6f503ac378a03d674e2ef957d32');
Index: ImageMagick-7.1.1-18/PerlMagick/t/read.t
===================================================================

15
ImageMagick.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Mon Nov 13 10:09:38 UTC 2023 - pgajdos@suse.com
- version update to 7.1.1.21
https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
- modified patches
[bsc#1217014][bsc#1216811]
% 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

6
ImageMagick.spec
View File

@ -20,7 +20,7 @@
%define asan_build 0
%define maj 7
%define mfr_version %{maj}.1.1
%define mfr_revision 20
%define mfr_revision 21
%define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision}
%define clibver 10
@ -55,9 +55,9 @@ 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
# https://github.com/ImageMagick/ImageMagick/commit/3c727503c6ae449160dc92cf6222ebe28ef8fb52
Patch6: ImageMagick-correct-time-to-live.patch
BuildRequires: chrpath
BuildRequires: dejavu-fonts
BuildRequires: fdupes