diff --git a/ImageMagick-7.0.10-35.tar.bz2 b/ImageMagick-7.0.10-35.tar.bz2 deleted file mode 100644 index a832325..0000000 --- a/ImageMagick-7.0.10-35.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24df71d3ffbb8e079e92a511c583ac6009c746f1caa19f6572cc8123abd256e7 -size 11727586 diff --git a/ImageMagick-7.0.10-35.tar.bz2.asc b/ImageMagick-7.0.10-35.tar.bz2.asc deleted file mode 100644 index 626f7d5..0000000 --- a/ImageMagick-7.0.10-35.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAl+eBc0ACgkQiatj1IJ3 -N3oy5A//S0A41FDEp8qH976vjOD3ft1gX56BKcyiHU70oV2iWEoyFf27OLqM7u5e -GpDG9VF8Xx2O0Ga30rzzu7DkKY2G+JHrtTXb/xa58hu5ENVWx8cRu3ZUP4TKE5y1 -5ABw24SEvSF2LTdCGF6vbguYWCrbSOl9Q1BJ6MbCFDrL4fu7q69hnDiWAwXuJpmD -yA0AQd6x8+Q/71H66A6/N/tQt5T1Ps6QMrkFIG8+BogxNfMY2Pf0mgtt2zoEzsah -Rie5BeZVGVUgtViXi0UM7nj9oPMNPsglAeRmLTi8e9QUO68yQyOfOmodnbdNlaBX -xxOSf/YNY556OOafiJlPLqR3iLdR40+6zSOLavl2ca2AACzeXG8SBHfmMd4k/q+Z -0+CHMiSqFdezxmymOsz6zIF804JRGdOhUHOcDpRe0M0tZ2cF139BXTu3prB7RZd4 -lQNPC2JyJS56rv1gi2PB+s92FyMltipF/lSZXyi4uoGWXgEVRXk3SGRL5/G+/x5p -ZVpg9MoK00CVP5BCjmTm8XHypVDn1dbJu0ki3Q9f9Rsih9Ko3MYUcUF6kL443Eqm -KKqiH1K3GX7GfVScESorhens4UydXARFDeF7yFt1sNMsqEeH7pE5OLD2CPfA4G7j -XwdLRLG3KU4MZ/IF7cO9eDhrSVdWT3f8QGjW1OZK4j1ewTKJnNo= -=g1xo ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.10-43.tar.bz2 b/ImageMagick-7.0.10-43.tar.bz2 new file mode 100644 index 0000000..a6068de --- /dev/null +++ b/ImageMagick-7.0.10-43.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e35d700a9e7865aac39b62fc8945284f34d5471a2a55bb70d629828e9a06cc4 +size 11721610 diff --git a/ImageMagick-7.0.10-43.tar.bz2.asc b/ImageMagick-7.0.10-43.tar.bz2.asc new file mode 100644 index 0000000..d0d82ab --- /dev/null +++ b/ImageMagick-7.0.10-43.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAl+7xy4ACgkQiatj1IJ3 +N3qW9RAArVIcS6pUQksnzRaAcnOQu817QebumWu64s/6kF4qh8v5Qu6FmdtVB/Ps +jGqT1ZU6bwL6F52VyPoz4P1HEp7bDW7YYaInig6dfV7YpzpFzOSErrJ6lp3IgWEe +LaUhzURevWNtvdv1OuerJezPXtxR7rM63YpzguwbqJ8yhutMIomXoHDGjPD5zTIL +Mh183Y/xQ6boDgj+2IZewwsDennw5mVTAIceCSuOemblgu75oXbQWSHeFa+iiJ4Q +0dyMsl3z+NykL1AdaVdbgRVLIgg3CowZw2y5qTQIm62FNq6Mx4Me2hPJEtkHQh1L +KvJroC9gs8XWgLb/TMR8RRNhbd7PPROlU9CIqX/3SIltaptS0pLxiNBe6ODKvqSh +U0Gi5oO/lp9pdEY1vqd1YpAnn6p2NpIcaHOdmspfYPrErwTVZRyLR612tZxsJ2JN +WkvwVJypnvv+hlk323Mdpo4+ftMRfP7Cs/nUz2995QzD6bUC58v14J5AKoUIXv41 +yVaEQwzfKPo3ND22Tn3Lk0RxxxD3pBeJMlFN7ASiFD/K5Po5dHeLLhKMufto1GAF +FE5l8k4EVjebmIX4H4Fpg0leZ/UI4KyC4RjEoJ72CRsb9jHvyTsDE5yJCTbmcY32 +knJJ2GK0bgy0556/Qc99XurzHfg3c4FuUyMG+d/lsn1AtsSegQo= +=1hBP +-----END PGP SIGNATURE----- diff --git a/ImageMagick-configuration-SUSE.patch b/ImageMagick-configuration-SUSE.patch index 5d581f8..b40e509 100644 --- a/ImageMagick-configuration-SUSE.patch +++ b/ImageMagick-configuration-SUSE.patch @@ -1,7 +1,7 @@ ---- policy.xml.orig 2020-11-03 10:34:55.594926720 +0100 -+++ policy.xml 2020-11-03 10:35:36.895153783 +0100 +--- policy.xml.orig 2020-11-23 12:47:05.000000000 +0100 ++++ policy.xml 2020-11-24 15:42:58.102090000 +0100 @@ -74,4 +74,23 @@ - + + diff --git a/ImageMagick.changes b/ImageMagick.changes index 67ee3d9..72cec44 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Tue Nov 24 12:32:20 UTC 2020 - pgajdos@suse.com + +- version update to 7.0.10.43 + * add padding to AcquirePolicyString(). + * revert memory patch to avert possible thread lock. + * add support for FilmLight FL32 image format. + * remove Linux shell artifact from Windows delegate configuration file. + * fix shell injection vulnerability via the -authenticate option (reference + alex@cure...). + * support DPX 4:2:2 sampling. + * Release ImageMagick version 7.0.10-38 GIT revision 17815:bf51a3f1f:20201114 + * add image settings support to -fx. + * better support for TIFF YCbCr photometric. + * verify TTF glyph format before dereferencing (reference + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=26932). + * force single HEIC image per container. + * Release ImageMagick version 7.0.10-37 GIT revision 17780:47a8392ef:20201107 + * check and report if profile is corrupt. + * do not add entropy based on mkstemp() unique filename. + ------------------------------------------------------------------- Tue Nov 3 09:24:54 UTC 2020 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 16147f5..a251d82 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,11 +20,11 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.0.10 -%define mfr_revision 35 +%define mfr_revision 43 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} -%define clibver 7 -%define cwandver 7 +%define clibver 8 +%define cwandver 8 %define cxxlibver 4 %define libspec -%{maj}_Q%{quantum_depth}HDRI %define config_dir ImageMagick-7 @@ -436,7 +436,7 @@ make install \ mv -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml mv %{buildroot}%{_sysconfdir}/%{config_dir}{,-upstream} cp -r %{buildroot}%{_sysconfdir}/%{config_dir}{-upstream,-SUSE} -patch --dir %{buildroot}%{_sysconfdir}/%{config_dir}-SUSE < %{PATCH0} +patch --fuzz=0 --dir %{buildroot}%{_sysconfdir}/%{config_dir}-SUSE < %{PATCH0} mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ ln -sf %{_sysconfdir}/alternatives/%{config_dir} %{buildroot}%{_sysconfdir}/%{config_dir} # symlink header file relative to /usr/include/ImageMagick-7/ diff --git a/baselibs.conf b/baselibs.conf index a08f7ea..0107eff 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,10 +1,10 @@ -libMagickCore-7_Q16HDRI7 -libMagickWand-7_Q16HDRI7 +libMagickCore-7_Q16HDRI8 +libMagickWand-7_Q16HDRI8 libMagick++-7_Q16HDRI4 ImageMagick-devel requires -ImageMagick- - requires "libMagickCore-7_Q16HDRI7- = " - requires "libMagickWand-7_Q16HDRI7- = " + requires "libMagickCore-7_Q16HDRI8- = " + requires "libMagickWand-7_Q16HDRI8- = " libMagick++-devel requires -ImageMagick- requires "libMagick++-7_Q16HDRI4- = "