Hello community, here is the log from the commit of package GraphicsMagick for openSUSE:Factory checked in at 2019-01-25 22:44:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/GraphicsMagick (Old) and /work/SRC/openSUSE:Factory/.GraphicsMagick.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "GraphicsMagick" Fri Jan 25 22:44:56 2019 rev:69 rq:668401 version:1.3.31 Changes: -------- --- /work/SRC/openSUSE:Factory/GraphicsMagick/GraphicsMagick.changes 2018-12-19 13:54:15.814882704 +0100 +++ /work/SRC/openSUSE:Factory/.GraphicsMagick.new.28833/GraphicsMagick.changes 2019-01-25 22:45:00.731106393 +0100 @@ -1,0 +2,6 @@ +Wed Dec 19 15:37:55 UTC 2018 - Petr Gajdos <pgaj...@suse.com> + +- asan_build: build ASAN included +- debug_build: build more suitable for debugging + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ GraphicsMagick.spec ++++++ --- /var/tmp/diff_new_pack.QM8Eyg/_old 2019-01-25 22:45:01.943104899 +0100 +++ /var/tmp/diff_new_pack.QM8Eyg/_new 2019-01-25 22:45:01.947104894 +0100 @@ -1,7 +1,7 @@ # # spec file for package GraphicsMagick # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,10 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%define asan_build 0 +%define debug_build 0 + %if 0%{?suse_version} >= 1315 %define bindperl 1 %else @@ -220,8 +223,19 @@ # This shouldn't be there yet. rm -f PerlMagick/Makefile.PL export CFLAGS="%{optflags} -fPIE" +%if !%{debug_build} +export CFLAGS="%{optflags} -fPIE" +%else +export CFLAGS="$RPM_OPT_FLAGS -O0" +export CXXFLAGS="$RPM_OPT_FLAGS -O0" +%endif %configure --enable-shared --disable-static \ - --with-modules --enable-lzw \ +%if !%{debug_build} + --with-modules \ +%else + --without-modules \ +%endif + --enable-lzw \ --with-frozenpaths \ --without-perl \ --with-magick-plus-plus \ @@ -231,7 +245,26 @@ --with-x \ --x-libraries=%{_libdir} \ --x-includes=%{_prefix}/include +%if %{asan_build} +sed -i -e 's/\(^CFLAGS.*\)/\1 -fsanitize=address/' \ + -e 's/\(^LIBS =.*\)/\1 -lasan/' \ + Makefile +%endif + +# sanity check to prevent ghostscript support from being reenabled +# for reasoning see bsc#1122792 +grep -q -- -DHasGS Makefile && GS_ENABLED=1 +if [ ! -z "$GS_ENABLED" ]; then + echo "Refusing to build with ghostscript support (-DHasGS)" 1>&2 + echo "See bsc#1122792 for the security implications" 1>&2 + exit 1 +fi + +%if !%{debug_build} make %{?_smp_mflags} LDFLAGS="-pie" +%else +make %{?_smp_mflags} +%endif %if %{bindperl} cd PerlMagick if [ -e PerlMagick/typemap ]; then @@ -271,6 +304,10 @@ %endif %check +%if %{asan_build} +# ASAN needs /proc to be mounted +exit 0 +%endif make %{?_smp_mflags} check export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs @@ -308,11 +345,13 @@ %endif %{_libdir}/lib%{name}-Q%{quant}.so.* %dir %{_libdir}/%{name}-%{version} +%if !%{debug_build} %dir %{_libdir}/%{name}-%{version}/modules-Q%{quant} %dir %{_libdir}/%{name}-%{version}/modules-Q%{quant}/coders %dir %{_libdir}/%{name}-%{version}/modules-Q%{quant}/filters %{_libdir}/%{name}-%{version}/modules-Q%{quant}/*/*.so %{_libdir}/%{name}-%{version}/modules-Q%{quant}/*/*.la +%endif %files -n libGraphicsMagick%{so_ver}-config %if 0%{?suse_version} < 1315 @@ -340,7 +379,9 @@ %{_includedir}/%{name}/magick/* %{_libdir}/lib%{name}.so %{_libdir}/lib%{name}Wand.so +%if !%{debug_build} %dir %{_libdir}/%{name}-%{version}/modules-Q%{quant} +%endif %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}Wand.pc %attr(755, root, root) %{_bindir}/%{name}-config
