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

Sync from SUSE:SLFO:Main ImageMagick revision 53c3e1143822109d759bfdbc88771f00

Browse Source
This commit is contained in:
Adrian Schröter 2024-09-30 16:45:25 +02:00
parent a810e832ff
commit a2c04c0db2
9 changed files with 488 additions and 237 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-----

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

Binary file not shown.

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmbLKqoACgkQiatj1IJ3
N3rxzhAAghylFbnhHzgMLeIL8xHqotsUs0njgR/VHd6F/D1aLGJCIChjATpOnPgd
IX96wFxNGJMDQYv70qyAKmw/JXDKbxoHS+lWRE8TMqYc8JWL5v7NenTTrhs2cZud
ZHaFdo9/pQaAAlhtCqpMWzgx/ZyzY4DnW7Q/1YbtlVrU7BVyOW0vn301ZAQFwagT
Ptu/afSGrepFAPeTS/qOo6LoZkT+iylW/t+NkG65eyoWOLvz3E13zmEO5yUkxNtC
yF6XfGFdBmt8/+7F2x7KFcKeBx3Zt/5yERbTqLqW9q0WCQ8TBzHy17ztWppocRZ4
WgULvmWYis2A2q2PuvfiB8AW3Ycw+MI/I4r2M0TQn1ngMnxdiHw8yFQXs5pY98/m
eEu0/HkyQNs/ANQ5soKcc/4RnonYu1vW0rPv6tZ9LNAzFiRhlVQXYct4Alkkw8o4
zuaL6TO51qeDj2cG3rIGoVek5uQ2fuMabnVFqCbZ5Atm+JsDCnqRlAWUbXfKg4t5
2/OY9b9E37HNcqhVU9mZrx0gnC/tynpFqg4mQ46LkqmEmx2UZvF7fRdX0GTDlJsq
Cy8FfeXM0/LNDikr3PLLsNtPUtqQH71iJ8aq0aZ4KlUImhRf04cylJPUmt0qCyp6
V3FgIC/QDI69HQSEAFgvJmpJSfDSGT3PGkscB+bLjkFAWXk//PY=
=75KZ
-----END PGP SIGNATURE-----

31
ImageMagick-configuration-SUSE.patch
View File

@ -1,6 +1,28 @@
--- a/config/policy-secure.xml Index: ImageMagick-7.1.1-30/config/policy-secure.xml
+++ b/config/policy-secure.xml ===================================================================
@@ -92,8 +92,10 @@ --- ImageMagick-7.1.1-30.orig/config/policy-secure.xml
+++ ImageMagick-7.1.1-30/config/policy-secure.xml
@@ -62,7 +62,7 @@
<policy domain="resource" name="disk" value="1GiB"/>
<!-- Set the maximum length of an image sequence. When this limit is
exceeded, an exception is thrown. -->
- <policy domain="resource" name="list-length" value="32"/>
+ <policy domain="resource" name="list-length" value="128"/>
<!-- Set the maximum width of an image. When this limit is exceeded, an
exception is thrown. -->
<policy domain="resource" name="width" value="8KP"/>
@@ -83,17 +83,19 @@
<!-- Replace passphrase for secure distributed processing -->
<!-- <policy domain="cache" name="shared-secret" value="secret-passphrase" stealth="true"/> -->
<!-- Do not permit any delegates to execute. -->
- <policy domain="delegate" rights="none" pattern="*"/>
+ <!--policy domain="delegate" rights="none" pattern="*"/-->
<!-- Do not permit any image filters to load. -->
<policy domain="filter" rights="none" pattern="*"/>
<!-- Don't read/write from/to stdin/stdout. -->
- <policy domain="path" rights="none" pattern="-"/>
+ <!--policy domain="path" rights="none" pattern="-"/-->
<!-- don't read sensitive paths. -->
<policy domain="path" rights="none" pattern="/etc/*"/> <policy domain="path" rights="none" pattern="/etc/*"/>
<!-- Indirect reads are not permitted. --> <!-- Indirect reads are not permitted. -->
<policy domain="path" rights="none" pattern="@*"/> <policy domain="path" rights="none" pattern="@*"/>
@ -8,8 +30,7 @@
+ <policy domain="module" rights="none" pattern="{EPHEMERAL,URL,HTTPS,MVG,MSL,TEXT,SHOW,WIN,PLT}"/> + <policy domain="module" rights="none" pattern="{EPHEMERAL,URL,HTTPS,MVG,MSL,TEXT,SHOW,WIN,PLT}"/>
<!-- These image types are security risks on read, but write is fine --> <!-- These image types are security risks on read, but write is fine -->
- <policy domain="module" rights="write" pattern="{MSL,MVG,PS,SVG,URL,XPS}"/> - <policy domain="module" rights="write" pattern="{MSL,MVG,PS,SVG,URL,XPS}"/>
+ <policy domain="module" rights="write" pattern="{MSL,MVG,PS,SVG,URL,XPS,PDF,EPI,EPS,PCL,PS1,PS2,PS3}"/> + <policy domain="module" rights="write" pattern="{MSL,MVG,PS,URL,XPS,PDF,EPI,EPS,PCL,PS1,PS2,PS3}"/>
<!-- This policy sets the number of times to replace content of certain <!-- This policy sets the number of times to replace content of certain
memory buffers and temporary files before they are freed or deleted. --> memory buffers and temporary files before they are freed or deleted. -->
<policy domain="system" name="shred" value="1"/> <policy domain="system" name="shred" value="1"/>

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-31/configure
=================================================================== ===================================================================
--- ImageMagick-7.1.1-17.orig/configure --- ImageMagick-7.1.1-31.orig/configure
+++ ImageMagick-7.1.1-17/configure +++ ImageMagick-7.1.1-31/configure
@@ -34840,7 +34840,9 @@ fi @@ -35015,7 +35015,9 @@ fi
# Subdirectory to place architecture-dependent configuration files # Subdirectory to place architecture-dependent configuration files

401
ImageMagick.changes
View File

@ -1,3 +1,264 @@
-------------------------------------------------------------------
Tue Aug 27 08:21:42 UTC 2024 - pgajdos@suse.com
- version update to 7.1.1.37
* Bump azure/trusted-signing-action from 0.3.20 to 0.4.0 #7518
* Silence warning and fix HEIC_COMPUTE_NUMERIC_VERSION definition when heic delegate is disabled. #7516
* protect macro arguments with parens 86cb2b1
* eliminate compiler warnings d90d8b4
* correct copyright year 115271e
* Ignore multiple exif and xmp profiles for the same jxl frame and fix reading those profiles per frame. c301208
* read/write in chunks fff3058
* optimize fwrite() arguments ada6785
* Renamed Output folder to Artifacts. 2a69677
* cancel interactive window selection with right button press ea2a2db
* cosmetic 712bde4
* eliminate compiler warning 9a9a25c
* eliminate compiler warning 0bd1687
* Make images mandatory in the issue template. c01fd37
* Added extra header detection for avif files. 9fc0590
* allow SeekBlob() to set an offset beyond the end of the blob 27c3f99
* be less forgiving for invalid image indexes 25db2e5
* Fixed problem with empty macros (#7562) 9fda5f2
* Added missing null checks for RequestOpenCLDevice. f85448e
* Added missing null check for AcquireOpenCLCommandQueue. 295e9c8
* persist app1 jpeg profile (ImageMagick/ImageMagick#4713) f0357c7
* Fixed build error. b3dd431
* Remove some of the dependencies for the macos-13 build. d0bce95
* parentheses is the plural of parenthesis 1fac80a
* distribute quantization error for -dither FloydSteinberg -depth 5b2825b
* release 8a0da9f
* properly set image byte order 40f6599
* set max colormap size for remap 1ffe565
-------------------------------------------------------------------
Sat Aug 3 18:26:29 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
- version update to 7.1.1.36
* uhdr.c: default initialize range field for hdr/sdr intent inputs to
enc by @aayushsoni111 in #7482
* Fixed typo in documentation of MagickAdaptiveBlurImage by @JonahEMorgan
in #7500
* Silence warning when freetype delegate is disabled. by @niclet in #7515
-------------------------------------------------------------------
Thu Jul 25 08:23:31 UTC 2024 - pgajdos@suse.com
- version update to 7.1.1.35
* Also set dpi-x and dpi-y when running rsvg-convert. eac001f
* convert sub-command is deprecated d67039e
* only operators should disable "identify ping" (ImageMagick/ImageMagick#7441) a262192
* fix compiler error ecc21c7
* -outdir deprecated 9980efa
* Get the correct width and height when heic:preserve-orientation is set to true. ed3a0dd
* Set heic image orientation using transform information. ba470aa
* Exit earlier when the symlink could not be created when invoking the svg:decode delegate. 8a48edd
* Fixed MSYS2 build error. 3b22378
* Also set the DNG properties when pinging the image. fc1c61b
* Silence warning when lqr delegate is disabled. ae0d69a
* Added version check for the heif_properties.h include. 656b4d2
* Make sure we always use the i64 version of the "file methods" on Windows. b3e8a78
* Changed defines to use method instead of a define. 75b66c4
* Changes due to upgrade of libheif. 841f033
* smooth the rendering of an ellipse (ImageMagick/ImageMagick#7465) 1bfce2a
-------------------------------------------------------------------
Sun Jun 23 20:52:45 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
- version update to 7.1.1.34
* Bump azure/trusted-signing-action from 0.3.18 to 0.3.19 in #7348
* Fix a typo in convert deprecation warning in #7383
* Bump azure/trusted-signing-action from 0.3.19 to 0.3.20 in #7388
* Updated FontConfig query to include font index, fixing (#7374) in #7409
- removed patch (upstreamed)
- ImageMagick-update-image-signature.patch
-------------------------------------------------------------------
Sat May 25 21:11:21 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
- version update to 7.1.1.33
* Fix typo in #7294
* Bump azure/trusted-signing-action from 0.3.16 to 0.3.18 in #7325
* Bump caphyon/advinst-github-action from 1.1 to 2.0 in #7326
- added patch
+ ImageMagick-update-image-signature.patch
-------------------------------------------------------------------
Thu May 16 09:06:36 UTC 2024 - pgajdos@suse.com
- reverted update-alternatives usage removal [bsc#1122033][bsc#1220818]
-------------------------------------------------------------------
Sun May 5 19:33:38 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
- version update to 7.1.1.32
* Fix GIF ICC profile reading #7282
* uhdr.c: add support for rgb inputs #7273
-------------------------------------------------------------------
Mon Apr 22 08:01:53 UTC 2024 - pgajdos@suse.com
- version update to 7.1.1.31
* Convert big PDF documents is slow #7263
* Update release.yml #7258
* Update README.md #7245
* uhdr.c: verify the availability of error message before accessing it #7229
- removed patches
- ImageMagick-wmflite-detection.patch (upstreamed)
`
-------------------------------------------------------------------
Mon Apr 15 10:19:07 UTC 2024 - pgajdos@suse.com
- relax list-length resource limit, fixes build of python-Wand
% ImageMagick-configuration-SUSE.patch
-------------------------------------------------------------------
Mon Apr 8 14:44:40 UTC 2024 - pgajdos@suse.com
- version update to 7.1.1.30
* install perl module into user-specified prefix by @bugfood in #7192
* Fix bmp option to bypass file size check by @OnTheList-1 in #7194
* add support for encoding/decoding ultrahdr images by @aayushsoni111 in #7198
* Updates to uhdr.c by @aayushsoni111 in #7217
- added patches
fix https://github.com/ImageMagick/ImageMagick/issues/7230
+ ImageMagick-wmflite-detection.patch
-------------------------------------------------------------------
Fri Mar 22 10:32:38 UTC 2024 - pgajdos@suse.com
- allow stdin/stdout
- modified patches
% ImageMagick-configuration-SUSE.patch
-------------------------------------------------------------------
Thu Mar 21 08:35:53 UTC 2024 - pgajdos@suse.com
- allow delegates to be executed, was disabled by default policy
- modified patches
% ImageMagick-configuration-SUSE.patch (refreshed)
% ImageMagick-library-installable-in-parallel.patch (refreshed)
-------------------------------------------------------------------
Mon Mar 4 11:55:33 UTC 2024 - pgajdos@suse.com
- enable SVG again
- modified patches
% ImageMagick-configuration-SUSE.patch (refreshed)
-------------------------------------------------------------------
Sat Mar 2 23:03:12 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
- We can not replace a symlink with a directory on the directly
Unregister the whole group manually in %pre with
update-alternatives. (boo#1220818)
Restore Requires(pre) on update-alternatives for the mean time.
-------------------------------------------------------------------
Tue Feb 27 20:28:12 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
- version update to 7.1.1.29
https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
-------------------------------------------------------------------
Thu Feb 22 07:57:01 UTC 2024 - Michael Vetter <mvetter@suse.com>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Sun Feb 11 20:57:22 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
- version update to 7.1.1.28
https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
-------------------------------------------------------------------
Sun Jan 21 19:12:06 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
- version update to 7.1.1.27
https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
-------------------------------------------------------------------
Tue Jan 16 14:54:49 UTC 2024 - pgajdos@suse.com
- only one configuration again, based on upstream 'secure' policy
- other upstream policies packaged in documentation
-------------------------------------------------------------------
Mon Jan 15 14:30:40 UTC 2024 - pgajdos@suse.com
- use correct policy.xml
-------------------------------------------------------------------
Sun Jan 14 10:57:43 UTC 2024 - munix9@googlemail.com
- Fix incomplete removal of update-alternatives for config
- Replace obsolete 'otherproviders(imagick-%{config_spec})' with
'Conflicts: imagick-%{config_spec}'
-------------------------------------------------------------------
Fri Jan 12 15:32:08 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
- version update to 7.1.1.26
https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
-------------------------------------------------------------------
Fri Jan 5 10:49:19 UTC 2024 - pgajdos@suse.com
- drop update-alternatives for config; use exactly one of configuration
package provided
-------------------------------------------------------------------
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 Mon Nov 13 10:09:38 UTC 2023 - pgajdos@suse.com
@ -108,7 +369,7 @@ Thu May 18 12:03:17 UTC 2023 - Dirk Müller <dmueller@suse.com>
Wed May 3 13:54:55 UTC 2023 - Deepthi Yadabettu Venkatachala <deepthi.venkatachala@suse.com> Wed May 3 13:54:55 UTC 2023 - Deepthi Yadabettu Venkatachala <deepthi.venkatachala@suse.com>
- version update to 7.1.1.8 - version update to 7.1.1.8
- https://github.com/ImageMagick/Website/blob/main/ChangeLog.md#711-8---2023-04-22 - https://github.com/ImageMagick/Website/blob/main/ChangeLog.md#711-8---2023-04-22
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 13 11:17:45 UTC 2023 - pgajdos@suse.com Thu Apr 13 11:17:45 UTC 2023 - pgajdos@suse.com
@ -186,7 +447,7 @@ Wed Jan 4 10:03:42 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
Sun Dec 18 16:01:22 UTC 2022 - Dirk Müller <dmueller@suse.com> Sun Dec 18 16:01:22 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 7.1.0.55: - update to 7.1.0.55:
* https://github.com/ImageMagick/Website/blob/main/ChangeLog.md#710-55---2022-12-17 * https://github.com/ImageMagick/Website/blob/main/ChangeLog.md#710-55---2022-12-17
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 5 10:22:56 UTC 2022 - pgajdos@suse.com Mon Dec 5 10:22:56 UTC 2022 - pgajdos@suse.com
@ -238,7 +499,7 @@ Mon Sep 12 12:41:51 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 7.1.0.48 - update to 7.1.0.48
upstream changelog: upstream changelog:
https://raw.githubusercontent.com/ImageMagick/Website/main/ChangeLog.md https://raw.githubusercontent.com/ImageMagick/Website/main/ChangeLog.md
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 30 10:24:06 UTC 2022 - pgajdos@suse.com Tue Aug 30 10:24:06 UTC 2022 - pgajdos@suse.com
@ -484,7 +745,7 @@ Mon Feb 14 22:49:45 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 7.1.0.24: - update to 7.1.0.24:
* optimize reading of XPM properties. * optimize reading of XPM properties.
* the GIF Netscape block must appear immediately after the global color table. * the GIF Netscape block must appear immediately after the global color table.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 7 10:11:16 UTC 2022 - pgajdos@suse.com Mon Feb 7 10:11:16 UTC 2022 - pgajdos@suse.com
@ -738,7 +999,7 @@ Tue Apr 13 11:39:43 UTC 2021 - pgajdos@suse.com
Tue Apr 6 01:21:33 UTC 2021 - Dirk Müller <dmueller@suse.com> Tue Apr 6 01:21:33 UTC 2021 - Dirk Müller <dmueller@suse.com>
- udpate to 7.0.11.6: - udpate to 7.0.11.6:
* fix portable Windows build. * fix portable Windows build.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 31 08:44:15 UTC 2021 - pgajdos@suse.com Wed Mar 31 08:44:15 UTC 2021 - pgajdos@suse.com
@ -974,7 +1235,7 @@ Mon Aug 31 16:56:25 UTC 2020 - pgajdos@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 31 13:30:24 UTC 2020 - pgajdos@suse.com Mon Aug 31 13:30:24 UTC 2020 - pgajdos@suse.com
- fix bsc#1106272 - fix bsc#1106272
- added patches - added patches
fix https://github.com/ImageMagick/ImageMagick/commit/029fb3425ecf82e8b30c060e38a135d1d3e76bb3 fix https://github.com/ImageMagick/ImageMagick/commit/029fb3425ecf82e8b30c060e38a135d1d3e76bb3
+ ImageMagick-set-correct-colorspace.patch + ImageMagick-set-correct-colorspace.patch
@ -1542,7 +1803,7 @@ Tue Apr 23 14:24:51 UTC 2019 - pgajdos@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 23 13:33:30 UTC 2019 - mvetter@suse.com Tue Apr 23 13:33:30 UTC 2019 - mvetter@suse.com
-bsc#1133110 - Remove jasper dependency from ImageMagick -bsc#1133110 - Remove jasper dependency from ImageMagick
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 16 11:48:44 UTC 2019 - pgajdos@suse.com Tue Apr 16 11:48:44 UTC 2019 - pgajdos@suse.com
@ -1757,7 +2018,7 @@ Mon Sep 3 08:20:41 UTC 2018 - pgajdos@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 22 09:10:19 UTC 2018 - pgajdos@suse.com Wed Aug 22 09:10:19 UTC 2018 - pgajdos@suse.com
- disable PS, PS2, PS3, XPS and PDF coders in default policy.xml - disable PS, PS2, PS3, XPS and PDF coders in default policy.xml
[bsc#1105592] [bsc#1105592]
------------------------------------------------------------------- -------------------------------------------------------------------
@ -1808,7 +2069,7 @@ Mon Jul 2 17:39:31 UTC 2018 - kstreitova@suse.com
- use "BuildRequires: p7zip-full" for TW as 7za binary needed by - use "BuildRequires: p7zip-full" for TW as 7za binary needed by
ImageMagick was moved to this package (see bsc#899627 for more ImageMagick was moved to this package (see bsc#899627 for more
details about this change) details about this change)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 26 09:49:48 UTC 2018 - pgajdos@suse.com Tue Jun 26 09:49:48 UTC 2018 - pgajdos@suse.com
@ -1870,7 +2131,7 @@ Wed May 2 12:25:24 UTC 2018 - pgajdos@suse.com
Wed May 2 11:00:44 UTC 2018 - pgajdos@suse.com Wed May 2 11:00:44 UTC 2018 - pgajdos@suse.com
- update to 7.0.7-29: - update to 7.0.7-29:
* Fixed numerous use of uninitialized values, integer overflow, * Fixed numerous use of uninitialized values, integer overflow,
memory exceeded, and timeouts (credit to OSS Fuzz). memory exceeded, and timeouts (credit to OSS Fuzz).
- turn off drawing primitive 'circle' test: - turn off drawing primitive 'circle' test:
+ ImageMagick-filter.t-primitive-circle.patch + ImageMagick-filter.t-primitive-circle.patch
@ -1924,7 +2185,7 @@ Mon Mar 26 08:47:41 UTC 2018 - pgajdos@suse.com
Mon Mar 19 05:37:42 UTC 2018 - pgajdos@suse.com Mon Mar 19 05:37:42 UTC 2018 - pgajdos@suse.com
- update to 7.0.7-27: - update to 7.0.7-27:
* Fixed numerous use of uninitialized values, integer overflow, * Fixed numerous use of uninitialized values, integer overflow,
memory exceeded, and timeouts. memory exceeded, and timeouts.
- remove ImageMagick-remove-test.tap-attributes.patch as the perl - remove ImageMagick-remove-test.tap-attributes.patch as the perl
testsuite fails in bunch of tests anyway. Waiting for results of testsuite fails in bunch of tests anyway. Waiting for results of
@ -1933,7 +2194,7 @@ Mon Mar 19 05:37:42 UTC 2018 - pgajdos@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 16 13:30:15 UTC 2018 - pgajdos@suse.com Fri Mar 16 13:30:15 UTC 2018 - pgajdos@suse.com
- added ImageMagick-remove-test.tap-attributes.patch, removes - added ImageMagick-remove-test.tap-attributes.patch, removes
failing test on i586 failing test on i586
https://github.com/ImageMagick/ImageMagick/issues/1019 https://github.com/ImageMagick/ImageMagick/issues/1019
@ -1948,7 +2209,7 @@ Wed Mar 14 15:08:42 UTC 2018 - pgajdos@suse.com
Mon Mar 5 11:35:52 UTC 2018 - pgajdos@suse.com Mon Mar 5 11:35:52 UTC 2018 - pgajdos@suse.com
- update to 7.0.7-25 - update to 7.0.7-25
* Fixed numerous use of uninitialized values, integer overflow, * Fixed numerous use of uninitialized values, integer overflow,
memory exceeded, and timeouts (credit to OSS Fuzz). memory exceeded, and timeouts (credit to OSS Fuzz).
------------------------------------------------------------------- -------------------------------------------------------------------
@ -1985,16 +2246,16 @@ Wed Feb 21 13:24:09 UTC 2018 - pgajdos@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 19 21:58:06 UTC 2018 - crrodriguez@opensuse.org Mon Feb 19 21:58:06 UTC 2018 - crrodriguez@opensuse.org
- Add explicit buildrequires on: pkgconfig(libwebpmux), - Add explicit buildrequires on: pkgconfig(libwebpmux),
pkgconfig(cairo), pkgconfig(fontconfig), pkgconfig(libpng), pkgconfig(cairo), pkgconfig(fontconfig), pkgconfig(libpng),
pkgconfig(x11), pkgconfig(xext), pkgconfig(zlib). all pkgconfig(x11), pkgconfig(xext), pkgconfig(zlib). all
of them direct build dependencies but not included in of them direct build dependencies but not included in
the spec file the spec file
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 31 18:50:15 CET 2018 - ro@suse.de Wed Jan 31 18:50:15 CET 2018 - ro@suse.de
- update context for ImageMagick-s390-disable-tests.patch - update context for ImageMagick-s390-disable-tests.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 24 10:43:41 UTC 2018 - pgajdos@suse.com Wed Jan 24 10:43:41 UTC 2018 - pgajdos@suse.com
@ -2055,7 +2316,7 @@ Wed Nov 22 09:51:46 UTC 2017 - pgajdos@suse.com
Wed Nov 1 13:16:23 UTC 2017 - pgajdos@suse.com Wed Nov 1 13:16:23 UTC 2017 - pgajdos@suse.com
- update to 7.0.7-10 - update to 7.0.7-10
* Fixed a problem with resource bookkeeping in * Fixed a problem with resource bookkeeping in
AcquireMatrixInfo(). AcquireMatrixInfo().
- update to 7.0.7-9 - update to 7.0.7-9
* Encode JSON control characters. * Encode JSON control characters.
@ -2084,7 +2345,7 @@ Thu Oct 5 07:08:47 UTC 2017 - pgajdos@suse.com
* Reset the magick_list_initialized boolean when needed. * Reset the magick_list_initialized boolean when needed.
* Fixed numerous memory leaks. * Fixed numerous memory leaks.
* Support URW-base35 fonts. * Support URW-base35 fonts.
* Removed "ping_preserve_iCCP=MagickTrue;" statement that was * Removed "ping_preserve_iCCP=MagickTrue;" statement that was
inadvertently added to coders/png.c. inadvertently added to coders/png.c.
------------------------------------------------------------------- -------------------------------------------------------------------
@ -2122,12 +2383,12 @@ Mon Sep 11 07:33:49 UTC 2017 - pgajdos@suse.com
- updated to 7.0.7-1 - updated to 7.0.7-1
* Fixed numerous memory leaks. * Fixed numerous memory leaks.
* Added -define tiff:write-layers=true to add support for writing * Added -define tiff:write-layers=true to add support for writing
layered tiff files. layered tiff files.
* Don't overwrite symbolic links when the shred policy is enabled. * Don't overwrite symbolic links when the shred policy is enabled.
* Support -metric ssim, structual similarity index. * Support -metric ssim, structual similarity index.
* Fixed thread safety issue inside the pango and librsvg decoder. * Fixed thread safety issue inside the pango and librsvg decoder.
* Fixed bug with writing tIME chunk when timezone has a negative * Fixed bug with writing tIME chunk when timezone has a negative
offset. offset.
* Support CubicSpline resize filter. Define the lobes with the * Support CubicSpline resize filter. Define the lobes with the
-define filter:lobes={2,3,4}. -define filter:lobes={2,3,4}.
@ -2341,7 +2602,7 @@ Tue Nov 22 09:32:21 UTC 2016 - pgajdos@suse.com
* Unit test pass again after small SUN image patch. * Unit test pass again after small SUN image patch.
* Fixed incorrect RLE decoding when reading a DCM image that contains * Fixed incorrect RLE decoding when reading a DCM image that contains
multiple segments. multiple segments.
* Fixed incorrect RLE decoding when reading an SGI image (reference * Fixed incorrect RLE decoding when reading an SGI image (reference
https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30514) https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30514)
------------------------------------------------------------------- -------------------------------------------------------------------
@ -2453,7 +2714,7 @@ Wed May 11 11:56:25 UTC 2016 - chris@computersalat.de
- rework ImageMagick-6.8.8-1-disable-insecure-coders.patch - rework ImageMagick-6.8.8-1-disable-insecure-coders.patch
* add new policy (TEXT, SHOW, WIN and PLT) * add new policy (TEXT, SHOW, WIN and PLT)
- rebase patches (p0) - rebase patches (p0)
* ImageMagick-6.6.8.9-doc.patch * ImageMagick-6.6.8.9-doc.patch
* ImageMagick-6.6.8.9-examples.patch * ImageMagick-6.6.8.9-examples.patch
* ImageMagick-6.7.6.1-no-dist-lzip.patch * ImageMagick-6.7.6.1-no-dist-lzip.patch
@ -2482,7 +2743,7 @@ Thu May 5 09:02:32 UTC 2016 - pgajdos@suse.com
Thu Apr 14 14:30:54 UTC 2016 - pgajdos@suse.com Thu Apr 14 14:30:54 UTC 2016 - pgajdos@suse.com
- Update to 6.9.3-8: - Update to 6.9.3-8:
* Respect gravity when rendering text (e.g. convert -gravity center * Respect gravity when rendering text (e.g. convert -gravity center
my.txt). my.txt).
* Return empty string for %d property and no directory. * Return empty string for %d property and no directory.
* Return filename for the %i property. * Return filename for the %i property.
@ -2499,25 +2760,25 @@ Tue Jan 5 11:40:38 UTC 2016 - pgajdos@suse.com
* Fixed memory leak when reading incorrect PSD files. * Fixed memory leak when reading incorrect PSD files.
* Enhance PDF to properly handle unicode titles. * Enhance PDF to properly handle unicode titles.
* Fix memory leak in icon coder. * Fix memory leak in icon coder.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 17 11:59:18 UTC 2015 - pgajdos@suse.com Thu Dec 17 11:59:18 UTC 2015 - pgajdos@suse.com
- Update to 6.9.2-8: - Update to 6.9.2-8:
* Gray artifacts in large gif when using -layers optimize. * Gray artifacts in large gif when using -layers optimize.
* The DICOM reader now handles the rescale intercept and slope. * The DICOM reader now handles the rescale intercept and slope.
* Added 'bmp3:alpha' option for including the alpha channel when * Added 'bmp3:alpha' option for including the alpha channel when
writing an image in the BMP3 format. writing an image in the BMP3 format.
* PixelColor off by one on i386. * PixelColor off by one on i386.
* Added local contrast enhancement. * Added local contrast enhancement.
* Fixed bug in SetPixelCacheExtent that made images all black. * Fixed bug in SetPixelCacheExtent that made images all black.
* Added 6dot variant for unicode and iso braille formats. * Added 6dot variant for unicode and iso braille formats.
* Fixed alpha blending issue with semi-transparent pixels in the * Fixed alpha blending issue with semi-transparent pixels in the
merged image of PSD files. This can be disabled by setting the merged image of PSD files. This can be disabled by setting the
option 'psd:alpha-unblend' to 'off'. option 'psd:alpha-unblend' to 'off'.
* Fixed issue in jpeg:extent that prevented it from working. * Fixed issue in jpeg:extent that prevented it from working.
* Fixed memory leak when reading Photoshop layers in a TIFF file. * Fixed memory leak when reading Photoshop layers in a TIFF file.
* Support gradient:bounding-box, gradient:vector, gradient:center, * Support gradient:bounding-box, gradient:vector, gradient:center,
and gradient:radius to shape the gradient rendering. and gradient:radius to shape the gradient rendering.
* Recognize label:@- as stdin. * Recognize label:@- as stdin.
* Make commas optional for coordinates. * Make commas optional for coordinates.
@ -2530,11 +2791,11 @@ Mon Oct 12 07:47:14 UTC 2015 - pgajdos@suse.com
* Fixed out of bounds error in -splice. * Fixed out of bounds error in -splice.
* Created Manhattan Interpolate method for -sparse-color. * Created Manhattan Interpolate method for -sparse-color.
* Don't round up for JPEG image resolution. * Don't round up for JPEG image resolution.
* Read the whole image @ image.jp2[0] or an individual * Read the whole image @ image.jp2[0] or an individual
tile @ image.jp2[1], image.jp2[2]. tile @ image.jp2[1], image.jp2[2].
* The -caption option no longer fails for filenames with @ prefix. * The -caption option no longer fails for filenames with @ prefix.
* Honor $XDG_CONFIG_HOME and $XDG_CACHE_HOME. * Honor $XDG_CONFIG_HOME and $XDG_CACHE_HOME.
* Added extra checks to avoid out of bounds error when parsing the 8bim * Added extra checks to avoid out of bounds error when parsing the 8bim
profile profile
* Fixed size of memory allocation in RLE coder to avoid segfault. * Fixed size of memory allocation in RLE coder to avoid segfault.
* The -colorspace gray option no long leaves a ghostly shadow. * The -colorspace gray option no long leaves a ghostly shadow.
@ -2576,7 +2837,7 @@ Thu Jul 23 08:59:31 UTC 2015 - jweberhofer@weberhofer.at
- Removed duplicates - Removed duplicates
- Only libMagickCore and ImageMagick-doc contains the LICENSE file. Other - Only libMagickCore and ImageMagick-doc contains the LICENSE file. Other
libraries do not longer contain it, as they always require libMagickCore libraries do not longer contain it, as they always require libMagickCore
to be instaleld. to be instaleld.
@ -2711,17 +2972,17 @@ Thu Feb 26 15:32:15 UTC 2015 - pgajdos@suse.com
Fri Jan 16 15:12:41 UTC 2015 - pgajdos@suse.com Fri Jan 16 15:12:41 UTC 2015 - pgajdos@suse.com
- update to 6.9.0-3 - update to 6.9.0-3
* Don't read beyond the end of a tEXt keyword when checking for * Don't read beyond the end of a tEXt keyword when checking for
Raw profile. Raw profile.
* Fixed enabling alpha in 32-bit BMP files. * Fixed enabling alpha in 32-bit BMP files.
* Added support for writing 16-bit TGA files. * Added support for writing 16-bit TGA files.
* Improved performance of dds. * Improved performance of dds.
* Fix ImageMagick crashes while read EXIF from TIFF. * Fix ImageMagick crashes while read EXIF from TIFF.
* Don't handle a "previous" image in the PNG or JNG decoder. * Don't handle a "previous" image in the PNG or JNG decoder.
* Don't override gamma with 1.0 when reading a grayscale PNG * Don't override gamma with 1.0 when reading a grayscale PNG
image. image.
* Update progress monitor for every PNG row instead of every pass. * Update progress monitor for every PNG row instead of every pass.
* Reject input PNG with dimensions larger than specified with * Reject input PNG with dimensions larger than specified with
-limit width and -limit height. -limit width and -limit height.
* etc., see ChangeLog * etc., see ChangeLog
@ -2794,8 +3055,8 @@ Fri Jul 18 08:48:55 UTC 2014 - pgajdos@suse.com
- updated to 6.8.9-5 - updated to 6.8.9-5
* Use -define profile:skip=icc, for example, to skip color profiles on read. * Use -define profile:skip=icc, for example, to skip color profiles on read.
* Do not let libpng16 check ICC/sRGB profiles in non-debug runs; we do it * Do not let libpng16 check ICC/sRGB profiles in non-debug runs; we do it
ourselves anyway. Avoids emitting "known incorrect profile" warnings. ourselves anyway. Avoids emitting "known incorrect profile" warnings.
For strict profile checking and warning, use "-debug coder". For strict profile checking and warning, use "-debug coder".
* Disabled OpenCL acceleration when image has a 'mask' or 'clip-mask'. * Disabled OpenCL acceleration when image has a 'mask' or 'clip-mask'.
@ -2882,7 +3143,7 @@ Thu Apr 24 09:54:12 UTC 2014 - dmueller@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 3 13:34:39 UTC 2014 - pgajdos@suse.com Mon Mar 3 13:34:39 UTC 2014 - pgajdos@suse.com
- directories in libMagickCore depends on %{clibver} and - directories in libMagickCore depends on %{clibver} and
%{quantum_depth} [bnc#866442] %{quantum_depth} [bnc#866442]
------------------------------------------------------------------- -------------------------------------------------------------------
@ -2940,7 +3201,7 @@ Wed Dec 18 11:55:23 UTC 2013 - pgajdos@suse.com
Mon Dec 9 08:55:53 UTC 2013 - pgajdos@suse.com Mon Dec 9 08:55:53 UTC 2013 - pgajdos@suse.com
- updated to 6.8.7-9: - updated to 6.8.7-9:
* fixed bug in coders/png.c that caused -define png:color-type=0 * fixed bug in coders/png.c that caused -define png:color-type=0
to fail to fail
* fixed bug in automatic selection of OpenCL device * fixed bug in automatic selection of OpenCL device
* simplified interface to initialize the OpenCL environment * simplified interface to initialize the OpenCL environment
@ -2996,7 +3257,7 @@ Tue Aug 6 09:59:32 UTC 2013 - pgajdos@suse.com
- updated to 6.8.6-7 - updated to 6.8.6-7
* Fix memory leak in CloneImageArtifacts and CloneImageProfiles. * Fix memory leak in CloneImageArtifacts and CloneImageProfiles.
* JPEG ICC color profile requires null after ICC tag * JPEG ICC color profile requires null after ICC tag
* etc. * etc.
- employ gpg-offline - employ gpg-offline
@ -3054,7 +3315,7 @@ Fri Mar 29 09:37:28 UTC 2013 - pgajdos@suse.com
- update to 6.8.4-0: - update to 6.8.4-0:
* dropped ImageMagick-6.8.2.4-revert-r9087-montage-signatures.patch, * dropped ImageMagick-6.8.2.4-revert-r9087-montage-signatures.patch,
issue is almost fixed -> new test-signatures.patch, issue is almost fixed -> new test-signatures.patch,
see followups in see followups in
http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=22479 http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=22479
* created rpath.patch * created rpath.patch
* created dont-build-in-install.patch * created dont-build-in-install.patch
@ -3085,7 +3346,7 @@ Wed Feb 6 15:40:56 UTC 2013 - vjt@openssl.it
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 6 14:25:33 UTC 2013 - vjt@openssl.it Wed Feb 6 14:25:33 UTC 2013 - vjt@openssl.it
- fix missed variable expansion - fix missed variable expansion
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 6 13:38:09 UTC 2013 - vjt@openssl.it Wed Feb 6 13:38:09 UTC 2013 - vjt@openssl.it
@ -3214,7 +3475,7 @@ Tue Jan 17 19:42:15 UTC 2012 - crrodriguez@opensuse.org
- Add explicit libbz2-devel BuildRequires - Add explicit libbz2-devel BuildRequires
- Support LZMA - Support LZMA
- Use libcms2 now. - Use libcms2 now.
- Cleanup huge dependency bloat in -devel package, this - Cleanup huge dependency bloat in -devel package, this
will likely cause build fails on dependant packages will likely cause build fails on dependant packages
the solution is to fix your BuildRequires. the solution is to fix your BuildRequires.
@ -3332,7 +3593,7 @@ Tue May 17 12:00:36 CEST 2011 - pgajdos@suse.cz
------------------------------------------------------------------- -------------------------------------------------------------------
Sun May 8 21:17:51 UTC 2011 - giecrilj@stegny.2a.pl Sun May 8 21:17:51 UTC 2011 - giecrilj@stegny.2a.pl
- created ImageMagick-devel-32bit for cross-compiling - created ImageMagick-devel-32bit for cross-compiling
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 21 10:00:25 UTC 2011 - giecrilj@stegny.2a.pl Thu Apr 21 10:00:25 UTC 2011 - giecrilj@stegny.2a.pl
@ -3555,7 +3816,7 @@ Mon Apr 26 13:30:55 CEST 2010 - pgajdos@suse.cz
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 7 14:51:13 CEST 2010 - ro@suse.de Wed Apr 7 14:51:13 CEST 2010 - ro@suse.de
- update baselibs.conf - update baselibs.conf
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 6 15:17:00 CEST 2010 - pgajdos@suse.cz Tue Apr 6 15:17:00 CEST 2010 - pgajdos@suse.cz
@ -3586,7 +3847,7 @@ Tue Apr 6 15:17:00 CEST 2010 - pgajdos@suse.cz
* The animate program no longer loops twice when -loop 1 is specified. * The animate program no longer loops twice when -loop 1 is specified.
* The caption format would sometimes hang when the text was not UTF-8. * The caption format would sometimes hang when the text was not UTF-8.
* Don't gamma correct log to linear color conversion unless the -gamma is * Don't gamma correct log to linear color conversion unless the -gamma is
specified (reference specified (reference
http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=15799). http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=15799).
* Detect CMYKProcessColor AI tag. * Detect CMYKProcessColor AI tag.
* Delete image from command line cache for -write option. * Delete image from command line cache for -write option.
@ -3724,7 +3985,7 @@ Tue Aug 4 18:57:12 CEST 2009 - pgajdos@suse.cz
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 30 16:57:13 CEST 2009 - ro@suse.de Thu Jul 30 16:57:13 CEST 2009 - ro@suse.de
- update baselibs.conf to complete previous change - update baselibs.conf to complete previous change
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 5 15:55:27 CEST 2009 - nadvornik@suse.cz Fri Jun 5 15:55:27 CEST 2009 - nadvornik@suse.cz
@ -3747,7 +4008,7 @@ Fri Dec 5 11:21:47 CET 2008 - nadvornik@suse.cz
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 1 12:43:56 CET 2008 - ro@suse.de Mon Dec 1 12:43:56 CET 2008 - ro@suse.de
- add libMagicWand1 to baselibs.conf (for libxine1) - add libMagicWand1 to baselibs.conf (for libxine1)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 7 15:09:28 CEST 2008 - thoenig@suse.de Tue Oct 7 15:09:28 CEST 2008 - thoenig@suse.de
@ -3786,7 +4047,7 @@ Wed Mar 26 13:57:14 CET 2008 - nadvornik@suse.cz
* read EXIF data in TIFF images * read EXIF data in TIFF images
* add -encipher / -decipher options to the command-line utilities * add -encipher / -decipher options to the command-line utilities
* many bugfixes and improvements * many bugfixes and improvements
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 3 17:39:00 CET 2007 - nadvornik@suse.cz Mon Dec 3 17:39:00 CET 2007 - nadvornik@suse.cz
@ -3806,7 +4067,7 @@ Mon Oct 8 14:20:12 CEST 2007 - pth@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 25 11:54:58 CEST 2007 - nadvornik@suse.cz Tue Sep 25 11:54:58 CEST 2007 - nadvornik@suse.cz
- updated to 6.3.5-10: fixes CVE-2007-4985, CVE-2007-4986, - updated to 6.3.5-10: fixes CVE-2007-4985, CVE-2007-4986,
CVE-2007-4987, CVE-2007-4988 [#327021] CVE-2007-4987, CVE-2007-4988 [#327021]
------------------------------------------------------------------- -------------------------------------------------------------------
@ -3823,7 +4084,7 @@ Sat Jul 28 21:18:41 CEST 2007 - coolo@suse.de
Wed Jul 25 17:31:33 CEST 2007 - nadvornik@suse.cz Wed Jul 25 17:31:33 CEST 2007 - nadvornik@suse.cz
- updated to 6.3.5-3, see ChangeLog for details - updated to 6.3.5-3, see ChangeLog for details
- reduced the requrements of the main package, - reduced the requrements of the main package,
created ImageMagick-extra with full set of requirements created ImageMagick-extra with full set of requirements
- adjusted to Shared Library Policy: - adjusted to Shared Library Policy:
* created libMagick10 and libWand10 * created libMagick10 and libWand10
@ -3883,12 +4144,12 @@ Wed Mar 15 11:02:41 CET 2006 - nadvornik@suse.cz
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 3 17:13:20 CET 2006 - nadvornik@suse.cz Fri Feb 3 17:13:20 CET 2006 - nadvornik@suse.cz
- better fix for format string vulnerability - better fix for format string vulnerability
CVE-2006-0082 [#141390] CVE-2006-0082 [#141390]
- fixed shell metacharacters in file names passed into delegates - fixed shell metacharacters in file names passed into delegates
CVE-2005-4601 [#141999] CVE-2005-4601 [#141999]
- added version numbers to devel subpackage requirements - added version numbers to devel subpackage requirements
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 25 21:32:48 CET 2006 - mls@suse.de Wed Jan 25 21:32:48 CET 2006 - mls@suse.de
@ -3912,7 +4173,7 @@ Wed Sep 21 18:08:42 CEST 2005 - nadvornik@suse.cz
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 18 00:47:48 CEST 2005 - postadal@suse.cz Sun Sep 18 00:47:48 CEST 2005 - postadal@suse.cz
- parallelize build - parallelize build
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 7 15:47:40 CEST 2005 - nadvornik@suse.cz Wed Sep 7 15:47:40 CEST 2005 - nadvornik@suse.cz
@ -3949,12 +4210,12 @@ Wed Mar 02 14:43:29 CET 2005 - nadvornik@suse.cz
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 22 11:17:44 CET 2005 - ro@suse.de Sat Jan 22 11:17:44 CET 2005 - ro@suse.de
- fix libltdl removal on lib64 - fix libltdl removal on lib64
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 18 14:38:36 CET 2005 - nadvornik@suse.cz Tue Jan 18 14:38:36 CET 2005 - nadvornik@suse.cz
- updated to 6.1.8 - updated to 6.1.8
* fixed .psd file read overflow (CAN-2005-0005) [#49839] * fixed .psd file read overflow (CAN-2005-0005) [#49839]
------------------------------------------------------------------- -------------------------------------------------------------------
@ -4062,7 +4323,7 @@ Thu Nov 21 19:14:43 CET 2002 - nadvornik@suse.cz
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 20 01:48:48 CET 2002 - ro@suse.de Wed Nov 20 01:48:48 CET 2002 - ro@suse.de
- fix build with latest automake - fix build with latest automake
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 01 11:48:35 CET 2002 - nadvornik@suse.cz Fri Nov 01 11:48:35 CET 2002 - nadvornik@suse.cz
@ -4073,7 +4334,7 @@ Fri Nov 01 11:48:35 CET 2002 - nadvornik@suse.cz
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 03 10:59:13 CEST 2002 - nadvornik@suse.cz Tue Sep 03 10:59:13 CEST 2002 - nadvornik@suse.cz
- do not try to detect supported ghostscript devices [#18424] - do not try to detect supported ghostscript devices [#18424]
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 29 19:12:23 CEST 2002 - nadvornik@suse.cz Thu Aug 29 19:12:23 CEST 2002 - nadvornik@suse.cz
@ -4152,8 +4413,8 @@ Thu Oct 18 09:33:39 CEST 2001 - nadvornik@suse.cz
Fri Aug 24 15:56:13 CEST 2001 - nadvornik@suse.cz Fri Aug 24 15:56:13 CEST 2001 - nadvornik@suse.cz
- update to 5.3.8: - update to 5.3.8:
- Added a new method SetImageClipMask(). - Added a new method SetImageClipMask().
- Added @ to the image geometry specification. Use it to specify - Added @ to the image geometry specification. Use it to specify
the square-root of the maximum area in pixels of an image the square-root of the maximum area in pixels of an image
- many bugfixes - many bugfixes
@ -4207,12 +4468,12 @@ Thu Apr 5 08:47:01 CEST 2001 - nadvornik@suse.cz
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 27 14:29:57 CEST 2001 - ro@suse.de Tue Mar 27 14:29:57 CEST 2001 - ro@suse.de
- libtoolize main dir as well - libtoolize main dir as well
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 27 00:49:07 CEST 2001 - ro@suse.de Tue Mar 27 00:49:07 CEST 2001 - ro@suse.de
- libtoolize - libtoolize
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 9 10:26:04 CET 2001 - nadvornik@suse.cz Fri Mar 9 10:26:04 CET 2001 - nadvornik@suse.cz
@ -4249,7 +4510,7 @@ Thu Nov 16 16:23:27 CET 2000 - nadvornik@suse.cz
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 14 10:10:35 CET 2000 - nadvornik@suse.cz Tue Nov 14 10:10:35 CET 2000 - nadvornik@suse.cz
- fixed writing transparent xpm files - fixed writing transparent xpm files
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 8 11:05:39 CET 2000 - nadvornik@suse.cz Wed Nov 8 11:05:39 CET 2000 - nadvornik@suse.cz
@ -4284,12 +4545,12 @@ Thu Sep 14 14:35:20 CEST 2000 - nadvornik@suse.cz
- update to 5.2.3 - update to 5.2.3
- new subpackage magickd for includes and static libs - new subpackage magickd for includes and static libs
- changed prefix to /usr - changed prefix to /usr
- removed --without-largefiles - removed --without-largefiles
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 23 00:05:39 CEST 2000 - ro@suse.de Wed Aug 23 00:05:39 CEST 2000 - ro@suse.de
- fixed perl path - fixed perl path
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 8 08:29:04 CEST 2000 - nadvornik@suse.cz Thu Jun 8 08:29:04 CEST 2000 - nadvornik@suse.cz
@ -4348,12 +4609,12 @@ Thu Apr 6 15:39:12 CEST 2000 - nadvornik@suse.cz
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 19 15:35:24 CET 2000 - ro@suse.de Wed Jan 19 15:35:24 CET 2000 - ro@suse.de
- fixed specfile - fixed specfile
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 3 01:50:26 CET 2000 - ro@suse.de Mon Jan 3 01:50:26 CET 2000 - ro@suse.de
- update to 5.1.0 - update to 5.1.0
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 27 16:31:01 CEST 1999 - bs@suse.de Mon Sep 27 16:31:01 CEST 1999 - bs@suse.de
@ -4368,12 +4629,12 @@ Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 2 01:34:11 CEST 1999 - ro@suse.de Thu Sep 2 01:34:11 CEST 1999 - ro@suse.de
- update to 4.2.9 - update to 4.2.9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 28 19:25:23 MEST 1999 - ro@suse.de Mon Jun 28 19:25:23 MEST 1999 - ro@suse.de
- update to 4.2.7 - update to 4.2.7
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 19 13:25:48 MEST 1999 - ro@suse.de Wed May 19 13:25:48 MEST 1999 - ro@suse.de
@ -4383,7 +4644,7 @@ Wed May 19 13:25:48 MEST 1999 - ro@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 19 10:05:36 MEST 1999 - ro@suse.de Wed May 19 10:05:36 MEST 1999 - ro@suse.de
- fixed specfile - fixed specfile
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 19 01:06:01 MEST 1999 - ro@suse.de Wed May 19 01:06:01 MEST 1999 - ro@suse.de

216
ImageMagick.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package ImageMagick # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
%define asan_build 0 %define asan_build 0
%define maj 7 %define maj 7
%define mfr_version %{maj}.1.1 %define mfr_version %{maj}.1.1
%define mfr_revision 21 %define mfr_revision 37
%define quantum_depth 16 %define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision} %define source_version %{mfr_version}-%{mfr_revision}
%define clibver 10 %define clibver 10
@ -28,7 +28,6 @@
%define cxxlibver 5 %define cxxlibver 5
%define libspec -%{maj}_Q%{quantum_depth}HDRI %define libspec -%{maj}_Q%{quantum_depth}HDRI
%define config_dir ImageMagick-7 %define config_dir ImageMagick-7
%define config_spec config-7
%define test_verbose 1 %define test_verbose 1
# bsc#1088463 # bsc#1088463
%define urw_base35_fonts 0 %define urw_base35_fonts 0
@ -55,8 +54,6 @@ 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: chrpath BuildRequires: chrpath
BuildRequires: dejavu-fonts BuildRequires: dejavu-fonts
@ -134,19 +131,21 @@ Recommends: transfig
%package -n libMagickCore%{libspec}%{clibver} %package -n libMagickCore%{libspec}%{clibver}
Summary: C runtime library for ImageMagick Summary: C runtime library for ImageMagick
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
Requires: imagick-%{config_spec} Requires: imagick-config-7
Recommends: %{config_spec}-SUSE Recommends: ImageMagick-config-7-SUSE
Recommends: ghostscript Recommends: ghostscript
Suggests: %{name}-extra = %{version} Suggests: ImageMagick-extra = %{version}
Recommends: ImageMagick
%package -n libMagickWand%{libspec}%{cwandver} %package -n libMagickWand%{libspec}%{cwandver}
Summary: C runtime library for ImageMagick Summary: C runtime library for ImageMagick
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
Recommends: ImageMagick
%package -n libMagick++%{libspec}%{cxxlibver} %package -n libMagick++%{libspec}%{cxxlibver}
Summary: C++ interface runtime library for ImageMagick Summary: C++ interface runtime library for ImageMagick
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name} Recommends: ImageMagick
%package -n libMagick++-devel %package -n libMagick++-devel
Summary: Development files for ImageMagick's C++ interface Summary: Development files for ImageMagick's C++ interface
@ -160,42 +159,42 @@ Summary: Document Files for ImageMagick Library
Group: Documentation/HTML Group: Documentation/HTML
BuildArch: noarch BuildArch: noarch
%package %{config_spec}-upstream-open %package config-7-upstream-open
Summary: Open ImageMagick Security Policy Summary: Open ImageMagick Security Policy
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun):update-alternatives Requires(postun): update-alternatives
Provides: imagick-%{config_spec} Provides: imagick-config-7
Obsoletes: %{config_spec}-upstream < %{version} Obsoletes: config-7-upstream < %{version}
Provides: %{config_spec}-upstream = %{version} Provides: config-7-upstream = %{version}
%package %{config_spec}-upstream-limited %package config-7-upstream-limited
Summary: Limited ImageMagick Security Policy Summary: Limited ImageMagick Security Policy
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun):update-alternatives Requires(postun): update-alternatives
Provides: imagick-%{config_spec} Provides: imagick-config-7
%package %{config_spec}-upstream-secure %package config-7-upstream-secure
Summary: Secure ImageMagick Security Policy Summary: Secure ImageMagick Security Policy
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun):update-alternatives Requires(postun): update-alternatives
Provides: imagick-%{config_spec} Provides: imagick-config-7
%package %{config_spec}-upstream-websafe %package config-7-upstream-websafe
Summary: Web-safe ImageMagick Security Policy Summary: Web-safe ImageMagick Security Policy
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun):update-alternatives Requires(postun): update-alternatives
Provides: imagick-%{config_spec} Provides: imagick-config-7
%package %{config_spec}-SUSE %package config-7-SUSE
Summary: SUSE Provided Configuration Summary: SUSE Provided Configuration
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun):update-alternatives Requires(postun): update-alternatives
Provides: imagick-%{config_spec} Provides: imagick-config-7
%description %description
ImageMagick is a robust collection of tools and libraries to read, ImageMagick is a robust collection of tools and libraries to read,
@ -295,7 +294,7 @@ support multiple generations of an image in memory at one time.
%description doc %description doc
HTML documentation for ImageMagick library and scene examples. HTML documentation for ImageMagick library and scene examples.
%description %{config_spec}-upstream-open %description config-7-upstream-open
This policy is designed for usage in secure settings like those This policy is designed for usage in secure settings like those
protected by firewalls or within Docker containers. Within this framework, protected by firewalls or within Docker containers. Within this framework,
ImageMagick enjoys broad access to resources and functionalities. This policy ImageMagick enjoys broad access to resources and functionalities. This policy
@ -305,7 +304,7 @@ less regulated conditions. Thus, organizations should thoroughly assess
the appropriateness of the open policy according to their particular use the appropriateness of the open policy according to their particular use
case and security prerequisites. case and security prerequisites.
%description %{config_spec}-upstream-limited %description config-7-upstream-limited
The primary objective of the limited security policy is to find a The primary objective of the limited security policy is to find a
middle ground between convenience and security. This policy involves the middle ground between convenience and security. This policy involves the
deactivation of potentially hazardous functionalities, like specific coders deactivation of potentially hazardous functionalities, like specific coders
@ -316,7 +315,7 @@ where there's a need to mitigate the potential threat of handling possibly
malicious or demanding images, all while retaining essential capabilities malicious or demanding images, all while retaining essential capabilities
for prevalent image formats. for prevalent image formats.
%description %{config_spec}-upstream-secure %description config-7-upstream-secure
This stringent security policy prioritizes the implementation of This stringent security policy prioritizes the implementation of
rigorous controls and restricted resource utilization to establish a rigorous controls and restricted resource utilization to establish a
profoundly secure setting while employing ImageMagick. It deactivates profoundly secure setting while employing ImageMagick. It deactivates
@ -331,7 +330,7 @@ undisclosed passphrase for remote connections. By adopting this robust
policy, entities can elevate their overall security stance and alleviate policy, entities can elevate their overall security stance and alleviate
potential vulnerabilities. potential vulnerabilities.
%description %{config_spec}-upstream-websafe %description config-7-upstream-websafe
This security protocol designed for web-safe usage focuses on situations This security protocol designed for web-safe usage focuses on situations
where ImageMagick is applied in publicly accessible contexts, like websites. where ImageMagick is applied in publicly accessible contexts, like websites.
It deactivates the capability to read from or write to any image formats It deactivates the capability to read from or write to any image formats
@ -342,22 +341,21 @@ the web-safe policy fortifies the safeguarding of systems accessible to
the public, reducing the risk of exploiting ImageMagick's capabilities the public, reducing the risk of exploiting ImageMagick's capabilities
for potential attacks. for potential attacks.
%description %{config_spec}-SUSE %description config-7-SUSE
ImageMagick configuration as provide by SUSE. It is upstream 'secure' ImageMagick configuration as provide by SUSE. It is upstream 'secure'
policy plus disable few other coders for reading and/or writing. policy plus disable few other coders for reading and/or writing.
%prep %prep
%setup -q -n ImageMagick-%{source_version} %setup -q -n ImageMagick-%{source_version}
%patch2 -p1 %patch -P 2 -p1
%ifarch i586 %ifarch i586
%if %{?suse_version} < 1550 %if %{?suse_version} < 1550
%patch4 -p1 %patch -P 4 -p1
%endif %endif
%endif %endif
%ifarch s390x %ifarch s390x
%patch5 -p1 %patch -P 5 -p1
%endif %endif
%patch6 -p1
%build %build
# bsc#1088463 # bsc#1088463
@ -390,7 +388,7 @@ export CXXFLAGS="%{optflags} -O0"
--with-gs-font-dir=%{_datadir}/fonts/ghostscript \ --with-gs-font-dir=%{_datadir}/fonts/ghostscript \
%endif %endif
--with-perl \ --with-perl \
--with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='gcc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --with-perl-options="INSTALLDIRS=vendor INSTALLVENDORARCH=%{perl_vendorarch} INSTALLVENDORMAN3DIR=/usr/share/man/man3" \
--disable-static \ --disable-static \
--with-gvc \ --with-gvc \
%if %{with ddjvuapi} %if %{with ddjvuapi}
@ -408,7 +406,8 @@ export CXXFLAGS="%{optflags} -O0"
--without-gcc-arch \ --without-gcc-arch \
--enable-pipes=no \ --enable-pipes=no \
--enable-reproducible-build=yes \ --enable-reproducible-build=yes \
--disable-openmp --disable-openmp \
--with-security-policy=open # open for %%check
%if %{asan_build} %if %{asan_build}
sed -i -e 's/\(^CFLAGS.*\)/\1 -fsanitize=address/' \ sed -i -e 's/\(^CFLAGS.*\)/\1 -fsanitize=address/' \
-e 's/\(^LIBS =.*\)/\1 -lasan/' \ -e 's/\(^LIBS =.*\)/\1 -lasan/' \
@ -418,7 +417,7 @@ sed -i -e 's/\(^CFLAGS.*\)/\1 -fsanitize=address/' \
# [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec # [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec
%make_build all %make_build all
%make_build -j1 perl-build %make_build -j1 perl-build
# mostly because */demo is used later with %check # mostly because */demo is used later with %%check
# polutting dir with .libs etc. # polutting dir with .libs etc.
cp -r Magick++/demo Magick++/examples cp -r Magick++/demo Magick++/examples
cp -r PerlMagick/demo PerlMagick/examples cp -r PerlMagick/demo PerlMagick/examples
@ -451,9 +450,9 @@ sed -i 's:TEST_VERBOSE=0:TEST_VERBOSE=1:' Makefile
cd .. cd ..
%install %install
%make_install pkgdocdir=%{_defaultdocdir}/%{name}-%{maj}/ %make_install pkgdocdir=%{_defaultdocdir}/ImageMagick-%{maj}/
# configuration magic # configuration magic
mv -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml mv -t %{buildroot}%{_sysconfdir}/ImageMagick* %{buildroot}%{_datadir}/ImageMagick*/*.xml
for policy in open limited secure websafe; do for policy in open limited secure websafe; do
cp -r %{buildroot}%{_sysconfdir}/%{config_dir}{,-upstream-$policy} cp -r %{buildroot}%{_sysconfdir}/%{config_dir}{,-upstream-$policy}
cp config/policy-$policy.xml %{buildroot}%{_sysconfdir}/%{config_dir}-upstream-$policy cp config/policy-$policy.xml %{buildroot}%{_sysconfdir}/%{config_dir}-upstream-$policy
@ -465,11 +464,12 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
ln -sf %{_sysconfdir}/alternatives/%{config_dir} %{buildroot}%{_sysconfdir}/%{config_dir} ln -sf %{_sysconfdir}/alternatives/%{config_dir} %{buildroot}%{_sysconfdir}/%{config_dir}
# symlink header file relative to /usr/include/ImageMagick-7/ # symlink header file relative to /usr/include/ImageMagick-7/
# so that inclusions like wand/*.h and magick/*.h work # so that inclusions like wand/*.h and magick/*.h work
ln -s ./MagickCore %{buildroot}%{_includedir}/%{name}-%{maj}/magick ln -s ./MagickCore %{buildroot}%{_includedir}/ImageMagick-%{maj}/magick
ln -s ./MagickWand %{buildroot}%{_includedir}/%{name}-%{maj}/wand ln -s ./MagickWand %{buildroot}%{_includedir}/ImageMagick-%{maj}/wand
# these will be included via %doc # these will be included via %%doc
rm -r %{buildroot}%{_datadir}/doc/%{name}-%{maj}/ rm -r %{buildroot}%{_datadir}/doc/ImageMagick-%{maj}/
rm %{buildroot}%{_libdir}/*.la rm %{buildroot}%{_libdir}/*.la
rm -r %{buildroot}/usr/lib/perl5/*linux-thread-multi*/
# remove RPATH from perl module # remove RPATH from perl module
perl_module=$(find %{buildroot}%{_prefix}/lib/perl5 -name '*.so') perl_module=$(find %{buildroot}%{_prefix}/lib/perl5 -name '*.so')
chmod 755 $perl_module chmod 755 $perl_module
@ -478,8 +478,8 @@ chmod 555 $perl_module
# remove %%{buildroot} from distributed file # remove %%{buildroot} from distributed file
sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/config%{libspec}%{clibver}/configure.xml sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/config%{libspec}%{clibver}/configure.xml
#remove duplicates #remove duplicates
%fdupes -s %{buildroot}%{_defaultdocdir}/%{name}-%{maj} %fdupes -s %{buildroot}%{_defaultdocdir}/ImageMagick-%{maj}
%fdupes -s %{buildroot}%{_includedir}/%{name}-%{maj} %fdupes -s %{buildroot}%{_includedir}/ImageMagick-%{maj}
%fdupes -s %{buildroot}%{_libdir}/pkgconfig %fdupes -s %{buildroot}%{_libdir}/pkgconfig
%perl_process_packlist %perl_process_packlist
@ -490,93 +490,93 @@ sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/con
%post -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig %post -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig
%postun -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig %postun -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig
%post %{config_spec}-upstream-open %pretrans config-7-upstream-open -p <lua>
-- this %pretrans to be removed soon [bug#1122033#c37]
path = "%{_sysconfdir}/%{config_dir}"
st = posix.stat(path)
if st and st.type == "directory" then
os.remove(path .. ".rpmmoved")
os.rename(path, path .. ".rpmmoved")
end
%pretrans config-7-upstream-limited -p <lua>
-- this %pretrans to be removed soon [bug#1122033#c37]
path = "%{_sysconfdir}/%{config_dir}"
st = posix.stat(path)
if st and st.type == "directory" then
os.remove(path .. ".rpmmoved")
os.rename(path, path .. ".rpmmoved")
end
%pretrans config-7-upstream-secure -p <lua>
-- this %pretrans to be removed soon [bug#1122033#c37]
path = "%{_sysconfdir}/%{config_dir}"
st = posix.stat(path)
if st and st.type == "directory" then
os.remove(path .. ".rpmmoved")
os.rename(path, path .. ".rpmmoved")
end
%pretrans config-7-SUSE -p <lua>
-- this %pretrans to be removed soon [bug#1122033#c37]
path = "%{_sysconfdir}/%{config_dir}"
st = posix.stat(path)
if st and st.type == "directory" then
os.remove(path .. ".rpmmoved")
os.rename(path, path .. ".rpmmoved")
end
%pretrans config-7-upstream-websafe -p <lua>
-- this %pretrans to be removed soon [bug#1122033#c37]
path = "%{_sysconfdir}/%{config_dir}"
st = posix.stat(path)
if st and st.type == "directory" then
os.remove(path .. ".rpmmoved")
os.rename(path, path .. ".rpmmoved")
end
%post config-7-upstream-open
%{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-open 1 %{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-open 1
%postun %{config_spec}-upstream-open %postun config-7-upstream-open
if [ ! -d %{_sysconfdir}/%{config_dir}-upstream ] ; then if [ ! -d %{_sysconfdir}/%{config_dir}-upstream ] ; then
%{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream %{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream
fi fi
%post %{config_spec}-upstream-limited %post config-7-upstream-limited
%{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-limited 5 %{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-limited 5
%postun %{config_spec}-upstream-limited %postun config-7-upstream-limited
if [ ! -d %{_sysconfdir}/%{config_dir}-upstream ] ; then if [ ! -d %{_sysconfdir}/%{config_dir}-upstream ] ; then
%{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-limited %{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-limited
fi fi
%post %{config_spec}-upstream-secure %post config-7-upstream-secure
%{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-secure 10 %{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-secure 10
%postun %{config_spec}-upstream-secure %postun config-7-upstream-secure
if [ ! -d %{_sysconfdir}/%{config_dir}-upstream ] ; then if [ ! -d %{_sysconfdir}/%{config_dir}-upstream ] ; then
%{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-secure %{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-secure
fi fi
%pretrans %{config_spec}-upstream-open -p <lua> %post config-7-SUSE
-- this %pretrans to be removed soon [bug#1122033#c37]
path = "%{_sysconfdir}/%{config_dir}"
st = posix.stat(path)
if st and st.type == "directory" then
os.remove(path .. ".rpmmoved")
os.rename(path, path .. ".rpmmoved")
end
%pretrans %{config_spec}-upstream-limited -p <lua>
-- this %pretrans to be removed soon [bug#1122033#c37]
path = "%{_sysconfdir}/%{config_dir}"
st = posix.stat(path)
if st and st.type == "directory" then
os.remove(path .. ".rpmmoved")
os.rename(path, path .. ".rpmmoved")
end
%pretrans %{config_spec}-upstream-secure -p <lua>
-- this %pretrans to be removed soon [bug#1122033#c37]
path = "%{_sysconfdir}/%{config_dir}"
st = posix.stat(path)
if st and st.type == "directory" then
os.remove(path .. ".rpmmoved")
os.rename(path, path .. ".rpmmoved")
end
%pretrans %{config_spec}-SUSE -p <lua>
-- this %pretrans to be removed soon [bug#1122033#c37]
path = "%{_sysconfdir}/%{config_dir}"
st = posix.stat(path)
if st and st.type == "directory" then
os.remove(path .. ".rpmmoved")
os.rename(path, path .. ".rpmmoved")
end
%pretrans %{config_spec}-upstream-websafe -p <lua>
-- this %pretrans to be removed soon [bug#1122033#c37]
path = "%{_sysconfdir}/%{config_dir}"
st = posix.stat(path)
if st and st.type == "directory" then
os.remove(path .. ".rpmmoved")
os.rename(path, path .. ".rpmmoved")
end
%post %{config_spec}-SUSE
%{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-SUSE 15 %{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-SUSE 15
%postun %{config_spec}-SUSE %postun config-7-SUSE
if [ ! -d %{_sysconfdir}/%{config_dir}-SUSE ] ; then if [ ! -d %{_sysconfdir}/%{config_dir}-SUSE ] ; then
%{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-SUSE %{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-SUSE
fi fi
%post %{config_spec}-upstream-websafe %post config-7-upstream-websafe
%{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-websafe 20 %{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-websafe 20
%postun %{config_spec}-upstream-websafe %postun config-7-upstream-websafe
if [ ! -d %{_sysconfdir}/%{config_dir}-upstream ] ; then if [ ! -d %{_sysconfdir}/%{config_dir}-upstream ] ; then
%{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-websafe %{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-websafe
fi fi
%files %files
%license LICENSE %license LICENSE
%doc NEWS.txt
%{_bindir}/[^MW]* %{_bindir}/[^MW]*
%{_mandir}/man1/* %{_mandir}/man1/*
%exclude %{_mandir}/man1/*-config.1%{ext_man} %exclude %{_mandir}/man1/*-config.1%{ext_man}
@ -642,7 +642,7 @@ fi
%files -n libMagick++-devel %files -n libMagick++-devel
%doc Magick++/examples %doc Magick++/examples
%doc Magick++/NEWS Magick++/README Magick++/AUTHORS %doc Magick++/AUTHORS
%{_libdir}/libMagick++*.so %{_libdir}/libMagick++*.so
%{_includedir}/ImageMagick*/Magick++.h %{_includedir}/ImageMagick*/Magick++.h
%{_includedir}/ImageMagick*/Magick++ %{_includedir}/ImageMagick*/Magick++
@ -651,33 +651,33 @@ fi
%{_mandir}/man1/Magick++-config.1%{?ext_man} %{_mandir}/man1/Magick++-config.1%{?ext_man}
%files doc %files doc
%{_defaultdocdir}/%{name}-%{maj} %{_defaultdocdir}/ImageMagick-%{maj}
%files %{config_spec}-upstream-open %files config-7-upstream-open
%dir %{_sysconfdir}/ImageMagick*-upstream-open/ %dir %{_sysconfdir}/ImageMagick*-upstream-open/
%config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-open/* %config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-open/*
%{_sysconfdir}/%{config_dir} %{_sysconfdir}/%{config_dir}
%ghost %{_sysconfdir}/alternatives/%{config_dir} %ghost %{_sysconfdir}/alternatives/%{config_dir}
%files %{config_spec}-upstream-limited %files config-7-upstream-limited
%dir %{_sysconfdir}/ImageMagick*-upstream-limited/ %dir %{_sysconfdir}/ImageMagick*-upstream-limited/
%config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-limited/* %config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-limited/*
%{_sysconfdir}/%{config_dir} %{_sysconfdir}/%{config_dir}
%ghost %{_sysconfdir}/alternatives/%{config_dir} %ghost %{_sysconfdir}/alternatives/%{config_dir}
%files %{config_spec}-upstream-secure %files config-7-upstream-secure
%dir %{_sysconfdir}/ImageMagick*-upstream-secure/ %dir %{_sysconfdir}/ImageMagick*-upstream-secure/
%config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-secure/* %config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-secure/*
%{_sysconfdir}/%{config_dir} %{_sysconfdir}/%{config_dir}
%ghost %{_sysconfdir}/alternatives/%{config_dir} %ghost %{_sysconfdir}/alternatives/%{config_dir}
%files %{config_spec}-SUSE %files config-7-SUSE
%dir %{_sysconfdir}/ImageMagick*-SUSE/ %dir %{_sysconfdir}/ImageMagick*-SUSE/
%config %{_sysconfdir}/ImageMagick*-SUSE/* %config %{_sysconfdir}/ImageMagick*-SUSE/*
%{_sysconfdir}/%{config_dir} %{_sysconfdir}/%{config_dir}
%ghost %{_sysconfdir}/alternatives/%{config_dir} %ghost %{_sysconfdir}/alternatives/%{config_dir}
%files %{config_spec}-upstream-websafe %files config-7-upstream-websafe
%dir %{_sysconfdir}/ImageMagick*-upstream-websafe/ %dir %{_sysconfdir}/ImageMagick*-upstream-websafe/
%config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-websafe/* %config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-websafe/*
%{_sysconfdir}/%{config_dir} %{_sysconfdir}/%{config_dir}