Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2018-04-17 11:15:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ImageMagick (Old) and /work/SRC/openSUSE:Factory/.ImageMagick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ImageMagick" Tue Apr 17 11:15:16 2018 rev:160 rq:595596 version:7.0.7.28 Changes: -------- --- /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick.changes 2018-04-06 17:47:16.136428194 +0200 +++ /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick.changes 2018-04-17 11:15:17.860656041 +0200 @@ -1,0 +2,21 @@ +Wed Apr 11 11:26:19 UTC 2018 - [email protected] + +- security update (webp.c) + * CVE-2018-9135 [bsc#1087825] + + ImageMagick-CVE-2018-9135.patch + +------------------------------------------------------------------- +Tue Apr 10 08:36:17 UTC 2018 - [email protected] + +- consider urw-base35-fonts [bsc#1088463] + +------------------------------------------------------------------- +Tue Apr 10 08:23:27 UTC 2018 - [email protected] + +- Drop buildrequire on mupdf-devel-static, there is only one occurance + in all makefiles mentioning MUPDF_LIBS and it is always empty +- Format with minimal run of spec-cleaner + * Use license + * Sort BRs alphabetically + +------------------------------------------------------------------- New: ---- ImageMagick-CVE-2018-9135.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.N3gYAg/_old 2018-04-17 11:15:18.576622468 +0200 +++ /var/tmp/diff_new_pack.N3gYAg/_new 2018-04-17 11:15:18.580622280 +0200 @@ -25,13 +25,16 @@ %define cwandver 5 %define cxxlibver 4 %define libspec -%{maj}_Q%{quantum_depth}HDRI +# bsc#1088463 +%define urw_base35_fonts 0 + Name: ImageMagick Version: %{mfr_version}.%{mfr_revision} Release: 0 Summary: Viewer and Converter for Images License: ImageMagick Group: Productivity/Graphics/Other -Url: http://www.imagemagick.org +URL: http://www.imagemagick.org Source0: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2 Source1: baselibs.conf Source2: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2.asc @@ -54,57 +57,63 @@ #%%ifarch i586 Patch5: ImageMagick-tests.tap-attributes.patch #%%endif +Patch6: ImageMagick-CVE-2018-9135.patch BuildRequires: chrpath -%if 0%{?suse_version} >= 1315 -BuildRequires: dejavu-fonts -%endif BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ -%if 0%{?suse_version} >= 1315 -BuildRequires: libjbig-devel -%endif BuildRequires: libjasper-devel BuildRequires: libjpeg-devel BuildRequires: libtool BuildRequires: libwmf-devel BuildRequires: lzma-devel -%if 0%{?suse_version} > 1315 -BuildRequires: mupdf-devel-static +BuildRequires: xdg-utils +BuildRequires: zip +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} >= 1315 +BuildRequires: dejavu-fonts +%endif +%if 0%{?suse_version} >= 1315 +BuildRequires: libjbig-devel %endif %if 0%{?suse_version} >= 1315 BuildRequires: p7zip BuildRequires: pkgconfig %endif -BuildRequires: xdg-utils -BuildRequires: zip %if 0%{?suse_version} >= 1315 BuildRequires: pkgconfig(OpenEXR) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(ddjvuapi) BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(libtiff-4) >= 4.0.3 +BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(libwebpmux) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(pango) %if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(ijs) +# bsc#1088463 +%if %{urw_base35_fonts} +BuildRequires: urw-base35-fonts +%else +BuildRequires: ghostscript-fonts-other +BuildRequires: ghostscript-fonts-std +%endif %else BuildRequires: ghostscript-fonts-other BuildRequires: ghostscript-fonts-std BuildRequires: ghostscript-library %endif -BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(libexif) %if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(libopenjp2) >= 2.1.0 %endif -BuildRequires: pkgconfig(librsvg-2.0) -BuildRequires: pkgconfig(libtiff-4) >= 4.0.3 -BuildRequires: pkgconfig(libwebp) -BuildRequires: pkgconfig(libwebpmux) -BuildRequires: pkgconfig(libxml-2.0) %if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(lqr-1) %endif -BuildRequires: pkgconfig(pango) %else BuildRequires: OpenEXR-devel BuildRequires: fftw3-devel @@ -125,7 +134,6 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(zlib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif %package -n perl-PerlMagick @@ -164,8 +172,8 @@ %package -n libMagickCore%{libspec}%{clibver} Summary: C runtime library for ImageMagick Group: Productivity/Graphics/Other -Suggests: ImageMagick-extra = %{version} Recommends: ghostscript +Suggests: ImageMagick-extra = %{version} %package -n libMagickWand%{libspec}%{cwandver} Summary: C runtime library for ImageMagick @@ -306,8 +314,15 @@ %ifarch i586 %patch5 -p1 %endif +%patch6 -p1 %build +# bsc#1088463 +%if %{urw_base35_fonts} +sed -i 's:type1:otf:' config/type-urw-base35.xml.in +sed -i 's:metrics=[^ ]*::' config/type-urw-base35.xml.in +sed -i 's:\.t1:.otf:' config/type-urw-base35.xml.in +%endif # make library binary package parallel installable export MODULES_DIRNAME="modules%{libspec}%{clibver}" export SHAREARCH_DIRNAME="config%{libspec}%{clibver}" @@ -319,6 +334,11 @@ --with-magick_plus_plus \ --with-modules \ --with-threads \ +%if %{urw_base35_fonts} + --with-urw-base35-font-dir=/usr/share/fonts/truetype \ +%else + --with-gs-font-dir=/usr/share/fonts/ghostscript \ +%endif --with-perl \ --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='gcc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --disable-static \ @@ -416,7 +436,8 @@ %if 0%{?suse_version} < 1315 %defattr(-,root,root) %endif -%doc LICENSE ChangeLog NEWS.txt +%license LICENSE +%doc ChangeLog NEWS.txt %{_bindir}/[^MW]* %{_mandir}/man1/* %exclude %{_mandir}/man1/*-config.1%{ext_man} @@ -425,7 +446,8 @@ %if 0%{?suse_version} < 1315 %defattr(-,root,root) %endif -%doc LICENSE ChangeLog NEWS.txt +%license LICENSE +%doc ChangeLog NEWS.txt %{_libdir}/libMagickCore*.so.%{clibver}* %dir %{_sysconfdir}/ImageMagick* %config %{_sysconfdir}/ImageMagick*/* @@ -490,7 +512,7 @@ %{perl_vendorarch}/auto/Image %{perl_vendorarch}/Image %if 0%{?suse_version} < 1315 -/var/adm/perl-modules/ImageMagick +%{_localstatedir}/adm/perl-modules/ImageMagick %endif %files -n libMagick++%{libspec}%{cxxlibver} ++++++ ImageMagick-CVE-2018-9135.patch ++++++ --- a/coders/webp.c +++ b/coders/webp.c @@ -181,6 +181,8 @@ static MagickBooleanType IsWEBPImageLossless(const unsigned char *stream, /* Read simple header. */ + if (length <= VP8_CHUNK_INDEX) + return(MagickFalse); if (stream[VP8_CHUNK_INDEX] != EXTENDED_HEADER) return(stream[VP8_CHUNK_INDEX] == LOSSLESS_FLAG ? MagickTrue : MagickFalse); /*
