summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/cherry-pick-d128bc0b-45731-debsnap-new-completion-function.patch87
-rw-r--r--debian/patches/completion-dscverify.diff40
-rw-r--r--debian/patches/cross-compile.diff63
-rw-r--r--debian/patches/example-shebang.patch12
-rw-r--r--debian/patches/further-mitigate-test-suite-hangs.patch15
-rw-r--r--debian/patches/make-zsh-static-really-static-#993843.patch168
-rw-r--r--debian/patches/series8
-rw-r--r--debian/patches/update-debian-sections.patch51
-rw-r--r--debian/patches/use-pager-instead-of-more-by-default.patch104
9 files changed, 548 insertions, 0 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
new file mode 100644
index 000000000..e4b2ec2d8
--- /dev/null
+++ b/debian/patches/cherry-pick-d128bc0b-45731-debsnap-new-completion-function.patch
@@ -0,0 +1,87 @@
+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/completion-dscverify.diff b/debian/patches/completion-dscverify.diff
new file mode 100644
index 000000000..6c5c02264
--- /dev/null
+++ b/debian/patches/completion-dscverify.diff
@@ -0,0 +1,40 @@
+Description: Add completion for dscverify(1) from Debian's devscripts.
+Author: Romain Porte <debian@microjoe.org>
+Reviewed-by: Daniel Shahaf <danielsh@apache.org>
+Bug-Debian: https://bugs.debian.org/953389
+Forwarded: https://www.zsh.org/mla/workers/2020/msg00350.html
+Applied-Upstream: master, https://sourceforge.net/p/zsh/code/ci/0d7f888945bd487d6458807684883b22dc3b31b8/#diff-1
+Last-Update: 2020-03-21
+--- a/Completion/Debian/Command/_dscverify
++++ b/Completion/Debian/Command/_dscverify
+@@ -0,0 +1,30 @@
++#compdef dscverify
++
++# $ dscverify --version
++# This is dscverify, from the Debian devscripts package, version 2.20.2
++# ...
++
++_dscverify() {
++ local all_opts=(
++ '--help[show the help message and exit]'
++ '--version[show the version + copyright and exit]'
++ '--no-default-keyrings[do not check against the default keyrings]'
++ '*--keyring[add keyring to the list of keyrings used]:keyring:_files -g "*.{kbx,gpg}(-.)"'
++ '(--nosigcheck --no-sig-check -u)'{--nosigcheck,--no-sig-check,-u}'[do not verify the GPG signature]'
++ '--verbose[do not suppress GPG output]'
++ '*:dsc file:_files -g "*.{changes,dsc,buildinfo}(-.)"'
++ )
++
++ local first_only=(
++ '(--no-conf --noconf)'{--no-conf,--noconf}'[do not read the devscripts config file]'
++ )
++
++ if (( CURRENT == 2 )); then
++ all_opts+=($first_only)
++ fi
++
++ _arguments \
++ "$all_opts[@]"
++}
++
++_dscverify "$@"
diff --git a/debian/patches/cross-compile.diff b/debian/patches/cross-compile.diff
new file mode 100644
index 000000000..4f718faa9
--- /dev/null
+++ b/debian/patches/cross-compile.diff
@@ -0,0 +1,63 @@
+Description: Adjust cross-compile fallback values to yes.
+Origin: commit, revision id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314mt
+Author: Dmitrijs Ledkovs <dmitrijs.ledkovs@canonical.com>
+Last-Update: 2012-12-20
+X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314mt
+
+=== modified file 'aczsh.m4'
+--- a/aczsh.m4
++++ b/aczsh.m4
+@@ -172,7 +172,7 @@
+ }
+ ], [zsh_cv_shared_$1=yes],
+ [zsh_cv_shared_$1=no],
+-[zsh_cv_shared_$1=no]
++[zsh_cv_shared_$1=yes]
+ )
+ else
+ zsh_cv_shared_$1=no
+@@ -244,7 +244,7 @@
+ }
+ ], [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]
+ )
+ else
+ zsh_cv_sys_dynamic_clash_ok=no
+@@ -318,7 +318,7 @@
+ }
+ ], [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]
+ )
+ else
+ 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=no],
+-[zsh_cv_sys_dynamic_execsyms=no]
++[zsh_cv_sys_dynamic_execsyms=yes]
+ )
+ LDFLAGS=$save_ldflags
+ else
+@@ -462,7 +462,7 @@
+ int fred () { return 42; }
+ ], [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]
+ )
+ LDFLAGS=$save_ldflags
+ else
+@@ -528,7 +528,7 @@
+ }
+ ], [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]
+ )
+ else
+ zsh_cv_sys_dynamic_strip_lib=no
diff --git a/debian/patches/example-shebang.patch b/debian/patches/example-shebang.patch
new file mode 100644
index 000000000..cc3c63fa7
--- /dev/null
+++ b/debian/patches/example-shebang.patch
@@ -0,0 +1,12 @@
+Description: Change shebang path in example script to Debian's zsh path
+Author: Axel Beckert <abe@debian.org>
+Forwarded: not-needed
+
+--- a/Util/reporter
++++ b/Util/reporter
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/zsh
++#!/bin/zsh
+ #
+ # NAME:
+ # reporter
diff --git a/debian/patches/further-mitigate-test-suite-hangs.patch b/debian/patches/further-mitigate-test-suite-hangs.patch
new file mode 100644
index 000000000..cf22be741
--- /dev/null
+++ b/debian/patches/further-mitigate-test-suite-hangs.patch
@@ -0,0 +1,15 @@
+Origin: https://www.zsh.org/mla/workers/2014/msg01250.html
+Author: Bart Schaefer <schaefer@brasslantern.com>
+Bug-Debian: https://bugs.debian.org/759870
+Description: Add a sleep call which should prevent a race condition in coproc
+
+--- a/Test/A05execution.ztst
++++ b/Test/A05execution.ztst
+@@ -239,6 +239,7 @@
+ print -u $ZTST_fd 'This test takes 5 seconds to fail...'
+ { printf "%d\n" {1..20000} } 2>/dev/null | ( read -e )
+ hang(){ printf "%d\n" {2..20000} | cat }; hang 2>/dev/null | ( read -e )
++ sleep 1 ;: avoid coproc exit race condition
+ print -p done
+ read -et 6 -p
+ 0:Bug regression: piping a shell construct to an external process may hang
diff --git a/debian/patches/make-zsh-static-really-static-#993843.patch b/debian/patches/make-zsh-static-really-static-#993843.patch
new file mode 100644
index 000000000..60b7b8bc9
--- /dev/null
+++ b/debian/patches/make-zsh-static-really-static-#993843.patch
@@ -0,0 +1,168 @@
+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
new file mode 100644
index 000000000..2c71f8161
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,8 @@
+further-mitigate-test-suite-hangs.patch
+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/update-debian-sections.patch b/debian/patches/update-debian-sections.patch
new file mode 100644
index 000000000..390f5c701
--- /dev/null
+++ b/debian/patches/update-debian-sections.patch
@@ -0,0 +1,51 @@
+From a7204dd6176d4c1305de7092525c8037fd335acf Mon Sep 17 00:00:00 2001
+From: Josh Triplett <josh@joshtriplett.org>
+Date: Thu, 8 Dec 2016 20:19:18 -0800
+Subject: [PATCH] Update for new programming language sections
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=847540;filename=0001-Update-for-new-programming-language-sections.patch;msg=13
+Bug-Debian: https://bugs.debian.org/847540
+Forwarded: not-yet
+Reviewed-By: Axel Beckert <abe@debian.org>, Daniel Shahaf <danielsh@apache.org>
+
+---
+ Completion/Debian/Command/_dak | 2 +-
+ Completion/Debian/Command/_debfoster | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Completion/Debian/Command/_dak b/Completion/Debian/Command/_dak
+index 086196c4a..d06f55d23 100644
+--- a/Completion/Debian/Command/_dak
++++ b/Completion/Debian/Command/_dak
+@@ -37,7 +37,7 @@
+ '(-n --no-action)'{-n,--no-action}'[do not do anything]'
+ '(-s --suite)'{-s,--suite=}':suite:_values -s , "suite list" oldstable stable testing unstable experimental'
+ ':package:_deb_packages avail'
+- ':section:(admin base comm contrib/admin contrib/comm contrib/devel contrib/doc contrib/games contrib/graphics contrib/interpreters contrib/kde contrib/libdevel contrib/libs contrib/mail contrib/math contrib/misc contrib/net contrib/otherosfs contrib/perl contrib/python contrib/science contrib/sound contrib/tex contrib/text contrib/utils contrib/web contrib/x11 devel doc editors electronics embedded games gnome graphics hamradio interpreters kde libdevel libs mail math misc net news non-free/admin non-free/base non-free/comm non-free/devel non-free/doc non-free/editors non-free/electronics non-free/games non-free/graphics non-free/hamradio non-free/libdevel non-free/libs non-free/mail non-free/math non-free/misc non-free/net non-free/news non-free/otherosfs non-free/python non-free/science non-free/sound non-free/tex non-free/text non-free/utils non-free/web non-free/x11 oldlibs otherosfs perl python science shells sound tex text utils web x11)'
++ ':section:({,contrib/,non-free/}{admin,cli-mono,comm,database,debug,devel,doc,editors,education,electronics,embedded,fonts,games,gnome,gnu-r,gnustep,graphics,hamradio,haskell,httpd,interpreters,introspection,java,javascript,kde,kernel,libdevel,libs,lisp,localization,mail,math,metapackages,misc,net,news,ocaml,oldlibs,otherosfs,perl,php,python,ruby,rust,science,shells,sound,tex,text,utils,vcs,video,web,x11,xfce,zope})'
+ ':priority:(extra important optional required standard)'
+ )
+ ;;
+diff --git a/Completion/Debian/Command/_debfoster b/Completion/Debian/Command/_debfoster
+index 08a1078e2..4c041bc36 100644
+--- a/Completion/Debian/Command/_debfoster
++++ b/Completion/Debian/Command/_debfoster
+@@ -44,10 +44,13 @@
+ ;;
+ *(#i)(no|)keepsections*)
+ _wanted values expl 'section' compadd \
+- x11 web utils text tex sound shells science \
+- otherosfs oldlibs news net misc math mail libs \
+- interpreters hamradio graphics games electronics \
+- editors doc devel comm base admin && ret=0
++ zope xfce x11 web video vcs utils text tex sound shells \
++ science rust ruby python php perl otherosfs oldlibs ocaml \
++ news net misc metapackages math mail localization lisp libs \
++ libdevel kernel kde javascript java introspection \
++ interpreters httpd haskell hamradio graphics gnustep gnu-r \
++ gnome games fonts embedded electronics education editors doc \
++ devel debug database comm cli-mono admin && ret=0
+ ;;
+ *(#i)guessdepends*)
+ _wanted values expl 'name extension' \
+--
+2.11.0
diff --git a/debian/patches/use-pager-instead-of-more-by-default.patch b/debian/patches/use-pager-instead-of-more-by-default.patch
new file mode 100644
index 000000000..818b1ab5d
--- /dev/null
+++ b/debian/patches/use-pager-instead-of-more-by-default.patch
@@ -0,0 +1,104 @@
+Description: Use /usr/bin/pager instead of more by default
+ Similar issue as with https://bugs.debian.org/993539, just for a
+ different setting. Replaces the according sed call in debian/rules.
+Bug-Debian: https://bugs.debian.org/993539
+Forwarded: not-needed
+Author: Axel Beckert <abe@debian.org>
+
+--- a/Completion/Base/Widget/_complete_debug
++++ b/Completion/Base/Widget/_complete_debug
+@@ -24,7 +24,7 @@
+
+ if (( debug_fd != -1 )); then
+ zstyle -s ':completion:complete-debug::::' pager pager
+- print -sR "${pager:-${PAGER:-${VISUAL:-${EDITOR:-more}}}} ${(q)tmp} ;: $w"
++ print -sR "${pager:-${PAGER:-${VISUAL:-${EDITOR:-/usr/bin/pager}}}} ${(q)tmp} ;: $w"
+ _message -r "Trace output left in $tmp (up-history to view)"
+ if [[ $compstate[nmatches] -le 1 && $compstate[list] != *force* ]]; then
+ compstate[list]='list force messages'
+--- a/Functions/MIME/zsh-mime-handler
++++ b/Functions/MIME/zsh-mime-handler
+@@ -288,11 +288,11 @@
+ # We need to page the output.
+ # Careful in case PAGER is a set of commands and arguments.
+ local -a pager
+- zsh-mime-contexts -a $suffix pager pager || pager=(${=PAGER:-more})
++ zsh-mime-contexts -a $suffix pager pager || pager=(${=PAGER:-/usr/bin/pager})
+ if [[ -n $stdin ]]; then
+ cat $argv | $execargs | $pager
+ else
+- $execargs | eval ${PAGER:-more}
++ $execargs | eval ${PAGER:-/usr/bin/pager}
+ fi
+ elif [[ $no_bg = yes || $flags = *needsterminal* || -z $DISPLAY ]]; then
+ # Needs a terminal, so run synchronously.
+--- a/Functions/Misc/mere
++++ b/Functions/Misc/mere
+@@ -86,4 +86,4 @@
+ fi |
+ nroff -T$terminal -man | $col -x
+ ) |
+-${=MANPAGER:-${PAGER:-more}} -s
++${=MANPAGER:-${PAGER:-/usr/bin/pager}} -s
+--- a/Functions/Misc/nslookup
++++ b/Functions/Misc/nslookup
+@@ -21,7 +21,7 @@
+ zstyle -s ':nslookup' prompt tmp && pmpt=(-p "$tmp")
+ zstyle -s ':nslookup' rprompt tmp && pmpt=("$pmpt[@]" -r "$tmp")
+ zstyle -s ':nslookup' pager tmp &&
+- [[ -z "$pager" ]] && pager="${opager:-more}"
++ [[ -z "$pager" ]] && pager="${opager:-/usr/bin/pager}"
+ (( $#pmpt )) || pmpt=(-p '> ')
+
+ zpty nslookup command nslookup "${(q)@}"
+--- a/Functions/Misc/run-help
++++ b/Functions/Misc/run-help
+@@ -29,7 +29,7 @@
+ return 0
+ elif [[ -n "${HELPDIR:-}" && -r $HELPDIR/$1 && $1 != compctl ]]
+ then
+- ${=PAGER:-more} $HELPDIR/$1
++ ${=PAGER:-/usr/bin/pager} $HELPDIR/$1
+ return $?
+ fi
+
+@@ -69,7 +69,7 @@
+ (comp*) man zshcompsys;;
+ (zf*) man zshftpsys;;
+ (run-help) man zshcontrib;;
+- (*) builtin functions ${what[(w)1]} | ${=PAGER:-more};;
++ (*) builtin functions ${what[(w)1]} | ${=PAGER:-/usr/bin/pager};;
+ esac;;
+ (*( is a * builtin))
+ 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}
+--- 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}
+--- a/Functions/Zftp/zfdir
++++ b/Functions/Zftp/zfdir
+@@ -95,15 +95,15 @@
+ fi
+
+ if [[ -n $file && -f $file ]]; then
+- eval ${PAGER:-more} \$file
++ eval ${PAGER:-/usr/bin/pager} \$file
+ else
+ if (zftp test); then
+ # Works OK in subshells
+- zftp dir $* | tee $file | eval ${PAGER:-more}
++ zftp dir $* | tee $file | eval ${PAGER:-/usr/bin/pager}
+ else
+ # Doesn't work in subshells (IRIX 6.2 --- why?)
+ zftp dir $* >$file
+- eval ${PAGER:-more} $file
++ eval ${PAGER:-/usr/bin/pager} $file
+ fi
+ fi
+ # }
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-03 21:07:48 +0000