summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/patches/cherry-pick-d128bc0b-45731-debsnap-new-completion-function.patch87
-rw-r--r--debian/patches/cross-compile.diff12
-rw-r--r--debian/patches/make-zsh-static-really-static-#993843.patch168
-rw-r--r--debian/patches/series2
-rw-r--r--debian/patches/use-pager-instead-of-more-by-default.patch14
5 files changed, 13 insertions, 270 deletions
diff --git a/debian/patches/cherry-pick-d128bc0b-45731-debsnap-new-completion-function.patch b/debian/patches/cherry-pick-d128bc0b-45731-debsnap-new-completion-function.patch
deleted file mode 100644
index e4b2ec2d8..000000000
--- a/debian/patches/cherry-pick-d128bc0b-45731-debsnap-new-completion-function.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Description: New _debsnap completion
-Origin: upstream
-Bug-Debian: https://bugs.debian.org/960298
-Forwarded: not-needed
-Applied-Upstream: workers/45731
-Last-Update: 2020-06-23
-
---- /dev/null
-+++ b/Completion/Debian/Command/_debsnap
-@@ -0,0 +1,77 @@
-+#compdef debsnap
-+
-+# Based on debsnap from devscripts-2.20.3
-+
-+local context state state_descr line ret=1
-+local -a expl
-+typeset -A opt_args
-+
-+_arguments \
-+ '(-d --destdir)'{-d+,--destdir=}'[set download directory]:download directory:_files -/' \
-+ '(-f --force)'{-f,--force}'[allow non-empty destination directory]' \
-+ '(-v --verbose)'{-v,--verbose}'[print configuration and report progress]' \
-+ --list"[list versions; don't download]" \
-+ --binary'[operate on binary packages (default: source packages)]' \
-+ '*'{-a+,--architecture=}'[specify architectures to download]:architecture to download:_deb_architectures' \
-+ --first='[download all versions newer than this]:version number (lower bound):->versions' \
-+ --last='[download all versions older than this]:version number (upper bound):->versions' \
-+ '(-)'{-h,--help}'[show usage information]' \
-+ '(-)'--version'[show version number and license]' \
-+ '1: :->package' \
-+ '2:version number to download:->versions' \
-+ && ret=0
-+
-+# -a implies --binary
-+if (( ${+opt_args[-a]} || ${+opt_args[--architecture]} )); then
-+ opt_args[--binary]=''
-+fi
-+
-+case $state in
-+ (package)
-+ if (( ${+opt_args[--binary]} )); then
-+ _description binary-packages expl 'binary package to download'
-+ _deb_packages "${expl[@]}" avail && ret=0
-+ else
-+ _description source-packages expl 'source package to download'
-+ _deb_packages "${expl[@]}" source && ret=0
-+ fi
-+ ;;
-+ (versions)
-+ local package=${(Q)line[1]}
-+ if [[ -n $package ]]; then
-+ # Compute the arguments to --list
-+ local -a args
-+ () {
-+ local i j
-+
-+ # repeatable flags with arguments, where the values can't contain colons
-+ for i in ${(k)opt_args[(I)(-a|--architecture)]}; do
-+ for j in ${(@s.:.)opt_args[$i]}; do
-+ [[ -n $j ]] || continue
-+ args+=( $i $j )
-+ done
-+ done
-+
-+ # non-repeatable flags with arguments, where the values may contain colons
-+ for i in ${(k)opt_args[(I)(--first|--last)]}; do
-+ # Avoid spurious "No matches" results in 'debsnap --first 42.1 --last 42.<TAB>'.
-+ [[ $context != option${i}-* ]] || continue
-+
-+ # Un-escape colons (epoch separators in the version number)
-+ args+=( $i ${(Q)opt_args[$i]} )
-+ done
-+
-+ # flags without arguments
-+ args+=( ${(k)opt_args[(I)(--binary)]} )
-+ }
-+
-+ local -a versions=( ${(Oaf)"$(_call_program versions debsnap --list ${args} -- ${line[1]})"} )
-+ _description -V versions expl ${state_descr}
-+ compadd "$@" "${expl[@]}" -a versions && ret=0
-+ else
-+ _message -- $state_descr && ret=0
-+ fi
-+ ;;
-+esac
-+
-+return ret
diff --git a/debian/patches/cross-compile.diff b/debian/patches/cross-compile.diff
index 4f718faa9..ca5f75e81 100644
--- a/debian/patches/cross-compile.diff
+++ b/debian/patches/cross-compile.diff
@@ -9,7 +9,7 @@ X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314m
+++ b/aczsh.m4
@@ -172,7 +172,7 @@
}
- ], [zsh_cv_shared_$1=yes],
+ ]])],[zsh_cv_shared_$1=yes],
[zsh_cv_shared_$1=no],
-[zsh_cv_shared_$1=no]
+[zsh_cv_shared_$1=yes]
@@ -18,7 +18,7 @@ X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314m
zsh_cv_shared_$1=no
@@ -244,7 +244,7 @@
}
- ], [zsh_cv_sys_dynamic_clash_ok=yes],
+ ]])],[zsh_cv_sys_dynamic_clash_ok=yes],
[zsh_cv_sys_dynamic_clash_ok=no],
-[zsh_cv_sys_dynamic_clash_ok=no]
+[zsh_cv_sys_dynamic_clash_ok=yes]
@@ -27,7 +27,7 @@ X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314m
zsh_cv_sys_dynamic_clash_ok=no
@@ -318,7 +318,7 @@
}
- ], [zsh_cv_sys_dynamic_rtld_global=yes],
+ ]])],[zsh_cv_sys_dynamic_rtld_global=yes],
[zsh_cv_sys_dynamic_rtld_global=no],
-[zsh_cv_sys_dynamic_rtld_global=no]
+[zsh_cv_sys_dynamic_rtld_global=yes]
@@ -36,7 +36,7 @@ X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314m
zsh_cv_sys_dynamic_rtld_global=no
@@ -388,7 +388,7 @@
int fred () { return 42; }
- ], [zsh_cv_sys_dynamic_execsyms=yes],
+ ]])],[zsh_cv_sys_dynamic_execsyms=yes],
[zsh_cv_sys_dynamic_execsyms=no],
-[zsh_cv_sys_dynamic_execsyms=no]
+[zsh_cv_sys_dynamic_execsyms=yes]
@@ -45,7 +45,7 @@ X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314m
else
@@ -462,7 +462,7 @@
int fred () { return 42; }
- ], [zsh_cv_sys_dynamic_strip_exe=yes],
+ ]])],[zsh_cv_sys_dynamic_strip_exe=yes],
[zsh_cv_sys_dynamic_strip_exe=no],
-[zsh_cv_sys_dynamic_strip_exe=no]
+[zsh_cv_sys_dynamic_strip_exe=yes]
@@ -54,7 +54,7 @@ X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314m
else
@@ -528,7 +528,7 @@
}
- ], [zsh_cv_sys_dynamic_strip_lib=yes],
+ ]])],[zsh_cv_sys_dynamic_strip_lib=yes],
[zsh_cv_sys_dynamic_strip_lib=no],
-[zsh_cv_sys_dynamic_strip_lib=no]
+[zsh_cv_sys_dynamic_strip_lib=yes]
diff --git a/debian/patches/make-zsh-static-really-static-#993843.patch b/debian/patches/make-zsh-static-really-static-#993843.patch
deleted file mode 100644
index 60b7b8bc9..000000000
--- a/debian/patches/make-zsh-static-really-static-#993843.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-Description: Fix dynamic linking with zsh-static and resulting segfaults on libc updates
-Origin: https://zsh.org/workers/49422
-Bug-Debian: https://bugs.debian.org/993843
-Bug: https://zsh.org/workers/49392
-Author: Axel Beckert <abe@debian.org>
-Author: Jun T <takimoto-j@kba.biglobe.ne.jp>
-
---- a/Src/Modules/parameter.c
-+++ b/Src/Modules/parameter.c
-@@ -2011,6 +2011,9 @@
- /**/
- static Groupset get_all_groups(void)
- {
-+#ifdef DISABLE_DYNAMIC_NSS
-+ return NULL;
-+#else
- Groupset gs = zhalloc(sizeof(*gs));
- Groupmap gaptr;
- gid_t *list, *lptr, egid;
-@@ -2063,6 +2066,7 @@
- }
-
- return gs;
-+#endif /* DISABLE_DYNAMIC_NSS */
- }
-
- /* Standard hash element lookup. */
-@@ -2081,7 +2085,11 @@
- pm->gsu.s = &nullsetscalar_gsu;
-
- if (!gs) {
-+#ifdef DISABLE_DYNAMIC_NSS
-+ zerr("parameter 'usergroups' not available: NSS is disabled");
-+#else
- zerr("failed to retrieve groups for user: %e", errno);
-+#endif
- pm->u.str = dupstring("");
- pm->node.flags |= (PM_UNSET|PM_SPECIAL);
- return &pm->node;
-@@ -2113,7 +2121,11 @@
- Groupmap gaptr;
-
- if (!gs) {
-+#ifdef DISABLE_DYNAMIC_NSS
-+ zerr("parameter 'usergroups' not available: NSS is disabled");
-+#else
- zerr("failed to retrieve groups for user: %e", errno);
-+#endif
- return;
- }
-
---- a/Src/hashnameddir.c
-+++ b/Src/hashnameddir.c
-@@ -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. */
--#ifdef HAVE_GETPWENT
-+#ifdef USE_GETPWENT
- struct passwd *pw;
-
- setpwent();
-@@ -190,7 +190,7 @@
-
- endpwent();
- usepwf = 0;
--#endif /* HAVE_GETPWENT */
-+#endif /* USE_GETPWENT */
- }
- if (usepwf) {
- /* Don't forget the non-NIS matches from the flat passwd file */
-@@ -229,7 +229,7 @@
- adduserdir(pw->pw_name, pw->pw_dir, ND_USERNAME, 1);
-
- endpwent();
--#endif /* HAVE_GETPWENT */
-+#endif /* USE_GETPWENT */
- #endif
- allusersadded = 1;
- }
---- a/Src/options.c
-+++ b/Src/options.c
-@@ -807,7 +807,7 @@
- return -1;
- }
-
--# ifdef HAVE_INITGROUPS
-+# ifdef USE_INITGROUPS
- /* Set the supplementary groups list.
- *
- * Note that on macOS, FreeBSD, and possibly some other platforms,
---- a/Src/params.c
-+++ b/Src/params.c
-@@ -841,9 +841,12 @@
- setsparam("HOST", ztrdup_metafy(hostnam));
- zfree(hostnam, 256);
-
-- setsparam("LOGNAME",
-- ztrdup_metafy((str = getlogin()) && *str ?
-- str : cached_username));
-+ setsparam("LOGNAME", ztrdup_metafy(
-+#ifndef DISABLE_DYNAMIC_NSS
-+ (str = getlogin()) && *str ? str :
-+#endif
-+ cached_username
-+ ));
-
- #if !defined(HAVE_PUTENV) && !defined(USE_SET_UNSET_ENV)
- /* Copy the environment variables we are inheriting to dynamic *
-@@ -4414,7 +4417,7 @@
- void
- usernamesetfn(UNUSED(Param pm), char *x)
- {
--#if defined(HAVE_SETUID) && defined(HAVE_GETPWNAM)
-+#if defined(HAVE_SETUID) && defined(USE_GETPWNAM)
- struct passwd *pswd;
-
- if (x && (pswd = getpwnam(x)) && (pswd->pw_uid != cached_uid)) {
-@@ -4431,7 +4434,7 @@
- cached_uid = pswd->pw_uid;
- }
- }
--#endif /* HAVE_SETUID && HAVE_GETPWNAM */
-+#endif /* HAVE_SETUID && USE_GETPWNAM */
- zsfree(x);
- }
-
---- a/Src/utils.c
-+++ b/Src/utils.c
-@@ -1115,7 +1115,7 @@
- char *
- get_username(void)
- {
--#ifdef HAVE_GETPWUID
-+#ifdef USE_GETPWUID
- struct passwd *pswd;
- uid_t current_uid;
-
-@@ -1128,9 +1128,9 @@
- else
- cached_username = ztrdup("");
- }
--#else /* !HAVE_GETPWUID */
-+#else /* !USE_GETPWUID */
- cached_uid = getuid();
--#endif /* !HAVE_GETPWUID */
-+#endif /* !USE_GETPWUID */
- return cached_username;
- }
-
-@@ -1306,7 +1306,7 @@
- return str;
- }
-
--#ifdef HAVE_GETPWNAM
-+#ifdef USE_GETPWNAM
- {
- /* Retrieve an entry from the password table/database for this user. */
- struct passwd *pw;
-@@ -1322,7 +1322,7 @@
- return dupstring(pw->pw_dir);
- }
- }
--#endif /* HAVE_GETPWNAM */
-+#endif /* USE_GETPWNAM */
-
- /* There are no more possible sources of directory names, so give up. */
- return NULL;
diff --git a/debian/patches/series b/debian/patches/series
index 2c71f8161..ecbc384c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,4 @@ update-debian-sections.patch
cross-compile.diff
example-shebang.patch
completion-dscverify.diff
-cherry-pick-d128bc0b-45731-debsnap-new-completion-function.patch
use-pager-instead-of-more-by-default.patch
-make-zsh-static-really-static-#993843.patch
diff --git a/debian/patches/use-pager-instead-of-more-by-default.patch b/debian/patches/use-pager-instead-of-more-by-default.patch
index 818b1ab5d..2c91e267e 100644
--- a/debian/patches/use-pager-instead-of-more-by-default.patch
+++ b/debian/patches/use-pager-instead-of-more-by-default.patch
@@ -7,7 +7,7 @@ Author: Axel Beckert <abe@debian.org>
--- a/Completion/Base/Widget/_complete_debug
+++ b/Completion/Base/Widget/_complete_debug
-@@ -24,7 +24,7 @@
+@@ -28,7 +28,7 @@
if (( debug_fd != -1 )); then
zstyle -s ':completion:complete-debug::::' pager pager
@@ -73,14 +73,14 @@ Author: Axel Beckert <abe@debian.org>
case ${what[(w)1]} in
--- a/Functions/Misc/run-help-svk
+++ b/Functions/Misc/run-help-svk
-@@ -1 +1 @@
--svk help ${${@:#-*}[1]} | ${=PAGER:-more}
-+svk help ${${@:#-*}[1]} | ${=PAGER:-/usr/bin/pager}
+@@ -1,1 +1,1 @@
+-svk help $1 | ${=PAGER:-more}
++svk help $1 | ${=PAGER:-/usr/bin/pager}
--- a/Functions/Misc/run-help-svn
+++ b/Functions/Misc/run-help-svn
-@@ -1 +1 @@
--svn help ${${@:#-*}[1]} | ${=PAGER:-more}
-+svn help ${${@:#-*}[1]} | ${=PAGER:-/usr/bin/pager}
+@@ -1,1 +1,1 @@
+-svn help $1 | ${=PAGER:-more}
++svn help $1 | ${=PAGER:-/usr/bin/pager}
--- a/Functions/Zftp/zfdir
+++ b/Functions/Zftp/zfdir
@@ -95,15 +95,15 @@
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-08 09:41:04 +0000