* update zsh to 5.9-4

This commit is contained in:
Alexander Baldeck 2023-07-24 19:45:33 +02:00
parent 6ce1fb8ee6
commit 071eb3c380
5 changed files with 184 additions and 2 deletions

View File

@ -1,22 +1,23 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=zsh
pkgname=('zsh' 'zsh-doc')
pkgver=5.9
pkgrel=3
pkgrel=4
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
url='https://www.zsh.org/'
license=('custom')
makedepends=('pcre' 'libcap' 'gdbm' 'yodl')
source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc}
'0001-50629-do-not-use-egrep-in-tests.patch'
'fix-autocompletion.patch'
'zprofile')
sha512sums=('d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e'
'SKIP'
'5cc6abcdcfb4f5ad7bc4a31364ca49dfd87ae03e0082d89cc2ba1f00570f6757266ee60894ad31b562408de91494c22f177b414b03cb78c31d92328686be9860'
'SKIP'
'af6a905e83807efb614a585ac1876e0a9cc8b745911b43915b06aab46757a6df6dfc64a7a60b53cc7e62e528c04aa7460e660a1de6720476030dd746af76c6e3'
'fa01836f40602e158fa5e802e8f2548af751c806c87a54e1761196497b2c35a68c6f8a195a5aac22c3c27e59b80b2f50bf590f124afe3ed4a9289b00033aff1f'
'b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034')
validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3'
'E96646BE08C0AF0AA0F90788A5FEEE3AC7937444'
@ -28,6 +29,10 @@ prepare() {
# 50629: do not use egrep in tests
patch -Np1 < ../0001-50629-do-not-use-egrep-in-tests.patch
# https://github.com/zsh-users/zsh/commit/3e3cfabcc74dc79d4d8717c4e5859d8d01be6c54
# https://www.zsh.org/mla/workers/2022/msg00652.html
patch -Np1 < ../fix-autocompletion.patch
# Set correct keymap path
sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys

View File

@ -0,0 +1,37 @@
From 3e3cfabcc74dc79d4d8717c4e5859d8d01be6c54 Mon Sep 17 00:00:00 2001
From: Bart Schaefer <schaefer@zsh.org>
Date: Fri, 3 Jun 2022 20:08:15 -0700
Subject: [PATCH] 50325: revert 38150 and fix in calling function
cfp_matcher_range() instead
---
Src/Zle/compmatch.c | 2 +-
Src/Zle/computil.c | 2 +-
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c
index bb8359f1d1..56e5509a45 100644
--- a/Src/Zle/compmatch.c
+++ b/Src/Zle/compmatch.c
@@ -1319,7 +1319,7 @@ pattern_match_equivalence(Cpattern lp, convchar_t wind, int wmtp,
convchar_t lchr;
int lmtp;
- if (!PATMATCHINDEX(lp->u.str, wind, &lchr, &lmtp)) {
+ if (!PATMATCHINDEX(lp->u.str, wind-1, &lchr, &lmtp)) {
/*
* No equivalent. No possible match; give up.
*/
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
index 59abb4cc40..77ccdebf7e 100644
--- a/Src/Zle/computil.c
+++ b/Src/Zle/computil.c
@@ -4383,7 +4383,7 @@ cfp_matcher_range(Cmatcher *ms, char *add)
* word pattern.
*/
if ((ind = pattern_match_equivalence
- (m->word, ind, mt, addc)) != CHR_INVALID) {
+ (m->word, ind+1, mt, addc)) != CHR_INVALID) {
if (ret) {
if (imeta(ind)) {
*p++ = Meta;

View File

@ -0,0 +1,30 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQENBFwswugBCADdkzua9HwC8Ip5zh7Z0/nJGKbMyq+cobXArhHos40taeidn0+v
HRES5y6PHR+h56c9TpmJEp/bLCHP5pLvcSz/ETz7+Kk82pld63pOHejSxAQCu7Wv
1NwrTu6TyKlZsNG1oZBxx2LkEN6k8Wy+88DlQqZoXOXafmhF+Sms6gv9DXa029sv
B07EehAx02T+b02QwVVG/Pq9austmsTd9EcNcVNRDneD2LcdxCllbS5IamjVa+NW
oeKZVqbsO71uUolwBvshFSBLPsSY8EZdGApjazQcY0lgkaRA/QlMOisyq2mjV6FY
JXHrlI3WWWK2vROjb35AHiHEE/EVgb5RVpxxABEBAAG0E2RhbmEgPGRhbmFAZGFu
YS5pcz6JAU4EEwEIADgWIQR8p+yq8GIWuQ+JQUas+BRsroy7xAUCXCzC6AIbAwUL
CQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCs+BRsroy7xA5XB/93EQqzs0as07U+
gmPDpvE7JwIY4TrcvAS7RHgJ4sE+arR5uTziHixiHBQQMedbfV51Jxgws6WL0Ko8
7K8h9sN2UGnXIc1lWuQ2FDshrcpSHZvLxL4Z7WC3Rj/Dq3/nuZZyljWQNHxg4BlO
EJqe67F5kT2OI591oxB6L1E6F8sVsgxD7gBCPVl/8CsyZ7wkyW/gMRqrlYolJhpS
B5C1zKJzvULQJKXDCh9DUyi7cKFtPyYfYtRWfWhKGz5Dhtt9qvBlxJzZufZ9QNQt
oPhNGF34QaLWTCLRbtoVbNq2NlxalZ5Byhg/0pBcQc2w4C70jSxF3c+2oMEGQIbc
5GJFgLpZuQENBFwswugBCAD5rIYdlLWHOMw+stWTRNquu3SZr+v7RRzreV9fOKN+
lUiqwicU2uCX39s/q+2wtF536r+IS/53DrMAW8sxf8eroK+MBnJYtP3U8BnB3mag
bTJXMjng2ZqZXvxzetXLyXR+38f+6WbJtV0ByDeFQQJYsFxOag3r6etxrzpwRFm0
PL440fc0nxOxhxWWJcR0RKTMX87ymipi9mETYeZi7h9B3cDw8aIUz2O3s45TtNlA
NI1MNMU4sAsc5i+w0zJON9gT+rWDYFj6BiEqnRoSK2XDm+WaJa3FwgW1WnHPTe+E
RJFGT58DICU3ta6cCQPavZz/KALyj8GBJ+PydelIAv2rABEBAAGJATYEGAEIACAW
IQR8p+yq8GIWuQ+JQUas+BRsroy7xAUCXCzC6AIbDAAKCRCs+BRsroy7xOgxB/40
sp9xFq8L/59yRTeXSskOsGk3aUlSnACofcRCGgDSXV5GwWJ/G0O8krhHOISJKuxc
vA0wLFq0WB/EafrKAPTSkrnxmq8noT3c8MpnFRSXHq3sOXkB4nqVEmUu/AAA0TbC
HcwhFQExvK7O+funxIGU5vqHFeQGJ0VcgC/KZUEMNtVV8aZGvn7JzSxEIwHVXGLu
5H7TnNWzLzkzIDVY9IJpTutsc6RMvv6BV8ooWBHSgzmh0MTqEjwNarHAMuffrAjE
zIO3qi0YCaxSDVf2jrWyYpB2QntplmUoubB9s/ngCqVb4A3B7JxPmJuL/0XMUThn
WZLWFpbLimyoUCfHoehZ
=dR/Y
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -0,0 +1,81 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQGNBFG3TRkBDADMoFASLIMP9faxKf/R/rOrZKbBT7ExMXQT9cVjlQLBcjOtb3uv
63NNTbj/fBDoHbgAal4jOrKYQVPa0LDyT7K9mgj+WBhNZObPeDbmbUwCsrwC6y46
CJokUc0JwtL0Qm1d8dvMgZ6TzO2J/ZRBAB+Bv+W5pVkV+3BifS8mhHLrwWaJD6s3
Axxl9PPACG1NB5mlItUci7BK+JTI2Bw7whe+gtyuCn/aat4ny6NYgc74PtLz0uS/
hG+4hFMKvZrPsflEY/H14GK1AutW8DFSjW6A+etnV9OBUemGz+0WoFOjE+AGHbuY
FQZYUcj/WZSVcxyK0GJbTa3/KbcOwqLd+xdIWLBybSboP0TAUelyok+1PLORlZnd
dwvE9cp1hEcEJj/hlmugR7aseG0Fb0txU9x3OnwYaiWbsjk7oLVynlcQGzGe58ID
SfdsA2ywhkuQO6q397QzNDPRnP92g++HZRm+bGl3U0ffk8Asqef5TLMZvURRMy//
8OQFjeMWaYCXlf0AEQEAAbQjRGFuaWVsIFNoYWhhZiA8ZGFuaWVsc2hAYXBhY2hl
Lm9yZz6JAb0EEwEKACcCGwMCHgECF4AFCwkIBwMFFQoJCAsFFgIDAQAFAmHqaY8F
CRPZ0/EACgkQpf7uOseTdESIUAv/TRYV7HRx68Lw82NuNF+Nlt2U+yAYpUEl1Uok
xGcqWjINSjS0onA226Yc0BpTQVjZzNDc7s7RJiKgN2BDFyOgqBhDy7lfSDnWj0hY
XQb4NukqbxGBnxZcOS8/2Y5Qt1hTxXhFBiKg2b2cQx7RR7wjksBsfLSHDEydiyNf
3+fiGjYd8ex42t6HG7uOPkHPoO3BgwNwdOEDvPHdzh/O4FMC8hR5pIaNMQ9aCs0Y
DYnzNlu8yH93MWeTr4aioOy71pzVIIac7XWQhuAjOFCv4K9yoP8oE7Hd49o6c2b6
2DJqQxW3NauLYU39DyIwGxVJmOv4x3h97ckhxln4w/rOLQaD6TX66sAmfYUmm1Hg
DFHz48+CJNQHKMvr9WDoKHGKzMB5YATZoZtXlgEwoq+xjtiV82ArrKiepGpuQoSW
quf8agxOvCfixxewaBSId5P1hAVcwackBBeACSeGHdy8J1NUKHtxu15PqE0bQgaP
Ms/E8pxtb/F+tdopPnakaSGLOam/tCZEYW5pZWwgU2hhaGFmIDxkLnNAZGFuaWVs
LnNoYWhhZi5uYW1lPokBvQQTAQoAJwIbAwIeAQIXgAULCQgHAwUVCgkICwUWAgMB
AAUCYeppigUJE9nT8QAKCRCl/u46x5N0RC52C/4lK5hBbzR/KaDnnVk1t8VG27kK
7mhnliys/pw+e1/bKeOvM4jdnTjQOsI+aUTY8WkYkGDKoDAsdhYtAaVok9SfLsjh
C7+4k++MZakzZ/6iecpYjHYFBmfP6RwvCU9V8zykbXPbRXn+PskycQ8WaWZ3TUOG
eZra5xaycuTUbA+JHVZpbC9r+KDCTuwpJYbLqI+fljVFF/YS1xmmnbj+l6R+vAqK
M5WlbjtbRls0A+RXYD0b13lvtiQNtGzrF5/i5gQIN2LwtPFoebbTeRQ9gZ51wVX4
SbWpifVJ3if8mXGzvpFDX4edkke1YPvr11lcluUKpP53c/O05QKuCIrzUIopezGG
ZmMw0FrqZ97m7hqnUFX7IxXt8dnEg0mwy/bMoMBwEejmx1HhNmGkHNgsDWvw9bN4
PEimj0GZZht3CO18iY6VeDh8vwFa4afd9S+myqJr426T+dgb5sGEV209xZU/B+iB
2bxIa2i8qR5uhOa9a5bRGNrU0DbjaUX4WaJ8JIO5AgUEWVN+mwEPwLW8GGMIZJhN
XFOJFZMQ0ZSCaoNZtSpTZNeS+rfffXD3QWv9Lgm36/RRDmn0vRYD09p0qVYXcyOl
5221sFg99eXrwH/SGI2dfw+SA/f8jil5fr/bcCRInyZcFOy/5ifMJzQYWqbVBp/p
mzFBYelKg1ggtMf5D7unh0luWnN/nXD5R9DrSIDXI7hai/cUdmxauSvZPVqSft1U
y9Wuu9IcJYb3RUdcYHZZCQGSEI3cGFpIxRWX0rz5dLHgjis4LUV7Mi0weAF9bhDI
PUdWwX51nSxWKmrPBsBsnSMWhfVrcBUS0Bbvh0HYpIR3lSwAn9lQlXkre+Z9q51a
ht/yzr9gR1EijDjOmGmJ/9SvEv4j35EAYXY+ljebcakk/ewScv3JeWqnQpuv7FW7
P97A9ZYlHpckmEwKjyjeVc8WH6xWZzR91veVx6I4nQC7qXJI/j9pnkeS5FkBolos
CV6nafl4vA+U0RbNaz4L1K11Y2/SmG5G6Z8M2upnA95q3J1+sLA8LHF7rY/OltN+
e+9D1tUMDquxbhXJM1U0ayS4blYCXDQZESZ5W0hbltfzrjBCu4B6HKH0kW4zUmtL
gWUGK0eM31bHzR5UipHKojNWqZhVyVSEYcCUrEaRuyHnrgXNLEpNqrzDNk1paIsr
eZ0metcaXktFuwGtJMJpmwARAQABiQO8BBgBAgAPAhsCBQJh6mmvBQkMPaKUAiHB
VSAEGQECAAYFAllTfpsACgkQ2yfpl0Ka8gxx2A++Jb0YPj5Nrf7SdI7JjIWYVgRP
4yMpVKEvfE6+kexrWn06mK4oqSgDH2jwKpZ088Uxkn3lBEd5MtCuC3bK1DcvR7nh
DHiCiJgoaYOVyrvTWpTC8/Kzz+MDcjBL16XYYEFykgTGsgb4j2HqoN/shcCSZECP
Ej8qAaAQ5QNyzkcVFuUr79sRoeNToGc+8r6AHvLS/HVkIKWhbTM8Zv0CawdT3Hc1
92smCtVZyGMUDi0aWVBtczObdo46AUNnSoMr0fHRryWsY+SwFbt+gmuJ+FPMxws7
XgFI9O/+KcCXw2lJbotGmi5frqcmHLkpeUoL+fnkuKIpT37qVXdtrwpwNLOC3+bL
e0PubIkGHkc6/x+9eFJ+bFwUshlrbZ5B8Yl4ie7zoT1jQwfNgn6172oJo0LRVrLh
V2awLQyg4AtpwTPcYG8sjIPTpxZCNvgBFeyPpg9b9ynynNqTF6sAD6AUOa7sn5GA
f4ENUNG7RSTneAKycLFoAhZVTmUsDLz9pGkbfNQ+cTBkVPeAKQuRX/acqVqQ+6lo
zbBv0i0i8DifBiKqTpIAk8rCHml2o27dxEPTREt8VLw6kTMwKLepZ2tNde+1y61m
fIEl5hpLk5GHJH883M2QuM1Cs7hDGlAZG8pMUs/x3bdgyheOiAJmtbXIertKGN1A
BnIAtGYxCRCl/u46x5N0RCpeDACDYNNK08T5Tyr6AyxRpUAvgZYVzNn1ygcvg6hi
0cNe2ODyOnu+YkIjQDbmMi0F2ceycJ+n2Z/BumwBaP4g2s1zXXO4WGIdO+DBGPKA
CKSuybSBxU7tmru891BSAuFJFAX8H0rgfQu3z99i+LHaQ07lrNBIgtVJW2xbRuSD
vZ7awDFzm/o55C5AiJeRiCo3L6/enD+KwOTWBJgzbXYmCcszq1oixuBbYDF6qa94
fxzQC1qwqv/LC1qQdMt3mkU6jmhK0YxHv6x7RQ6PZo6/Yd8nSfpdbrNB1VD5z+/N
q+S79WIGk4HGd+xiifVqmE2riAVqwE1wgjyLejCtA6UP/qD0/Yx23l8zbWenUyOx
HQ2ccjM8lJ2V1GAaC75RyMO+F6ZV0eSBFq5RSTCCEj7Q+s+nuVm9FV253jw3PjnM
bLQkXIVD4DbVn9XFj3ssqr931YA44K/rv/aXb/67mfZGdflm9m+X7EEndZea4CM1
GZmcOlx2/SMGK0b+B1h0pda8OXu5AY0EUbdNGQEMALfmHEa2y0mOHGTvk9We/JG/
sLVKbcmHbFE4zDWvkahRIIp7xllyYt7fcR2Q9iHcIxVlJp43k3cfG3YpKVHnU5Rt
yaxbqz19MTIJIGwvwRCxfuEro96h2Ewa/ojDHGWRGhhTCeCAB5pddUcpGvqfazFR
vGx7AqE0T2Mj3LTUtG9WBtd2TeqnboPtcVq4EwQSZ7UBLJ7gsOdR2ThQDkEz5C0k
6VR073G5BG46LVxVsd9MrL1R6GaaNYMbeV0LTyQEg4JKH1HR14HK4wkw08ewKDkp
zQK4CVKXSmM2l+tjwPo8FioX0Nfj2PsFAu4hqZo+NBTJ3c1W7WlSkXZRG6EwDhjr
Q2+6OH9NkQSud7yWOWRrSqunIQRNwswWliXLkne8+sms8dFuaC6bZoBh5dcSOZsN
amBOfGyujaF4C5c5ItGm8lKZ4Ne5jMlp0ZFlItmwIqwGh1JIRBuEnjnHeXb2QeCk
FpJho0xruOddzcQMP7jaV0QrvxlD3kv+Hd7oC1G7yQARAQABiQGlBBgBAgAPAhsM
BQJh6mmhBQkT2dQIAAoJEKX+7jrHk3RE688MAMY44EwyEiCS2gusCCga9/bYXVKO
wDXReunPrwr7cnp0oT2JgbVlhExjzYFnbz1jhLpbERq5XArPlM/zvR31UGXfFcES
xuNy3jG6Me2jhVNIEmCip9SUw/Z1rwA4n3TY5nQ6Q2lkmdR+TkKGRPN21uCo586S
iHprXNOB+o1oJ/ODEO32FTtRMaOTkuzmhDNw6eJlxFgms2AzTwY5w+eR/KJkCGuO
MvOcMrqkKyQE4maRQWIBTf+tJShRI90RE+5ZfZxnhN8SjTUeeN3N5TRMuYays1QC
5O686J/adxobHgaocP5WtuLQoSWpp4o9hBljTMdqqG/9Arg8c1o4ZKgwc0eI4NgP
HoeWsyVOV9B9QMdvDT2qVHShzNgYfyelx/WZoMW9iOIFP3EmRwqr9Q4NY+QbzH4r
MAS9ClOreQkX66wYjqUUSmQhPI9jj+rp5YrNMrqK1b2EQSNbc648fv2c/T8UQ8dX
HhlloHfjgipkOPHtswUb3ahMlMTORhmWu7Hk4g==
=Yr2R
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -0,0 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQENBFZWC4cBCADgb7/oPoCs9SE+/jrzmDT7L+PbYLCygCExxp4mt3CsSzn5xefq
NGU+aBJnvyongcsYrW173GumDjXCG3GBtnmqs3dFeoqnEsSZFMYiQ4ctmWh48P+W
uQVQOWuh0CVS2OCFn37b5F9dy3oF6gJFdqbwOXJSgWMA/+StMGSkslTYFlG/JwZ1
csk9jSwQw/yKDlTiFaqMwIwSXTK5fItSn3F0R+usgMhwRPu8gvK23tmEhnnwgmlR
xfEwJCLqGnvlW74dRkCjY349GAG1IN2felFfHn0ok/Lbx7coKRoEvHaCVbmtPSmX
Ps9axAV97wk37wS1dhEXcjxLb9GIZgptgo7DABEBAAG0LlBldGVyIFN0ZXBoZW5z
b24gPHAudy5zdGVwaGVuc29uQG50bHdvcmxkLmNvbT6JATcEEwEIACEFAlZWC4cC
GwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQpx2anUvbJ7NtaQf/RQ/RLvOG
iI4XJp/C9JIVHfHL7I801uT8V3y/d2+DehFasR9T+6B/Mf5y22NI31i5XBQuK0Wo
Zsi7F3bhNHyeVgO/p5JLBmxohByjL9f7B+k9Tt/DyWh66AVaCoam4ACR8TBOlNkD
p/8U0zzrxE9fQrjjK/PzhpVe97LKScEAu2Zc/qUFp4eTAnlqyosTqvU64+n1PrNC
CtZVYPnL17GCC4+S7yrh34Kllx+fkoHimTL/cUG+6+7sbmpUImpP+pgNEnL1IzBB
ajZRl1581McMGhIH1TBYrEVnIhononoOO7qr1eahUCEhVvanyVTnSeTTVR0VgK4s
joYLwDLM4XidgrkBDQRWVguHAQgA7JTI0botnBMfTAGff4Duoor5m0PuExQFCHcJ
/df5SyUUskycMlGR73+IbcT2D/zBIFDv5ZhCdOdmIW3CHICK+Ws7N5+KSzlzC+Vf
2LMmXuyJLhXeTqXI1ta6bIGjXeh5VA9Jd7B8dRQhCn1OrGbFhwtJSGejTmcWiLJW
+2GV9s44e9MlscMHvAk9QAvqrSUJoAkN3OCdgjcpDNVT8ek3NnjCD4xrBTxCcI1n
KsJeOgNHPkbou9+eHY80amkAkRn2ZSI9n25WjhKAp9QGDNL5wqHLjgHP6WiEwumN
DWPnPd+5FQHQXy1GHgH2BozfT1KZJ012T0Keuk/hnZJ/TVe4gwARAQABiQEfBBgB
CAAJBQJWVguHAhsMAAoJEKcdmp1L2yez1T0H/jitvgACci+5PQG1djYwioQIui4J
1nSg4HxW+4SCpSwlmH2LkKaF3WbjpPTRhYeMZ5zdOvGnjPUZCjGtWkWx0p+Jrpe/
QIC3CNXerX9fpkr0K7+knqkb1RsjHU/YSsYTDDVJpL3BQOZzVocOjPa1YPTfTBU5
tsQdA4RORi15LyAWcEAmR+X3qH2JM5pGP23hhOKnrFSSnfBP6ef1/jjRbfK5yItZ
5DOf6i3WS40zxB67dlBlHZwOQuYA3Sr01hEz4CeAkpV7lQ1gKelm1ZmcFQI6yqcR
PmVjIuxE1A/gTFe6LaAfCGA6/H1H6LLwWQ/rnUi/seMJ6aRkz/05dg7j5+E=
=wOVS
-----END PGP PUBLIC KEY BLOCK-----