From unknown Mon Aug 18 14:16:23 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#30654 <30654@debbugs.gnu.org> To: bug#30654 <30654@debbugs.gnu.org> Subject: Status: [PATCH 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict. Reply-To: bug#30654 <30654@debbugs.gnu.org> Date: Mon, 18 Aug 2025 21:16:23 +0000 retitle 30654 [PATCH 1/1] gnu: giflib: Make "reallocarray" private, solve g= libc@2.26 conflict. reassign 30654 guix-patches submitter 30654 Hartmut Goebel severity 30654 normal tag 30654 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 15:12:25 2018 Received: (at submit) by debbugs.gnu.org; 28 Feb 2018 20:12:25 +0000 Received: from localhost ([127.0.0.1]:37881 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er85R-000567-Ar for submit@debbugs.gnu.org; Wed, 28 Feb 2018 15:12:25 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er85M-00055q-P6 for submit@debbugs.gnu.org; Wed, 28 Feb 2018 15:12:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1er85G-0007GW-9c for submit@debbugs.gnu.org; Wed, 28 Feb 2018 15:12:15 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.9 required=5.0 tests=BAYES_00, UNWANTED_LANGUAGE_BODY autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:57197) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1er85G-0007GM-5g for submit@debbugs.gnu.org; Wed, 28 Feb 2018 15:12:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er85E-00084g-Rk for guix-patches@gnu.org; Wed, 28 Feb 2018 15:12:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1er85A-0007ES-Qw for guix-patches@gnu.org; Wed, 28 Feb 2018 15:12:12 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:35133) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1er85A-0007DD-HD for guix-patches@gnu.org; Wed, 28 Feb 2018 15:12:08 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3zs6D5037Hz1r4cf for ; Wed, 28 Feb 2018 21:12:04 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3zs6D466RMz1qvmX for ; Wed, 28 Feb 2018 21:12:04 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id VmlpPgfe2fuM for ; Wed, 28 Feb 2018 21:12:03 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-93-104-168-191.dynamic.mnet-online.de [93.104.168.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Wed, 28 Feb 2018 21:12:03 +0100 (CET) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 78853604D6 for ; Wed, 28 Feb 2018 21:12:03 +0100 (CET) From: Hartmut Goebel To: guix-patches@gnu.org Subject: [PATCH 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict. Date: Wed, 28 Feb 2018 21:12:02 +0100 Message-Id: <20180228201202.1481-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.13.6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Move the declaration from gif_lib.h to gif_lib_private.h to solve conflicts when some .c-file #includes both stdlib.h and gif_lib.h. See also https://sourceforge.net/p/giflib/bugs/110/ * gnu/packages/patches/giflib-make-reallocarray-private.patch: New file * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/image.scm(giflib)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/image.scm | 4 ++- .../patches/giflib-make-reallocarray-private.patch | 42 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/giflib-make-reallocarray-private.patch diff --git a/gnu/local.mk b/gnu/local.mk index 24368727f..de8161bbb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -693,6 +693,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/ghostscript-runpath.patch \ + %D%/packages/patches/giflib-make-reallocarray-private.patch \ %D%/packages/patches/gimp-CVE-2017-17784.patch \ %D%/packages/patches/gimp-CVE-2017-17785.patch \ %D%/packages/patches/gimp-CVE-2017-17786.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e3e3a3ccc..a39718903 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -572,7 +572,9 @@ error-resilience, a Java-viewer for j2k-images, ...") version ".tar.bz2")) (sha256 (base32 - "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz")))) + "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz")) + (patches (search-patches + "giflib-make-reallocarray-private.patch")))) (build-system gnu-build-system) (outputs '("bin" ; utility programs "out")) ; library diff --git a/gnu/packages/patches/giflib-make-reallocarray-private.patch b/gnu/packages/patches/giflib-make-reallocarray-private.patch new file mode 100644 index 000000000..d29ac05c8 --- /dev/null +++ b/gnu/packages/patches/giflib-make-reallocarray-private.patch @@ -0,0 +1,42 @@ +Move the declaration from gif_lib.h to gif_lib_private.h to solve +conflicts when some .c-file #includes both stdlib.h and gif_lib.h. +See also https://sourceforge.net/p/giflib/bugs/110/ + +diff -ur giflib-5.1.4.orig/lib/gifalloc.c giflib-5.1.4/lib/gifalloc.c +--- giflib-5.1.4.orig/lib/gifalloc.c 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/gifalloc.c 2018-02-28 20:39:12.093799085 +0100 +@@ -8,7 +8,7 @@ + #include + #include + +-#include "gif_lib.h" ++#include "gif_lib_private.h" + + #define MAX(x, y) (((x) > (y)) ? (x) : (y)) + +diff -ur giflib-5.1.4.orig/lib/gif_lib.h giflib-5.1.4/lib/gif_lib.h +--- giflib-5.1.4.orig/lib/gif_lib.h 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/gif_lib.h 2018-02-28 20:31:43.135716712 +0100 +@@ -244,9 +244,6 @@ + GifPixelType ColorTransIn2[]); + extern int GifBitSize(int n); + +-extern void * +-reallocarray(void *optr, size_t nmemb, size_t size); +- + /****************************************************************************** + Support for the in-core structures allocation (slurp mode). + ******************************************************************************/ +diff -ur giflib-5.1.4.orig/lib/gif_lib_private.h giflib-5.1.4/lib/gif_lib_private.h +--- giflib-5.1.4.orig/lib/gif_lib_private.h 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/gif_lib_private.h 2018-02-28 20:31:56.208257947 +0100 +@@ -54,6 +54,9 @@ + bool gif89; + } GifFilePrivateType; + ++extern void * ++reallocarray(void *optr, size_t nmemb, size_t size); ++ + #endif /* _GIF_LIB_PRIVATE_H */ + + /* end */ -- 2.13.6 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 15:16:51 2018 Received: (at 30654) by debbugs.gnu.org; 28 Feb 2018 20:16:51 +0000 Received: from localhost ([127.0.0.1]:37886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er89j-0005Cp-0b for submit@debbugs.gnu.org; Wed, 28 Feb 2018 15:16:51 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:53339) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er89g-0005Cg-Vc for 30654@debbugs.gnu.org; Wed, 28 Feb 2018 15:16:49 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3zs6KW5TF1z1rMTG for <30654@debbugs.gnu.org>; Wed, 28 Feb 2018 21:16:47 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3zs6KW4V5Mz1qvmX for <30654@debbugs.gnu.org>; Wed, 28 Feb 2018 21:16:47 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id DaP__iOQeRjx for <30654@debbugs.gnu.org>; Wed, 28 Feb 2018 21:16:47 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-93-104-168-191.dynamic.mnet-online.de [93.104.168.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <30654@debbugs.gnu.org>; Wed, 28 Feb 2018 21:16:47 +0100 (CET) Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id EBE54604D6 for <30654@debbugs.gnu.org>; Wed, 28 Feb 2018 21:16:46 +0100 (CET) From: Hartmut Goebel Subject: giflib / khtml build failures To: 30654@debbugs.gnu.org Organization: crazy-compilers.com Message-ID: <0a80adad-2621-d2e6-3df9-5bab94471727@crazy-compilers.com> Date: Wed, 28 Feb 2018 21:16:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30654 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) An example for these conflicts is building khtml: In file included from /tmp/guix-build-khtml-5.39.0.drv-0/khtml-5.39.0/src/imload/decoders/gifloader.cpp:44:0: /gnu/store/xs8cg35shfi5w32nqasz0nsmmf7wagmw-giflib-5.1.4/include/gif_lib.h:248:51: error: declaration of ‘void* reallocarray(void*, size_t, size_t)’ has a different exception specifier reallocarray(void *optr, size_t nmemb, size_t size); ^ In file included from /gnu/store/cfdn69spjc44x4sd0acrwhxq6yay3rbc-gcc-5.5.0/include/c++/cstdlib:72:0, from /gnu/store/cfdn69spjc44x4sd0acrwhxq6yay3rbc-gcc-5.5.0/include/c++/bits/stl_algo.h:59, from /gnu/store/cfdn69spjc44x4sd0acrwhxq6yay3rbc-gcc-5.5.0/include/c++/algorithm:62, from /gnu/store/cf9jagd5abi2wpsvd0bxa90i6d6npmba-qtbase-5.9.4/include/qt5/QtCore/qglobal.h:109, from /gnu/store/cf9jagd5abi2wpsvd0bxa90i6d6npmba-qtbase-5.9.4/include/qt5/QtCore/qatomic.h:41, from /gnu/store/cf9jagd5abi2wpsvd0bxa90i6d6npmba-qtbase-5.9.4/include/qt5/QtCore/qrefcount.h:43, from /gnu/store/cf9jagd5abi2wpsvd0bxa90i6d6npmba-qtbase-5.9.4/include/qt5/QtCore/qbytearray.h:44, from /gnu/store/cf9jagd5abi2wpsvd0bxa90i6d6npmba-qtbase-5.9.4/include/qt5/QtCore/QByteArray:1, from /tmp/guix-build-khtml-5.39.0.drv-0/khtml-5.39.0/src/imload/imageloaderprovider.h:28, from /tmp/guix-build-khtml-5.39.0.drv-0/khtml-5.39.0/src/imload/decoders/gifloader.h:4, from /tmp/guix-build-khtml-5.39.0.drv-0/khtml-5.39.0/src/imload/decoders/gifloader.cpp:27: /gnu/store/n6acaivs0jwiwpidjr551dhdni5kgpcr-glibc-2.26.105-g0890d5379c/include/stdlib.h:443:14: error: from previous declaration ‘void* reallocarray(void*, size_t, size_t) throw ()’ extern void *reallocarray (void *__ptr, size_t __nmemb, size_t __size) ^ -- Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible | From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 15:57:41 2018 Received: (at 30654) by debbugs.gnu.org; 28 Feb 2018 20:57:41 +0000 Received: from localhost ([127.0.0.1]:37911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er8nF-00068F-9c for submit@debbugs.gnu.org; Wed, 28 Feb 2018 15:57:41 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:60910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er8nD-000687-GE for 30654@debbugs.gnu.org; Wed, 28 Feb 2018 15:57:40 -0500 Received: from localhost (178.113.137.123.wireless.dyn.drei.com [178.113.137.123]) by dd26836.kasserver.com (Postfix) with ESMTPSA id A30083360129; Wed, 28 Feb 2018 21:57:37 +0100 (CET) Date: Wed, 28 Feb 2018 22:57:42 +0100 From: Danny Milosavljevic To: Hartmut Goebel Subject: Re: [bug#30654] giflib / khtml build failures Message-ID: <20180228225742.77c7707e@scratchpost.org> In-Reply-To: <0a80adad-2621-d2e6-3df9-5bab94471727@crazy-compilers.com> References: <20180228201202.1481-1-h.goebel@crazy-compilers.com> <0a80adad-2621-d2e6-3df9-5bab94471727@crazy-compilers.com> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30654 Cc: 30654@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Hi Harmut, I would prefer to remove reallocarray from giflib entirely. As it is now, it's anyone's guess which of the functions is taken after ld.so is done with setting up your program-using-glibc-and-giflib (I'm sure there's a resolution mechanism but let's not tempt it to fail please). I'd just empty giflib's lib/openbsd-reallocarray.c and remove the prototype from the header file entirely. /gnu/store$ objdump -t ywvngg36v2cdidcclvk0k14mxmmn73wp-giflib-5.1.4/lib/libgif.so.7 |grep reallocarray 0000000000005970 g F .text 0000000000000056 reallocarray That means giflib and glibc both define the same function with mutually incompatible signatures (here only slightly incompatible). Note that this is only a problem for C++ since C doesn't have exceptions. From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 16:06:11 2018 Received: (at 30654) by debbugs.gnu.org; 28 Feb 2018 21:06:11 +0000 Received: from localhost ([127.0.0.1]:37915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er8vT-0006LF-5U for submit@debbugs.gnu.org; Wed, 28 Feb 2018 16:06:11 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:60884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er8vR-0006L6-Cj for 30654@debbugs.gnu.org; Wed, 28 Feb 2018 16:06:09 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3zs7QS0Hq3z1qx9d; Wed, 28 Feb 2018 22:06:08 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3zs7QR6wn5z1qvmg; Wed, 28 Feb 2018 22:06:07 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id yD6X42TmXHQD; Wed, 28 Feb 2018 22:06:07 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-93-104-168-191.dynamic.mnet-online.de [93.104.168.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Wed, 28 Feb 2018 22:06:07 +0100 (CET) Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id CA7D6604D6; Wed, 28 Feb 2018 22:06:06 +0100 (CET) Subject: Re: [bug#30654] giflib / khtml build failures To: Danny Milosavljevic References: <20180228201202.1481-1-h.goebel@crazy-compilers.com> <0a80adad-2621-d2e6-3df9-5bab94471727@crazy-compilers.com> <20180228225742.77c7707e@scratchpost.org> From: Hartmut Goebel Organization: crazy-compilers.com Message-ID: Date: Wed, 28 Feb 2018 22:06:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180228225742.77c7707e@scratchpost.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30654 Cc: 30654@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Am 28.02.2018 um 22:57 schrieb Danny Milosavljevic: > I would prefer to remove reallocarray from giflib entirely. But this is a much more invasive change. I'd leave this to upstream. IMHO To do it correctly, we would need to use conditional compilation - which I can not do anyway due to lack of glibc knowledge. What about renaming the one in giflib into __giflib__reallocmemory? It's only used 9 times in the whole code. -- Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible | From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 16:10:43 2018 Received: (at 30654) by debbugs.gnu.org; 28 Feb 2018 21:10:43 +0000 Received: from localhost ([127.0.0.1]:37920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er8zq-0006RO-Pd for submit@debbugs.gnu.org; Wed, 28 Feb 2018 16:10:42 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:33604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er8zo-0006RF-Fx for 30654@debbugs.gnu.org; Wed, 28 Feb 2018 16:10:40 -0500 Received: from localhost (178.113.137.123.wireless.dyn.drei.com [178.113.137.123]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 2D12C33602D3; Wed, 28 Feb 2018 22:10:39 +0100 (CET) Date: Wed, 28 Feb 2018 23:10:44 +0100 From: Danny Milosavljevic To: Hartmut Goebel Subject: Re: [bug#30654] giflib / khtml build failures Message-ID: <20180228231044.68fee208@scratchpost.org> In-Reply-To: <20180228225742.77c7707e@scratchpost.org> References: <20180228201202.1481-1-h.goebel@crazy-compilers.com> <0a80adad-2621-d2e6-3df9-5bab94471727@crazy-compilers.com> <20180228225742.77c7707e@scratchpost.org> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30654 Cc: 30654@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) > Note that this is only a problem for C++ since C doesn't have exceptions. Oops, I meant this problem is only found when using C++ and in hiding otherwise. From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 16:18:15 2018 Received: (at 30654) by debbugs.gnu.org; 28 Feb 2018 21:18:15 +0000 Received: from localhost ([127.0.0.1]:37929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er979-0006ci-3a for submit@debbugs.gnu.org; Wed, 28 Feb 2018 16:18:15 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:34196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er977-0006ca-2f for 30654@debbugs.gnu.org; Wed, 28 Feb 2018 16:18:13 -0500 Received: from localhost (178.113.137.123.wireless.dyn.drei.com [178.113.137.123]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 7B4E033602D3; Wed, 28 Feb 2018 22:18:11 +0100 (CET) Date: Wed, 28 Feb 2018 23:18:19 +0100 From: Danny Milosavljevic To: Hartmut Goebel Subject: Re: [bug#30654] giflib / khtml build failures Message-ID: <20180228231819.4b4f5a43@scratchpost.org> In-Reply-To: References: <20180228201202.1481-1-h.goebel@crazy-compilers.com> <0a80adad-2621-d2e6-3df9-5bab94471727@crazy-compilers.com> <20180228225742.77c7707e@scratchpost.org> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30654 Cc: 30654@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Wed, 28 Feb 2018 22:06:06 +0100 Hartmut Goebel wrote: > What about renaming the one in giflib into __giflib__reallocmemory? It's > only used 9 times in the whole code. Sure, even better! But I think leading underscore is reserved in C (for exposed compiler-internal functions like crt startup). From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 16:46:57 2018 Received: (at 30654) by debbugs.gnu.org; 28 Feb 2018 21:46:57 +0000 Received: from localhost ([127.0.0.1]:37955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er9Yv-0007Ia-9H for submit@debbugs.gnu.org; Wed, 28 Feb 2018 16:46:57 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:56863) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er9Yq-0007IN-AP for 30654@debbugs.gnu.org; Wed, 28 Feb 2018 16:46:55 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3zs8KR10fhz1rQ0G; Wed, 28 Feb 2018 22:46:51 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3zs8KR0qBmz1qvmd; Wed, 28 Feb 2018 22:46:51 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id YeZtNmLFJcyv; Wed, 28 Feb 2018 22:46:49 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-93-104-168-191.dynamic.mnet-online.de [93.104.168.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Wed, 28 Feb 2018 22:46:49 +0100 (CET) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id F2BCC604D6; Wed, 28 Feb 2018 22:46:48 +0100 (CET) From: Hartmut Goebel To: 30654@debbugs.gnu.org Subject: [PATCH v2 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict. Date: Wed, 28 Feb 2018 22:46:48 +0100 Message-Id: <20180228214648.7996-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.13.6 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30654 Cc: dannym@scratchpost.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Rename the function and move the declaration from gif_lib.h to gif_lib_private.h to solve conflicts when some .c-file #includes both stdlib.h and gif_lib.h. See also https://sourceforge.net/p/giflib/bugs/110/ * gnu/packages/patches/giflib-make-reallocarray-private.patch: New file * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/image.scm(giflib)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/image.scm | 4 +- .../patches/giflib-make-reallocarray-private.patch | 120 +++++++++++++++++++++ 3 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/giflib-make-reallocarray-private.patch diff --git a/gnu/local.mk b/gnu/local.mk index 24368727f..de8161bbb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -693,6 +693,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/ghostscript-runpath.patch \ + %D%/packages/patches/giflib-make-reallocarray-private.patch \ %D%/packages/patches/gimp-CVE-2017-17784.patch \ %D%/packages/patches/gimp-CVE-2017-17785.patch \ %D%/packages/patches/gimp-CVE-2017-17786.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e3e3a3ccc..a39718903 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -572,7 +572,9 @@ error-resilience, a Java-viewer for j2k-images, ...") version ".tar.bz2")) (sha256 (base32 - "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz")))) + "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz")) + (patches (search-patches + "giflib-make-reallocarray-private.patch")))) (build-system gnu-build-system) (outputs '("bin" ; utility programs "out")) ; library diff --git a/gnu/packages/patches/giflib-make-reallocarray-private.patch b/gnu/packages/patches/giflib-make-reallocarray-private.patch new file mode 100644 index 000000000..69228c5be --- /dev/null +++ b/gnu/packages/patches/giflib-make-reallocarray-private.patch @@ -0,0 +1,120 @@ +Move the declaration from gif_lib.h to gif_lib_private.h to solve +conflicts when some .c-file #includes both stdlib.h and gif_lib.h. +See also https://sourceforge.net/p/giflib/bugs/110/ + +diff -ur giflib-5.1.4.orig/lib/dgif_lib.c giflib-5.1.4/lib/dgif_lib.c +--- giflib-5.1.4.orig/lib/dgif_lib.c 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/dgif_lib.c 2018-02-28 22:38:11.659126414 +0100 +@@ -396,7 +396,7 @@ + + if (GifFile->SavedImages) { + SavedImage* new_saved_images = +- (SavedImage *)reallocarray(GifFile->SavedImages, ++ (SavedImage *)giflib_private_reallocarray(GifFile->SavedImages, + (GifFile->ImageCount + 1), sizeof(SavedImage)); + if (new_saved_images == NULL) { + GifFile->Error = D_GIF_ERR_NOT_ENOUGH_MEM; +@@ -1108,7 +1108,7 @@ + if (ImageSize > (SIZE_MAX / sizeof(GifPixelType))) { + return GIF_ERROR; + } +- sp->RasterBits = (unsigned char *)reallocarray(NULL, ImageSize, ++ sp->RasterBits = (unsigned char *)giflib_private_reallocarray(NULL, ImageSize, + sizeof(GifPixelType)); + + if (sp->RasterBits == NULL) { +diff -ur giflib-5.1.4.orig/lib/gifalloc.c giflib-5.1.4/lib/gifalloc.c +--- giflib-5.1.4.orig/lib/gifalloc.c 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/gifalloc.c 2018-02-28 22:38:11.657126423 +0100 +@@ -8,7 +8,7 @@ + #include + #include + +-#include "gif_lib.h" ++#include "gif_lib_private.h" + + #define MAX(x, y) (((x) > (y)) ? (x) : (y)) + +@@ -188,7 +188,7 @@ + + /* perhaps we can shrink the map? */ + if (RoundUpTo < ColorUnion->ColorCount) { +- GifColorType *new_map = (GifColorType *)reallocarray(Map, ++ GifColorType *new_map = (GifColorType *)giflib_private_reallocarray(Map, + RoundUpTo, sizeof(GifColorType)); + if( new_map == NULL ) { + GifFreeMapObject(ColorUnion); +@@ -232,7 +232,7 @@ + if (*ExtensionBlocks == NULL) + *ExtensionBlocks=(ExtensionBlock *)malloc(sizeof(ExtensionBlock)); + else { +- ExtensionBlock* ep_new = (ExtensionBlock *)reallocarray ++ ExtensionBlock* ep_new = (ExtensionBlock *)giflib_private_reallocarray + (*ExtensionBlocks, (*ExtensionBlockCount + 1), + sizeof(ExtensionBlock)); + if( ep_new == NULL ) +@@ -325,7 +325,7 @@ + if (GifFile->SavedImages == NULL) + GifFile->SavedImages = (SavedImage *)malloc(sizeof(SavedImage)); + else +- GifFile->SavedImages = (SavedImage *)reallocarray(GifFile->SavedImages, ++ GifFile->SavedImages = (SavedImage *)giflib_private_reallocarray(GifFile->SavedImages, + (GifFile->ImageCount + 1), sizeof(SavedImage)); + + if (GifFile->SavedImages == NULL) +@@ -355,7 +355,7 @@ + } + + /* next, the raster */ +- sp->RasterBits = (unsigned char *)reallocarray(NULL, ++ sp->RasterBits = (unsigned char *)giflib_private_reallocarray(NULL, + (CopyFrom->ImageDesc.Height * + CopyFrom->ImageDesc.Width), + sizeof(GifPixelType)); +@@ -369,7 +369,7 @@ + + /* finally, the extension blocks */ + if (sp->ExtensionBlocks != NULL) { +- sp->ExtensionBlocks = (ExtensionBlock *)reallocarray(NULL, ++ sp->ExtensionBlocks = (ExtensionBlock *)giflib_private_reallocarray(NULL, + CopyFrom->ExtensionBlockCount, + sizeof(ExtensionBlock)); + if (sp->ExtensionBlocks == NULL) { +diff -ur giflib-5.1.4.orig/lib/gif_lib.h giflib-5.1.4/lib/gif_lib.h +--- giflib-5.1.4.orig/lib/gif_lib.h 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/gif_lib.h 2018-02-28 20:31:43.135716712 +0100 +@@ -244,9 +244,6 @@ + GifPixelType ColorTransIn2[]); + extern int GifBitSize(int n); + +-extern void * +-reallocarray(void *optr, size_t nmemb, size_t size); +- + /****************************************************************************** + Support for the in-core structures allocation (slurp mode). + ******************************************************************************/ +diff -ur giflib-5.1.4.orig/lib/gif_lib_private.h giflib-5.1.4/lib/gif_lib_private.h +--- giflib-5.1.4.orig/lib/gif_lib_private.h 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/gif_lib_private.h 2018-02-28 22:38:11.657126423 +0100 +@@ -54,6 +54,9 @@ + bool gif89; + } GifFilePrivateType; + ++extern void * ++giflib_private_reallocarray(void *optr, size_t nmemb, size_t size); ++ + #endif /* _GIF_LIB_PRIVATE_H */ + + /* end */ +diff -ur giflib-5.1.4.orig/lib/openbsd-reallocarray.c giflib-5.1.4/lib/openbsd-reallocarray.c +--- giflib-5.1.4.orig/lib/openbsd-reallocarray.c 2018-02-28 20:31:02.295682659 +0100 ++++ giflib-5.1.4/lib/openbsd-reallocarray.c 2018-02-28 22:38:11.656126428 +0100 +@@ -27,7 +27,7 @@ + #define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) + + void * +-reallocarray(void *optr, size_t nmemb, size_t size) ++giflib_private_reallocarray(void *optr, size_t nmemb, size_t size) + { + if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && + nmemb > 0 && SIZE_MAX / nmemb < size) { -- 2.13.6 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 22:01:35 2018 Received: (at 30654) by debbugs.gnu.org; 1 Mar 2018 03:01:35 +0000 Received: from localhost ([127.0.0.1]:38085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erETO-00062P-W6 for submit@debbugs.gnu.org; Wed, 28 Feb 2018 22:01:35 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:60884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erETN-00062H-3b for 30654@debbugs.gnu.org; Wed, 28 Feb 2018 22:01:33 -0500 Received: from localhost (77.118.161.51.wireless.dyn.drei.com [77.118.161.51]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 37C8F33602EB; Thu, 1 Mar 2018 04:01:31 +0100 (CET) Date: Thu, 1 Mar 2018 05:01:34 +0100 From: Danny Milosavljevic To: Hartmut Goebel Subject: Re: [PATCH v2 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict. Message-ID: <20180301050134.29aed1ba@scratchpost.org> In-Reply-To: <20180228214648.7996-1-h.goebel@crazy-compilers.com> References: <20180228214648.7996-1-h.goebel@crazy-compilers.com> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30654 Cc: 30654@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) LGTM! Note that this causes 600 rebuilds, so let's take care not to overload Hydra. From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 01 02:52:57 2018 Received: (at 30654) by debbugs.gnu.org; 1 Mar 2018 07:52:57 +0000 Received: from localhost ([127.0.0.1]:38194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erJ1N-0004Yr-0o for submit@debbugs.gnu.org; Thu, 01 Mar 2018 02:52:57 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:54889) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erJ1K-0004Yi-O7 for 30654@debbugs.gnu.org; Thu, 01 Mar 2018 02:52:55 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3zsPmj348Vz1r5JH; Thu, 1 Mar 2018 08:52:53 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3zsPmj1xhpz1qvnB; Thu, 1 Mar 2018 08:52:53 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id UHbPdEeKAq75; Thu, 1 Mar 2018 08:52:52 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-93-104-160-87.dynamic.mnet-online.de [93.104.160.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Thu, 1 Mar 2018 08:52:52 +0100 (CET) Received: from [192.168.110.2] (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 57B6B601FF; Thu, 1 Mar 2018 08:52:52 +0100 (CET) Subject: Re: [PATCH v2 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict. To: Danny Milosavljevic References: <20180228214648.7996-1-h.goebel@crazy-compilers.com> <20180301050134.29aed1ba@scratchpost.org> From: Hartmut Goebel Organization: crazy-compilers.com Message-ID: Date: Thu, 1 Mar 2018 08:52:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180301050134.29aed1ba@scratchpost.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: de-DE X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30654 Cc: 30654@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Thanks for the review. > so let's take care not to overload Hydra. How to? I have not clue. Should I commit to core-updates? Or maybe (mis-) use a graft? -- Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible | From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 17 13:29:57 2018 Received: (at 30654) by debbugs.gnu.org; 17 Mar 2018 17:29:57 +0000 Received: from localhost ([127.0.0.1]:38620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1exFeX-0004L4-EU for submit@debbugs.gnu.org; Sat, 17 Mar 2018 13:29:57 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:51874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1exFeW-0004Kp-Ev for 30654@debbugs.gnu.org; Sat, 17 Mar 2018 13:29:56 -0400 Received: by mail-wm0-f45.google.com with SMTP id h21so8435830wmd.1 for <30654@debbugs.gnu.org>; Sat, 17 Mar 2018 10:29:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=K5lMax12Fzv/KMCDE7VnI+NFSGW1BaRX/MdlZouUUpM=; b=bydK0CNxX3w0AM4AAPn2P89u78/CkEDDSaHYk5nnBX251XPBfFW/lt7vUi431w38p+ c3AHSCVYIHd4UogiWr63OE8QGnwvHwGwdjanzB/uAOXlFiCLAQ5GChe/7aILpRmGwfp8 GSxWB/aLlGVX8JGdMES58nOJekZTT4dHeZN9RUHl6wniPcop6YLdWz7nUaw63nTb6Uyw O/fYtYzMLVON2RUIk4YD0SqH37no7n0dJOWkTsBr5fY6eds7roz7ZwSBJbGobUneSczU +iSSEu9JipWykCDGNGe//1CPbNlTKG0cmN0wdRv6JQr6HYn/LgMoVhc6zEAhJXhcvuW7 gQ1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=K5lMax12Fzv/KMCDE7VnI+NFSGW1BaRX/MdlZouUUpM=; b=ac5J9tPdofuCcudutiCn0TJTGVUavSb4dwyPgc7DYz4QbxRuhEEYyDdk84jfOX2xEl CADEA2dW1SZA117l4VHEkXpO0Bhd//2SJuG3KcxYEquOlL4BtWP3Ideo1bg99mLEznDr jE7/zjIfS/eg1dcrUSYJ+K5v6z5qL5IiaSTjd346HKgLgBFHcEU2k2MrqhX571ZRDQv9 GWJDZfZ17+bxsbofMe2pCu6Kt3JF5IfuN0kzPH8W6w2GLDQeVXTypaQwKCHn9dLYog6J 19yL1oqaS2q/zuihlK7cXvXNXeeffjT2hIYsIgZO6jYt3yZn3gHqP2RuUjLVmuNvkArp eAMQ== X-Gm-Message-State: AElRT7GYLsKACSSgpTnvSrQfJMDmwNzutD7pyU+EKtKTjNUBGOiIJ60O H2AJTNEN+SI8eRXkTDdLMEzx57Y= X-Google-Smtp-Source: AG47ELuF08xXt5ky8Aq2duCPJ4XaLYRwZUe7wCZMaOjHQyimDy1+/L/TAjDJZyAnMDdsXU0niGe+sg== X-Received: by 10.80.182.48 with SMTP id b45mr7019884ede.87.1521307790383; Sat, 17 Mar 2018 10:29:50 -0700 (PDT) Received: from [192.168.2.150] (ppp-2-84-51-64.home.otenet.gr. [2.84.51.64]) by smtp.gmail.com with ESMTPSA id p26sm5193222edm.41.2018.03.17.10.29.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Mar 2018 10:29:49 -0700 (PDT) Subject: Re: [bug#30654] [PATCH v2 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict. To: Hartmut Goebel , Danny Milosavljevic References: <20180228214648.7996-1-h.goebel@crazy-compilers.com> <20180301050134.29aed1ba@scratchpost.org> From: Manolis Ragkousis Message-ID: <4d783c88-5b26-19fb-1ddb-c3cc0ede39d6@gmail.com> Date: Sat, 17 Mar 2018 19:29:47 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 30654 Cc: 30654@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Hello, On 03/01/18 09:52, Hartmut Goebel wrote: > How to? I have not clue. Should I commit to core-updates? Or maybe > (mis-) use a graft? > > What is the status of this patch? I can't find it in either master or core-updates. Thank you, Manolis From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 17 16:58:52 2018 Received: (at 30654) by debbugs.gnu.org; 17 Mar 2018 20:58:52 +0000 Received: from localhost ([127.0.0.1]:38712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1exIui-0000yE-8P for submit@debbugs.gnu.org; Sat, 17 Mar 2018 16:58:52 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:33896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1exIug-0000y4-Oh for 30654@debbugs.gnu.org; Sat, 17 Mar 2018 16:58:51 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 403ZS94bKlz1qtFW; Sat, 17 Mar 2018 21:58:49 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 403ZS93zKrz1sQxC; Sat, 17 Mar 2018 21:58:49 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id o_S1ea1tIhN5; Sat, 17 Mar 2018 21:58:48 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-93-104-181-5.dynamic.mnet-online.de [93.104.181.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Sat, 17 Mar 2018 21:58:48 +0100 (CET) Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id AEC96603DF; Sat, 17 Mar 2018 21:58:48 +0100 (CET) Subject: Re: [bug#30654] [PATCH v2 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict. To: Manolis Ragkousis , Danny Milosavljevic References: <20180228214648.7996-1-h.goebel@crazy-compilers.com> <20180301050134.29aed1ba@scratchpost.org> <4d783c88-5b26-19fb-1ddb-c3cc0ede39d6@gmail.com> From: Hartmut Goebel Organization: crazy-compilers.com Message-ID: <472d451f-289b-940d-4b20-9e168f64810b@crazy-compilers.com> Date: Sat, 17 Mar 2018 21:58:48 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <4d783c88-5b26-19fb-1ddb-c3cc0ede39d6@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: de-DE X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30654 Cc: 30654@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Am 17.03.2018 um 18:29 schrieb Manolis Ragkousis: > Hello, > > On 03/01/18 09:52, Hartmut Goebel wrote: >> How to? I have not clue. Should I commit to core-updates? Or maybe >> (mis-) use a graft? >> >> > What is the status of this patch? I can't find it in either master or > core-updates. As proposed I pushed it to staging-next. -- Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible | From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 22 11:38:08 2018 Received: (at 30654-done) by debbugs.gnu.org; 22 Jun 2018 15:38:08 +0000 Received: from localhost ([127.0.0.1]:60462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fWO8W-0004Td-3X for submit@debbugs.gnu.org; Fri, 22 Jun 2018 11:38:08 -0400 Received: from mail-it0-f41.google.com ([209.85.214.41]:36815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fWO8S-0004T7-HY for 30654-done@debbugs.gnu.org; Fri, 22 Jun 2018 11:38:04 -0400 Received: by mail-it0-f41.google.com with SMTP id j135-v6so3487862itj.1 for <30654-done@debbugs.gnu.org>; Fri, 22 Jun 2018 08:38:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=A1FLLo4/o0660pWG/L0EZ86ZMEV504xyaiy641gMdhg=; b=ike6WNaCNQo36SkFSwxyz0Etdn65nFvUjqm1+9c7uIcPynoYqAlX7bR2WYwNo2N9L0 vswwIcoS1BJSyUwCmCGwkYEgX7pgRIafMIN+4rGmXEYbfcyXoh9dCk+MfFn2OQAD8iyE Q/q2mS+P7lqz4jlJrE1VcljkLMvYu0s29w77FVQTdZK+Khdd/g97+9f8oH8JjBnzd/ZC 7mX2Rq5vChLqT3tMy4sbm1ofg4Tp0GD7SWtcIrfMoQWsG0bzF+1Y1LnjDq57o3BFbLON jt15hVHCebRphMyTHomFQQm+jnnk99wXmJEC61iUOIGEI71n8Bkl3rHD4BMkTkOL9n6g 2P4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=A1FLLo4/o0660pWG/L0EZ86ZMEV504xyaiy641gMdhg=; b=X7QAdo8PFMhiHLjjn7KtQmZpLw6X0UZBEyq/lgWTszB8v6+Gh/2DMd6P5i2VZ8auLN lFlUPuf+ud9tuxZdWOlcNF7/IMsIdcwLzMcM/2J8j9108UcRa+LDwPnGxSfvi2yDDmPV 8yQdmRAcYzF3GErktFM0jSlJNgv3q5ojjKjqJ1hIrmGDOZJtDnj3Ch4gc5HmWr9NbayH QwDv0i9/z8NtEEsgjlAtBVSp7v4fYVkj9+unpSG/51RqR6IHv0oGorlmyWlvkACgXZXr Jm2xoIi7L7SkhL45Ue8q2QmGGwWdXLXRzVhlGtlyTi8dJbKSXzzu3iFgpdjD7TrBvhQH MlOA== X-Gm-Message-State: APt69E0N+peFO/dJ8Uo/dZJiT9pKGhG9q/af/UQ2kIwrmY/zeViD2tlm w/LSeeO+0i4lRRDWJHkJvedC7WcjO0m//9pT9VFf7I8= X-Google-Smtp-Source: ADUXVKLyt7qle5/jSRnOcs/r8U8AXcJgwlfv8ElfcF94/K5IgZQTBGJ+kobIa95pN1UdCQW9BsQv98uJq136nSKzL2M= X-Received: by 2002:a24:2e43:: with SMTP id i64-v6mr1986381ita.0.1529681878698; Fri, 22 Jun 2018 08:37:58 -0700 (PDT) MIME-Version: 1.0 From: =?UTF-8?Q?G=C3=A1bor_Boskovits?= Date: Fri, 22 Jun 2018 17:37:47 +0200 Message-ID: Subject: gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict. To: 30654-done@debbugs.gnu.org Content-Type: multipart/alternative; boundary="000000000000ffd5c1056f3cd08a" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 30654-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --000000000000ffd5c1056f3cd08a Content-Type: text/plain; charset="UTF-8" Thanks! This landed on master as *7ac43c44.* --000000000000ffd5c1056f3cd08a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Thanks! This landed on master as=C2=A07ac43c44. --000000000000ffd5c1056f3cd08a-- From unknown Mon Aug 18 14:16:23 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 21 Jul 2018 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator