Accepting request 580889 from graphics

- update to 7.0.7-24
  * Do not refer to page in OptimizeLayerFrames (reference
    https://github.com/ImageMagick/ImageMagick/pull/987).
  * PerlMagick unit tests pass again.
  * Fixed numerous use of uninitialized values, integer overflow,
    memory exceeded, and timeouts (credit to OSS Fuzz).
- removed upstreamed
  - ImageMagick-write.t-PICT-signature.patch
  - ImageMagick-montage.t-directory-exception.patch

OBS-URL: https://build.opensuse.org/request/show/580889
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=157
This commit is contained in:
Dominique Leuenberger 2018-03-04 10:51:38 +00:00 committed by Git OBS Bridge
commit ce3ee5dfa2
8 changed files with 33 additions and 49 deletions

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJaijVsAAoJEImrY9SCdzd6khIP/2oRwQ+/F5P/ba/4fJx3xlbf
BH8iS6UmOopd0eVO1BIfNo1uBr4i+kp20nE5GkYFL3pi8XiAaQ7l+IaYudUakaiD
NNSjfbA9KSD6sUBHv+l/VSFv2WD1xE6wXXfAiNj06paX+q5D2nDHf9dPzc4Pr1s6
h3hZYW4GZ4wAZH+bFXZ+tzCwxZBqaTkWQG43kEgTbjsjVxcOB4HTIyMQBuRfE7de
FrbUPi6hmrqO7Oi2ZoqqNcQmvZbdPd2dZa0D0/E6/C4IMEcQrGMIqiEIQCigo37I
huXykRHMzxjkht3Cz8Einy1mOHCTLfaELLamXuUVz25C51rxUwVQqJ+nxgSDkUAL
06B8Hf7v2PbvUP99CFjJjrB2Y/krutpWVtocT0kxbb+qmBcL1MHf4Tqdr2v1LD4W
sxHvpVhWuwjvAKScqLC2xuibxJE0s+wW4Zx9KPBjbzGAeJk6gGZCZHcxty+QmFi8
FCZZBkyYyF/eZ304D99ycMVjJS9Wy5bbCrjlzUtG97hDAynSGtVB3CpEpyhLBFW3
RweM6Js7Bl1DZ1PigyXz4cy5Ag1jScNFUOZMTyYNTnVXmwVkblpfEPHGn3ik55uT
OrZRaQi2hDS05zVNGwLeBvNGgxyqIiSP0IKrLdgl4zgulundaxk5izj8CRfRr8aW
3aS9lWLmz9b9bMuzSJcX
=roPT
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJakyzMAAoJEImrY9SCdzd6H24P/1PPyst4ozeg2E9KGQert0YU
15IAPO51KkxeoV7T8CFsI8QiSvVpqlVMEnjloyfyWQhD+V2F+ixsQ0UUv600+/i3
3Inpp25GalN6ouO/x83xKp0u5O1LEfPI4pJNQfIGYhIDZkXmpuhqmxLSXZwVBiUJ
1FGj7O5j4h1TjyECQGo+CFY3+zYit1zCwg30ZWz1C4SqRwjDaudUM9GWdrnHc0rJ
8UtGJMgRt6AOptRE89hUkjHlPvt8l8NA9oGGPvJa/zwiITt6K3UdDxQ1rLP4LTgy
UNyBfYM5JGGjZZZAzXjH8MwSVgbu1N2rvZ2CDBoLUVwojwBL8f71mXqEiiVMOJaf
EctQ1ag+DcuVFxPOFusSPALpdXf3b/8FC8wdJVVg53m8tgg8ZmAJyrf9WE3/IV5F
1wdV1vSiVvF6qRjt7sZY1ThxJqNIKKc5MrbbOyse25oRxZrObkUFl90ineBsBdXo
v+nxO+pyAZviUR1DtVMiBcKhwnfudYjbfM27+LOH2NP4U8RwI1SSBFVTQCoLWP59
qXJV9irELR0wmvbKEbd597OCZiuXFH4nOZVv+mx91xV3dDXn64WZ8sKTPk/vmLb0
jjvfQCVSsqjKUxkU3wOJxl8L5eOv+wILFRwDS74Ei9u8BRmt9K9vgSQXVW7GQWrx
Ft9DRyb1h+iI3EAH2KcP
=2Zhy
-----END PGP SIGNATURE-----

View File

@ -1,12 +0,0 @@
--- a/PerlMagick/t/subroutines.pl
+++ b/PerlMagick/t/subroutines.pl
@@ -1050,7 +1050,7 @@ sub testMontage {
} else {
# Check montage directory
my $directory = $montage->Get('directory');
- my $expected = join( "\n", @colors ) . "\n";
+ my $expected = join( "\xff", @colors ) . "\xff";
if ( !defined($directory) ) {
print "ok $test\n";
} elsif ( $directory ne $expected) {

View File

@ -1,11 +0,0 @@
--- a/PerlMagick/t/write.t
+++ b/PerlMagick/t/write.t
@@ -129,7 +129,7 @@ print("Apple Macintosh QuickDraw/PICT file ...\n");
testReadWrite( 'PICT:input.pict',
'PICT:output.pict',
q//,
- 'f7b3db46d6f696ea8392f0ad0be945dd502a806e2c1e9c082efef517191758f7');
+ '646ac633d5b5553721e032d2c9f8f54ffc19d315832bbf808c2b7321b1067293');
print("Portable pixmap format (color), ASCII format ...\n");
++$test;

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Feb 28 09:19:13 UTC 2018 - pgajdos@suse.com
- update to 7.0.7-24
* Do not refer to page in OptimizeLayerFrames (reference
https://github.com/ImageMagick/ImageMagick/pull/987).
* PerlMagick unit tests pass again.
* Fixed numerous use of uninitialized values, integer overflow,
memory exceeded, and timeouts (credit to OSS Fuzz).
- removed upstreamed
- ImageMagick-write.t-PICT-signature.patch
- ImageMagick-montage.t-directory-exception.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 23 08:05:31 UTC 2018 - pgajdos@suse.com Fri Feb 23 08:05:31 UTC 2018 - pgajdos@suse.com

View File

@ -18,7 +18,7 @@
%define maj 7 %define maj 7
%define mfr_version %{maj}.0.7 %define mfr_version %{maj}.0.7
%define mfr_revision 23 %define mfr_revision 24
%define quantum_depth 16 %define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision} %define source_version %{mfr_version}-%{mfr_revision}
%define clibver 5 %define clibver 5
@ -48,10 +48,6 @@ Patch2: ImageMagick-library-installable-in-parallel.patch
#%%ifarch s390x s390 ppc64 ppc #%%ifarch s390x s390 ppc64 ppc
Patch3: ImageMagick-s390-disable-tests.patch Patch3: ImageMagick-s390-disable-tests.patch
#%%endif #%%endif
# https://github.com/ImageMagick/ImageMagick/issues/992
Patch4: ImageMagick-montage.t-directory-exception.patch
# https://github.com/ImageMagick/ImageMagick/issues/994
Patch5: ImageMagick-write.t-PICT-signature.patch
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: dcraw BuildRequires: dcraw
%if 0%{?suse_version} >= 1315 %if 0%{?suse_version} >= 1315
@ -301,8 +297,6 @@ HTML documentation for ImageMagick library and scene examples.
%ifarch s390x s390 ppc ppc64 %ifarch s390x s390 ppc ppc64
%patch3 -p1 %patch3 -p1
%endif %endif
%patch4 -p1
%patch5 -p1
%build %build
# make library binary package parallel installable # make library binary package parallel installable