From 65f2c797f7a31957389d1874e5fd4ee1840e1959 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 18 Apr 2018 16:23:07 +0000
Subject: [PATCH] zsh: bump to 5.5.1.

---
 .../{zsh-5.5.patchset => zsh-5.5.1.patchset}     | 16 ++++++++--------
 .../zsh/{zsh-5.5.recipe => zsh-5.5.1.recipe}     |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename app-shells/zsh/patches/{zsh-5.5.patchset => zsh-5.5.1.patchset} (95%)
 rename app-shells/zsh/{zsh-5.5.recipe => zsh-5.5.1.recipe} (95%)

diff --git a/app-shells/zsh/patches/zsh-5.5.patchset b/app-shells/zsh/patches/zsh-5.5.1.patchset
similarity index 95%
rename from app-shells/zsh/patches/zsh-5.5.patchset
rename to app-shells/zsh/patches/zsh-5.5.1.patchset
index b6a2db805..ec7333963 100644
--- a/app-shells/zsh/patches/zsh-5.5.patchset
+++ b/app-shells/zsh/patches/zsh-5.5.1.patchset
@@ -89,7 +89,7 @@ index 36f5f06..c7d04db 100644
      /*
       * If we are using unsetenv() to remove values from the
 diff --git a/configure.ac b/configure.ac
-index 1a498f8..75069c2 100644
+index d15a6cd..5b8aec5 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -874,7 +874,7 @@ if test x$enable_cap = xyes; then
@@ -135,7 +135,7 @@ Subject: Enable dynamic modules on Haiku
 
 
 diff --git a/configure.ac b/configure.ac
-index 75069c2..7dc785d 100644
+index 5b8aec5..395c7bb 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -868,6 +868,7 @@ fi
@@ -146,7 +146,7 @@ index 75069c2..7dc785d 100644
  fi
  
  if test x$enable_cap = xyes; then
-@@ -2899,7 +2900,8 @@ char *argv[];
+@@ -2902,7 +2903,8 @@ char *argv[];
      aix*)         DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
      solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
      darwin*)      DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
@@ -167,7 +167,7 @@ Subject: C89 fixes for gcc2 compatibility
 
 
 diff --git a/Src/exec.c b/Src/exec.c
-index e154d12..dba5f37 100644
+index 216057a..9149489 100644
 --- a/Src/exec.c
 +++ b/Src/exec.c
 @@ -3034,10 +3034,11 @@ execcmd_exec(Estate state, Execcmd_params eparams,
@@ -214,7 +214,7 @@ index 47e5a24..38890e5 100644
  	case 4: c |= ((wordcode) STOUC(s[2])) << 19;
  	case 3: c |= ((wordcode) STOUC(s[1])) << 11;
 diff --git a/Src/utils.c b/Src/utils.c
-index 180693d..f7b36d6 100644
+index b418517..d026e02 100644
 --- a/Src/utils.c
 +++ b/Src/utils.c
 @@ -138,10 +138,11 @@ set_widearray(char *mb_array, Widechar_array wca)
@@ -230,7 +230,7 @@ index 180693d..f7b36d6 100644
  
      if (cmd) {
  	if (unset(SHINSTDIN) || locallevel) {
-@@ -2763,6 +2764,7 @@ int
+@@ -2765,6 +2766,7 @@ int
  checkrmall(char *s)
  {
      DIR *rmd;
@@ -238,14 +238,14 @@ index 180693d..f7b36d6 100644
      int count = 0;
      if (!shout)
  	return 1;
-@@ -2772,7 +2774,6 @@ checkrmall(char *s)
+@@ -2774,7 +2776,6 @@ checkrmall(char *s)
  	else
  	    s = dyncat("/", s);
      }
 -    const int max_count = 100;
      if ((rmd = opendir(unmeta(s)))) {
  	int ignoredots = !isset(GLOBDOTS);
- 	/* ### TODO: Passing ignoredots here is wrong.  See workers/41672
+ 	char *fname;
 -- 
 2.17.0
 
diff --git a/app-shells/zsh/zsh-5.5.recipe b/app-shells/zsh/zsh-5.5.1.recipe
similarity index 95%
rename from app-shells/zsh/zsh-5.5.recipe
rename to app-shells/zsh/zsh-5.5.1.recipe
index c26cbdb58..0d813702f 100644
--- a/app-shells/zsh/zsh-5.5.recipe
+++ b/app-shells/zsh/zsh-5.5.1.recipe
@@ -9,9 +9,9 @@ LICENSE="ZSH
 	GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://downloads.sf.net/zsh/zsh-$portVersion.tar.xz"
-CHECKSUM_SHA256="a8359b81d090425d497c6f3c724a7c21a81c614b03e7662ed347705d86958e53"
+CHECKSUM_SHA256="e1c38808fcbe0cc1344d55c9a758349f7ba1e317325b154621ac37eddac4aa80"
 SOURCE_URI_2="https://downloads.sf.net/zsh/zsh-$portVersion-doc.tar.xz"
-CHECKSUM_SHA256_2="b995c16a2ded516b6e07883932640fcca8b53b1b8a1934094a8a32ef087f52fc"
+CHECKSUM_SHA256_2="41ce13a89a6bc7e709b6f110e54288d59f02ba2becd2646895d28188d4dd6283"
 PATCHES="zsh-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"