Zsh 5.8.1: Refresh patches, drop cherry-picked patch for commit 754658af

4 files changed, 23 insertions, 57 deletions

diff --git a/debian/patches/cherry-pick-754658af-Fix-copy-paste-error-in-earlier-commit-that-broke-git-stash-drop-completion.patch b/debian/patches/cherry-pick-754658af-Fix-copy-paste-error-in-earlier-commit-that-broke-git-stash-drop-completion.patch
deleted file mode 100644
index 44961e303..000000000
--- a/debian/patches/cherry-pick-754658af-Fix-copy-paste-error-in-earlier-commit-that-broke-git-stash-drop-completion.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Origin: 754658aff38e1bdf487c58bec6174cbecd019d11
-Author: dana <dana@dana.is>
-Date: Fri Mar 13 09:46:14 2020 -0500
-Description: _git: Fix copy/paste error in earlier commit that broke `git stash drop`
- This was broken by workers/44923 (8aa84bd5fc44)
-Reviewed-By: Axel Beckert <abe@debian.org>
-Comment: This is the upstream commit without the changes to upstream Changelog file.
-Bug: https://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=46093
-
-diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
-index 8487ebc1a..9a44ddbbe 100644
---- a/Completion/Unix/Command/_git
-+++ b/Completion/Unix/Command/_git
-@@ -1809,7 +1809,7 @@ _git-stash () {
-           _nothing
-           ;;
-         (drop)
--          _arguments -S $endopt \_git-notes
-+          _arguments -S $endopt \
-             '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
-             ':: :__git_stashes' && ret=0
-           ;;
diff --git a/debian/patches/cross-compile.diff b/debian/patches/cross-compile.diff
index 0fbe17d76..4f718faa9 100644
--- a/debian/patches/cross-compile.diff
+++ b/debian/patches/cross-compile.diff
@@ -5,9 +5,9 @@ Last-Update: 2012-12-20
 X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314mt
 
 === modified file 'aczsh.m4'
---- old/aczsh.m4	2009-09-08 17:04:03 +0000
-+++ new/aczsh.m4	2012-12-20 15:33:57 +0000
-@@ -171,7 +171,7 @@
+--- a/aczsh.m4
++++ b/aczsh.m4
+@@ -172,7 +172,7 @@
  }
  ], [zsh_cv_shared_$1=yes],
  [zsh_cv_shared_$1=no],
@@ -16,7 +16,7 @@ X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314m
  )
  else
      zsh_cv_shared_$1=no
-@@ -242,7 +242,7 @@
+@@ -244,7 +244,7 @@
  }
  ], [zsh_cv_sys_dynamic_clash_ok=yes],
  [zsh_cv_sys_dynamic_clash_ok=no],
@@ -25,7 +25,7 @@ X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314m
  )
  else
      zsh_cv_sys_dynamic_clash_ok=no
-@@ -315,7 +315,7 @@
+@@ -318,7 +318,7 @@
  }
  ], [zsh_cv_sys_dynamic_rtld_global=yes],
  [zsh_cv_sys_dynamic_rtld_global=no],
@@ -34,7 +34,7 @@ X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314m
  )
  else
      zsh_cv_sys_dynamic_rtld_global=no
-@@ -384,7 +384,7 @@
+@@ -388,7 +388,7 @@
  int fred () { return 42; }
  ], [zsh_cv_sys_dynamic_execsyms=yes],
  [zsh_cv_sys_dynamic_execsyms=no],
@@ -43,7 +43,7 @@ X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314m
  )
      LDFLAGS=$save_ldflags
  else
-@@ -457,7 +457,7 @@
+@@ -462,7 +462,7 @@
  int fred () { return 42; }
  ], [zsh_cv_sys_dynamic_strip_exe=yes],
  [zsh_cv_sys_dynamic_strip_exe=no],
@@ -52,7 +52,7 @@ X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314m
  )
      LDFLAGS=$save_ldflags
  else
-@@ -522,7 +522,7 @@
+@@ -528,7 +528,7 @@
  }
  ], [zsh_cv_sys_dynamic_strip_lib=yes],
  [zsh_cv_sys_dynamic_strip_lib=no],
@@ -61,4 +61,3 @@ X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314m
  )
  else
      zsh_cv_sys_dynamic_strip_lib=no
-
diff --git a/debian/patches/make-zsh-static-really-static-#993843.patch b/debian/patches/make-zsh-static-really-static-#993843.patch
index 1257ee8d5..60b7b8bc9 100644
--- a/debian/patches/make-zsh-static-really-static-#993843.patch
+++ b/debian/patches/make-zsh-static-really-static-#993843.patch
@@ -5,11 +5,9 @@ Bug: https://zsh.org/workers/49392
 Author: Axel Beckert <abe@debian.org>
 Author: Jun T <takimoto-j@kba.biglobe.ne.jp>
 
-diff --git a/Src/Modules/parameter.c b/Src/Modules/parameter.c
-index ef9148d7b..b44555323 100644
 --- a/Src/Modules/parameter.c
 +++ b/Src/Modules/parameter.c
-@@ -2011,6 +2011,9 @@ scanpmdissaliases(HashTable ht, ScanFunc func, int flags)
+@@ -2011,6 +2011,9 @@
  /**/
  static Groupset get_all_groups(void)
  {
@@ -19,7 +17,7 @@ index ef9148d7b..b44555323 100644
      Groupset gs = zhalloc(sizeof(*gs));
      Groupmap gaptr;
      gid_t *list, *lptr, egid;
-@@ -2063,6 +2066,7 @@ static Groupset get_all_groups(void)
+@@ -2063,6 +2066,7 @@
      }
  
      return gs;
@@ -27,7 +25,7 @@ index ef9148d7b..b44555323 100644
  }
  
  /* Standard hash element lookup. */
-@@ -2081,7 +2085,11 @@ getpmusergroups(UNUSED(HashTable ht), const char *name)
+@@ -2081,7 +2085,11 @@
      pm->gsu.s = &nullsetscalar_gsu;
  
      if (!gs) {
@@ -39,7 +37,7 @@ index ef9148d7b..b44555323 100644
  	pm->u.str = dupstring("");
  	pm->node.flags |= (PM_UNSET|PM_SPECIAL);
  	return &pm->node;
-@@ -2113,7 +2121,11 @@ scanpmusergroups(UNUSED(HashTable ht), ScanFunc func, int flags)
+@@ -2113,7 +2121,11 @@
      Groupmap gaptr;
  
      if (!gs) {
@@ -51,11 +49,9 @@ index ef9148d7b..b44555323 100644
  	return;
      }
  
-diff --git a/Src/hashnameddir.c b/Src/hashnameddir.c
-index bed43d025..cbd1344ef 100644
 --- a/Src/hashnameddir.c
 +++ b/Src/hashnameddir.c
-@@ -178,7 +178,7 @@ fillnameddirtable(UNUSED(HashTable ht))
+@@ -178,7 +178,7 @@
  	    /* Using NIS or NIS+ didn't add any user directories. This seems
  	     * fishy, so we fall back to using getpwent(). If we don't have
  	     * that, we only use the passwd file. */
@@ -64,7 +60,7 @@ index bed43d025..cbd1344ef 100644
  	    struct passwd *pw;
  
  	    setpwent();
-@@ -190,7 +190,7 @@ fillnameddirtable(UNUSED(HashTable ht))
+@@ -190,7 +190,7 @@
  
  	    endpwent();
  	    usepwf = 0;
@@ -73,7 +69,7 @@ index bed43d025..cbd1344ef 100644
  	}
  	if (usepwf) {
  	    /* Don't forget the non-NIS matches from the flat passwd file */
-@@ -229,7 +229,7 @@ fillnameddirtable(UNUSED(HashTable ht))
+@@ -229,7 +229,7 @@
  	    adduserdir(pw->pw_name, pw->pw_dir, ND_USERNAME, 1);
  
  	endpwent();
@@ -82,11 +78,9 @@ index bed43d025..cbd1344ef 100644
  #endif
  	allusersadded = 1;
      }
-diff --git a/Src/options.c b/Src/options.c
-index 783022591..a1fe918fc 100644
 --- a/Src/options.c
 +++ b/Src/options.c
-@@ -811,7 +811,7 @@ dosetopt(int optno, int value, int force, char *new_opts)
+@@ -807,7 +807,7 @@
  	    return -1;
  	}
  
@@ -95,11 +89,9 @@ index 783022591..a1fe918fc 100644
  	/* Set the supplementary groups list.
  	 *
  	 * Note that on macOS, FreeBSD, and possibly some other platforms,
-diff --git a/Src/params.c b/Src/params.c
-index 4f6b361f9..704aad588 100644
 --- a/Src/params.c
 +++ b/Src/params.c
-@@ -843,9 +843,12 @@ createparamtable(void)
+@@ -841,9 +841,12 @@
      setsparam("HOST", ztrdup_metafy(hostnam));
      zfree(hostnam, 256);
  
@@ -115,7 +107,7 @@ index 4f6b361f9..704aad588 100644
  
  #if !defined(HAVE_PUTENV) && !defined(USE_SET_UNSET_ENV)
      /* Copy the environment variables we are inheriting to dynamic *
-@@ -4430,7 +4433,7 @@ usernamegetfn(UNUSED(Param pm))
+@@ -4414,7 +4417,7 @@
  void
  usernamesetfn(UNUSED(Param pm), char *x)
  {
@@ -124,7 +116,7 @@ index 4f6b361f9..704aad588 100644
      struct passwd *pswd;
  
      if (x && (pswd = getpwnam(x)) && (pswd->pw_uid != cached_uid)) {
-@@ -4447,7 +4450,7 @@ usernamesetfn(UNUSED(Param pm), char *x)
+@@ -4431,7 +4434,7 @@
  	    cached_uid = pswd->pw_uid;
  	}
      }
@@ -133,11 +125,9 @@ index 4f6b361f9..704aad588 100644
      zsfree(x);
  }
  
-diff --git a/Src/utils.c b/Src/utils.c
-index c32741ca7..a74c8bd2c 100644
 --- a/Src/utils.c
 +++ b/Src/utils.c
-@@ -1119,7 +1119,7 @@ char *cached_username;
+@@ -1115,7 +1115,7 @@
  char *
  get_username(void)
  {
@@ -146,7 +136,7 @@ index c32741ca7..a74c8bd2c 100644
      struct passwd *pswd;
      uid_t current_uid;
  
-@@ -1132,9 +1132,9 @@ get_username(void)
+@@ -1128,9 +1128,9 @@
  	else
  	    cached_username = ztrdup("");
      }
@@ -158,7 +148,7 @@ index c32741ca7..a74c8bd2c 100644
      return cached_username;
  }
  
-@@ -1310,7 +1310,7 @@ getnameddir(char *name)
+@@ -1306,7 +1306,7 @@
  	return str;
      }
  
@@ -167,7 +157,7 @@ index c32741ca7..a74c8bd2c 100644
      {
  	/* Retrieve an entry from the password table/database for this user. */
  	struct passwd *pw;
-@@ -1326,7 +1326,7 @@ getnameddir(char *name)
+@@ -1322,7 +1322,7 @@
  		return dupstring(pw->pw_dir);
  	}
      }
diff --git a/debian/patches/series b/debian/patches/series
index e2b8a5476..2c71f8161 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,5 @@ cross-compile.diff
 example-shebang.patch
 completion-dscverify.diff
 cherry-pick-d128bc0b-45731-debsnap-new-completion-function.patch
-cherry-pick-754658af-Fix-copy-paste-error-in-earlier-commit-that-broke-git-stash-drop-completion.patch
 use-pager-instead-of-more-by-default.patch
 make-zsh-static-really-static-#993843.patch