[bug#30654] [PATCH 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict.

[bug#30654] [PATCH 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict.

[Hartmut Goebel]

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 <stdio.h>
+ #include <string.h>
+ 
+-#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

[bug#30654] giflib / khtml build failures

[Hartmut Goebel]

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 |

[bug#30654] giflib / khtml build failures

[Danny Milosavljevic]

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.

[bug#30654] giflib / khtml build failures

[Hartmut Goebel]

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 |

[bug#30654] giflib / khtml build failures

[Danny Milosavljevic]

On Wed, 28 Feb 2018 22:06:06 +0100
Hartmut Goebel <h.goebel@crazy-compilers.com> 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).

[bug#30654] giflib / khtml build failures

[Danny Milosavljevic]

> 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.

[bug#30654] [PATCH v2 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict.

[Hartmut Goebel]

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 <stdio.h>
+ #include <string.h>
+ 
+-#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

[bug#30654] [PATCH v2 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict.

[Danny Milosavljevic]

LGTM!

Note that this causes 600 rebuilds, so let's take care not to overload Hydra.

[bug#30654] [PATCH v2 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict.

[Hartmut Goebel]

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 |

[bug#30654] [PATCH v2 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict.

[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.

Thank you,
Manolis

[bug#30654] [PATCH v2 1/1] gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict.

[Hartmut Goebel]

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 |

bug#30654: gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict.

[Gábor Boskovits]

[-- Attachment #1: Type: text/plain, Size: 45 bytes --]

Thanks! This landed on master as *7ac43c44.*

[-- Attachment #2: Type: text/html, Size: 744 bytes --]