commit php7-gmagick for openSUSE:Factory
Hello community, here is the log from the commit of package php7-gmagick for openSUSE:Factory checked in at 2019-12-29 15:50:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7-gmagick (Old) and /work/SRC/openSUSE:Factory/.php7-gmagick.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php7-gmagick" Sun Dec 29 15:50:01 2019 rev:7 rq:759828 version:2.0.5RC1 Changes: -------- --- /work/SRC/openSUSE:Factory/php7-gmagick/php7-gmagick.changes 2018-05-15 10:34:03.466743022 +0200 +++ /work/SRC/openSUSE:Factory/.php7-gmagick.new.6675/php7-gmagick.changes 2019-12-29 15:50:21.051194113 +0100 @@ -1,0 +2,6 @@ +Sat Dec 28 21:07:31 UTC 2019 - Arjen de Korte <suse+build@de-korte.org> + +- Run in single thread mode by default to prevent a segfault on + shutdown in PHP 7.4 (fix-segfault-on-shutdown.patch) + +------------------------------------------------------------------- New: ---- fix-segfault-on-shutdown.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7-gmagick.spec ++++++ --- /var/tmp/diff_new_pack.32uwq3/_old 2019-12-29 15:50:21.539194336 +0100 +++ /var/tmp/diff_new_pack.32uwq3/_new 2019-12-29 15:50:21.539194336 +0100 @@ -1,7 +1,7 @@ # # spec file for package php7-gmagick # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # 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/ # @@ -27,6 +27,8 @@ URL: https://pecl.php.net/package/gmagick Source0: https://pecl.php.net/get/%{pkg_name}-%{version}.tgz Source1: %{pkg_name}.ini +# PATCH-FIX-UPSTREAM fix-segfault-on-shutdown.patch https://bugs.php.net/bug.php?id=78465 +Patch0: fix-segfault-on-shutdown.patch BuildRequires: %{php_name}-devel >= 7.0.1 BuildRequires: GraphicsMagick-devel >= 1.3.17 BuildRequires: ghostscript-fonts-std @@ -47,6 +49,7 @@ %prep %setup -q -n %{pkg_name}-%{version} +%patch0 mkdir %{name} %build ++++++ fix-segfault-on-shutdown.patch ++++++ There seems to be a problem when the program is terminating if GraphicsMagick has been compiled with OpenMP support and has used more than one thread. It often segfaults in that case. See https://bugs.php.net/bug.php?id=78465 and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91256 --- gmagick.c +++ gmagick.c @@ -1709,6 +1709,9 @@ return FAILURE; InitializeMagick(cwd); +#if PHP_VERSION_ID >= 70400 + SetMagickResourceLimit(ThreadsResource, 1); +#endif efree(cwd); /* init constants */
participants (1)
-
root