diff options
Diffstat (limited to 'system/zsh')
| -rw-r--r-- | system/zsh/APKBUILD | 16 | ||||
| -rw-r--r-- | system/zsh/datetime-test-fix.patch | 14 | ||||
| -rw-r--r-- | system/zsh/fix-deprecated-egrep.patch | 8 |
3 files changed, 27 insertions, 11 deletions
diff --git a/system/zsh/APKBUILD b/system/zsh/APKBUILD index 6ae71a896..f5d0ba889 100644 --- a/system/zsh/APKBUILD +++ b/system/zsh/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=zsh -pkgver=5.8.1 -pkgrel=1 +pkgver=5.9 +pkgrel=0 pkgdesc="A very advanced and programmable command interpreter (shell)" url="https://www.zsh.org/" arch="all" @@ -14,6 +14,7 @@ makedepends_host="ncurses-dev pcre-dev utmps-dev" install="zsh.post-install zsh.post-upgrade zsh.pre-deinstall" # Note the custom fetch() function source="https://www.zsh.org/pub/$pkgname-$pkgver.tar.xz + datetime-test-fix.patch fix-deprecated-egrep.patch skel @@ -51,7 +52,7 @@ _comps="android-tools:Unix/_adb rsync:Unix/_rsync subversion:Unix/_subversion tmux:Unix/_tmux - zfs:Unix/_zfs*:Unix/_zpool" + " for _i in $_comps; do subpackages="$subpackages ${_i%%:*}-zsh-completion:_completion:noarch" done @@ -114,8 +115,8 @@ check() { rm "$builddir"/Test/B03print.ztst # Not guaranteed to work portably (requires atime) rm "$builddir"/Test/C02cond.ztst - # PPC? - rm "$builddir"/Test/V09datetime.ztst + # Breaks with musl locale: https://zsh.org/workers/50246 + rm "$builddir"/Test/E02xtrace.ztst make test } @@ -181,8 +182,9 @@ _submv() { mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/ } -sha512sums="f54a5a47ed15d134902613f6169c985680afc45a67538505e11b66b348fcb367145e9b8ae2d9eac185e07ef5f97254b85df01ba97294002a8c036fd02ed5e76d zsh-5.8.1.tar.xz -fdb5c46637c7e981c0889ea9f3acd450dcd51deab57bbce11c3778c0811a36fe16dfbe06aa997c1eaa4e5c056e99fb747d4a2c93b72b9acad8e590923bfaa4fe fix-deprecated-egrep.patch +sha512sums="d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e zsh-5.9.tar.xz +e1d0f931a7dd12343741226f81532ca402336eaed1d255b434aebbeecdc386dfc7a13e7390c74c40be88e0f5093c3aa0bca7fb5718027daaae9187b33d3f5e34 datetime-test-fix.patch +08bf4c2f14fd04f6844dc3d6d2488bd109e5ea488a5a22a263829ae52264f63a4b3978a7840b4c1e1dd0b9a63e8e7e92303769f0ce4a8d991a9d283cdd8e70c5 fix-deprecated-egrep.patch d820fcf65bb3c52f23e968110b5df1188fc0b64079312f64d22ffe35de3b4f3055d4d629b3b0f97a1bfaddf62dbc80676af31c3a1a79645632082abfc854cf97 skel 63167188e22bf8933eb420a5ba068ab897531b90c8d8b8ec892f26a9180267a971013046a72b810d5b9d3add427cf650df608b0e008cd0789681ed1371b172c3 zprofile 1675e016f97333cad89b587f4292d81b6bc10e27b75482e3e0c3808539c95bd49b907b6579fb98d817f77f2f2384c0df5afa3e2b6f43b6ae9b466925cd9ccffc zshrc" diff --git a/system/zsh/datetime-test-fix.patch b/system/zsh/datetime-test-fix.patch new file mode 100644 index 000000000..3703fb417 --- /dev/null +++ b/system/zsh/datetime-test-fix.patch @@ -0,0 +1,14 @@ +# Ref: https://bugs.gentoo.org/833981 +--- a/Test/V09datetime.ztst ++++ b/Test/V09datetime.ztst +@@ -79,8 +79,8 @@ + >1973^@03^@03 + + # We assume '%@' is not a valid format on any OSs. +-# The result can be '%@' (Linux), '@' (BSDs) or an error (Cygwin). +- [[ $(strftime '%@' 0 2> /dev/null) == (%|)@ || $? != 0 ]] ++# The result can be '%@' (Linux), '\n' (Linux with musl libc) '@', (BSDs) or an error (Cygwin). ++ [[ $(strftime '%@' 0 2> /dev/null) == (%|)@ || $? != 0 || $'\n' ]] + 0:bad format specifier + + # This test may fail at 23:59:59.xxx on New Year's Eve :/ diff --git a/system/zsh/fix-deprecated-egrep.patch b/system/zsh/fix-deprecated-egrep.patch index 58d141002..c5ec96f7b 100644 --- a/system/zsh/fix-deprecated-egrep.patch +++ b/system/zsh/fix-deprecated-egrep.patch @@ -25,7 +25,7 @@ diff -ur a/Test/D07multibyte.ztst b/Test/D07multibyte.ztst diff -ur a/Test/E01options.ztst b/Test/E01options.ztst --- a/Test/E01options.ztst 2023-04-06 03:22:25.019387496 +0000 +++ b/Test/E01options.ztst 2023-04-06 03:22:45.338578392 +0000 -@@ -649,7 +649,7 @@ +@@ -651,7 +651,7 @@ >noktarg1 >0 1 @@ -37,7 +37,7 @@ diff -ur a/Test/E01options.ztst b/Test/E01options.ztst diff -ur a/Test/V07pcre.ztst b/Test/V07pcre.ztst --- a/Test/V07pcre.ztst 2023-04-06 03:22:25.019387496 +0000 +++ b/Test/V07pcre.ztst 2023-04-06 03:24:15.802995141 +0000 -@@ -13,7 +13,7 @@ +@@ -12,7 +12,7 @@ unset -m LC_\* mb_ok= langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8 @@ -61,8 +61,8 @@ diff -ur a/Test/X02zlevi.ztst b/Test/X02zlevi.ztst diff -ur a/Test/X03zlebindkey.ztst b/Test/X03zlebindkey.ztst --- a/Test/X03zlebindkey.ztst 2023-04-06 03:22:25.015387655 +0000 +++ b/Test/X03zlebindkey.ztst 2023-04-06 03:24:02.531518995 +0000 -@@ -5,7 +5,7 @@ - %prep +@@ -6,7 +6,7 @@ + unset -m LC_\* ZSH_TEST_LANG= langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8 - $(locale -a 2>/dev/null | egrep 'utf8|UTF-8')) |