From 762b32c4e6c79b9ee8458ad3309b5fd6ecbec844 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 23 Mar 2019 17:45:20 +0100
Subject: [PATCH] gzip: gcc2 patch for 1.10.

---
 app-arch/gzip/patches/gzip-1.10.patchset | 27 ++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/app-arch/gzip/patches/gzip-1.10.patchset b/app-arch/gzip/patches/gzip-1.10.patchset
index 60b2596e7..cf43b5069 100644
--- a/app-arch/gzip/patches/gzip-1.10.patchset
+++ b/app-arch/gzip/patches/gzip-1.10.patchset
@@ -1,4 +1,4 @@
-From d3377bee761bdb0abbd141fa86bf82af497f157e Mon Sep 17 00:00:00 2001
+From b20ebcc4a50426942827a18edbff3a60f46d016d Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Tue, 26 Apr 2016 21:03:14 +0000
 Subject: Do not try to create hard links.
@@ -21,7 +21,7 @@ index d4ecc3f..9c0b0f7 100644
 2.19.1
 
 
-From 7978312f3c2c056502d014b88b928032a6ba1124 Mon Sep 17 00:00:00 2001
+From e7a269065e8423a0e1666fcae5f5ec5732823ccd Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 2 Oct 2018 15:27:27 +0200
 Subject: gcc2 patch
@@ -104,6 +104,29 @@ index 329c9a5..83dc38a 100644
  extern void display_ratio (off_t num, off_t den, FILE *file);
  extern void fprint_off    (FILE *, off_t, int);
  
+diff --git a/lib/filenamecat-lgpl.c b/lib/filenamecat-lgpl.c
+index f50ecc1..7bdd4fc 100644
+--- a/lib/filenamecat-lgpl.c
++++ b/lib/filenamecat-lgpl.c
+@@ -51,6 +51,8 @@ mfile_name_concat (char const *dir, char const *base, char **base_in_result)
+   size_t dirlen = dirbase - dir + dirbaselen;
+   size_t baselen = strlen (base);
+   char sep = '\0';
++  char *p_concat;
++  char *p;
+   if (dirbaselen)
+     {
+       /* DIR is not a file system root, so separate with / if needed.  */
+@@ -67,8 +69,7 @@ mfile_name_concat (char const *dir, char const *base, char **base_in_result)
+       sep = '.';
+     }
+ 
+-  char *p_concat = malloc (dirlen + (sep != '\0')  + baselen + 1);
+-  char *p;
++  p_concat = malloc (dirlen + (sep != '\0')  + baselen + 1);
+ 
+   if (p_concat == NULL)
+     return NULL;
 diff --git a/lib/stdnoreturn.in.h b/lib/stdnoreturn.in.h
 index b1d709d..d26a612 100644
 --- a/lib/stdnoreturn.in.h