diff --git a/app-arch/gzip/gzip-1.11.recipe b/app-arch/gzip/gzip-1.12.recipe similarity index 94% rename from app-arch/gzip/gzip-1.11.recipe rename to app-arch/gzip/gzip-1.12.recipe index 9742ee1cc..138b2fbf8 100644 --- a/app-arch/gzip/gzip-1.11.recipe +++ b/app-arch/gzip/gzip-1.12.recipe @@ -9,7 +9,7 @@ COPYRIGHT="1992-1993 Jean-loup Gailly LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="http://ftpmirror.gnu.org/gzip/gzip-$portVersion.tar.xz" -CHECKSUM_SHA256="9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907" +CHECKSUM_SHA256="ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956" PATCHES="gzip-$portVersion.patchset" ARCHITECTURES="all" diff --git a/app-arch/gzip/patches/gzip-1.11.patchset b/app-arch/gzip/patches/gzip-1.12.patchset similarity index 86% rename from app-arch/gzip/patches/gzip-1.11.patchset rename to app-arch/gzip/patches/gzip-1.12.patchset index 03cb56afa..782b50ada 100644 --- a/app-arch/gzip/patches/gzip-1.11.patchset +++ b/app-arch/gzip/patches/gzip-1.12.patchset @@ -1,14 +1,14 @@ -From 5a410be6c41191dc4444585d3e918ed7079310f8 Mon Sep 17 00:00:00 2001 +From 666864b06c345f59a6bd1485a34d9f14260d510d Mon Sep 17 00:00:00 2001 From: fbrosson Date: Tue, 26 Apr 2016 21:03:14 +0000 Subject: Do not try to create hard links. diff --git a/Makefile.am b/Makefile.am -index cd79331..80e0bfb 100644 +index 4f51b61..ab4f8e4 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -149,7 +149,7 @@ install-exec-hook remove-installed-links: +@@ -160,7 +160,7 @@ install-exec-hook remove-installed-links: rm -f "$$dest" && \ case $@ in \ install-exec-hook) \ @@ -21,17 +21,17 @@ index cd79331..80e0bfb 100644 2.30.2 -From fee57c4c05c42881355ecd4f0366607ddb6b1bab Mon Sep 17 00:00:00 2001 +From 7126f33fc69e45d457c8b911d41899221d830fbc Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 2 Oct 2018 15:27:27 +0200 Subject: gcc2 patch diff --git a/gzip.c b/gzip.c -index f75b614..d418cde 100644 +index 4300997..d8c8f0e 100644 --- a/gzip.c +++ b/gzip.c -@@ -303,7 +303,7 @@ static const struct option longopts[] = +@@ -305,7 +305,7 @@ static const struct option longopts[] = /* local functions */ @@ -40,7 +40,7 @@ index f75b614..d418cde 100644 local void help (void); local void license (void); local void version (void); -@@ -323,7 +323,7 @@ local void copy_stat (struct stat *ifstat); +@@ -325,7 +325,7 @@ local void copy_stat (struct stat *ifstat); local void install_signal_handlers (void); static void remove_output_file (bool); static void abort_gzip_signal (int); @@ -49,7 +49,7 @@ index f75b614..d418cde 100644 static void finish_out (void); int main (int argc, char **argv); static int (*work) (int infile, int outfile) = zip; /* function to call */ -@@ -1188,6 +1188,7 @@ local char *get_suffix(name) +@@ -1182,6 +1182,7 @@ local char *get_suffix(name) NULL, NULL}; char const **suf; bool suffix_of_builtin = false; @@ -57,7 +57,7 @@ index f75b614..d418cde 100644 /* Normally put Z_SUFFIX at the start of KNOWN_SUFFIXES, but if it is a suffix of one of them, put it at the end. */ -@@ -1201,7 +1202,7 @@ local char *get_suffix(name) +@@ -1195,7 +1196,7 @@ local char *get_suffix(name) } } @@ -66,7 +66,7 @@ index f75b614..d418cde 100644 strlwr(z_lower); known_suffixes[suffix_of_builtin ? sizeof known_suffixes / sizeof *known_suffixes - 2 -@@ -1216,7 +1217,7 @@ local char *get_suffix(name) +@@ -1210,7 +1211,7 @@ local char *get_suffix(name) } strlwr(suffix); slen = strlen(suffix); @@ -76,10 +76,10 @@ index f75b614..d418cde 100644 int s = strlen(*suf); if (slen > s && ! ISSLASH (suffix[slen - s - 1]) diff --git a/gzip.h b/gzip.h -index 7c0acd4..10f0dee 100644 +index b150145..76d5efd 100644 --- a/gzip.h +++ b/gzip.h -@@ -272,7 +272,7 @@ extern int unpack (int in, int out); +@@ -273,7 +273,7 @@ extern int unpack (int in, int out); extern int unlzh (int in, int out); /* in gzip.c */ @@ -87,8 +87,8 @@ index 7c0acd4..10f0dee 100644 +extern __attribute__ ((__noreturn__)) void abort_gzip (void); /* in deflate.c */ - extern void lm_init (int pack_level); -@@ -309,11 +309,11 @@ extern char *gzip_base_name (char *fname) _GL_ATTRIBUTE_PURE; + extern off_t deflate (int pack_level); +@@ -311,11 +311,11 @@ extern char *gzip_base_name (char *fname) _GL_ATTRIBUTE_PURE; extern int xunlink (char *fname); extern void make_simple_name (char *name); extern char *add_envopt (int *argcp, char ***argvp, char const *env); @@ -105,7 +105,7 @@ index 7c0acd4..10f0dee 100644 extern void fprint_off (FILE *, off_t, int); diff --git a/lib/calloc.c b/lib/calloc.c -index 25064e9..808de4a 100644 +index 0a934b3..87ae759 100644 --- a/lib/calloc.c +++ b/lib/calloc.c @@ -44,6 +44,7 @@ rpl_calloc (size_t n, size_t s) @@ -122,7 +122,7 @@ index 25064e9..808de4a 100644 } +} diff --git a/lib/filenamecat-lgpl.c b/lib/filenamecat-lgpl.c -index d52dc80..5211177 100644 +index 56981aa..5c23cb6 100644 --- a/lib/filenamecat-lgpl.c +++ b/lib/filenamecat-lgpl.c @@ -52,6 +52,7 @@ mfile_name_concat (char const *dir, char const *base, char **base_in_result) @@ -143,7 +143,7 @@ index d52dc80..5211177 100644 return NULL; diff --git a/lib/malloc.c b/lib/malloc.c -index 0d8b359..09a9f88 100644 +index f334dd6..cd7db42 100644 --- a/lib/malloc.c +++ b/lib/malloc.c @@ -40,6 +40,7 @@ rpl_malloc (size_t n) @@ -160,7 +160,7 @@ index 0d8b359..09a9f88 100644 } +} diff --git a/lib/malloca.c b/lib/malloca.c -index b488423..0e8382a 100644 +index e7beaaf..ba351b4 100644 --- a/lib/malloca.c +++ b/lib/malloca.c @@ -56,15 +56,18 @@ mmalloca (size_t n) @@ -186,7 +186,7 @@ index b488423..0e8382a 100644 and p <= mem + sizeof (small_t) + 2 * sa_alignment_max - 1 hence p + n <= mem + nplus. diff --git a/lib/realloc.c b/lib/realloc.c -index af03f0c..7de1503 100644 +index c878381..026cdd8 100644 --- a/lib/realloc.c +++ b/lib/realloc.c @@ -52,6 +52,7 @@ rpl_realloc (void *p, size_t n) @@ -203,7 +203,7 @@ index af03f0c..7de1503 100644 } +} diff --git a/lib/savedir.c b/lib/savedir.c -index 55e0acd..8e8210c 100644 +index e91ceb5..cc25f8f 100644 --- a/lib/savedir.c +++ b/lib/savedir.c @@ -149,11 +149,12 @@ streamsavedir (DIR *dirp, enum savedir_option option) @@ -221,7 +221,7 @@ index 55e0acd..8e8210c 100644 char *dest = name_space + used; used += stpcpy (dest, entries[i].name) - dest + 1; diff --git a/lib/stdnoreturn.in.h b/lib/stdnoreturn.in.h -index 4b6cbcd..4356d91 100644 +index d9e7466..ffe68ff 100644 --- a/lib/stdnoreturn.in.h +++ b/lib/stdnoreturn.in.h @@ -17,7 +17,7 @@ @@ -234,10 +234,10 @@ index 4b6cbcd..4356d91 100644 /* ISO C11 for platforms that lack it. diff --git a/lib/xmalloc.c b/lib/xmalloc.c -index 51a0832..330e29e 100644 +index 993c1ee..50ddde5 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c -@@ -239,6 +239,7 @@ xpalloc (void *pa, idx_t *pn, idx_t n_incr_min, ptrdiff_t n_max, idx_t s) +@@ -245,6 +245,7 @@ xpalloc (void *pa, idx_t *pn, idx_t n_incr_min, ptrdiff_t n_max, idx_t s) This is typically idx_t, but it should be size_t on (theoretical?) platforms where SIZE_MAX < IDX_MAX so xpalloc does not pass values greater than SIZE_MAX to xrealloc. */ @@ -245,7 +245,7 @@ index 51a0832..330e29e 100644 #if IDX_MAX <= SIZE_MAX idx_t nbytes; #else -@@ -265,6 +266,7 @@ xpalloc (void *pa, idx_t *pn, idx_t n_incr_min, ptrdiff_t n_max, idx_t s) +@@ -271,6 +272,7 @@ xpalloc (void *pa, idx_t *pn, idx_t n_incr_min, ptrdiff_t n_max, idx_t s) *pn = n; return pa; }