Hello community,
here is the log from the commit of package GraphicsMagick for
openSUSE:Leap:15.2 checked in at 2020-03-29 14:55:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/GraphicsMagick (Old)
and /work/SRC/openSUSE:Leap:15.2/.GraphicsMagick.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "GraphicsMagick"
Sun Mar 29 14:55:20 2020 rev:25 rq:788191 version:1.3.35
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/GraphicsMagick/GraphicsMagick.changes
2020-01-15 14:45:12.793198316 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.GraphicsMagick.new.3160/GraphicsMagick.changes
2020-03-29 14:55:21.379142167 +0200
@@ -2 +2 @@
-Wed Jan 8 08:47:53 UTC 2020 - [email protected]
+Wed Mar 25 08:17:55 UTC 2020 - [email protected]
@@ -4,6 +4,262 @@
-- security update
-- added patches
- CVE-2019-19951 [bsc#1160321]
- + GraphicsMagick-CVE-2019-19951.patch
- CVE-2019-19953 [bsc#1160364]
- + GraphicsMagick-CVE-2019-19953.patch
+- version update to 1.3.35
+ Special Issues:
+ * It has been discovered that the 'ICU' library (a perhaps 30MB C++
+ library) which is now often a libxml2 dependendency causes huge
+ process initialization overhead. This is noticed as unexpected
+ slowness when GraphicsMagick utilities are used to process small to
+ medium sized files. The time to initialize the 'ICU' library is
+ often longer than the time that GraphicsMagick would otherwise
+ require to read the input file, process the image, and write the
+ output file. If the 'ICU' dependency can not be avoided, then make
+ sure to use the modules build so there is only impact for file
+ formats which require libxml2. Please lobby the 'ICU' library
+ developers to change their implementation to avoid long start-up
+ times due to merely linking with the library.
+ Security Fixes:
+ * GraphicsMagick is now participating in Google's oss-fuzz project due
+ to the contributions and assistance of Alex Gaynor. Since February 4
+ 2018, 398 issues have been opened by oss-fuzz (some of which were
+ benign build issues) and 11 issues remain open.
+ The issues list is available at
+ https://bugs.chromium.org/p/oss-fuzz/issues/list under search term
+ "graphicsmagick". Issues are available for anyone to view and
+ duplicate if they have been in "Verified" status for 30 days, or if
+ they have been in "New" status for 90 days. There are too many
+ fixes to list here. Please consult the GraphicsMagick ChangeLog
+ file, Mercurial repository commit log, and the oss-fuzz issues list
+ for details.
+ Bug fixes:
+ * Fix broken definition of ResourceInfinity which resulted in that
+ GetMagickResource() would return -1 rather than the maximum range
+ value for the return type as documented. (problem added by the
+ 1.3.32 release).
+ * ModifyCache(): Re-open the pixel cache if the cache rows/columns do
+ not match the owning image rows/columns.
+ * Fix DisplayImages() return status. The return status was inverted.
+ * HISTOGRAM: Histogram once again includes the histogram as a text
+ comment. This became broken by previous security fixes.
+ * PICT: Fixed heap buffer overuns reported multiple sources.
+ * JNG: Detect when JPEG encoder has failed and throw an exception.
+ * MVG/DrawImage(): Performs even more parsing validations.
+ * Clang static analyzer fixes: A great many fixes were made based on
+ problem reports by the Clang static analyzer.
+ * Visual Studio static analyzer fixes: A great many fixes were made
+ based on problem reports by the Visual Studio 2019 static analyzer.
+ Many of these may improve the robustness of 64-bit code.
+ New Features:
+ * GRADIENT/GradientImage(): Improved accuracy of gradient levels as
+ well as dramaticaly improving performance. Output PseudoClass
+ images if we can. Add support for using the image 'gravity'
+ attribute as well as the "gradient:direction" definition to produce
+ gradient vector directions corresponding to SouthGravity (the
+ previously-existing default), NorthGravity, WestGravity,
+ EastGravity, NorthWestGravity, NorthEastGravity, SouthWestGravity,
+ and SouthEastGravity.
+ API Updates:
+ * InitializeMagickEx(): New function which may be used in place of
+ InitializeMagick() to initialize GraphicsMagick. This
+ initialization function returns an error status value, may update a
+ passed ExceptionInfo structure with error information, and provides
+ an options parameter which supports simple bit-flags to tailor
+ initialization. The signal handler registrations are skipped if the
+ MAGICK_OPT_NO_SIGNAL_HANDER flag is set in the options.
+ Feature improvements:
+ * Replace use of non-reentrant legacy POSIX functions with reentrant
+ equivalents.
+ * Timing of image reads should now be very accurate. The timer was
+ sometimes not stopped as soon as it should be.
+ * PICT: The PICT reader is working pretty good now. It handles all
+ the PICT image files I have available to me.
+ Behavior Changes:
+ * POSIX Signals: Use the normal termination signal handler for SIGXCPU
+ and SIGXFSZ so that ulimit or setrlimit(2) may be used to apply CPU
+ (RLIMIT_CPU) and output file size (RLIMIT_FSIZE) limits with the
+ normal cleanup, and without dumping core. Note that any output files
+ currently being written may be truncated and files being written by
+ external programs (e.g. Ghostscript) might be left behind unless
+ they are to a temporary file assigned by GraphicsMagick.
+ * Some private string and integer constants were removed from the
+ apparent library ABI. Some private functions were marked static and
+ removed from the apparent library ABI. This is mentioned because
+ someone is sure to notice and be concerned about it.
+ * The remaining private content in installed header files was moved
+ into -private.h header files which are not installed. This should
+ not be cause for concern but is mentiond because someone is sure to
+ notice and be concerned about it.
+
+-------------------------------------------------------------------
+Mon Jan 6 22:29:55 UTC 2020 - Stefan Brüns <[email protected]>
+
+- Remove xorg-x11-fonts runtime Requires, gm display no longer
+ fails when it is missing (see boo#619103).
+- Cleanup, replace $RPM_OPT_FLAGS with %optflags
+
+-------------------------------------------------------------------
+Sat Jan 4 16:04:54 UTC 2020 - Arjen de Korte <[email protected]>
+
+- Revert the change to relinquish resources used by OpenMP on all
+ devices. There are concerns upstream that this might break
+ applications that use OpenMP too and suddenly find their threads
+ closed (remove GraphicsMagick-wait-for-threads-close.patch)
+
+-------------------------------------------------------------------
+Thu Jan 2 20:18:49 UTC 2020 - Arjen de Korte <[email protected]>
+
+- Due to a broken check, it wasn't noticed the typemap file is
+ already provided in the source archive (removed typemap)
+
+-------------------------------------------------------------------
+Sun Dec 29 14:32:23 UTC 2019 - Arjen de Korte <[email protected]>
+
+- Relinquish resources used by OpenMP on all devices (GCC >= 9)
+ + GraphicsMagick-wait-for-threads-close.patch
+- Set configure options to what is actually build
+
+-------------------------------------------------------------------
+Fri Dec 27 17:03:02 UTC 2019 - Arjen de Korte <[email protected]>
+
+- version update to 1.3.34
+ * DPS: Eliminate a memory leak.
+ * Debug Trace: Only output text to terminate an XML format log file
+ if XML format is active.
+ * EXIF Parser: Detect non-terminal parsing and report an error.
+ * EXIF Parser: Eliminate heap buffer overflows.
+ * HuffmanDecodeImage(): Fix heap overflow in 32-bit applications.
+ * MAT: Implement subimage/subrange support.
+ * MVG: Address non-terminal loops, excessive run-time, thrown
+ assertions, divide-by-zero, heap overflow, and memory leaks.
+ * OpenModule(): Now properly case-insensitive, as it used to be.
+ * PCX: Verify that pixel region is not negative. Assure that opacity
+ channel is initialized to opaqueOpacity. Update DirectClass
+ representation while PseudoClass representation is updated.
+ Improve read performance with uncompressed PCX.
+ * PICT: Fix heap overflow in PICT writer.
+ * PNG: Fix validation of raw profile length.
+ * PNG: Skip coalescing layers if there is only one layer.
+ * PNM: Fix denial of service opportunity by limiting the length of
+ PNM comment text.
+ * WPG: Avoid Avoid dereferencing a null pointer.
+ * WPG: Implement subimage/subrange support.
+ * WPG: Improve performance when reading an embedded image.
+ * Wand library: In MagickClearException(), destroy any existing
+ exception info before re-initializing the exception info or else
+ there will be a memory leak.
+ * XPM: Rquire that image properties appear in the first 512 bytes
+ of the XPM file header.
+ * Compliles clean using GCC 9.
+ * Python scripts related to the build (enabled by --enable-maintainer-mode)
+ are now compatible with Python 3.
+ * Now supports using Google gperftools tcmalloc library for the memory
+ allocator. This improves performance for certain repetitive work-loads
+ and heavily-threaded algorithms.
+ * Configure now reports the status of zstd (FaceBook Zstandard)
+ compression in its configuration summary.
+ * TclMagick: Address many issues mentioned by SourceForge issue #420
+ "TclMagick issues and patch".
+ * PNG: Post-processing to convert the image type in the PNG reader based
+ on a specified magick prefix string is now disabled. This can (and
+ should) be done after the image has been returned.
+ * Trace Logging: The compiled-in logging default is always to stderr,
+ which may be over-ridden using log.mgk as soon as it is loaded.
+
+-------------------------------------------------------------------
+Tue Oct 8 15:00:02 UTC 2019 - [email protected]
+
+- version update to 1.3.33
+ * It has been discovered that the 'ICU' library (a perhaps 30MB C++
+ library) which is now often a libxml2 dependendency causes huge
+ process initialization overhead. This is noticed as unexpected
+ slowness when GraphicsMagick utilities are used to process small to
+ medium sized files. The time to initialize is often longer than the
+ time to read the input file, process the image, and write the output
+ file. If the 'ICU' dependency can not be avoided, then make sure to
+ use the modules build. Please lobby the 'ICU' library developers to
+ change their implementation to avoid long start-up times due to
+ merely linking with the library.
+ * GraphicsMagick is now participating in Google's oss-fuzz project due
+ to the contributions and assistance of Alex Gaynor. Since February 4
+ 2018, 353 issues have been opened by oss-fuzz and 338 of those
+ issues have been resolved. The issues list is available at
+ https://bugs.chromium.org/p/oss-fuzz/issues/list under search term
+ "graphicsmagick". Issues are available for anyone to view and
+ duplicate if they have been in "Verified" status for 30 days, or if
+ they have been in "New" status for 90 days. There are too many
+ fixes to list here. Please consult the GraphicsMagick ChangeLog
+ file, Mercurial repository commit log, and the oss-fuzz issues list
+ for details.
+ * Documentation has been added regarding security hazards due to
+ commands which support a '@filename' syntax.
++++ 282 more lines (skipped)
++++ between /work/SRC/openSUSE:Leap:15.2/GraphicsMagick/GraphicsMagick.changes
++++ and
/work/SRC/openSUSE:Leap:15.2/.GraphicsMagick.new.3160/GraphicsMagick.changes
Old:
----
GraphicsMagick-1.3.29.tar.bz2
GraphicsMagick-CVE-2018-10805.patch
GraphicsMagick-CVE-2018-16644.patch
GraphicsMagick-CVE-2018-16645.patch
GraphicsMagick-CVE-2018-18544.patch
GraphicsMagick-CVE-2018-20184.patch
GraphicsMagick-CVE-2018-20189.patch
GraphicsMagick-CVE-2019-11005.patch
GraphicsMagick-CVE-2019-11006.patch
GraphicsMagick-CVE-2019-11007.patch
GraphicsMagick-CVE-2019-11010.patch
GraphicsMagick-CVE-2019-11505.patch
GraphicsMagick-CVE-2019-11506.patch
GraphicsMagick-CVE-2019-16709.patch
GraphicsMagick-CVE-2019-19950.patch
GraphicsMagick-CVE-2019-19951.patch
GraphicsMagick-CVE-2019-19953.patch
GraphicsMagick-CVE-2019-7397.patch
GraphicsMagick-dcm.c-update.patch
GraphicsMagick-disable-indirect-reads.patch
GraphicsMagick-xwd.c-update.patch
typemap
New:
----
GraphicsMagick-1.3.35.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ GraphicsMagick.spec ++++++
--- /var/tmp/diff_new_pack.Rt4dFl/_old 2020-03-29 14:55:22.183142793 +0200
+++ /var/tmp/diff_new_pack.Rt4dFl/_new 2020-03-29 14:55:22.191142800 +0200
@@ -1,7 +1,7 @@
#
# spec file for package GraphicsMagick
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,9 +12,10 @@
# 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 asan_build 0
%define debug_build 0
@@ -29,61 +30,22 @@
%define pp_so_ver 12
%define wand_so_ver 2
Name: GraphicsMagick
-Version: 1.3.29
+Version: 1.3.35
Release: 0
Summary: Viewer and Converter for Images
License: MIT
Group: Productivity/Graphics/Convertors
-Url: http://www.GraphicsMagick.org/
-Source:
ftp://ftp.GraphicsMagick.org/pub/%{name}/%{base_version}/%{name}-%{version}.tar.bz2
-# following typemap file is needed for building PerlMagick with perl 5.16;
-# should be present in Graphics Magick 1.4.0
-%if %{bindperl}
-Source1: typemap
-%endif
+URL: http://www.GraphicsMagick.org/
+Source:
ftp://ftp.GraphicsMagick.org/pub/%{name}/%{base_version}/%{name}-%{version}.tar.xz
%if %{bindperl}
Patch0: GraphicsMagick-perl-linkage.patch
-Patch1: GraphicsMagick-dcm.c-update.patch
-Patch2: GraphicsMagick-CVE-2018-10805.patch
-Patch3: GraphicsMagick-disable-insecure-coders.patch
-Patch4: GraphicsMagick-CVE-2018-16645.patch
-Patch5: GraphicsMagick-CVE-2018-16644.patch
-Patch6: GraphicsMagick-CVE-2018-18544.patch
-Patch7: GraphicsMagick-CVE-2018-20189.patch
-Patch8: GraphicsMagick-CVE-2018-20184.patch
-Patch9: GraphicsMagick-CVE-2019-7397.patch
-# CVE-2019-11008 [bsc#1132054], CVE-2019-11009 [bsc#1132053], CVE-2019-11473
[bsc#1133203], CVE-2019-11474 [bsc#1133202]
-Patch10: GraphicsMagick-xwd.c-update.patch
-# CVE-2019-11007 [bsc#1132060]
-Patch11: GraphicsMagick-CVE-2019-11007.patch
-# CVE-2019-11010 [bsc#1132055]
-Patch12: GraphicsMagick-CVE-2019-11010.patch
-# CVE-2019-11006 [bsc#1132061]
-Patch13: GraphicsMagick-CVE-2019-11006.patch
-# CVE-2019-11005 [bsc#1132058]
-Patch14: GraphicsMagick-CVE-2019-11005.patch
-# CVE-2019-11505 [bsc#1133501]
-Patch15: GraphicsMagick-CVE-2019-11505.patch
-# CVE-2019-11506 [bsc#1133498]
-Patch16: GraphicsMagick-CVE-2019-11506.patch
-# disable indirect reads [bsc#1138425]
-Patch17: GraphicsMagick-disable-indirect-reads.patch
-# CVE-2019-16709 [bsc#1151782]
-Patch18: GraphicsMagick-CVE-2019-16709.patch
-# CVE-2019-19950 [bsc#1159852]
-Patch19: GraphicsMagick-CVE-2019-19950.patch
-# CVE-2019-19951 [bsc#1160321]
-Patch20: GraphicsMagick-CVE-2019-19951.patch
-# CVE-2019-19953 [bsc#1160364]
-Patch21: GraphicsMagick-CVE-2019-19953.patch
%endif
+Patch1: GraphicsMagick-disable-insecure-coders.patch
BuildRequires: cups-client
BuildRequires: dcraw
BuildRequires: gcc-c++
-BuildRequires: ghostscript-fonts-other
BuildRequires: ghostscript-fonts-std
-BuildRequires: ghostscript-library
-BuildRequires: libjasper-devel
+BuildRequires: ghostscript-mini
%if 0%{?suse_version} >= 1315
BuildRequires: libjbig-devel
BuildRequires: libltdl-devel
@@ -110,7 +72,6 @@
BuildRequires: libxml-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%endif
-Requires: xorg-x11-fonts
%description
GraphicsMagick provides an image manipulation and translation
@@ -247,28 +208,8 @@
%setup -q
%if %{bindperl}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
%endif
+%patch1 -p1
%build
# This shouldn't be there yet.
@@ -276,8 +217,8 @@
%if !%{debug_build}
export CFLAGS="%{optflags} -fPIE"
%else
-export CFLAGS="$RPM_OPT_FLAGS -O0"
-export CXXFLAGS="$RPM_OPT_FLAGS -O0"
+export CFLAGS="%{optflags} -O0"
+export CXXFLAGS="%{optflags} -O0"
%endif
%configure --enable-shared --disable-static \
%if !%{debug_build}
@@ -285,9 +226,12 @@
%else
--without-modules \
%endif
- --enable-lzw \
--with-frozenpaths \
+ --without-dps \
+ --without-jp2 \
--without-perl \
+ --without-trio \
+ --without-zstd \
--with-magick-plus-plus \
--with-quantum-depth=%{quant} \
--enable-quantum-library-names \
@@ -300,6 +244,16 @@
-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
@@ -307,13 +261,6 @@
%endif
%if %{bindperl}
cd PerlMagick
-if [ -e PerlMagick/typemap ]; then
- echo "With Graphics Magick 1.4.0, typmap exists yet, please "
- echo "no need to carry it as a package source anymore."
- exit 1
-else
- cp %{SOURCE1} .
-fi
perl Makefile.PL
make %{?_smp_mflags} LD_RUN_PATH="%{_libdir}"
%endif
@@ -354,6 +301,7 @@
export MAGICK_CONFIGURE_PATH=$PWD/config
%if %{bindperl}
cd PerlMagick
+# bsc#1105592
rm -r t/ps
make test
%endif
++++++ GraphicsMagick-disable-insecure-coders.patch ++++++
--- /var/tmp/diff_new_pack.Rt4dFl/_old 2020-03-29 14:55:22.223142825 +0200
+++ /var/tmp/diff_new_pack.Rt4dFl/_new 2020-03-29 14:55:22.223142825 +0200
@@ -1,7 +1,7 @@
-Index: GraphicsMagick-1.3.29/coders/pdf.c
+Index: GraphicsMagick-1.3.31/coders/pdf.c
===================================================================
---- GraphicsMagick-1.3.29.orig/coders/pdf.c 2018-04-29 20:01:26.000000000
+0200
-+++ GraphicsMagick-1.3.29/coders/pdf.c 2019-05-28 11:02:55.701995167 +0200
+--- GraphicsMagick-1.3.31.orig/coders/pdf.c 2018-11-17 17:13:19.000000000
+0100
++++ GraphicsMagick-1.3.31/coders/pdf.c 2018-12-19 11:00:49.332814619 +0100
@@ -495,7 +495,7 @@ ModuleExport void RegisterPDFImage(void)
entry->seekable_stream=True;
entry->description="Encapsulated Portable Document Format";
@@ -20,10 +20,10 @@
(void) RegisterMagickInfo(entry);
}
-Index: GraphicsMagick-1.3.29/coders/ps.c
+Index: GraphicsMagick-1.3.31/coders/ps.c
===================================================================
---- GraphicsMagick-1.3.29.orig/coders/ps.c 2018-04-29 20:01:26.000000000
+0200
-+++ GraphicsMagick-1.3.29/coders/ps.c 2019-05-28 11:02:55.701995167 +0200
+--- GraphicsMagick-1.3.31.orig/coders/ps.c 2018-04-29 20:01:26.000000000
+0200
++++ GraphicsMagick-1.3.31/coders/ps.c 2018-12-19 11:00:49.332814619 +0100
@@ -458,7 +458,7 @@ ModuleExport void RegisterPSImage(void)
entry->adjoin=False;
entry->description="Adobe Encapsulated PostScript Interchange format";
@@ -69,10 +69,10 @@
(void) RegisterMagickInfo(entry);
}
-Index: GraphicsMagick-1.3.29/coders/ps2.c
+Index: GraphicsMagick-1.3.31/coders/ps2.c
===================================================================
---- GraphicsMagick-1.3.29.orig/coders/ps2.c 2018-04-29 20:01:26.000000000
+0200
-+++ GraphicsMagick-1.3.29/coders/ps2.c 2019-05-28 11:02:55.701995167 +0200
+--- GraphicsMagick-1.3.31.orig/coders/ps2.c 2018-04-29 20:01:26.000000000
+0200
++++ GraphicsMagick-1.3.31/coders/ps2.c 2018-12-19 11:00:49.332814619 +0100
@@ -244,7 +244,7 @@ ModuleExport void RegisterPS2Image(void)
entry->seekable_stream=True;
entry->description="Adobe Level II Encapsulated PostScript";
@@ -91,10 +91,10 @@
(void) RegisterMagickInfo(entry);
}
-Index: GraphicsMagick-1.3.29/coders/ps3.c
+Index: GraphicsMagick-1.3.31/coders/ps3.c
===================================================================
---- GraphicsMagick-1.3.29.orig/coders/ps3.c 2018-04-29 20:01:26.000000000
+0200
-+++ GraphicsMagick-1.3.29/coders/ps3.c 2019-05-28 11:02:55.701995167 +0200
+--- GraphicsMagick-1.3.31.orig/coders/ps3.c 2018-11-17 17:13:19.000000000
+0100
++++ GraphicsMagick-1.3.31/coders/ps3.c 2018-12-19 11:00:49.332814619 +0100
@@ -386,7 +386,7 @@ ModuleExport void RegisterPS3Image(void)
entry->description="Adobe Level III Encapsulated PostScript";
entry->seekable_stream=MagickTrue;
@@ -113,40 +113,47 @@
(void) RegisterMagickInfo(entry);
}
-Index: GraphicsMagick-1.3.29/config/delegates.mgk.in
+Index: GraphicsMagick-1.3.31/config/delegates.mgk.in
===================================================================
---- GraphicsMagick-1.3.29.orig/config/delegates.mgk.in 2016-05-30
19:19:54.000000000 +0200
-+++ GraphicsMagick-1.3.29/config/delegates.mgk.in 2019-05-28
11:02:55.701995167 +0200
-@@ -76,28 +76,8 @@
+--- GraphicsMagick-1.3.31.orig/config/delegates.mgk.in 2018-11-17
17:13:19.000000000 +0100
++++ GraphicsMagick-1.3.31/config/delegates.mgk.in 2018-12-19
11:00:49.336814638 +0100
+@@ -76,27 +76,27 @@
<delegate decode="dot" command='"@DOTDecodeDelegate@" -Tps "%i" -o "%o"' />
<delegate decode="dvi" command='"@DVIDecodeDelegate@" -q -o "%o" "%i"' />
<delegate decode="edit" stealth="True" command='"@EditorDelegate@" -title
"Edit Image Comment" -e vi "%o"' />
- <delegate decode="eps" encode="pdf" mode="bi" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSPDFDevice@
"-sOutputFile=%o" -- "%i" -c quit' />
- <delegate decode="eps" encode="ps" mode="bi" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSPSDevice@
"-sOutputFile=%o" -- "%i" -c quit' />
++ <!--delegate decode="eps" encode="pdf" mode="bi" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSPDFDevice@
"-sOutputFile=%o" -- "%i" -c quit' /-->
++ <!--delegate decode="eps" encode="ps" mode="bi" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSPSDevice@
"-sOutputFile=%o" -- "%i" -c quit' /-->
<delegate decode="fig" command='"@FIGDecodeDelegate@" -L ps "%i" "%o"' />
-- <!-- Read monochrome Postscript, EPS, and PDF -->
+ <!-- Read monochrome Postscript, EPS, and PDF -->
- <delegate decode="gs-mono" stealth="True" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSMonoDevice@
-dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s "-sOutputFile=%s" -- "%s" -c
quit' />
--
-- <!-- Read grayscale Postscript, EPS, and PDF -->
++ <!--delegate decode="gs-mono" stealth="True" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSMonoDevice@
-dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s "-sOutputFile=%s" -- "%s" -c
quit' /-->
+
+ <!-- Read grayscale Postscript, EPS, and PDF -->
- <delegate decode="gs-gray" stealth="True" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSGrayDevice@
-dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s "-sOutputFile=%s" -- "%s" -c
quit' />
--
-- <!-- Read colormapped Postscript, EPS, and PDF -->
++ <!--delegate decode="gs-gray" stealth="True" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSGrayDevice@
-dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s "-sOutputFile=%s" -- "%s" -c
quit' /-->
+
+ <!-- Read colormapped Postscript, EPS, and PDF -->
- <delegate decode="gs-palette" stealth="True" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSPaletteDevice@
-dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s "-sOutputFile=%s" -- "%s" -c
quit' />
--
-- <!-- Read color Postscript, EPS, and PDF -->
++ <!--delegate decode="gs-palette" stealth="True" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSPaletteDevice@
-dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s "-sOutputFile=%s" -- "%s" -c
quit' /-->
+
+ <!-- Read color Postscript, EPS, and PDF -->
- <delegate decode="gs-color" stealth="True" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSColorDevice@
-dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s "-sOutputFile=%s" -- "%s" -c
quit' />
--
-- <!-- Read color+alpha Postscript, EPS, and PDF -->
++ <!--delegate decode="gs-color" stealth="True" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSColorDevice@
-dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s "-sOutputFile=%s" -- "%s" -c
quit' /-->
+
+ <!-- Read color+alpha Postscript, EPS, and PDF -->
- <delegate decode="gs-color+alpha" stealth="True" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSColorAlphaDevice@
-dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s "-sOutputFile=%s" -- "%s" -c
quit' />
--
-- <!-- Read CMYK Postscript, EPS, and PDF -->
++ <!--delegate decode="gs-color+alpha" stealth="True" command='"@PSDelegate@"
-q -dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSColorAlphaDevice@
-dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s "-sOutputFile=%s" -- "%s" -c
quit' /-->
+
+ <!-- Read CMYK Postscript, EPS, and PDF -->
- <delegate decode="gs-cmyk" stealth="True" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSCMYKDevice@
-dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s "-sOutputFile=%s" -- "%s" -c
quit' />
--
- <delegate decode="hpg" command='"@HPGLDecodeDelegate@" -q -m eps -f
`basename "%o"` "%i" && @MVDelegate@ -f `basename "%o"` "%o"' />
- <delegate decode="hpgl" command='"@HPGLDecodeDelegate@" -q -m eps -f
`basename "%o"` "%i" && @MVDelegate@ -f `basename "%o"` "%o"' />
- <!-- Read HTML file -->
-@@ -110,16 +90,10 @@
++ <!--delegate decode="gs-cmyk" stealth="True" command='"@PSDelegate@" -q
-dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSCMYKDevice@
-dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s "-sOutputFile=%s" -- "%s" -c
quit' /-->
+
+ <!-- Read monochrome PDF using Poppler's pdftoppm -->
+ <delegate decode="poppler-mono" stealth="True" command='"pdftoppm" "-mono"
"-freetype" "yes" "-aa" "yes" "-aaVector" "yes" "-rx" "72" "-ry" "72" "%s" ">"
"%s"' />
+@@ -119,16 +119,10 @@
<delegate decode="mpeg" command='"@MPEGDecodeDelegate@" -q -b "%i" -f -o3
"%u%%05d"; @GMDelegate@ convert -temporary "%u*.ppm" "miff:%o" ; rm -f
"%u"*.ppm ' />
<!-- Write MPEG file using mpeg2encode -->
<delegate encode="mpeg-encode" stealth="True"
command='"@MPEGEncodeDelegate@" "%i" "%o"' />
@@ -163,11 +170,11 @@
<delegate decode="ps" encode="print" mode="encode"
command='"@PrintDelegate@" "%i"' />
<!-- Read HTML file -->
<delegate decode="shtml" command='"@HTMLDecodeDelegate@" -U -o "%o" "%i"' />
-Index: GraphicsMagick-1.3.29/Makefile.in
+Index: GraphicsMagick-1.3.31/Makefile.in
===================================================================
---- GraphicsMagick-1.3.29.orig/Makefile.in 2018-04-29 20:05:43.000000000
+0200
-+++ GraphicsMagick-1.3.29/Makefile.in 2019-05-28 11:02:55.705995190 +0200
-@@ -3876,7 +3876,6 @@ TESTS_TESTS = \
+--- GraphicsMagick-1.3.31.orig/Makefile.in 2018-11-17 17:14:38.000000000
+0100
++++ GraphicsMagick-1.3.31/Makefile.in 2018-12-19 11:00:49.336814638 +0100
+@@ -3885,7 +3885,6 @@ TESTS_TESTS = \
tests/rwfile.tap \
tests/rwfile_sized.tap \
tests/rwfile_miff.tap \
@@ -175,20 +182,20 @@
tests/rwfile_deep.tap
TESTS_EXTRA_DIST = \
-Index: GraphicsMagick-1.3.29/tests/rwblob.tap
+Index: GraphicsMagick-1.3.31/tests/rwblob.tap
===================================================================
---- GraphicsMagick-1.3.29.orig/tests/rwblob.tap 2017-07-04
23:32:09.000000000 +0200
-+++ GraphicsMagick-1.3.29/tests/rwblob.tap 2019-05-28 11:02:55.705995190
+0200
+--- GraphicsMagick-1.3.31.orig/tests/rwblob.tap 2018-11-17
17:13:19.000000000 +0100
++++ GraphicsMagick-1.3.31/tests/rwblob.tap 2018-12-19 11:01:16.444942352
+0100
@@ -10,7 +10,7 @@ rwblob=./rwblob
check_types='bilevel gray pallette truecolor'
# Number of tests we plan to run
--test_plan_fn 204
-+test_plan_fn 196
+-test_plan_fn 209
++test_plan_fn 201
# ART format
for type in ${check_types}
-@@ -66,18 +66,6 @@ do
+@@ -68,18 +68,6 @@ do
test_command_fn "DPX ${type}" ${MEMCHECK} ${rwblob}
"${SRCDIR}/input_${type}.miff" DPX
done
@@ -207,16 +214,16 @@
# FAX format
for type in ${check_types}
do
-Index: GraphicsMagick-1.3.29/tests/rwfile.tap
+Index: GraphicsMagick-1.3.31/tests/rwfile.tap
===================================================================
---- GraphicsMagick-1.3.29.orig/tests/rwfile.tap 2018-01-20
15:31:41.000000000 +0100
-+++ GraphicsMagick-1.3.29/tests/rwfile.tap 2019-05-28 11:02:55.705995190
+0200
+--- GraphicsMagick-1.3.31.orig/tests/rwfile.tap 2018-11-17
17:13:19.000000000 +0100
++++ GraphicsMagick-1.3.31/tests/rwfile.tap 2018-12-19 11:01:03.856883049
+0100
@@ -11,7 +11,7 @@ rwfile=./rwfile
check_types='bilevel gray pallette truecolor'
# Number of tests we plan to run
--test_plan_fn 576
-+test_plan_fn 536
+-test_plan_fn 648
++test_plan_fn 608
# ART format
for type in ${check_types}
@@ -269,7 +276,7 @@
# FAX format
for type in ${check_types}
do
-@@ -284,13 +242,6 @@ do
+@@ -290,13 +248,6 @@ do
test_command_fn "PCX ${type} (stdio)" ${MEMCHECK} ${rwfile} -stdio
-filespec "out_${type}_stdio_%d" "${SRCDIR}/input_${type}.miff" PCX
done
@@ -283,7 +290,7 @@
# PGM format
for type in ${check_types}
do
-@@ -350,27 +301,6 @@ do
+@@ -356,27 +307,6 @@ do
done
done
@@ -311,15 +318,3 @@
# PSD format
for type in ${check_types}
do
-Index: GraphicsMagick-1.3.29/coders/pcl.c
-===================================================================
---- GraphicsMagick-1.3.29.orig/coders/pcl.c 2018-04-29 20:01:26.000000000
+0200
-+++ GraphicsMagick-1.3.29/coders/pcl.c 2019-05-28 11:03:16.954116429 +0200
-@@ -143,6 +143,7 @@ ModuleExport void RegisterPCLImage(void)
- entry->adjoin=True;
- entry->description="Page Control Language";
- entry->module="PCL";
-+ entry->coder_class=BrokenCoderClass;
- (void) RegisterMagickInfo(entry);
- }
-
++++++ GraphicsMagick-perl-linkage.patch ++++++
--- /var/tmp/diff_new_pack.Rt4dFl/_old 2020-03-29 14:55:22.235142834 +0200
+++ /var/tmp/diff_new_pack.Rt4dFl/_new 2020-03-29 14:55:22.235142834 +0200
@@ -1,12 +1,13 @@
-diff -up GraphicsMagick-1.3.14/PerlMagick/Makefile.PL.in.perl_linkage
GraphicsMagick-1.3.14/PerlMagick/Makefile.PL.in
---- GraphicsMagick-1.3.14/PerlMagick/Makefile.PL.in.perl_linkage
2012-02-25 14:43:38.000000000 -0600
-+++ GraphicsMagick-1.3.14/PerlMagick/Makefile.PL.in 2012-02-26
07:35:38.542731280 -0600
+Index: GraphicsMagick-1.3.31/PerlMagick/Makefile.PL.in
+===================================================================
+--- GraphicsMagick-1.3.31.orig/PerlMagick/Makefile.PL.in 2018-12-19
11:03:59.273709484 +0100
++++ GraphicsMagick-1.3.31/PerlMagick/Makefile.PL.in 2018-12-19
11:06:05.822305744 +0100
@@ -78,7 +78,7 @@ WriteMakefile
- 'INSTALLBIN' => $magick_BIN_DIR,
+ 'INSTALLBIN' => $magick_BIN_DIR,
# Library specification
-- 'LIBS' => ["-L$magick_LIB_DIR -lGraphicsMagick $magick_LDFLAGS
$magick_DEP_LIBS"],
-+ 'LIBS' => ["-L$magick_LIB_DIR -L../magick/.libs -lGraphicsMagick
$magick_LDFLAGS $magick_DEP_LIBS"],
+- 'LIBS' => ["-L$magick_LIB_DIR $magick_LDFLAGS $magick_API_LIBS"],
++ 'LIBS' => ["-L$magick_LIB_DIR -L../magick/.libs $magick_LDFLAGS
$magick_API_LIBS"],
# Perl binary name (if a Perl binary is built)
- 'MAP_TARGET' => 'PerlMagick',
+ 'MAP_TARGET' => 'PerlMagick',
