diff --git a/ImageMagick-7.0.8-28.tar.bz2 b/ImageMagick-7.0.8-28.tar.bz2 deleted file mode 100644 index 2e8e772..0000000 --- a/ImageMagick-7.0.8-28.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe9b6eb51a66029a0b15c8dfbbaee6298f5e978c2d1acaf17e3062144050be1d -size 11431659 diff --git a/ImageMagick-7.0.8-28.tar.bz2.asc b/ImageMagick-7.0.8-28.tar.bz2.asc deleted file mode 100644 index 328d2a7..0000000 --- a/ImageMagick-7.0.8-28.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAABAgAGBQJcarHRAAoJEImrY9SCdzd6CScP/1ovLeZch6o2PYDR+sy/i5k5 -RqRExhCoIJpIKTXr2XGYvOP4waOmmkz43JZV1lRuV3LrRdRLnEdlg6zpp9XEdLy8 -oSyAYUjGpoD/klrIgi7myxc2+ugX3a0fD0pvDaXxUTDxAbZaoW5qsbe68TSLLx46 -qafJ+IupGUVIZDIDhZ3DSXNEE8kE92EXQjwep4Z7M9VSqNlI3TnwXjxeQBPhps20 -pOBW9ZPa4ypdEERDcSZ4ZbSLp7FZZkb9UcrJeYyx2cc52rOm5r6/cW/KywXQT/fZ -b1aC8Gdl8i7uJY/TCtj94HbRfHYmuSrhsg0pn9CFrgrTH1VWc/1yZcW00/gu/TbK -edtl33ICa0to7Pxc3hUwt2TVIxCDfDrxZ1Tb/DgWEFJfFmpoFzezksSipYMANc2b -8auMmHYZWtnUZLaKhCfQ/yzJYy6EyrjFdZPU4F4Xx21nmCd9IDAK9eW/ZL6VYQ+U -TzyB6FRUYhZ13fiLT3c1apEeAR6ZkApa3fENzyDNkUpx8+1t+Z7dPIT9XB6+QWb7 -uMrB2TDP6CKYYY6xW4e6u+JHdUFdLOtBHG2Pi1awBzx23wQ7xYGI/cwewhC8ZF1n -+CQDJzin+zOClU+caiZTAXAqmAiKvXtlKc2tXtQNRQblpJD+I0qL4UicmgsYPK56 -vKXQkUo2jYvfOGGsSiXR -=vczZ ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.8-30.tar.bz2 b/ImageMagick-7.0.8-30.tar.bz2 new file mode 100644 index 0000000..ebe96ea --- /dev/null +++ b/ImageMagick-7.0.8-30.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee64f96c3ba41fa5af901e2e244e62e9bdee949b3c795293c65c2a163ce4d13b +size 11429092 diff --git a/ImageMagick-7.0.8-30.tar.bz2.asc b/ImageMagick-7.0.8-30.tar.bz2.asc new file mode 100644 index 0000000..f732573 --- /dev/null +++ b/ImageMagick-7.0.8-30.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJce9GXAAoJEImrY9SCdzd6144P/09gj1dzXfgClgO2Pg33TMAd +P4DGi4eUN7RWV4Msl+R6z8680p9n8EIz5qUhRlWOBd8eHyUDo4VxLFiCMfx02CYN +CP5NOgGmfry6hC2hPJ7PgZxcPbu1Oi+RknZlxEkuv4F7h6em5Sk/LxupcqOnqU8U +aUM5slG5jMpWtigfz3uwBoVWDNkMfMedCxC3GclYfm4+wODMtLSDauXNHpDqMBKw +hG9uhwgfZF6LHQSGvs5koX1sN+gxtABR+lYQqZEWkq3m1Lg5egKyGAiieVON3t5L +KwxRQG09NkvfUim9SR4KWExHpjcqlgGZkxOvpl+pbRgD2/lPb3EQUV6QTcmlqZvE +FRzzS0lIO48h4zglc30GmCohoqzwVgAj/lcMYHxNSDTt765dN6Mxu5ZADpkYdYDn +SXC/Qo4WoaUAhlEHLm1hX5RREp7o31TeXAwmJy/1cBzwAYgFy5SniWPY+t6JIGbD +bT4AtjsRTB07aBZvtb5H5JXNBmUAFHUxEnuoYsoxDJsEI5ELSyQGiBlrAQm0jixQ +6ER3U8V8DSBez/Ky034liRbsV6GwQ9owrXjYEVLPQATTTjw0hbaIK+U4FmCZUU86 +xSwtPbXT95OVyAkoLCi4EllQCbzP0+6gXRdZjLQCtScCZB9jz/KFjzDBqP7SwDb1 +NveO3Uc+e9vaFFHLoiWH +=3Cqe +-----END PGP SIGNATURE----- diff --git a/ImageMagick-montage.t.patch b/ImageMagick-montage.t.patch deleted file mode 100644 index 0181de5..0000000 --- a/ImageMagick-montage.t.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/PerlMagick/t/montage.t b/PerlMagick/t/montage.t -index 5dd1e16f80..749242d09b 100644 ---- a/PerlMagick/t/montage.t -+++ b/PerlMagick/t/montage.t -@@ -122,8 +122,8 @@ testMontage( q//, - testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, - q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+3+3>', frame=>'8x10', - borderwidth=>'0', gravity=>'Center', background=>'gray'/, -- 'dcfa6c2bc0e20ff0b5dba464559a1e106e605ec456c21c1205a53e478e4f3e02', -- 'dcfa6c2bc0e20ff0b5dba464559a1e106e605ec456c21c1205a53e478e4f3e02', -+ '0bb09155fd14aaaeab01d8ff9e78ec940168be15c8f7353bb69889347cc02457', -+ '0bb09155fd14aaaeab01d8ff9e78ec940168be15c8f7353bb69889347cc02457', - '72a7587a058c71cd62226e59b64c335190a37d7dd990d68534cf05df61084783'); - - # -@@ -133,8 +133,8 @@ testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, - 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'/, -- 'b3b7a530270164b4c5e391ac8080736a901428e5f650694170969fd292559317', -- 'b3b7a530270164b4c5e391ac8080736a901428e5f650694170969fd292559317', -+ 'd654efe38f3cf4f837fde12753bd6f7d4c3eb5153fa3f0ed0799ed41f5dcdc91', -+ 'd654efe38f3cf4f837fde12753bd6f7d4c3eb5153fa3f0ed0799ed41f5dcdc91', - '9fe18e11ac759d3a86362f16d0bdee4b6952d617daa3ad2c3511e19050dda71d'); - - # -@@ -144,7 +144,7 @@ testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, - 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:'/, -- '08d4dfa09995e13a518002565d862f6e89d65de37d59c1d1ab45d7c6cde6bd47'); -+ '56ad577ef744d6f612258d3e15eb70b9700b7876ba0cb7fb9a665c622c1962fe'); - - # - # 14) Test Un-bordered, Un-framed Montage diff --git a/ImageMagick.changes b/ImageMagick.changes index 387fbf9..314f581 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Mar 4 12:53:26 UTC 2019 - pgajdos@suse.com + +- update to 7.0.8-30 + * Support define to remove additional background from an image during a + trim, e.g. -define trim:percent-background=0% -trim. + * Fixed a number of issues (reference + https://github.com/ImageMagick/ImageMagick/issues). + * Fixed numerous use of uninitialized values, integer overflow, memory + exceeded, and timeouts (credit to OSS Fuzz). +- deleted patches + - ImageMagick-montage.t.patch (upstreamed) + ------------------------------------------------------------------- Thu Feb 28 11:44:05 UTC 2019 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index b0e28b5..60365ea 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.0.8 -%define mfr_revision 28 +%define mfr_revision 30 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 6 @@ -49,8 +49,6 @@ Patch2: ImageMagick-library-installable-in-parallel.patch #%%ifarch s390x s390 ppc64 ppc Patch3: ImageMagick-s390-disable-tests.patch #%%endif -# https://github.com/ImageMagick/ImageMagick/issues/1484 -Patch4: ImageMagick-montage.t.patch BuildRequires: chrpath BuildRequires: fdupes BuildRequires: gcc-c++ @@ -336,7 +334,6 @@ preserved. %ifarch s390x s390 ppc ppc64 %patch3 -p1 %endif -%patch4 -p1 -R %build # bsc#1088463