* update zsh to 5.9-5.1
This commit is contained in:
parent
effc8faf0f
commit
0c584cf3b5
45
zsh/0005-zsh-5.9-c99.patch
Normal file
45
zsh/0005-zsh-5.9-c99.patch
Normal file
@ -0,0 +1,45 @@
|
||||
https://github.com/zsh-users/zsh/commit/4c89849c98172c951a9def3690e8647dae76308f
|
||||
https://bugs.gentoo.org/919001
|
||||
|
||||
Avoid incompatible pointer types in terminfo global variable checks.
|
||||
Some compilers reject these incompatible pointer types, causing the
|
||||
checks to always fail, when these variables are in fact available.
|
||||
|
||||
Submitted upstream: <https://www.zsh.org/mla/workers/2023/msg01112.html>
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1769,27 +1769,27 @@ if test x$zsh_cv_path_term_header != xnone; then
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(if boolcodes is available)
|
||||
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no])
|
||||
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no])
|
||||
AC_MSG_RESULT($boolcodes)
|
||||
|
||||
AC_MSG_CHECKING(if numcodes is available)
|
||||
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no])
|
||||
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no])
|
||||
AC_MSG_RESULT($numcodes)
|
||||
|
||||
AC_MSG_CHECKING(if strcodes is available)
|
||||
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no])
|
||||
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no])
|
||||
AC_MSG_RESULT($strcodes)
|
||||
|
||||
AC_MSG_CHECKING(if boolnames is available)
|
||||
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no])
|
||||
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no])
|
||||
AC_MSG_RESULT($boolnames)
|
||||
|
||||
AC_MSG_CHECKING(if numnames is available)
|
||||
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no])
|
||||
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no])
|
||||
AC_MSG_RESULT($numnames)
|
||||
|
||||
AC_MSG_CHECKING(if strnames is available)
|
||||
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no])
|
||||
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no])
|
||||
AC_MSG_RESULT($strnames)
|
||||
|
||||
dnl There are apparently defective terminal library headers on some
|
||||
71
zsh/0006-zsh-5.9-relro.patch
Normal file
71
zsh/0006-zsh-5.9-relro.patch
Normal file
@ -0,0 +1,71 @@
|
||||
https://src.fedoraproject.org/rpms/zsh/blob/rawhide/f/0003-zsh-fix-module-loading-problem-with-full-RELRO.patch
|
||||
https://github.com/zsh-users/zsh/commit/a84fdd7c8f77935ecce99ff2b0bdba738821ed79
|
||||
|
||||
From a84fdd7c8f77935ecce99ff2b0bdba738821ed79 Mon Sep 17 00:00:00 2001
|
||||
From: Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
|
||||
Date: Mon, 26 Jun 2023 17:13:04 +0900
|
||||
Subject: [PATCH] 51889: fix module loading problem with full RELRO
|
||||
|
||||
If full RELRO (relocation read-only, one of the security enhancement
|
||||
methods for ELF-based systems) is used when building zsh (as in binary
|
||||
packages of most Linuxes), loading a module (e.g. zsh/zftp) fails unless
|
||||
all the modules it depends on are already loaded. With this patch the
|
||||
necessary modules are automatically loaded.
|
||||
|
||||
Upstream-commit: a84fdd7c8f77935ecce99ff2b0bdba738821ed79
|
||||
Signed-off-by: Lukáš Zaoral <lzaoral@redhat.com>
|
||||
---
|
||||
Src/Modules/zftp.c | 2 +-
|
||||
Src/mkbltnmlst.sh | 24 ++++++++++++++++++++++++
|
||||
2 files changed, 25 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c
|
||||
index 49b3ffa89..47a5e9de9 100644
|
||||
--- a/Src/Modules/zftp.c
|
||||
+++ b/Src/Modules/zftp.c
|
||||
@@ -3172,7 +3172,7 @@ static struct features module_features = {
|
||||
int
|
||||
setup_(UNUSED(Module m))
|
||||
{
|
||||
- return (require_module("zsh/net/tcp", NULL, 0) == 1);
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
diff --git a/Src/mkbltnmlst.sh b/Src/mkbltnmlst.sh
|
||||
index c4611d8b3..067ecdaf9 100644
|
||||
--- a/Src/mkbltnmlst.sh
|
||||
+++ b/Src/mkbltnmlst.sh
|
||||
@@ -76,6 +76,30 @@ for x_mod in $x_mods; do
|
||||
test "x$linked" = xno && echo "#endif"
|
||||
done
|
||||
|
||||
+# if dynamic module 'mod' with load=no has moddeps in its .mdd,
|
||||
+# then output add_dep(mod, dep) for each 'dep' in moddeps.
|
||||
+dyn_mods="`grep ' link=dynamic .* load=no ' $CFMOD | \
|
||||
+ sed -e '/^#/d' -e 's/ .*/ /' -e 's/^name=/ /'`"
|
||||
+
|
||||
+for mod in $dyn_mods; do
|
||||
+ modfile="`grep '^name='$mod' ' $CFMOD | \
|
||||
+ sed -e 's/^.* modfile=//' -e 's/ .*//'`"
|
||||
+ if test "x$modfile" = x; then
|
||||
+ echo >&2 "WARNING: no name for \`$mod' in $CFMOD (ignored)"
|
||||
+ continue
|
||||
+ fi
|
||||
+ unset moddeps
|
||||
+ . $srcdir/../$modfile
|
||||
+ if test -n "$moddeps"; then
|
||||
+ echo '#ifdef DYNAMIC'
|
||||
+ echo "/* non-linked-in known module \`$mod' */"
|
||||
+ for dep in $moddeps; do
|
||||
+ echo " add_dep(\"$mod\", \"$dep\");"
|
||||
+ done
|
||||
+ echo '#endif'
|
||||
+ fi
|
||||
+done
|
||||
+
|
||||
echo
|
||||
done_mods=" "
|
||||
for bin_mod in $bin_mods; do
|
||||
--
|
||||
2.41.0
|
||||
@ -4,7 +4,7 @@
|
||||
pkgbase=zsh
|
||||
pkgname=('zsh' 'zsh-doc')
|
||||
pkgver=5.9
|
||||
pkgrel=5
|
||||
pkgrel=5.1
|
||||
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
||||
url='https://www.zsh.org/'
|
||||
license=('custom')
|
||||
@ -14,6 +14,8 @@ source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc}
|
||||
'0002-fix-autocompletion.patch'
|
||||
'0003-51862-support-texinfo-7-0.patch'
|
||||
'0004-pcre2.patch'
|
||||
'0005-zsh-5.9-c99.patch'
|
||||
'0006-zsh-5.9-relro.patch'
|
||||
'zprofile')
|
||||
sha512sums=('d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e'
|
||||
'SKIP'
|
||||
@ -23,6 +25,8 @@ sha512sums=('d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396
|
||||
'fa01836f40602e158fa5e802e8f2548af751c806c87a54e1761196497b2c35a68c6f8a195a5aac22c3c27e59b80b2f50bf590f124afe3ed4a9289b00033aff1f'
|
||||
'891577e8c3a5beb236a7044a0960a014d8a7149ce5dba7715f07b1e4d2db475f4aab7bb6cfeadaaeffe37fb889836f368467882fba1a5ac23076548185432d51'
|
||||
'2b6fd1d077244023591e7e2995797e90b2cda7f9c8b3978521c0b77ef1c363f175b6ebb48730deb7171c695cba23c9455d71c3ddc5a55da91832274121587af5'
|
||||
'89a472cd0c08869cee82049a26a7b434fc2b67f45e6450e552dac2c17c9df17b406584fa64a4b2ca91ce8a0470c303bce8080e43a37f7c643064db713bfbbf98'
|
||||
'35fdb43f7adf4c579f235beab6c924bc5977c5fef5e9945c86a6b0acef2ae435bbb08ea35bfbe286460c6df5fb26b24b7f8daa8daa288db6a3cad8b1948d329c'
|
||||
'b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034')
|
||||
validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3'
|
||||
'E96646BE08C0AF0AA0F90788A5FEEE3AC7937444'
|
||||
@ -47,6 +51,9 @@ prepare() {
|
||||
# 51877: do not build pcre module if pcre2-config is not found
|
||||
patch -Np1 < ../0004-pcre2.patch
|
||||
|
||||
patch -Np1 < ../0005-zsh-5.9-c99.patch
|
||||
patch -Np1 < ../0006-zsh-5.9-relro.patch
|
||||
|
||||
# Set correct keymap path
|
||||
sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user