haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

zsh, bump to 5.9 (#13288)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-12-02 07:25:49 +01:00
committed by GitHub
parent 3dbd3d7e4d
commit dd0626e7ab
3 changed files with 200 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

434
app-shells/zsh/patches/zsh-5.8.1.patchset
View File

@@ -1,434 +0,0 @@
From d0043fb1261c576b96c1b1f8dd388c109b761ab1 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Wed, 18 Sep 2013 03:11:28 -0600
Subject: Fix for gcc2
diff --git a/Src/Modules/param_private.c b/Src/Modules/param_private.c
index 86416c5..b8e7c18 100644
--- a/Src/Modules/param_private.c
+++ b/Src/Modules/param_private.c
@@ -79,6 +79,7 @@ static int makeprivate_error = 0;
static void
makeprivate(HashNode hn, UNUSED(int flags))
{
+ struct gsu_closure *gsu;
Param pm = (Param)hn;
if (pm->level == locallevel) {
if (pm->ename || (pm->node.flags & PM_NORESTORE) ||
@@ -92,7 +93,7 @@ makeprivate(HashNode hn, UNUSED(int flags))
makeprivate_error = 1;
return;
}
- struct gsu_closure *gsu = zhalloc(sizeof(struct gsu_closure));
+ gsu = zhalloc(sizeof(struct gsu_closure));
switch (PM_TYPE(pm->node.flags)) {
case PM_SCALAR:
gsu->g = (void *)(pm->gsu.s);
diff --git a/Src/Zle/textobjects.c b/Src/Zle/textobjects.c
index c93777b..ce91995 100644
--- a/Src/Zle/textobjects.c
+++ b/Src/Zle/textobjects.c
@@ -61,8 +61,9 @@ selectword(UNUSED(char **args))
}
/* similarly scan forward over characters of the same class */
while (zlecs < zlell) {
+ int pos;
INCCS();
- int pos = zlecs;
+ pos = zlecs;
/* single newlines within blanks are included */
if (all && !sclass && pos < zlell && zleline[pos] == ZWC('\n'))
INCPOS(pos);
diff --git a/Src/Zle/zle_hist.c b/Src/Zle/zle_hist.c
index 581ca49..ebe5a1b 100644
--- a/Src/Zle/zle_hist.c
+++ b/Src/Zle/zle_hist.c
@@ -1622,10 +1622,11 @@ doisearch(char **args, int dir, int pattern)
else
goto ins;
} else if (cmd == Th(z_bracketedpaste)) {
+ size_t pastelen;
char *paste = bracketedstring();
set_isrch_spot(top_spot++, hl, pos, pat_hl, pat_pos, end_pos,
zlemetacs, sbptr, dir, nomatch);
- size_t pastelen = strlen(paste);
+ pastelen = strlen(paste);
if (sbptr + pastelen >= sibuf - FIRST_SEARCH_CHAR - 2) {
int oldsize = sibuf;
sibuf += (pastelen >= sibuf) ? pastelen + 1 : sibuf;
diff --git a/Src/Zle/zle_vi.c b/Src/Zle/zle_vi.c
index 0f198d0..03d6371 100644
--- a/Src/Zle/zle_vi.c
+++ b/Src/Zle/zle_vi.c
@@ -183,11 +183,12 @@ getvirange(int wf)
vilinerange = (visual == 2);
region_active = 0;
} else {
+ Keymap km;
virangeflag = 1;
wordflag = wf;
mark = -1;
/* use operator-pending keymap if one exists */
- Keymap km = openkeymap("viopp");
+ km = openkeymap("viopp");
if (km)
selectlocalmap(km);
/* Now we need to execute the movement command, to see where it *
diff --git a/Src/params.c b/Src/params.c
index 863b326..c6ac72e 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -5056,7 +5056,7 @@ arrfixenv(char *s, char **t)
int
zputenv(char *str)
{
- DPUTS(!str, "Attempt to put null string into environment.");
+ //DPUTS(!str, "Attempt to put null string into environment.");
#ifdef USE_SET_UNSET_ENV
/*
* If we are using unsetenv() to remove values from the
diff --git a/configure.ac b/configure.ac
index af8c5bb..fa01cc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -901,7 +901,7 @@ if test x$enable_cap = xyes; then
AC_CHECK_LIB(cap, cap_get_proc)
fi
-AC_CHECK_LIB(socket, socket)
+AC_CHECK_LIB(network, socket)
AC_SEARCH_LIBS(gethostbyname2, bind)
case $LIBS in
--
2.45.2
From 2b723fc3ffccc4bb863b4bea290c1183a41b77cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Wed, 11 Jan 2017 18:17:20 +0100
Subject: Haiku rusage fix
diff --git a/Src/jobs.c b/Src/jobs.c
index e743825..96837e9 100644
--- a/Src/jobs.c
+++ b/Src/jobs.c
@@ -1026,7 +1026,7 @@ should_report_time(Job j)
#endif
}
-#ifdef HAVE_GETRUSAGE
+#if defined(HAVE_GETRUSAGE) && !defined(__HAIKU__)
if (reportmemory >= 0 &&
j->procs->ti.ru_maxrss / 1024 > reportmemory)
return 1;
--
2.45.2
From b422a91aab7c273974a6d47333eb3ee9b3ecf268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Thu, 17 Aug 2017 16:16:21 +0200
Subject: Enable dynamic modules on Haiku
diff --git a/configure.ac b/configure.ac
index fa01cc2..8119cc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -895,6 +895,7 @@ fi
if test "x$dynamic" = xyes; then
AC_CHECK_LIB(dl, dlopen)
+ AC_CHECK_LIB(root, dlopen)
fi
if test x$enable_cap = xyes; then
@@ -2882,7 +2883,8 @@ char *argv[];
aix*) DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
darwin*) DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
- beos*|haiku*) DLLDFLAGS="${DLLDFLAGS=-nostart}" ;;
+ beos*) DLLDFLAGS="${DLLDFLAGS=-nostart}" ;;
+ haiku*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
openbsd*)
if test x$zsh_cv_sys_elf = xyes; then
DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}"
--
2.45.2
From 9734a2e9f9ba425602d0359aa73703cc5401222e Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Sat, 14 Apr 2018 18:11:49 +0000
Subject: C89 fixes for gcc2 compatibility
diff --git a/Src/exec.c b/Src/exec.c
index 5002765..0c55a5c 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -3136,10 +3136,11 @@ execcmd_exec(Estate state, Execcmd_params eparams,
}
if (exec_argv0) {
char *str, *s;
+ size_t sz;
exec_argv0 = dupstring(exec_argv0);
remnulargs(exec_argv0);
untokenize(exec_argv0);
- size_t sz = strlen(exec_argv0);
+ sz = strlen(exec_argv0);
str = s = zalloc(5 + 1 + sz + 1);
strcpy(s, "ARGV0=");
s+=6;
diff --git a/Src/init.c b/Src/init.c
index 99ccc16..bebefc0 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -1300,8 +1300,9 @@ run_init_scripts(void)
sourcehome(".profile");
if (interact) {
+ char *s;
noerrs = 2;
- char *s = getsparam("ENV");
+ s = getsparam("ENV");
if (s) {
s = dupstring(s);
if (!parsestr(&s)) {
diff --git a/Src/parse.c b/Src/parse.c
index de1b279..f596c0e 100644
--- a/Src/parse.c
+++ b/Src/parse.c
@@ -403,8 +403,9 @@ ecstrcode(char *s)
unsigned val = hasher(s);
if ((l = strlen(s) + 1) && l <= 4) {
+ wordcode c;
t = has_token(s);
- wordcode c = (t ? 3 : 2);
+ c = (t ? 3 : 2);
switch (l) {
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 f5667f3..465048f 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -138,10 +138,11 @@ set_widearray(char *mb_array, Widechar_array wca)
static void
zwarning(const char *cmd, const char *fmt, va_list ap)
{
+ char *prefix;
if (isatty(2))
zleentry(ZLE_CMD_TRASH);
- char *prefix = scriptname ? scriptname : (argzero ? argzero : "");
+ prefix = scriptname ? scriptname : (argzero ? argzero : "");
if (cmd) {
if (unset(SHINSTDIN) || locallevel) {
@@ -2823,6 +2824,7 @@ int
checkrmall(char *s)
{
DIR *rmd;
+ const int max_count = 100;
int count = 0;
if (!shout)
return 1;
@@ -2832,7 +2834,6 @@ checkrmall(char *s)
else
s = dyncat("/", s);
}
- const int max_count = 100;
if ((rmd = opendir(unmeta(s)))) {
int ignoredots = !isset(GLOBDOTS);
char *fname;
--
2.45.2
From 4002381bd3b07582320a04f8fe79308673d994e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 27 Oct 2018 10:36:50 +0200
Subject: Some other function resides in libroot
diff --git a/configure.ac b/configure.ac
index 8119cc0..c31387b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -746,10 +746,12 @@ dnl and might not be compiled into the zsh executable.
dnl On ReliantUNIX -lc better be the last library, else funny things
dnl may happen.
AC_CHECK_LIB(c, printf, [LIBS="$LIBS -lc"])
+AC_CHECK_LIB(root, printf)
AC_CHECK_LIB(m, pow)
AC_CHECK_LIB(rt, clock_gettime)
+AC_CHECK_LIB(root, clock_gettime)
dnl Various features of ncurses depend on having the right header
dnl (the system's own curses.h may well not be good enough).
--
2.45.2
From e13624f4db7dc0564be7aa820e5e8d5017165dcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Mon, 18 Feb 2019 13:41:08 +0100
Subject: Build fix for gcc2 from hanya
diff --git a/Src/Modules/nearcolor.c b/Src/Modules/nearcolor.c
index b49ee9a..44313ba 100644
--- a/Src/Modules/nearcolor.c
+++ b/Src/Modules/nearcolor.c
@@ -49,12 +49,12 @@ deltae(Cielab lab1, Cielab lab2)
static void
RGBtoLAB(int red, int green, int blue, Cielab lab)
{
- double R = red / 255.0;
- double G = green / 255.0;
- double B = blue / 255.0;
- R = 100.0 * (R > 0.04045 ? pow((R + 0.055) / 1.055, 2.4) : R / 12.92);
- G = 100.0 * (G > 0.04045 ? pow((G + 0.055) / 1.055, 2.4) : G / 12.92);
- B = 100.0 * (B > 0.04045 ? pow((B + 0.055) / 1.055, 2.4) : B / 12.92);
+ double r = red / 255.0;
+ double g = green / 255.0;
+ double b = blue / 255.0;
+ double R = 100.0 * (r > 0.04045 ? pow((r + 0.055) / 1.055, 2.4) : r / 12.92);
+ double G = 100.0 * (g > 0.04045 ? pow((g + 0.055) / 1.055, 2.4) : g / 12.92);
+ double B = 100.0 * (b > 0.04045 ? pow((b + 0.055) / 1.055, 2.4) : b / 12.92);
/* Observer. = 2 degrees, Illuminant = D65 */
double X = (R * 0.4124 + G * 0.3576 + B * 0.1805) / 95.047;
--
2.45.2
From 5e4f0702df349d4936f130afa0057a09db9f6a5c Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 13 Mar 2022 15:56:24 +0000
Subject: zsh, fix for gcc2
diff --git a/Src/jobs.c b/Src/jobs.c
index 96837e9..d830d39 100644
--- a/Src/jobs.c
+++ b/Src/jobs.c
@@ -2933,6 +2933,7 @@ acquire_pgrp(void)
sigaddset(&blockset, SIGTTOU);
sigaddset(&blockset, SIGTSTP);
oldset = signal_block(blockset);
+ {
int loop_count = 0;
while ((ttpgrp = gettygrp()) != -1 && ttpgrp != mypgrp) {
mypgrp = GETPGRP();
@@ -2966,6 +2967,7 @@ acquire_pgrp(void)
}
lastpgrp = mypgrp;
}
+ }
if (mypgrp != mypid) {
if (setpgrp(0, 0) == 0) {
mypgrp = mypid;
--
2.45.2
From 5a1816383a1feab18d82398a8f42e0bc4aef52a5 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 11 Dec 2023 18:27:05 -0700
Subject: remove hd from hexdump completions
diff --git a/Completion/Unix/Command/_hexdump b/Completion/Unix/Command/_hexdump
index f700ca6..6c0e0ba 100644
--- a/Completion/Unix/Command/_hexdump
+++ b/Completion/Unix/Command/_hexdump
@@ -1,4 +1,4 @@
-#compdef hexdump hd
+#compdef hexdump
local -a args fmts optpar
fmts=(
--
2.45.2
From 64030ffdd7ef08a134f590f6dfe778c7b0415c48 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 11 Dec 2023 18:27:51 -0700
Subject: quick fixes for Haiku filesystem layout
diff --git a/Completion/Unix/Type/_domains b/Completion/Unix/Type/_domains
index 851ac79..614e625 100644
--- a/Completion/Unix/Type/_domains
+++ b/Completion/Unix/Type/_domains
@@ -5,11 +5,11 @@ local expl domains tmp
if ! zstyle -a ":completion:${curcontext}:domains" domains domains; then
if (( ! $+_cache_domains )); then
_cache_domains=()
- if [[ -f /etc/resolv.conf ]]; then
+ if [[ -f /boot/system/settings/network/resolv.conf ]]; then
while read tmp; do
[[ "$tmp" = (domain|search)* ]] &&
_cache_domains=( "$_cache_domains[@]" "${=${tmp%%[ ]#}#*[ ]}" )
- done < /etc/resolv.conf
+ done < /boot/system/settings/network/resolv.conf
_cache_domains=( "${(@)_cache_domains:#[ ]#}" )
fi
fi
diff --git a/Completion/Unix/Type/_hosts b/Completion/Unix/Type/_hosts
index 4057fee..4df5155 100644
--- a/Completion/Unix/Type/_hosts
+++ b/Completion/Unix/Type/_hosts
@@ -21,7 +21,7 @@ if ! zstyle -a ":completion:${curcontext}:hosts" hosts _hosts; then
# tested _cache_hosts doesn't exist.
_cache_hosts=(${(s: :)${(ps:\t:)${(f)~~"$(_call_program hosts getent hosts 2>/dev/null)"}##${~ipstrip}}})
else
- _cache_hosts=(${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##${~ipstrip}}})
+ _cache_hosts=(${(s: :)${(ps:\t:)${${(f)~~"$(</boot/system/settings/network/hosts)"}%%\#*}##${~ipstrip}}})
if (( ${+commands[ypcat]} )) &&
tmp=$(_call_program hosts ypcat hosts.byname 2>/dev/null); then
_cache_hosts+=( ${=${(f)tmp}##${~ipstrip}} ) # If you use YP
@@ -37,7 +37,7 @@ if ! zstyle -a ":completion:${curcontext}:hosts" hosts _hosts; then
# discarded. ssh's known_hosts files are thus supported. This style defaults
# to the list /etc/ssh/ssh_known_hosts, ~/.ssh/known_hosts
zstyle -a ":completion:${curcontext}:hosts" known-hosts-files khostfiles ||
- khostfiles=(/etc/ssh/ssh_known_hosts ~/.ssh/known_hosts)
+ khostfiles=(/boot/system/settings/ssh/ssh_known_hosts ~/config/settings/ssh/known_hosts)
for khostfile in $khostfiles; do
if [[ -r $khostfile ]]; then
--
2.45.2
From 0611929d618d2b6f83f88de5a0d23908e8ac3168 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Sun, 3 Nov 2024 06:14:28 -0700
Subject: quick fix for texinfo > 7
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index 5a6a705..1eada22 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -265,7 +265,7 @@ texi2html.conf: $(sdir_top)/Config/version.mk
d=`echo $(VERSION_DATE)`; \
v="<font size=\"-1\">Zsh version $(VERSION), released on $$d.</font>"; \
case '$(TEXI2HTML)' in \
- *texi2any*) echo "set_from_init_file('PRE_BODY_CLOSE','$$v');" ;; \
+ *texi2any*) echo "texinfo_set_from_init_file('PRE_BODY_CLOSE','$$v');" ;; \
*) echo "\$$PRE_BODY_CLOSE = '$$v';" ;; \
esac > $@
--
2.45.2

197
app-shells/zsh/patches/zsh-5.9.patchset Normal file
View File

@@ -0,0 +1,197 @@
From b3a2cfee7f0c370e470733cd370c916fb13df176 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Wed, 18 Sep 2013 03:11:28 -0600
Subject: check for libnetwork
diff --git a/configure.ac b/configure.ac
index c72148d..315afd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -900,7 +900,7 @@ if test x$enable_cap = xyes; then
AC_CHECK_LIB(cap, cap_get_proc)
fi
-AC_CHECK_LIB(socket, socket)
+AC_CHECK_LIB(network, socket)
AC_SEARCH_LIBS(gethostbyname2, bind)
case $LIBS in
--
2.51.0
From 5fb3bf658c01e3854a862d466f116affb85324aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Wed, 11 Jan 2017 18:17:20 +0100
Subject: Haiku rusage fix
diff --git a/Src/jobs.c b/Src/jobs.c
index a91ef78..1940431 100644
--- a/Src/jobs.c
+++ b/Src/jobs.c
@@ -1036,7 +1036,7 @@ should_report_time(Job j)
#endif
}
-#ifdef HAVE_GETRUSAGE
+#if defined(HAVE_GETRUSAGE) && !defined(__HAIKU__)
if (reportmemory >= 0 &&
j->procs->ti.ru_maxrss / 1024 > reportmemory)
return 1;
--
2.51.0
From f2cf8fa6e0e7d304a4330d6ce92aa2a7f6c237eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Thu, 17 Aug 2017 16:16:21 +0200
Subject: Enable dynamic modules on Haiku
diff --git a/configure.ac b/configure.ac
index 315afd9..558678b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -894,6 +894,7 @@ fi
if test "x$dynamic" = xyes; then
AC_CHECK_LIB(dl, dlopen)
+ AC_CHECK_LIB(root, dlopen)
fi
if test x$enable_cap = xyes; then
@@ -2847,7 +2848,8 @@ char *argv[];
aix*) DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
darwin*) DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
- beos*|haiku*) DLLDFLAGS="${DLLDFLAGS=-nostart}" ;;
+ beos*) DLLDFLAGS="${DLLDFLAGS=-nostart}" ;;
+ haiku*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
openbsd*)
if test x$zsh_cv_sys_elf = xyes; then
DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}"
--
2.51.0
From 2bfd0565b7da4db0a1d6b430126911a069bbe1c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 27 Oct 2018 10:36:50 +0200
Subject: Some other function resides in libroot
diff --git a/configure.ac b/configure.ac
index 558678b..95a4fd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -745,10 +745,12 @@ dnl and might not be compiled into the zsh executable.
dnl On ReliantUNIX -lc better be the last library, else funny things
dnl may happen.
AC_CHECK_LIB(c, printf, [LIBS="$LIBS -lc"])
+AC_CHECK_LIB(root, printf)
AC_CHECK_LIB(m, pow)
AC_CHECK_LIB(rt, clock_gettime)
+AC_CHECK_LIB(root, clock_gettime)
dnl Various features of ncurses depend on having the right header
dnl (the system's own curses.h may well not be good enough).
--
2.51.0
From 40430e9f75dc9086e80c1269ddc3cfc61a9fee31 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 11 Dec 2023 18:27:05 -0700
Subject: remove hd from hexdump completions
diff --git a/Completion/Unix/Command/_hexdump b/Completion/Unix/Command/_hexdump
index f700ca6..6c0e0ba 100644
--- a/Completion/Unix/Command/_hexdump
+++ b/Completion/Unix/Command/_hexdump
@@ -1,4 +1,4 @@
-#compdef hexdump hd
+#compdef hexdump
local -a args fmts optpar
fmts=(
--
2.51.0
From b03e4bce5561135b289ba5ec7cd75de2f257a1da Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 11 Dec 2023 18:27:51 -0700
Subject: quick fixes for Haiku filesystem layout
diff --git a/Completion/Unix/Type/_domains b/Completion/Unix/Type/_domains
index 851ac79..614e625 100644
--- a/Completion/Unix/Type/_domains
+++ b/Completion/Unix/Type/_domains
@@ -5,11 +5,11 @@ local expl domains tmp
if ! zstyle -a ":completion:${curcontext}:domains" domains domains; then
if (( ! $+_cache_domains )); then
_cache_domains=()
- if [[ -f /etc/resolv.conf ]]; then
+ if [[ -f /boot/system/settings/network/resolv.conf ]]; then
while read tmp; do
[[ "$tmp" = (domain|search)* ]] &&
_cache_domains=( "$_cache_domains[@]" "${=${tmp%%[ ]#}#*[ ]}" )
- done < /etc/resolv.conf
+ done < /boot/system/settings/network/resolv.conf
_cache_domains=( "${(@)_cache_domains:#[ ]#}" )
fi
fi
diff --git a/Completion/Unix/Type/_hosts b/Completion/Unix/Type/_hosts
index 4057fee..4df5155 100644
--- a/Completion/Unix/Type/_hosts
+++ b/Completion/Unix/Type/_hosts
@@ -21,7 +21,7 @@ if ! zstyle -a ":completion:${curcontext}:hosts" hosts _hosts; then
# tested _cache_hosts doesn't exist.
_cache_hosts=(${(s: :)${(ps:\t:)${(f)~~"$(_call_program hosts getent hosts 2>/dev/null)"}##${~ipstrip}}})
else
- _cache_hosts=(${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##${~ipstrip}}})
+ _cache_hosts=(${(s: :)${(ps:\t:)${${(f)~~"$(</boot/system/settings/network/hosts)"}%%\#*}##${~ipstrip}}})
if (( ${+commands[ypcat]} )) &&
tmp=$(_call_program hosts ypcat hosts.byname 2>/dev/null); then
_cache_hosts+=( ${=${(f)tmp}##${~ipstrip}} ) # If you use YP
@@ -37,7 +37,7 @@ if ! zstyle -a ":completion:${curcontext}:hosts" hosts _hosts; then
# discarded. ssh's known_hosts files are thus supported. This style defaults
# to the list /etc/ssh/ssh_known_hosts, ~/.ssh/known_hosts
zstyle -a ":completion:${curcontext}:hosts" known-hosts-files khostfiles ||
- khostfiles=(/etc/ssh/ssh_known_hosts ~/.ssh/known_hosts)
+ khostfiles=(/boot/system/settings/ssh/ssh_known_hosts ~/config/settings/ssh/known_hosts)
for khostfile in $khostfiles; do
if [[ -r $khostfile ]]; then
--
2.51.0
From 9c2dd778cffedd2e1a472b519b4fd5fce2e646c6 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Sun, 3 Nov 2024 06:14:28 -0700
Subject: quick fix for texinfo > 7
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index 23e5fc7..ec5dbcb 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -266,7 +266,7 @@ texi2html.conf: $(sdir_top)/Config/version.mk
d=`echo $(VERSION_DATE)`; \
v="<font size=\"-1\">Zsh version $(VERSION), released on $$d.</font>"; \
case '$(TEXI2HTML)' in \
- *texi2any*) echo "set_from_init_file('PRE_BODY_CLOSE','$$v');" ;; \
+ *texi2any*) echo "texinfo_set_from_init_file('PRE_BODY_CLOSE','$$v');" ;; \
*) echo "\$$PRE_BODY_CLOSE = '$$v';" ;; \
esac > $@
--
2.51.0

6
app-shells/zsh/zsh-5.8.1.recipe → app-shells/zsh/zsh-5.9.recipe
View File

@@ -7,11 +7,11 @@ HOMEPAGE="https://www.zsh.org/"
COPYRIGHT="1992-2020 The Zsh Development Group" COPYRIGHT="1992-2020 The Zsh Development Group"
LICENSE="ZSH LICENSE="ZSH
GNU GPL v2" GNU GPL v2"
REVISION="8" REVISION="1"
SOURCE_URI="https://downloads.sf.net/zsh/zsh-$portVersion.tar.xz" SOURCE_URI="https://downloads.sf.net/zsh/zsh-$portVersion.tar.xz"
CHECKSUM_SHA256="b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919" CHECKSUM_SHA256="9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5"
SOURCE_URI_2="https://downloads.sf.net/zsh/zsh-$portVersion-doc.tar.xz" SOURCE_URI_2="https://downloads.sf.net/zsh/zsh-$portVersion-doc.tar.xz"
CHECKSUM_SHA256_2="8b9cb53d6432f13e9767a8680b642e8e8a52c7f1b8decd211756ca20c667f917" CHECKSUM_SHA256_2="6f7c091249575e68c177c5e8d5c3e9705660d0d3ca1647aea365fd00a0bd3e8a"
PATCHES="zsh-$portVersion.patchset" PATCHES="zsh-$portVersion.patchset"
ADDITIONAL_FILES=" ADDITIONAL_FILES="
zprofile zprofile