From 9c65a192efcc98f1662117363cfb0e028dc5ff90482a9f5b2e2d13df422a124d Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 22 Oct 2018 09:43:10 +0000 Subject: [PATCH] - security update * CVE-2018-17100 [bsc#1108637] + tiff-CVE-2018-17100.patch OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=391 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index 47495ff..8bac5b1 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 22 09:40:38 UTC 2018 - Petr Gajdos + +- add a possibility to build with ASAN + ------------------------------------------------------------------- Wed Oct 3 08:07:50 UTC 2018 - Petr Gajdos diff --git a/ImageMagick.spec b/ImageMagick.spec index 5020053..c893fae 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -12,10 +12,11 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define asan_build 0 %define maj 7 %define mfr_version %{maj}.0.8 %define mfr_revision 12 @@ -339,6 +340,11 @@ export CONFIGURE_RELATIVE_PATH="ImageMagick%{libspec}%{clibver}" --enable-pipes=no \ --enable-reproducible-build=yes \ --disable-openmp +%if %{asan_build} +sed -i -e 's/\(^CFLAGS.*\)/\1 -fsanitize=address/' \ + -e 's/\(^LIBS =.*\)/\1 -lasan/' \ + Makefile +%endif # don't build together, PerlMagick could be miscompiled when using parallel build[1] # [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec make %{?_smp_mflags} all @@ -355,6 +361,10 @@ dos2unix www/api/*.php chmod -x PerlMagick/demo/*.pl %check +%if %{asan_build} +# ASAN needs /proc to be mounted +exit 0 +%endif %ifarch i586 # https://github.com/ImageMagick/ImageMagick/issues/1215 rm PerlMagick/t/montage.t