aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoromni <omni+alpine@hack.org>2022-05-15 22:14:40 +0000
committerJakub Jirutka <jakub@jirutka.cz>2022-07-03 01:58:51 +0200
commit5e45686dd4e544d3a6b163b0eedc6af355e25811 (patch)
tree82ef3abccfa148ebd59eb30506da5362c71584a4
parent2c37f50c499f0ffc81f9ee6489b223153af538f6 (diff)
downloadaports-5e45686dd4e544d3a6b163b0eedc6af355e25811.tar.gz
aports-5e45686dd4e544d3a6b163b0eedc6af355e25811.tar.bz2
aports-5e45686dd4e544d3a6b163b0eedc6af355e25811.tar.xz
main/zsh: upgrade to 5.9
Co-Authored-By: Jakub Jirutka <jakub@jirutka.cz>
-rw-r--r--main/zsh/APKBUILD12
-rw-r--r--main/zsh/skip-test-failing-on-musl.patch25
2 files changed, 32 insertions, 5 deletions
diff --git a/main/zsh/APKBUILD b/main/zsh/APKBUILD
index e376cf9eb4..83a52e9f7a 100644
--- a/main/zsh/APKBUILD
+++ b/main/zsh/APKBUILD
@@ -12,8 +12,8 @@
# - CVE-2018-1071
#
pkgname=zsh
-pkgver=5.8.1
-pkgrel=4
+pkgver=5.9
+pkgrel=0
pkgdesc="Very advanced and programmable command interpreter (shell)"
url="https://www.zsh.org/"
arch="all"
@@ -36,7 +36,8 @@ subpackages="
$pkgname-vcs::noarch
$pkgname-zftp
"
-source="https://download.sourceforge.net/project/zsh/zsh/$pkgver/zsh-$pkgver.tar.xz
+source="https://sourceforge.net/projects/zsh/files/zsh/$pkgver/zsh-$pkgver.tar.xz
+ skip-test-failing-on-musl.patch
zsh-newuser-install-alpine.patch
zprofile
zshenv
@@ -61,7 +62,7 @@ _comps="android-tools::Unix/_adb
rsync::Unix/_rsync
subversion::Unix/_subversion
tmux::Unix/_tmux
- zfs::Unix/_zfs*:Unix/_zpool
+ zfs::Unix/_zfs*
"
for _i in $_comps; do
subpackages="$subpackages ${_i%%:*}-zsh-completion:_completion:noarch"
@@ -201,7 +202,8 @@ _completion() {
}
sha512sums="
-f54a5a47ed15d134902613f6169c985680afc45a67538505e11b66b348fcb367145e9b8ae2d9eac185e07ef5f97254b85df01ba97294002a8c036fd02ed5e76d zsh-5.8.1.tar.xz
+d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e zsh-5.9.tar.xz
+4fb6bf20f27ff4b36c5519dc0f7ac43b0cbf299ab0525c0f49920ed848166367207a58160eaa8d573e7ed0373540bde7a5363386e41a36945deba016a255a61d skip-test-failing-on-musl.patch
3be36a30af2c33c5d4d0412acd30fbb52fbaad49c692f12ab1a9c57d87cee62ad0b4737127585e2dc5824b98428ff097977f610a4d1fa3d83c9370b7cf2956f7 zsh-newuser-install-alpine.patch
66a6bdf8d915c818a2c31c35c90c2a19f91d15e2d8547d050e980ef63080f27033ef1f59da5befb30dbf46050ce907690a680e48db11711d40930420f7ec1c2b zprofile
e1c40649c940b91fb6dbcf9e7878e3c96d3729c8eee7b97cfe007d14d19add500863cef588ea4818ab83921fef9f9b4384c2003b26e9d753a8d59e9aca837d43 zshenv
diff --git a/main/zsh/skip-test-failing-on-musl.patch b/main/zsh/skip-test-failing-on-musl.patch
new file mode 100644
index 0000000000..ba04ce214b
--- /dev/null
+++ b/main/zsh/skip-test-failing-on-musl.patch
@@ -0,0 +1,25 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 03 Jul 2022 01:52:19 +0200
+Subject: Skip test case in E02xtrace failing on musl
+
+--- a/Test/E02xtrace.ztst
++++ b/Test/E02xtrace.ztst
+@@ -150,7 +150,6 @@
+ test_cases=(
+ f # baseline
+ foo-bar # Dash
+- ヌ # Meta (the UTF-8 representation of this character has an 0x83 byte)
+ \$\'ba\\0z\' # Nul, escaped as though by ${(qqqq)}
+ )
+ for 1 in "$test_cases[@]"; do
+@@ -172,10 +171,6 @@
+ > # traced
+ > echo inner
+ >}
+->$'\M-c\M-\C-C\M-\C-L' () {
+-> # traced
+-> echo inner
+->}
+ >$'ba\C-@z' () {
+ > # traced
+ > echo inner