From eb04a96399c22e5a92a9297a425dd976b875c3e0b802cb6862546d6ef54a33bf Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 14 Mar 2018 15:14:28 +0000 Subject: [PATCH 1/8] - update to 7.0.7-26 * Fixed numerous use of uninitialized values, integer overflow, memory exceeded, and timeouts (credit to OSS Fuzz). OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=345 --- ImageMagick-7.0.7-25.tar.bz2 | 3 --- ImageMagick-7.0.7-25.tar.bz2.asc | 16 ---------------- ImageMagick-7.0.7-26.tar.bz2 | 3 +++ ImageMagick-7.0.7-26.tar.bz2.asc | 16 ++++++++++++++++ ImageMagick.changes | 7 +++++++ ImageMagick.spec | 2 +- 6 files changed, 27 insertions(+), 20 deletions(-) delete mode 100644 ImageMagick-7.0.7-25.tar.bz2 delete mode 100644 ImageMagick-7.0.7-25.tar.bz2.asc create mode 100644 ImageMagick-7.0.7-26.tar.bz2 create mode 100644 ImageMagick-7.0.7-26.tar.bz2.asc diff --git a/ImageMagick-7.0.7-25.tar.bz2 b/ImageMagick-7.0.7-25.tar.bz2 deleted file mode 100644 index defa919..0000000 --- a/ImageMagick-7.0.7-25.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac4b23a587eabc8227e4ce38a647ac133fc5e49e54f28732513e334466de990d -size 10771371 diff --git a/ImageMagick-7.0.7-25.tar.bz2.asc b/ImageMagick-7.0.7-25.tar.bz2.asc deleted file mode 100644 index d9f9be1..0000000 --- a/ImageMagick-7.0.7-25.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABAgAGBQJanDg/AAoJEImrY9SCdzd6kYgQAKepY34e+G+nwhQ2cLs6kWvJ -kWcxXTTp3kmrtd3ECDAe1IsbitESHAwlThVFGV3x+Y91nMFfmixtcHLQeEb5xeRv -nFt2LOJq5EoVhO1K4h6emZGXfwAN8PJtJBFYrELQ/fuT+LZLs8FSs+Nrws6f/uTP -bldxgCw7qmAsb607Iq/lhZEDShzCJyB/5yRYPFrbVCIe9hVhEbJHRNtEHYzHl4Mu -606LgQyByo5or1ImU+KNq7MSlzfVbxQEDoqxiiPOPuPLcx4DBop8U+dX2+bMvF9H -58QCz369sr+Isd/lFStz+n0iSCn30uxp4ed+CJ2z7ap5htAZGE0hNZvBir+cEx6D -Hmm81hSN6w1mRSRes9nb+pjHmRmAnadu6rS7ZlHeTGHGFbhPGSo52oO/XxH/GgdC -93wkwgXnjWM0VxfD1ZNNQ5nY/JWnu4vCGrxABqWxyZodbXSo+3I0Xg5Yjc7FWpAf -JS4/oEdmOTe+UvLN4cMAmLJwEMSBx4IYnVvQMSR2ue8icJ+c66jhHPr9DN2Jrsjc -Z7/lH33T9c1fJDtpEM1fzoc/t1HUNnmbbICSfa3fYKcJAyUpktadSii/ktkanlBu -yYhylB4AunuWxR26lIkDzamA02ajxR2qrqItF4krQh2WOZ3Aj34QFDjCPiODduuQ -VPCcMnmegFBMj1ekMxLx -=VpMR ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.7-26.tar.bz2 b/ImageMagick-7.0.7-26.tar.bz2 new file mode 100644 index 0000000..6b807d7 --- /dev/null +++ b/ImageMagick-7.0.7-26.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49679b4e73e2861c6b43fd1b5268454c963e544a82c0cf2dbe3bbd1f785a7c8a +size 10765084 diff --git a/ImageMagick-7.0.7-26.tar.bz2.asc b/ImageMagick-7.0.7-26.tar.bz2.asc new file mode 100644 index 0000000..520e2a8 --- /dev/null +++ b/ImageMagick-7.0.7-26.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJapl03AAoJEImrY9SCdzd65QEP/iz9iXCwh0elXpRpqshP8jqP +fFdlaoW1eg8q2bC04ckYmG7PssfJkJyTf3EA0KWH2osrAChuD35Jy/PWxoaQdvx2 +GxarW5owwMbdimmBA3dgeHkIyJTgezuhlWDjvxGWWHPUWXclVrnpizF7cnjKLZz3 ++Lo2EIgjsNycC+WRoyQZFobnq29VxgZ2p+EFy25+7ZUQ9SOzSBdBOL6tPaeS5Wg6 +BE5AnxXy2lWT7spO/4jtRVbgYzkJM26zKRwY3pGbihV0u0btIEdXRAHr5pl8Jgwb +CQ+B2wbrtuiTAXZxT78W5us64R2X63iMBzqN3hs8EPBkdMU90nE5Xs5S1Gb9SKbY +Yaq194GJAeh0a5zEjDoQ/i5wsrLZyV2kYhROe+2EJR8PbgIQQu8+y/Js0WHbNAmb +6GIORv/mN4ciP8r/bZM4tqxHbi1lGJAcExf1yvSxzbH3EBIqY1A2TcimN00fTohm +9rKa63u5jtvguMulepP7HA+8ul9l/8gMApUeW96VxqEcG3hx94Bc724YZmkEEEHo +D5tTUa5byQLZBTsoRNF2HWfSW9kl0ZDNsRFc0d0n71u6NEJZzcVTWCmMETdCauAL +BS71Cdb5Hr7DJt+xSBK6w2UuXpDudPv805dbUh97VpNfEkR/aNa5ybTUIeLbgUKO +lMT8FKlXoLtQZ2gdh0/+ +=U6C9 +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 0d01835..c974c6c 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 14 15:08:42 UTC 2018 - pgajdos@suse.com + +- update to 7.0.7-26 + * Fixed numerous use of uninitialized values, integer overflow, memory + exceeded, and timeouts (credit to OSS Fuzz). + ------------------------------------------------------------------- Mon Mar 5 11:35:52 UTC 2018 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 4703cf4..fe372fb 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -18,7 +18,7 @@ %define maj 7 %define mfr_version %{maj}.0.7 -%define mfr_revision 25 +%define mfr_revision 26 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 5 From 5bf0c828f8420391e85bf5f8ea66eb4a6ed031d03eea55d9edda8f60f949ff0b Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 16 Mar 2018 13:31:03 +0000 Subject: [PATCH 2/8] - added ImageMagick-remove-test.tap-attributes.patch, removes failing test on i586 https://github.com/ImageMagick/ImageMagick/issues/1019 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=346 --- ImageMagick-remove-test.tap-attributes.patch | 22 ++++++++++++++++++++ ImageMagick.changes | 7 +++++++ ImageMagick.spec | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 ImageMagick-remove-test.tap-attributes.patch diff --git a/ImageMagick-remove-test.tap-attributes.patch b/ImageMagick-remove-test.tap-attributes.patch new file mode 100644 index 0000000..a634214 --- /dev/null +++ b/ImageMagick-remove-test.tap-attributes.patch @@ -0,0 +1,22 @@ +https://github.com/ImageMagick/ImageMagick/issues/1019 +Index: ImageMagick-7.0.7-26/Magick++/tests/tests.tap +=================================================================== +--- ImageMagick-7.0.7-26.orig/Magick++/tests/tests.tap 2018-03-11 22:49:04.000000000 +0100 ++++ ImageMagick-7.0.7-26/Magick++/tests/tests.tap 2018-03-16 14:21:59.572243993 +0100 +@@ -8,14 +8,14 @@ + # + subdir=Magick++/tests + . ./common.shi +-echo "1..13" ++echo "1..12" + + SRCDIR=${top_srcdir}/${subdir}/ + export SRCDIR + + cd ${subdir} || exit 1 + +-for mytest in appendImages attributes averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages ++for mytest in appendImages averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages + do + ./${mytest} && echo "ok" || echo "not ok" + done diff --git a/ImageMagick.changes b/ImageMagick.changes index c974c6c..82d24e1 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 16 13:30:15 UTC 2018 - pgajdos@suse.com + +- added ImageMagick-remove-test.tap-attributes.patch, removes + failing test on i586 + https://github.com/ImageMagick/ImageMagick/issues/1019 + ------------------------------------------------------------------- Wed Mar 14 15:08:42 UTC 2018 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index fe372fb..47baf42 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -48,6 +48,7 @@ Patch2: ImageMagick-library-installable-in-parallel.patch #%%ifarch s390x s390 ppc64 ppc Patch3: ImageMagick-s390-disable-tests.patch #%%endif +Patch4: ImageMagick-remove-test.tap-attributes.patch BuildRequires: chrpath BuildRequires: dcraw %if 0%{?suse_version} >= 1315 @@ -297,6 +298,7 @@ HTML documentation for ImageMagick library and scene examples. %ifarch s390x s390 ppc ppc64 %patch3 -p1 %endif +%patch4 -p1 %build # make library binary package parallel installable From 38dae2dd8b46938f2db437b29fb399dbd0b9a0b86936ed505e69054f8b61c394 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 19 Mar 2018 07:06:17 +0000 Subject: [PATCH 3/8] - update to 7.0.7-27: * Fixed numerous use of uninitialized values, integer overflow, memory exceeded, and timeouts. - remove ImageMagick-remove-test.tap-attributes.patch as the perl testsuite fails in bunch of tests anyway. Waiting for results of the upstream bug (https://github.com/ImageMagick/ImageMagick/issues/1019) OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=347 --- ImageMagick-7.0.7-26.tar.bz2 | 3 --- ImageMagick-7.0.7-26.tar.bz2.asc | 16 -------------- ImageMagick-7.0.7-27.tar.bz2 | 3 +++ ImageMagick-7.0.7-27.tar.bz2.asc | 16 ++++++++++++++ ImageMagick-remove-test.tap-attributes.patch | 22 -------------------- ImageMagick.changes | 10 +++++++++ ImageMagick.spec | 4 +--- 7 files changed, 30 insertions(+), 44 deletions(-) delete mode 100644 ImageMagick-7.0.7-26.tar.bz2 delete mode 100644 ImageMagick-7.0.7-26.tar.bz2.asc create mode 100644 ImageMagick-7.0.7-27.tar.bz2 create mode 100644 ImageMagick-7.0.7-27.tar.bz2.asc delete mode 100644 ImageMagick-remove-test.tap-attributes.patch diff --git a/ImageMagick-7.0.7-26.tar.bz2 b/ImageMagick-7.0.7-26.tar.bz2 deleted file mode 100644 index 6b807d7..0000000 --- a/ImageMagick-7.0.7-26.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49679b4e73e2861c6b43fd1b5268454c963e544a82c0cf2dbe3bbd1f785a7c8a -size 10765084 diff --git a/ImageMagick-7.0.7-26.tar.bz2.asc b/ImageMagick-7.0.7-26.tar.bz2.asc deleted file mode 100644 index 520e2a8..0000000 --- a/ImageMagick-7.0.7-26.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABAgAGBQJapl03AAoJEImrY9SCdzd65QEP/iz9iXCwh0elXpRpqshP8jqP -fFdlaoW1eg8q2bC04ckYmG7PssfJkJyTf3EA0KWH2osrAChuD35Jy/PWxoaQdvx2 -GxarW5owwMbdimmBA3dgeHkIyJTgezuhlWDjvxGWWHPUWXclVrnpizF7cnjKLZz3 -+Lo2EIgjsNycC+WRoyQZFobnq29VxgZ2p+EFy25+7ZUQ9SOzSBdBOL6tPaeS5Wg6 -BE5AnxXy2lWT7spO/4jtRVbgYzkJM26zKRwY3pGbihV0u0btIEdXRAHr5pl8Jgwb -CQ+B2wbrtuiTAXZxT78W5us64R2X63iMBzqN3hs8EPBkdMU90nE5Xs5S1Gb9SKbY -Yaq194GJAeh0a5zEjDoQ/i5wsrLZyV2kYhROe+2EJR8PbgIQQu8+y/Js0WHbNAmb -6GIORv/mN4ciP8r/bZM4tqxHbi1lGJAcExf1yvSxzbH3EBIqY1A2TcimN00fTohm -9rKa63u5jtvguMulepP7HA+8ul9l/8gMApUeW96VxqEcG3hx94Bc724YZmkEEEHo -D5tTUa5byQLZBTsoRNF2HWfSW9kl0ZDNsRFc0d0n71u6NEJZzcVTWCmMETdCauAL -BS71Cdb5Hr7DJt+xSBK6w2UuXpDudPv805dbUh97VpNfEkR/aNa5ybTUIeLbgUKO -lMT8FKlXoLtQZ2gdh0/+ -=U6C9 ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.7-27.tar.bz2 b/ImageMagick-7.0.7-27.tar.bz2 new file mode 100644 index 0000000..30123ef --- /dev/null +++ b/ImageMagick-7.0.7-27.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d73d1e92935d3485c30d1b68216e0234936a6759711ff8365474c96fc0d2730 +size 10765064 diff --git a/ImageMagick-7.0.7-27.tar.bz2.asc b/ImageMagick-7.0.7-27.tar.bz2.asc new file mode 100644 index 0000000..9b53498 --- /dev/null +++ b/ImageMagick-7.0.7-27.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJarqgnAAoJEImrY9SCdzd6JLgP/0OcRGgIclO9njQhVzISSOPw ++NzmJbVEddzf2tfR1v6ggkumZPrNkATEVPfVc+rLP7spNv2DxEdB3iFXu5luxeT1 +iRxIqRKqOdELGPqyTIqrftR2UbPPcuGXA7gEEw1jD2XNdPtLlndBt4cQxk3p6KDX +OCLdJD5T3a5MFy6AI+Yk4CcM5VBuoIS3QBnSDHucTAfg6OKLt0+3pTOYTq+EHzbs +6JxHAD+d/NKkyqs51uWeKO/UzxWaCcrPl7RpAaSdCBQtpxTcPK+cNBzUJMqMJIdK +o8oTYSJjmMJMj7T4zIL13DQkLpoofk0PKeF+D++BC9j/malFg8kLaVv2JTzXoZ+n +6htBj9F4HNcHa1Obl3tOEr/KlOf17M9KdKx8LZ2QeAmJrKS7y4oLbnqwVt+Zv2/v +7rTGBzm9wNWwBmR8SNYnwmDfltBwrc9c9NruJt2q+5qyQCbqzNaK8HraA85TpY2G +UeJPFSYRrODDooCZ6AMkvxTawVqaDN2g8yr2M06bUz88C6b/Myfe0SkeO60PnGnk +RclQsO7NTc6+1ym2sLkQ+xKu1eWN5oAPudrzqx2hzXRgBPzuSsNKl19+z0qDi8E5 +xQCIS5LhmfPxYYHlz4a6LuS4Lwi6fxtaNS3lzCcB2/dXQYEenlGtAi71KWzKPNYl +fPyst8PBeIDKXU/bgQyV +=qCYS +-----END PGP SIGNATURE----- diff --git a/ImageMagick-remove-test.tap-attributes.patch b/ImageMagick-remove-test.tap-attributes.patch deleted file mode 100644 index a634214..0000000 --- a/ImageMagick-remove-test.tap-attributes.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/ImageMagick/ImageMagick/issues/1019 -Index: ImageMagick-7.0.7-26/Magick++/tests/tests.tap -=================================================================== ---- ImageMagick-7.0.7-26.orig/Magick++/tests/tests.tap 2018-03-11 22:49:04.000000000 +0100 -+++ ImageMagick-7.0.7-26/Magick++/tests/tests.tap 2018-03-16 14:21:59.572243993 +0100 -@@ -8,14 +8,14 @@ - # - subdir=Magick++/tests - . ./common.shi --echo "1..13" -+echo "1..12" - - SRCDIR=${top_srcdir}/${subdir}/ - export SRCDIR - - cd ${subdir} || exit 1 - --for mytest in appendImages attributes averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages -+for mytest in appendImages averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages - do - ./${mytest} && echo "ok" || echo "not ok" - done diff --git a/ImageMagick.changes b/ImageMagick.changes index 82d24e1..4acfb01 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Mar 19 05:37:42 UTC 2018 - pgajdos@suse.com + +- update to 7.0.7-27: + * Fixed numerous use of uninitialized values, integer overflow, + memory exceeded, and timeouts. +- remove ImageMagick-remove-test.tap-attributes.patch as the perl + testsuite fails in bunch of tests anyway. Waiting for results of + the upstream bug (https://github.com/ImageMagick/ImageMagick/issues/1019) + ------------------------------------------------------------------- Fri Mar 16 13:30:15 UTC 2018 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 47baf42..1576294 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -18,7 +18,7 @@ %define maj 7 %define mfr_version %{maj}.0.7 -%define mfr_revision 26 +%define mfr_revision 27 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 5 @@ -48,7 +48,6 @@ Patch2: ImageMagick-library-installable-in-parallel.patch #%%ifarch s390x s390 ppc64 ppc Patch3: ImageMagick-s390-disable-tests.patch #%%endif -Patch4: ImageMagick-remove-test.tap-attributes.patch BuildRequires: chrpath BuildRequires: dcraw %if 0%{?suse_version} >= 1315 @@ -298,7 +297,6 @@ HTML documentation for ImageMagick library and scene examples. %ifarch s390x s390 ppc ppc64 %patch3 -p1 %endif -%patch4 -p1 %build # make library binary package parallel installable From 55a2fcaffe20e6801cb8335358a0256c46477cd63d2d02d3d9ecc989376034ce Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 26 Mar 2018 08:49:59 +0000 Subject: [PATCH 4/8] - update to 7.0.7-28: * Fixed numerous use of uninitialized values, integer overflow, memory exceeded, and timeouts - tesuite still fails, however: https://github.com/ImageMagick/ImageMagick/issues/1058 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=348 --- ImageMagick-7.0.7-27.tar.bz2 | 3 --- ImageMagick-7.0.7-27.tar.bz2.asc | 16 ---------------- ImageMagick-7.0.7-28.tar.bz2 | 3 +++ ImageMagick-7.0.7-28.tar.bz2.asc | 16 ++++++++++++++++ ImageMagick.changes | 9 +++++++++ ImageMagick.spec | 5 +++-- 6 files changed, 31 insertions(+), 21 deletions(-) delete mode 100644 ImageMagick-7.0.7-27.tar.bz2 delete mode 100644 ImageMagick-7.0.7-27.tar.bz2.asc create mode 100644 ImageMagick-7.0.7-28.tar.bz2 create mode 100644 ImageMagick-7.0.7-28.tar.bz2.asc diff --git a/ImageMagick-7.0.7-27.tar.bz2 b/ImageMagick-7.0.7-27.tar.bz2 deleted file mode 100644 index 30123ef..0000000 --- a/ImageMagick-7.0.7-27.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d73d1e92935d3485c30d1b68216e0234936a6759711ff8365474c96fc0d2730 -size 10765064 diff --git a/ImageMagick-7.0.7-27.tar.bz2.asc b/ImageMagick-7.0.7-27.tar.bz2.asc deleted file mode 100644 index 9b53498..0000000 --- a/ImageMagick-7.0.7-27.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABAgAGBQJarqgnAAoJEImrY9SCdzd6JLgP/0OcRGgIclO9njQhVzISSOPw -+NzmJbVEddzf2tfR1v6ggkumZPrNkATEVPfVc+rLP7spNv2DxEdB3iFXu5luxeT1 -iRxIqRKqOdELGPqyTIqrftR2UbPPcuGXA7gEEw1jD2XNdPtLlndBt4cQxk3p6KDX -OCLdJD5T3a5MFy6AI+Yk4CcM5VBuoIS3QBnSDHucTAfg6OKLt0+3pTOYTq+EHzbs -6JxHAD+d/NKkyqs51uWeKO/UzxWaCcrPl7RpAaSdCBQtpxTcPK+cNBzUJMqMJIdK -o8oTYSJjmMJMj7T4zIL13DQkLpoofk0PKeF+D++BC9j/malFg8kLaVv2JTzXoZ+n -6htBj9F4HNcHa1Obl3tOEr/KlOf17M9KdKx8LZ2QeAmJrKS7y4oLbnqwVt+Zv2/v -7rTGBzm9wNWwBmR8SNYnwmDfltBwrc9c9NruJt2q+5qyQCbqzNaK8HraA85TpY2G -UeJPFSYRrODDooCZ6AMkvxTawVqaDN2g8yr2M06bUz88C6b/Myfe0SkeO60PnGnk -RclQsO7NTc6+1ym2sLkQ+xKu1eWN5oAPudrzqx2hzXRgBPzuSsNKl19+z0qDi8E5 -xQCIS5LhmfPxYYHlz4a6LuS4Lwi6fxtaNS3lzCcB2/dXQYEenlGtAi71KWzKPNYl -fPyst8PBeIDKXU/bgQyV -=qCYS ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.7-28.tar.bz2 b/ImageMagick-7.0.7-28.tar.bz2 new file mode 100644 index 0000000..4d3d5ce --- /dev/null +++ b/ImageMagick-7.0.7-28.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e635bdaa0a78572a81428f92d320506f8b21a44bbd40b5fd63b1b5a0bf7be2d2 +size 10765842 diff --git a/ImageMagick-7.0.7-28.tar.bz2.asc b/ImageMagick-7.0.7-28.tar.bz2.asc new file mode 100644 index 0000000..3f6fcc4 --- /dev/null +++ b/ImageMagick-7.0.7-28.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJauBpPAAoJEImrY9SCdzd6cdgP/A49jN+DAqSNx8w2vjRMRKtS ++3Gri5d/kVzmQeCDaLjE81DjbaFovVReBrN3NSm2yTbO1iMdhtepVbzYWGXvm6mP +C2TGEBzMe4NRge/kajgGNsvcPmphj7Esf8xW814l5LNc5uhgUc/lSl2Gk+tivNZr +h/XtRLpfJLR9y+5gxcQjNd/cQgxI5j2rKwFuVh2Bt0dYaSRo1qsKyfWOUDSTIwVX +BLzb34WC9/us29xr9JUiZaSKZLtjZVuCnBJmhDeLjgyAqsutT0ZjHCQ4o1FT7cUN +OKCZQJdbwTjFp2bclYKXvZawWYf7PoQWUlQRATc/K7JSb6hHf7fxqAhlxX7LlRuv +8th4kIovu1bu1dF9Nw9WzW157FsVylid5m1/xajQglFwFL4PGvSwok8Tw+DGl3bf +sA5kRAELV1dp/4TMniEAujNIgwjCA2PeAFatKifN0TbkI1//R874IpxWwUEWM2JY +M/eIsa1gU2WgyO27Xu+OSTxTkIPSBGWGLA+lJV5VZbakkJO6VW6ppnCqi70QSXhN +3M1OM9M9UNG7inRUtBRuC2kVcE4KcFTP3fhI8rK0CGay/CpJ/UD0WuyzeCG5DURc +6eqzlGFmM+SapRUZb0vd90tGtQgt2gle6dwdK1NdNlxcGGxKCZVxmdULIrzXWeqA +NKwsorPLrQL5F9fuyE2C +=jaqy +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 4acfb01..3d96568 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Mar 26 08:47:41 UTC 2018 - pgajdos@suse.com + +- update to 7.0.7-28: + * Fixed numerous use of uninitialized values, integer overflow, memory + exceeded, and timeouts +- tesuite still fails, however: + https://github.com/ImageMagick/ImageMagick/issues/1058 + ------------------------------------------------------------------- Mon Mar 19 05:37:42 UTC 2018 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 1576294..6d37efe 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -18,7 +18,7 @@ %define maj 7 %define mfr_version %{maj}.0.7 -%define mfr_revision 27 +%define mfr_revision 28 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 5 @@ -40,7 +40,7 @@ Source3: ImageMagick.keyring Patch0: ImageMagick-disable-insecure-coders.patch # workaround, see https://github.com/ImageMagick/ImageMagick/issues/439 #%%ifarch i586 -#%%if %{?suse_version} == 1500 +#%%if %%{?suse_version} == 1500 Patch1: ImageMagick-relax-filter.t.patch #%%endif #%%endif @@ -353,6 +353,7 @@ cd PerlMagick %ifarch i586 # TODO test is failing completely (19/19), wrong # checksums +# https://github.com/ImageMagick/ImageMagick/issues/1059 rm t/montage.t %endif %if 0%{?suse_version} >= 1315 From 49c1614aa3b0ff0563bc00577343c1f6f232b154885a515aab4a970e3cf8ec1d Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 26 Mar 2018 12:29:33 +0000 Subject: [PATCH 5/8] - added ImageMagick-write.t-pict.patch OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=349 --- ImageMagick-write.t-pict.patch | 13 +++++++++++++ ImageMagick.changes | 1 + ImageMagick.spec | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 ImageMagick-write.t-pict.patch diff --git a/ImageMagick-write.t-pict.patch b/ImageMagick-write.t-pict.patch new file mode 100644 index 0000000..f556c14 --- /dev/null +++ b/ImageMagick-write.t-pict.patch @@ -0,0 +1,13 @@ +Index: ImageMagick-7.0.7-28/PerlMagick/t/write.t +=================================================================== +--- ImageMagick-7.0.7-28.orig/PerlMagick/t/write.t 2018-03-26 13:43:15.879147515 +0200 ++++ ImageMagick-7.0.7-28/PerlMagick/t/write.t 2018-03-26 13:44:36.796638166 +0200 +@@ -129,7 +129,7 @@ print("Apple Macintosh QuickDraw/PICT fi + testReadWrite( 'PICT:input.pict', + 'PICT:output.pict', + q//, +- '646ac633d5b5553721e032d2c9f8f54ffc19d315832bbf808c2b7321b1067293'); ++ 'f7b3db46d6f696ea8392f0ad0be945dd502a806e2c1e9c082efef517191758f7'); + + print("Portable pixmap format (color), ASCII format ...\n"); + ++$test; diff --git a/ImageMagick.changes b/ImageMagick.changes index 3d96568..cb1606a 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -6,6 +6,7 @@ Mon Mar 26 08:47:41 UTC 2018 - pgajdos@suse.com exceeded, and timeouts - tesuite still fails, however: https://github.com/ImageMagick/ImageMagick/issues/1058 +- added ImageMagick-write.t-pict.patch ------------------------------------------------------------------- Mon Mar 19 05:37:42 UTC 2018 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 6d37efe..fd21c72 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -48,6 +48,7 @@ Patch2: ImageMagick-library-installable-in-parallel.patch #%%ifarch s390x s390 ppc64 ppc Patch3: ImageMagick-s390-disable-tests.patch #%%endif +Patch4: ImageMagick-write.t-pict.patch BuildRequires: chrpath BuildRequires: dcraw %if 0%{?suse_version} >= 1315 @@ -297,6 +298,7 @@ HTML documentation for ImageMagick library and scene examples. %ifarch s390x s390 ppc ppc64 %patch3 -p1 %endif +%patch4 -p1 %build # make library binary package parallel installable From 7d5559d7a1bec59b15f5dd36b120a38ba33a769f62b4e462fea35c0068fdc1bd Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 4 Apr 2018 13:44:59 +0000 Subject: [PATCH 6/8] - do not run tests on i586 at all OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=350 --- ImageMagick-tests.tap-attributes.patch | 21 +++++++++++++++++++++ ImageMagick.changes | 5 +++++ ImageMagick.spec | 22 ++++++++++++++++------ 3 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 ImageMagick-tests.tap-attributes.patch diff --git a/ImageMagick-tests.tap-attributes.patch b/ImageMagick-tests.tap-attributes.patch new file mode 100644 index 0000000..8423f82 --- /dev/null +++ b/ImageMagick-tests.tap-attributes.patch @@ -0,0 +1,21 @@ +Index: ImageMagick-7.0.7-28/Magick++/tests/tests.tap +=================================================================== +--- ImageMagick-7.0.7-28.orig/Magick++/tests/tests.tap 2018-03-25 20:18:56.000000000 +0200 ++++ ImageMagick-7.0.7-28/Magick++/tests/tests.tap 2018-04-04 15:07:22.292261487 +0200 +@@ -8,14 +8,14 @@ + # + subdir=Magick++/tests + . ./common.shi +-echo "1..13" ++echo "1..12" + + SRCDIR=${top_srcdir}/${subdir}/ + export SRCDIR + + cd ${subdir} || exit 1 + +-for mytest in appendImages attributes averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages ++for mytest in appendImages averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages + do + ./${mytest} && echo "ok" || echo "not ok" + done diff --git a/ImageMagick.changes b/ImageMagick.changes index cb1606a..b88c15f 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 4 13:43:58 UTC 2018 - pgajdos@suse.com + +- do not run tests on i586 at all + ------------------------------------------------------------------- Mon Mar 26 08:47:41 UTC 2018 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index fd21c72..67cc0e3 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -48,7 +48,12 @@ 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/1058 Patch4: ImageMagick-write.t-pict.patch +# https://github.com/ImageMagick/ImageMagick/issues/1019 +#%%ifarch i586 +Patch5: ImageMagick-tests.tap-attributes.patch +#%%endif BuildRequires: chrpath BuildRequires: dcraw %if 0%{?suse_version} >= 1315 @@ -299,6 +304,9 @@ HTML documentation for ImageMagick library and scene examples. %patch3 -p1 %endif %patch4 -p1 +%ifarch i586 +%patch5 -p1 +%endif %build # make library binary package parallel installable @@ -347,17 +355,19 @@ dos2unix www/api/*.php chmod -x PerlMagick/demo/*.pl %check +%ifarch i586 +# do not run tests on i586 at all +# https://github.com/ImageMagick/ImageMagick/issues/1059 +# https://github.com/ImageMagick/ImageMagick/issues/1019 +exit 0 +# https://github.com/ImageMagick/ImageMagick/issues/1059 +rm PerlMagick/t/montage.t +%endif make %{?_smp_mflags} check export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs export MAGICK_CONFIGURE_PATH=$PWD/config cd PerlMagick -%ifarch i586 -# TODO test is failing completely (19/19), wrong -# checksums -# https://github.com/ImageMagick/ImageMagick/issues/1059 -rm t/montage.t -%endif %if 0%{?suse_version} >= 1315 make %{?_smp_mflags} test %else From 666cf3a6b8f914952355e5ac04f723d6d25c0118be92f0685b71e50489b3f1f7 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 4 Apr 2018 13:49:41 +0000 Subject: [PATCH 7/8] - added ImageMagick-tests.tap-attributes.patch OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=351 --- ImageMagick.changes | 1 + ImageMagick.spec | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index b88c15f..a5054fa 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -12,6 +12,7 @@ Mon Mar 26 08:47:41 UTC 2018 - pgajdos@suse.com - tesuite still fails, however: https://github.com/ImageMagick/ImageMagick/issues/1058 - added ImageMagick-write.t-pict.patch +- added ImageMagick-tests.tap-attributes.patch ------------------------------------------------------------------- Mon Mar 19 05:37:42 UTC 2018 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 67cc0e3..7d07105 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -357,8 +357,10 @@ chmod -x PerlMagick/demo/*.pl %check %ifarch i586 # do not run tests on i586 at all -# https://github.com/ImageMagick/ImageMagick/issues/1059 # https://github.com/ImageMagick/ImageMagick/issues/1019 +# https://github.com/ImageMagick/ImageMagick/issues/1058 +# https://github.com/ImageMagick/ImageMagick/issues/1059 +# (but keep patches for a while before giving up completely) exit 0 # https://github.com/ImageMagick/ImageMagick/issues/1059 rm PerlMagick/t/montage.t From 330dcd1343de2271ec7c0c22c574cc24668c92131ff84fe2a5dc4b0e410c1df1 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 6 Apr 2018 07:27:47 +0000 Subject: [PATCH 8/8] Accepting request 593827 from home:fcrozat:branches:graphics - Remove BuildRequires on dcraw, it is not needed at buildtime. OBS-URL: https://build.opensuse.org/request/show/593827 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=352 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index a5054fa..ee0f2b6 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 5 15:09:26 UTC 2018 - fcrozat@suse.com + +- Remove BuildRequires on dcraw, it is not needed at buildtime. + ------------------------------------------------------------------- Wed Apr 4 13:43:58 UTC 2018 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 7d07105..2674ae0 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -55,7 +55,6 @@ Patch4: ImageMagick-write.t-pict.patch Patch5: ImageMagick-tests.tap-attributes.patch #%%endif BuildRequires: chrpath -BuildRequires: dcraw %if 0%{?suse_version} >= 1315 BuildRequires: dejavu-fonts %endif