Accepting request 645679 from graphics

- update to 7.0.8-14: * Adding coder headers with magic.xml will no longer be supported. * Adding coder aliases with coder.xml will no longer be supported. * fixing oss-fuzz issues - asan_build: build ASAN included - debug_build: build more suitable for debugging OBS-URL: https://build.opensuse.org/request/show/645679 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=170
2018-11-08 08:42:29 +00:00 · 2018-11-08 08:42:29 +00:00 · f0036bd471
commit f0036bd471
parent ac81e5cf39 ec9cd2bc06
6 changed files with 67 additions and 21 deletions
--- a/ImageMagick-7.0.8-12.tar.bz2
+++ b/ImageMagick-7.0.8-12.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40855289517d04f8250ce70c028b62762d384b33a8294c0e7e494400d08c9c4e
-size 10838305
--- a/ImageMagick-7.0.8-12.tar.bz2.asc
+++ b/ImageMagick-7.0.8-12.tar.bz2.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJbp6TtAAoJEImrY9SCdzd6CoIQAJyEii045XMzveL62p8bA7Fv
-pNCKr+3R4usenIbt8/CUmGET/8lfJLDWIpz31v29eKCX5mvkL+9sCZZwUDrV4kNL
-SsIy3sZv3CWVAnWou8O/fKMvvYk192KyN45GljpGPAwSeAkCyjEFoZG7DzH3IWbb
-jZ7g929wPxDIds2H5EP62oHwTcOR2cy8Q/Xw1BPXBAZjH1N9wB4VMTVh5mEALFR5
-Z0P/h9QdDoH6ItgOGBPrbdrBQhP4BDTsx1pXQGufQGD33sGC3UnnjDiCB7ZIUpFM
-w5Q9BModbOsMp2P/nhz7AME1CRcYLtHph6Hhyisqe3RgiPg/+kxRCZx8XWjw7JL2
-Ta5fxgSqLS//ewXphgNANXFTgQx6NliW7wlzyHng8XCRJcJvuxrfIKOQ+g+kJ0lh
-vlhPTX+vlcECR0Vqi9owpjxlLtCOe6Pw16YuixqGBySQqvnb/mlAOOuk/Rhmo/Sn
-H04cMYtETB5kPOHvvoW3eieE8UcxvrDlrFlV9vJz/SapS0eilTyJFoH4GHOr6ptY
-rI4NdlZsUUav61uK6KT04reEHnEOLnaaWUeLOKVspWtFoq7+SEc+z6rgcxzEhs6n
-UXj2/Yy+cwAu//QdsPgEurpA7ZlxWcQJpVoid23OinOrAtz4Gm6HaMU+JmXV5pVU
-oJbv2YMIS/rajLs81m2V
-=ihQy
-----END PGP SIGNATURE-----
--- a/ImageMagick-7.0.8-14.tar.bz2
+++ b/ImageMagick-7.0.8-14.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b209d9ebaae668b531540e32d7fd90a2c7dfe0d48f4de555e3969ae14171f0e
+size 10793480
--- a/ImageMagick-7.0.8-14.tar.bz2.asc
+++ b/ImageMagick-7.0.8-14.tar.bz2.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABAgAGBQJb0ILZAAoJEImrY9SCdzd6ZmUQAJNRFbQgEq0fRBjoPgQhzr7t
+tmfDpdsB9PnvOJPg5G4P97A+7Op9rA0NY2J5SuQpQVCLqKAenWKkb3pIiu1Sos0Z
+YHhcujT8wKX4ajSO8YsqwKlg6crTcAEW2+PG0ChCpG8FdNzomtlt1CxQtJubKyJ0
+KnWJ52BrfM1FOVNb4UGo8xaGv28lnAgaehU0daMaEbLIhaOxIdkUWkzsT7IWHTET
+/4nvnOIQ94qpbzmC5ZxTyKy2xAhV2nThpgX1v3BhoACULyqn7OBfQYaPM4Ks/6J0
+z46tCairOPzotTlXhaxy+HbhWPgLQfgqgi4Az2VewHuO3UhsdXvVO622ttPMV82v
+B1Us2bxmwVibKqMEeRM0Rb6YZd2q38iUzG1FnW3K+T+5rT6RMbotbsKiQj1DqjOU
+xCgSUsLbem0H/IjSnFUvh1ZOHz3HpRBi107om6SL6wrEPrBpc1cENWl6eHv2lz2Y
+LF3LvY+X4hHANhlwzCiWMt3LGx/gwlrkCjHdjKu48ELVIof5nz5kB8oCzdug2riL
+OczIojfYnFaT/yBJD0i0QoWkTajUY7Py2/D89Tp0tjtqbnnVBOq/doiFewlpsjrR
+7EYm6QvWWyGWuhTMAVC+hucAOFjjzGQRO7qThbfcMGqIz2vjGZTkQ0+mJjK2EtBG
+bs9N3a8qM5f+f6PeS+y+
+=MxpH
+-----END PGP SIGNATURE-----
--- a/ImageMagick.changes
+++ b/ImageMagick.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Oct 31 07:58:16 UTC 2018 - Petr Gajdos <pgajdos@suse.com>
+
+- update to 7.0.8-14:
+  * Adding coder headers with magic.xml will no longer be supported.
+  * Adding coder aliases with coder.xml will no longer be supported.
+  * fixing oss-fuzz issues
+
+-------------------------------------------------------------------
+Mon Oct 22 09:40:38 UTC 2018 - Petr Gajdos <pgajdos@suse.com>
+
+- asan_build: build ASAN included
+- debug_build: build more suitable for debugging
+
 -------------------------------------------------------------------
 Wed Oct  3 08:07:50 UTC 2018 - Petr Gajdos <pgajdos@suse.com>

--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@ -12,13 +12,15 @@
 # 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 debug_build   0
+%define asan_build    0
 %define maj           7
 %define mfr_version   %{maj}.0.8
-%define mfr_revision  12
+%define mfr_revision  14
 %define quantum_depth 16
 %define source_version %{mfr_version}-%{mfr_revision}
 %define clibver   6
@ -148,6 +150,7 @@ Requires:       pkgconfig(bzip2)
 Requires:       libbz2-devel
 %endif

+%if !%{debug_build}
 %package extra
 Summary:        Extra codecs for the ImageMagick image viewer/converter
 Group:          Productivity/Graphics/Other
@ -159,6 +162,7 @@ Recommends:     hp2xx
 Recommends:     libwmf
 Recommends:     netpbm
 Recommends:     transfig
+%endif

 %package -n libMagickCore%{libspec}%{clibver}
 Summary:        C runtime library for ImageMagick
@ -215,6 +219,7 @@ different image formats. Image processing operations are available from
 the command line as well as through C, C++, and Perl-based programming
 interfaces.

+%if !%{debug_build}
 %description extra
 This package adds support for djvu, wmf and jpeg2000 formats and
 installs optional helper applications.
@ -228,6 +233,7 @@ add special effects to an image and save your completed work in many
 different image formats. Image processing operations are available from
 the command line as well as through C, C++, and Perl-based programming
 interfaces.
+%endif

 %description -n libMagickCore%{libspec}%{clibver}
 ImageMagick is a robust collection of tools and libraries to read,
@ -308,12 +314,20 @@ sed -i 's:\.t1:.otf:'      config/type-urw-base35.xml.in
 export MODULES_DIRNAME="modules%{libspec}%{clibver}"
 export SHAREARCH_DIRNAME="config%{libspec}%{clibver}"
 export CONFIGURE_RELATIVE_PATH="ImageMagick%{libspec}%{clibver}"
+%if %{debug_build}
+export CFLAGS="%{optflags} -O0"
+export CXXFLAGS="%{optflags} -O0"
+%endif
 %configure \
  --disable-silent-rules \
  --enable-shared \
  --without-frozenpaths \
  --with-magick_plus_plus \
+%if !%{debug_build}
  --with-modules \
+%else
+  --without-modules \
+%endif
  --with-threads \
 %if %{urw_base35_fonts}
  --with-urw-base35-font-dir=/usr/share/fonts/truetype \
@ -339,6 +353,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 +374,15 @@ dos2unix www/api/*.php
 chmod -x PerlMagick/demo/*.pl

 %check
+%if %{debug_build}
+# testsuite does not succeed with -O0 for some reason,
+# research TODO
+exit 0
+%endif
+%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
@ -427,6 +455,7 @@ sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/con
 %dir %{_sysconfdir}/ImageMagick*
 %config %{_sysconfdir}/ImageMagick*/*
 %dir %{_libdir}/ImageMagick*
+%if !%{debug_build}
 %dir %{_libdir}/ImageMagick*/modules*
 %dir %{_libdir}/ImageMagick*/modules*/*
 %exclude %{_libdir}/ImageMagick*/modules*/*/wmf.*
@ -437,6 +466,7 @@ sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/con
 %{_libdir}/ImageMagick*/modules*/*/*.so
 # don't remove la files, see bnc#579798
 %{_libdir}/ImageMagick*/modules*/*/*.la
+%endif
 %{_libdir}/ImageMagick*/config*

 %files -n libMagickWand%{libspec}%{cwandver}
@ -445,6 +475,7 @@ sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/con
 %endif
 %{_libdir}/libMagickWand*.so.%{cwandver}*

+%if !%{debug_build}
 %files extra
 %if 0%{?suse_version} < 1315
 %defattr(-,root,root)
@ -457,6 +488,7 @@ sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/con
 %endif
 %{_libdir}/ImageMagick*/modules*/*/djvu.so
 %{_libdir}/ImageMagick*/modules*/*/djvu.la
+%endif

 %files devel
 %if 0%{?suse_version} < 1315