Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2017-04-06 10:59:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ImageMagick (Old) and /work/SRC/openSUSE:Factory/.ImageMagick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ImageMagick" Thu Apr 6 10:59:42 2017 rev:137 rq:483272 version:7.0.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick.changes 2017-03-24 01:52:49.644871252 +0100 +++ /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick.changes 2017-04-06 10:59:44.743973737 +0200 @@ -1,0 +2,18 @@ +Wed Mar 22 11:26:21 UTC 2017 - pgaj...@suse.com + +- updated to 7.0.5-4 + * new branch, see + https://www.imagemagick.org/script/porting.php +- deleted unneded patches + . ImageMagick-6.6.8.9-doc.patch + . ImageMagick-6.6.8.9-examples.patch + . ImageMagick-6.7.6.1-no-dist-lzip.patch + . ImageMagick-6.8.4.0-dont-build-in-install.patch + . ImageMagick-6.8.4.0-rpath.patch + . ImageMagick-montage.t.patch + . ImageMagick-6.8.5.7-no-XPMCompliance.patch +- renamed patches + . ImageMagick-6.8.8-1-disable-insecure-coders.patch to + ImageMagick-disable-insecure-coders.patch + +------------------------------------------------------------------- Old: ---- ImageMagick-6.6.8.9-doc.patch ImageMagick-6.6.8.9-examples.patch ImageMagick-6.7.6.1-no-dist-lzip.patch ImageMagick-6.8.4.0-dont-build-in-install.patch ImageMagick-6.8.4.0-rpath.patch ImageMagick-6.8.5.7-no-XPMCompliance.patch ImageMagick-6.8.8-1-disable-insecure-coders.patch ImageMagick-6.9.8-2.tar.xz ImageMagick-6.9.8-2.tar.xz.asc ImageMagick-montage.t.patch New: ---- ImageMagick-7.0.5-4.tar.xz ImageMagick-7.0.5-4.tar.xz.asc ImageMagick-disable-insecure-coders.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.14WeSL/_old 2017-04-06 10:59:46.043790029 +0200 +++ /var/tmp/diff_new_pack.14WeSL/_new 2017-04-06 10:59:46.047789463 +0200 @@ -19,10 +19,10 @@ Name: ImageMagick BuildRequires: autoconf >= 2.69 +BuildRequires: chrpath BuildRequires: dcraw -%if 0%{?suse_version} >= 1140 BuildRequires: dejavu-fonts -%endif +BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: fftw3-devel BuildRequires: freetype2-devel @@ -35,9 +35,7 @@ BuildRequires: libjbig-devel BuildRequires: libjpeg-devel BuildRequires: liblcms2-devel -%if 0%{?suse_version} >= 1140 BuildRequires: liblqr-devel -%endif BuildRequires: librsvg-devel BuildRequires: libtiff-devel >= 4.0.3 BuildRequires: libtool @@ -45,71 +43,50 @@ BuildRequires: libwmf-devel BuildRequires: libxml2-devel BuildRequires: lzma-devel -%if 0%{?suse_version} >= 1310 BuildRequires: mupdf-devel-static -%endif -%if 0%{?suse_version} >= 1140 BuildRequires: openexr-devel -%endif BuildRequires: openjpeg2-devel >= 2.1.0 -%if 0%{?suse_version} >= 1140 BuildRequires: p7zip -%endif BuildRequires: pango-devel BuildRequires: pkgconfig BuildRequires: xdg-utils BuildRequires: xz BuildRequires: zip -%define maj 6 -%define mfr_version %{maj}.9.8 -%define mfr_revision 2 +%define maj 7 +%define mfr_version %{maj}.0.5 +%define mfr_revision 4 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} -%define clibver 4 -%define cxxlibver 7 -%define libspec -%{maj}_Q%{quantum_depth} +%define clibver 2 +%define cwandver 0 +%define cxxlibver 2 +%define libspec -%{maj}_Q%{quantum_depth}HDRI Version: %{mfr_version}.%{mfr_revision} Release: 0 Summary: Viewer and Converter for Images License: ImageMagick Group: Productivity/Graphics/Other Url: http://www.imagemagick.org -Source: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz -# To get mtime of file -Source1: ImageMagick.changes -Source2: baselibs.conf -Source3: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz.asc -Source4: ImageMagick.keyring +Source0: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz +Source1: baselibs.conf +Source2: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz.asc +Source3: ImageMagick.keyring # suse specific patches -Patch0: ImageMagick-6.6.8.9-examples.patch -Patch1: ImageMagick-6.6.8.9-doc.patch -Patch2: ImageMagick-6.7.6.1-no-dist-lzip.patch -Patch3: ImageMagick-6.8.4.0-rpath.patch -# workaround for http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23462 -# upstream insists on XPMCompliance, so leaving this for compatibility reasons -Patch4: ImageMagick-6.8.5.7-no-XPMCompliance.patch -# bugs -# will ask upstream if needed, or if other solution exists -Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch -# revert https://github.com/ImageMagick/ImageMagick/commit/56d460bf2bc74bed22bed8dfe1cb0479035a24f7 -# as this does not fit to 6.9.8-2 -# commented in the commit -Patch12: ImageMagick-montage.t.patch -Patch20: ImageMagick-6.8.8-1-disable-insecure-coders.patch +Patch0: ImageMagick-disable-insecure-coders.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick Requires: ImageMagick = %{version} -Requires: libMagickCore%{libspec}-%{clibver} = %{version} +Requires: libMagickCore%{libspec}%{clibver} = %{version} Requires: perl = %{perl_version} Summary: Perl interface for ImageMagick Group: Development/Libraries/Perl %package devel Requires: ImageMagick = %{version} -Requires: libMagickCore%{libspec}-%{clibver} = %{version} -Requires: libMagickWand%{libspec}-%{clibver} = %{version} +Requires: libMagickCore%{libspec}%{clibver} = %{version} +Requires: libMagickWand%{libspec}%{cwandver} = %{version} Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ Requires: glibc-devel @@ -118,29 +95,29 @@ %package extra Requires: ImageMagick = %{version} -Requires: libMagickCore%{libspec}-%{clibver} = %{version} +Requires: libMagickCore%{libspec}%{clibver} = %{version} Summary: Viewer and Converter for Images - extra codecs #delegates configured in delegates.xml that imagemagick can use Group: Productivity/Graphics/Other Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf -%package -n libMagickCore%{libspec}-%{clibver} +%package -n libMagickCore%{libspec}%{clibver} Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other Suggests: ImageMagick-extra = %{version} -%package -n libMagickWand%{libspec}-%{clibver} +%package -n libMagickWand%{libspec}%{cwandver} Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other -%package -n libMagick++%{libspec}-%{cxxlibver} +%package -n libMagick++%{libspec}%{cxxlibver} Requires: ImageMagick Summary: C++ Interface for ImageMagick - runtime library Group: Development/Libraries/C and C++ %package -n libMagick++-devel Requires: ImageMagick-devel = %{version} -Requires: libMagick++%{libspec}-%{cxxlibver} = %{version} +Requires: libMagick++%{libspec}%{cxxlibver} = %{version} Requires: libstdc++-devel Summary: C++ Interface for ImageMagick - files mandatory for development Group: Development/Libraries/C and C++ @@ -148,9 +125,7 @@ %package doc Summary: Document Files for ImageMagick Library Group: Development/Libraries/C and C++ -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif %description ImageMagick is a robust collection of tools and libraries to read, @@ -188,7 +163,7 @@ the command line as well as through C, C++, and PERL-based programming interfaces. -%description -n libMagickCore%{libspec}-%{clibver} +%description -n libMagickCore%{libspec}%{clibver} ImageMagick is a robust collection of tools and libraries to read, write, and manipulate an image in many image formats, including popular formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, @@ -199,7 +174,7 @@ the command line as well as through C, C++, and PERL-based programming interfaces. -%description -n libMagickWand%{libspec}-%{clibver} +%description -n libMagickWand%{libspec}%{cwandver} ImageMagick is a robust collection of tools and libraries to read, write, and manipulate an image in many image formats, including popular formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, @@ -215,7 +190,7 @@ the module to read, manipulate, or write an image or image sequence from within a Perl script. This makes it suitable for Web CGI scripts. -%description -n libMagick++%{libspec}-%{cxxlibver} +%description -n libMagick++%{libspec}%{cxxlibver} This is Magick++, the object-oriented C++ API for the ImageMagick image-processing library. @@ -250,108 +225,95 @@ %prep %setup -q -n ImageMagick-%{source_version} -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch11 -%patch12 -p1 -R -%patch20 -p1 - -# remove executeable bits from per demos -chmod -x PerlMagick/demo/*.pl +%patch0 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" -export LDFLAGS="-L%{_libdir}" -# for MODULES_DIRNAME setup purpose see bnc#866442 -export MODULES_DIRNAME="modules-%{maj}_Q%{quantum_depth}-%{clibver}" -# for SHAREARCH_DIRNAME setup purpose see bnc#866442 -export SHAREARCH_DIRNAME="config-%{maj}_Q%{quantum_depth}-%{clibver}" -# for CONFIGURE_RELATIVE_PATH setup purpose see bnc#866442 -sed -i 's:^\(CONFIGURE_RELATIVE_PATH=.*\):\1_Q%{quantum_depth}-%{clibver}:' configure.ac -CHANGES=`stat --format="%y" %SOURCE1|cut --characters=1-10` -# Use mtime of .changes for build time -sed -i -e "s|^PACKAGE_RELEASE_DATE.*$|PACKAGE_RELEASE_DATE=\"$CHANGES\"|" version.sh -autoreconf --force --install -v -automake -%configure --with-pic \ +%configure \ + --with-pic \ --enable-shared \ --without-frozenpaths \ --with-magick_plus_plus \ --with-modules \ --with-threads \ --with-perl \ - --with-perl-options="INSTALLDIRS=vendor CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ + --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --disable-static \ --with-graphviz \ --with-djvu \ --with-lcms2 \ --with-jbig \ --with-openjp2 \ -%if 0%{?suse_version} >= 1140 --with-openexr \ -%endif --with-rsvg \ --with-webp \ --with-wmf \ --with-quantum-depth=%{quantum_depth} \ --without-gcc-arch \ --enable-pipes=no \ - --enable-indirect-reads=no + --enable-indirect-reads=no \ + --enable-reproducible-build=yes # 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 make -j1 perl-build +# mostly because */demo is used later with %check +# polutting dir with .libs etc. +cp -r Magick++/demo Magick++/examples +cp -r PerlMagick/demo PerlMagick/examples +# other improvements +dos2unix www/api/*.php +chmod -x PerlMagick/demo/*.pl -%if 0%{?suse_version} >= 1140 %check make check -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs export MAGICK_CONFIGURE_PATH=$PWD/config cd PerlMagick -make test +%ifarch i586 +# TODO test is failing completely (19/19), wrong +# checksums +rm t/montage.t %endif +make test +cd .. %install %{__make} install \ DESTDIR=%{buildroot} \ - pkgdocdir=%{_defaultdocdir}/%{name}/ -%perl_process_packlist -# remove unneded files from Magick++/demo for %doc, but not in place -# they are needed for make check -cp -r Magick++/demo . -%{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} -PATH='/bin:/usr/bin' find demo -type f -perm /111 -execdir %{__rm} -rf '{}' ';' -%{__mv} demo/makefile.2 demo/Makefile -### -%{__mv} -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml -PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ - -execdir %{__sed} -i -e 's@ -L/usr/src[^ ]*@@g' -e 's@ /usr/lib/libltdl.la@@g' '{}' ';' -%{__rm} %{buildroot}%{_libdir}/*.la - + pkgdocdir=%{_defaultdocdir}/%{name}-%{maj}/ +# symlink header file relative to /usr/include/ImageMagick-7/ +# so that inclusions like wand/*.h and magick/*.h work +ln -s ./MagickCore %{buildroot}%{_includedir}/%{name}-%{maj}/magick +ln -s ./MagickWand %{buildroot}%{_includedir}/%{name}-%{maj}/wand +# these will be included via %doc +rm -r %{buildroot}%{_datadir}/doc/%{name}-%{maj}/ +mv -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml +rm %{buildroot}%{_libdir}/*.la +# remove RPATH from perl module +perl_module=$(find %{buildroot}/usr/lib/perl5 -name '*.so') +chmod 755 $perl_module +chrpath -d $perl_module +chmod 555 $perl_module +# remove %%{buildroot} from distributed file +sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/config-Q16HDRI/configure.xml #remove duplicates -%if 0%{?suse_version} > 1020 -%fdupes -s %{buildroot}%{_defaultdocdir}/%{name} +%fdupes -s %{buildroot}%{_defaultdocdir}/%{name}-%{maj} %fdupes -s %{buildroot}%{_includedir}/%{name}-%{maj} %fdupes -s %{buildroot}%{_libdir}/pkgconfig -%endif +%perl_process_packlist -%post -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig +%post -n libMagickCore%{libspec}%{clibver} -p /sbin/ldconfig -%postun -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig +%postun -n libMagickCore%{libspec}%{clibver} -p /sbin/ldconfig -%post -n libMagickWand%{libspec}-%{clibver} -p /sbin/ldconfig +%post -n libMagickWand%{libspec}%{cwandver} -p /sbin/ldconfig -%postun -n libMagickWand%{libspec}-%{clibver} -p /sbin/ldconfig +%postun -n libMagickWand%{libspec}%{cwandver} -p /sbin/ldconfig -%post -n libMagick++%{libspec}-%{cxxlibver} -p /sbin/ldconfig +%post -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig -%postun -n libMagick++%{libspec}-%{cxxlibver} -p /sbin/ldconfig +%postun -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig %files %defattr(-,root,root) @@ -359,9 +321,9 @@ %doc %{_mandir}/man1/* %exclude %{_mandir}/man1/*-config.1.gz -%files -n libMagickCore%{libspec}-%{clibver} +%files -n libMagickCore%{libspec}%{clibver} %defattr(-,root,root) -%doc LICENSE +%doc LICENSE ChangeLog NEWS.txt %dir %{_sysconfdir}/ImageMagick* %config %{_sysconfdir}/ImageMagick*/* %{_libdir}/libMagickCore*.so.%{clibver}* @@ -376,9 +338,9 @@ %{_libdir}/ImageMagick*/modules*/*/*.la %{_libdir}/ImageMagick*/config* -%files -n libMagickWand%{libspec}-%{clibver} +%files -n libMagickWand%{libspec}%{cwandver} %defattr(-,root,root) -%{_libdir}/libMagickWand*.so.%{clibver}* +%{_libdir}/libMagickWand*.so.%{cwandver}* %files extra %defattr(-,root,root) @@ -395,48 +357,43 @@ %{_libdir}/libMagickCore*.so %{_libdir}/libMagickWand*.so %dir %{_includedir}/ImageMagick* +%{_includedir}/ImageMagick*/MagickCore +%{_includedir}/ImageMagick*/MagickWand %{_includedir}/ImageMagick*/magick %{_includedir}/ImageMagick*/wand %{_bindir}/MagickCore-config %{_bindir}/MagickWand-config -%{_bindir}/Magick-config -%{_bindir}/Wand-config %{_libdir}/pkgconfig/MagickCore*.pc -%{_libdir}/pkgconfig/ImageMagick.pc -%{_libdir}/pkgconfig/ImageMagick-*.pc -%{_libdir}/pkgconfig/*Wand*.pc +%{_libdir}/pkgconfig/ImageMagick*.pc +%{_libdir}/pkgconfig/MagickWand*.pc %doc %{_mandir}/man1/*-config.1.gz %exclude %{_mandir}/man1/Magick++-config.1.gz %files -n perl-PerlMagick %defattr(-,root,root,-) %doc PerlMagick/README.txt -%doc PerlMagick/demo +%doc PerlMagick/examples %doc %{_mandir}/man3/* %{perl_vendorarch}/auto/Image %{perl_vendorarch}/Image -%if 0%{?suse_version} < 1140 -/var/adm/perl-modules/ImageMagick -%endif -%files -n libMagick++%{libspec}-%{cxxlibver} +%files -n libMagick++%{libspec}%{cxxlibver} %defattr(-,root,root) %{_libdir}/libMagick++*.so.%{cxxlibver}* %files -n libMagick++-devel %defattr(-,root,root) -%doc demo +%doc Magick++/examples %doc Magick++/NEWS Magick++/README Magick++/AUTHORS %{_libdir}/libMagick++*.so %{_includedir}/ImageMagick*/Magick++.h %{_includedir}/ImageMagick*/Magick++ %{_bindir}/Magick++-config -%{_libdir}/pkgconfig/ImageMagick++*.pc %{_libdir}/pkgconfig/Magick++*.pc %doc %{_mandir}/man1/Magick++-config.1.gz %files doc %defattr(-,root,root) -%{_defaultdocdir}/%{name} +%{_defaultdocdir}/%{name}-%{maj} %changelog ++++++ ImageMagick-6.9.8-2.tar.xz -> ImageMagick-7.0.5-4.tar.xz ++++++ /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick-6.9.8-2.tar.xz /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick-7.0.5-4.tar.xz differ: char 17, line 1 ++++++ ImageMagick-disable-insecure-coders.patch ++++++ Index: ImageMagick-6.9.8-2/config/policy.xml =================================================================== --- ImageMagick-6.9.8-2.orig/config/policy.xml 2017-03-19 00:28:24.000000000 +0100 +++ ImageMagick-6.9.8-2/config/policy.xml 2017-03-20 14:05:22.979847731 +0100 @@ -81,4 +81,15 @@ <!-- <policy domain="cache" name="memory-map" value="anonymous"/> --> <!-- <policy domain="cache" name="synchronize" value="True"/> --> <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> + <!-- Disable insecure coders by default --> + <!-- https://bugzilla.suse.com/show_bug.cgi?id=978061 --> + <policy domain="coder" rights="none" pattern="EPHEMERAL" /> + <policy domain="coder" rights="none" pattern="URL" /> + <policy domain="coder" rights="none" pattern="HTTPS" /> + <policy domain="coder" rights="none" pattern="MVG" /> + <policy domain="coder" rights="none" pattern="MSL" /> + <policy domain="coder" rights="none" pattern="TEXT" /> + <policy domain="coder" rights="none" pattern="SHOW" /> + <policy domain="coder" rights="none" pattern="WIN" /> + <policy domain="coder" rights="none" pattern="PLT" /> </policymap> ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.14WeSL/_old 2017-04-06 10:59:46.179770810 +0200 +++ /var/tmp/diff_new_pack.14WeSL/_new 2017-04-06 10:59:46.179770810 +0200 @@ -1,11 +1,11 @@ -libMagickCore-6_Q16-4 -libMagickWand-6_Q16-4 -libMagick++-6_Q16-7 +libMagickCore-7_Q16HDRI2 +libMagickWand-7_Q16HDRI0 +libMagick++-7_Q16HDRI2 ImageMagick-devel requires -ImageMagick-<targettype> - requires "libMagickCore-6_Q16-4-<targettype> = <version>" - requires "libMagickWand-6_Q16-4-<targettype> = <version>" + requires "libMagickCore-7_Q16HDRI2-<targettype> = <version>" + requires "libMagickWand-7_Q16HDRI0-<targettype> = <version>" libMagick++-devel requires -ImageMagick-<targettype> - requires "libMagick++-6_Q16-7-<targettype> = <version>" + requires "libMagick++-7_Q16HDRI2-<targettype> = <version>"
