* [PR PATCH] Upgrade the Korn shell to the new upstream
@ 2021-02-12 4:49 lev105
2021-02-12 5:18 ` [PR PATCH] [Updated] " lev105
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: lev105 @ 2021-02-12 4:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1893 bytes --]
There is a new pull request by lev105 against master on the void-packages repository
https://github.com/lev105/void-packages master
https://github.com/void-linux/void-packages/pull/28685
Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28685.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-28685.patch --]
[-- Type: text/x-diff, Size: 2721 bytes --]
From 3eaec992d83fc1ea3f37d7d1a347cc228df541ed Mon Sep 17 00:00:00 2001
From: Lev Kujawski <int21h@mailbox.org>
Date: Thu, 11 Feb 2021 21:39:56 -0700
Subject: [PATCH] Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
---
srcpkgs/ksh/template | 48 ++++++++++++++++----------------------------
1 file changed, 17 insertions(+), 31 deletions(-)
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b0..615dbfd6680 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,16 +1,15 @@
# Template file for 'ksh'
pkgname=ksh
-version=2020.0.0
-revision=1
-wrksrc="ast-${version}"
-build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
+version=1.0.0a
+revision=2
+_commit="37a18bab7173427ce045c9a67772cb98eb678cb7"
+wrksrc="${pkgname}-${_commit}"
short_desc="AT&T's Korn shell (ksh93)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
-checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
+distfiles="https://github.com/ksh93/ksh/archive/${_commit}.tar.gz"
+checksum=2ec6700a3c1ef688409a9339acb745e72902717b9e719e7937cdcccaa140e16d
nocross=yes
register_shell="/bin/ksh"
@@ -19,30 +18,17 @@ alternatives="
ksh:ksh.1:/usr/share/man/man1/ksh93.1
"
-build_options="static"
-if [ "$build_option_static" ]; then
- LDFLAGS+=" -static"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
- makedepends+=" musl-fts-devel"
-esac
-
-post_extract() {
- sed -i -e 's/= library/= static_library/' \
- -e 's/install: true/install: false/' src/lib/*/meson.build
- sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
- if [ "$build_option_static" ]; then
- # Drop tests that use .so
- sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
- sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
- fi
+do_build() {
+ ./bin/package make
}
-post_install() {
- mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
- mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
+
+do_install() {
+ ARCH=$(./bin/package)
+ vmkdir usr/bin
+ vmove arch/${ARCH}/bin/ksh usr/bin/ksh93
+ vmkdir usr/share/man/man1
+ vmove arch/${ARCH}/man/man1/sh.1 usr/share/man/man1/ksh93.1
vmkdir usr/share/ksh
- vcopy src/cmd/ksh93/fun usr/share/ksh/functions
- vlicense LICENSE
+ vcopy arch/${ARCH}/fun usr/share/ksh/functions
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Upgrade the Korn shell to the new upstream
2021-02-12 4:49 [PR PATCH] Upgrade the Korn shell to the new upstream lev105
@ 2021-02-12 5:18 ` lev105
2021-02-12 5:24 ` lev105
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: lev105 @ 2021-02-12 5:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1898 bytes --]
There is an updated pull request by lev105 against master on the void-packages repository
https://github.com/lev105/void-packages master
https://github.com/void-linux/void-packages/pull/28685
Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28685.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-28685.patch --]
[-- Type: text/x-diff, Size: 2721 bytes --]
From 5dc6cfce97fe33a0a89b1d3b36074582b056bb54 Mon Sep 17 00:00:00 2001
From: Lev Kujawski <int21h@mailbox.org>
Date: Thu, 11 Feb 2021 21:39:56 -0700
Subject: [PATCH] Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
---
srcpkgs/ksh/template | 48 ++++++++++++++++----------------------------
1 file changed, 17 insertions(+), 31 deletions(-)
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b0..615dbfd6680 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,16 +1,15 @@
# Template file for 'ksh'
pkgname=ksh
-version=2020.0.0
-revision=1
-wrksrc="ast-${version}"
-build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
+version=1.0.0a
+revision=2
+_commit="37a18bab7173427ce045c9a67772cb98eb678cb7"
+wrksrc="${pkgname}-${_commit}"
short_desc="AT&T's Korn shell (ksh93)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
-checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
+distfiles="https://github.com/ksh93/ksh/archive/${_commit}.tar.gz"
+checksum=2ec6700a3c1ef688409a9339acb745e72902717b9e719e7937cdcccaa140e16d
nocross=yes
register_shell="/bin/ksh"
@@ -19,30 +18,17 @@ alternatives="
ksh:ksh.1:/usr/share/man/man1/ksh93.1
"
-build_options="static"
-if [ "$build_option_static" ]; then
- LDFLAGS+=" -static"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
- makedepends+=" musl-fts-devel"
-esac
-
-post_extract() {
- sed -i -e 's/= library/= static_library/' \
- -e 's/install: true/install: false/' src/lib/*/meson.build
- sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
- if [ "$build_option_static" ]; then
- # Drop tests that use .so
- sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
- sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
- fi
+do_build() {
+ ./bin/package make
}
-post_install() {
- mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
- mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
+
+do_install() {
+ ARCH=$(./bin/package)
+ vmkdir usr/bin
+ vmove arch/${ARCH}/bin/ksh usr/bin/ksh93
+ vmkdir usr/share/man/man1
+ vmove arch/${ARCH}/man/man1/sh.1 usr/share/man/man1/ksh93.1
vmkdir usr/share/ksh
- vcopy src/cmd/ksh93/fun usr/share/ksh/functions
- vlicense LICENSE
+ vcopy arch/${ARCH}/fun usr/share/ksh/functions
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Upgrade the Korn shell to the new upstream
2021-02-12 4:49 [PR PATCH] Upgrade the Korn shell to the new upstream lev105
2021-02-12 5:18 ` [PR PATCH] [Updated] " lev105
@ 2021-02-12 5:24 ` lev105
2021-02-12 5:26 ` lev105
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: lev105 @ 2021-02-12 5:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1898 bytes --]
There is an updated pull request by lev105 against master on the void-packages repository
https://github.com/lev105/void-packages master
https://github.com/void-linux/void-packages/pull/28685
Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28685.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-28685.patch --]
[-- Type: text/x-diff, Size: 2721 bytes --]
From f158c83f444e593cbcfa26b5e8c427377128a4eb Mon Sep 17 00:00:00 2001
From: Lev Kujawski <int21h@mailbox.org>
Date: Thu, 11 Feb 2021 21:39:56 -0700
Subject: [PATCH] Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
---
srcpkgs/ksh/template | 48 ++++++++++++++++----------------------------
1 file changed, 17 insertions(+), 31 deletions(-)
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b0..615dbfd6680 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,16 +1,15 @@
# Template file for 'ksh'
pkgname=ksh
-version=2020.0.0
-revision=1
-wrksrc="ast-${version}"
-build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
+version=1.0.0a
+revision=2
+_commit="37a18bab7173427ce045c9a67772cb98eb678cb7"
+wrksrc="${pkgname}-${_commit}"
short_desc="AT&T's Korn shell (ksh93)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
-checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
+distfiles="https://github.com/ksh93/ksh/archive/${_commit}.tar.gz"
+checksum=2ec6700a3c1ef688409a9339acb745e72902717b9e719e7937cdcccaa140e16d
nocross=yes
register_shell="/bin/ksh"
@@ -19,30 +18,17 @@ alternatives="
ksh:ksh.1:/usr/share/man/man1/ksh93.1
"
-build_options="static"
-if [ "$build_option_static" ]; then
- LDFLAGS+=" -static"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
- makedepends+=" musl-fts-devel"
-esac
-
-post_extract() {
- sed -i -e 's/= library/= static_library/' \
- -e 's/install: true/install: false/' src/lib/*/meson.build
- sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
- if [ "$build_option_static" ]; then
- # Drop tests that use .so
- sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
- sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
- fi
+do_build() {
+ ./bin/package make
}
-post_install() {
- mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
- mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
+
+do_install() {
+ ARCH=$(./bin/package)
+ vmkdir usr/bin
+ vmove arch/${ARCH}/bin/ksh usr/bin/ksh93
+ vmkdir usr/share/man/man1
+ vmove arch/${ARCH}/man/man1/sh.1 usr/share/man/man1/ksh93.1
vmkdir usr/share/ksh
- vcopy src/cmd/ksh93/fun usr/share/ksh/functions
- vlicense LICENSE
+ vcopy arch/${ARCH}/fun usr/share/ksh/functions
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Upgrade the Korn shell to the new upstream
2021-02-12 4:49 [PR PATCH] Upgrade the Korn shell to the new upstream lev105
2021-02-12 5:18 ` [PR PATCH] [Updated] " lev105
2021-02-12 5:24 ` lev105
@ 2021-02-12 5:26 ` lev105
2021-02-12 6:19 ` lev105
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: lev105 @ 2021-02-12 5:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1898 bytes --]
There is an updated pull request by lev105 against master on the void-packages repository
https://github.com/lev105/void-packages master
https://github.com/void-linux/void-packages/pull/28685
Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28685.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-28685.patch --]
[-- Type: text/x-diff, Size: 2737 bytes --]
From 0de3441938fab38446970dce28715b5c47b596e3 Mon Sep 17 00:00:00 2001
From: Lev Kujawski <int21h@mailbox.org>
Date: Thu, 11 Feb 2021 21:39:56 -0700
Subject: [PATCH] Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
---
srcpkgs/ksh/template | 48 ++++++++++++++++----------------------------
1 file changed, 17 insertions(+), 31 deletions(-)
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b0..62ce60139ab 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,16 +1,15 @@
# Template file for 'ksh'
pkgname=ksh
-version=2020.0.0
-revision=1
-wrksrc="ast-${version}"
-build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
+version=1.0.0a
+revision=2
+_commit="37a18bab7173427ce045c9a67772cb98eb678cb7"
+wrksrc="${pkgname}-${_commit}"
short_desc="AT&T's Korn shell (ksh93)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
-checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
+distfiles="https://github.com/ksh93/ksh/archive/${_commit}.tar.gz"
+checksum=2ec6700a3c1ef688409a9339acb745e72902717b9e719e7937cdcccaa140e16d
nocross=yes
register_shell="/bin/ksh"
@@ -19,30 +18,17 @@ alternatives="
ksh:ksh.1:/usr/share/man/man1/ksh93.1
"
-build_options="static"
-if [ "$build_option_static" ]; then
- LDFLAGS+=" -static"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
- makedepends+=" musl-fts-devel"
-esac
-
-post_extract() {
- sed -i -e 's/= library/= static_library/' \
- -e 's/install: true/install: false/' src/lib/*/meson.build
- sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
- if [ "$build_option_static" ]; then
- # Drop tests that use .so
- sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
- sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
- fi
+do_build() {
+ ./bin/package make
}
-post_install() {
- mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
- mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
+
+do_install() {
+ ARCH=$(./bin/package)
+ vmkdir usr/bin
+ mv arch/${ARCH}/bin/ksh ${DESTDIR}/usr/bin/ksh93
+ vmkdir usr/share/man/man1
+ mv arch/${ARCH}/man/man1/sh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
vmkdir usr/share/ksh
- vcopy src/cmd/ksh93/fun usr/share/ksh/functions
- vlicense LICENSE
+ vcopy arch/${ARCH}/fun usr/share/ksh/functions
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Upgrade the Korn shell to the new upstream
2021-02-12 4:49 [PR PATCH] Upgrade the Korn shell to the new upstream lev105
` (2 preceding siblings ...)
2021-02-12 5:26 ` lev105
@ 2021-02-12 6:19 ` lev105
2021-02-12 6:39 ` lev105
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: lev105 @ 2021-02-12 6:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1898 bytes --]
There is an updated pull request by lev105 against master on the void-packages repository
https://github.com/lev105/void-packages master
https://github.com/void-linux/void-packages/pull/28685
Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28685.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-28685.patch --]
[-- Type: text/x-diff, Size: 2797 bytes --]
From 31adffa3679ebebb280b1c48f19e851a2842bad0 Mon Sep 17 00:00:00 2001
From: Lev Kujawski <int21h@mailbox.org>
Date: Thu, 11 Feb 2021 21:39:56 -0700
Subject: [PATCH] Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
---
srcpkgs/ksh/template | 51 ++++++++++++++++++--------------------------
1 file changed, 21 insertions(+), 30 deletions(-)
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b0..0232b8454f8 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,16 +1,15 @@
# Template file for 'ksh'
pkgname=ksh
-version=2020.0.0
-revision=1
-wrksrc="ast-${version}"
-build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
+version=1.0.0a
+revision=2
+_commit="37a18bab7173427ce045c9a67772cb98eb678cb7"
+wrksrc="${pkgname}-${_commit}"
short_desc="AT&T's Korn shell (ksh93)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
-checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
+distfiles="https://github.com/ksh93/ksh/archive/${_commit}.tar.gz"
+checksum=2ec6700a3c1ef688409a9339acb745e72902717b9e719e7937cdcccaa140e16d
nocross=yes
register_shell="/bin/ksh"
@@ -19,30 +18,22 @@ alternatives="
ksh:ksh.1:/usr/share/man/man1/ksh93.1
"
-build_options="static"
-if [ "$build_option_static" ]; then
- LDFLAGS+=" -static"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
- makedepends+=" musl-fts-devel"
-esac
+do_build() {
+ ./bin/package make
+}
-post_extract() {
- sed -i -e 's/= library/= static_library/' \
- -e 's/install: true/install: false/' src/lib/*/meson.build
- sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
- if [ "$build_option_static" ]; then
- # Drop tests that use .so
- sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
- sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
- fi
+do_check() {
+ ./bin/shtests
}
-post_install() {
- mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
- mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
+
+do_install() {
+ ARCH=$(./bin/package)
+ vmkdir usr/bin
+ mv arch/${ARCH}/bin/ksh ${DESTDIR}/usr/bin/ksh93
+ vmkdir usr/share/man/man1
+ mv arch/${ARCH}/man/man1/sh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
vmkdir usr/share/ksh
- vcopy src/cmd/ksh93/fun usr/share/ksh/functions
- vlicense LICENSE
+ vcopy arch/${ARCH}/fun usr/share/ksh/functions
+ rmdir ${DESTDIR}/usr/lib
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Upgrade the Korn shell to the new upstream
2021-02-12 4:49 [PR PATCH] Upgrade the Korn shell to the new upstream lev105
` (3 preceding siblings ...)
2021-02-12 6:19 ` lev105
@ 2021-02-12 6:39 ` lev105
2021-02-12 7:54 ` [PR PATCH] [Updated] " lev105
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: lev105 @ 2021-02-12 6:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by lev105 on void-packages repository
https://github.com/void-linux/void-packages/pull/28685#issuecomment-778009497
Comment:
Apparently some tests fail within the build server environment. I'll have a look later.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Upgrade the Korn shell to the new upstream
2021-02-12 4:49 [PR PATCH] Upgrade the Korn shell to the new upstream lev105
` (4 preceding siblings ...)
2021-02-12 6:39 ` lev105
@ 2021-02-12 7:54 ` lev105
2021-02-12 8:15 ` lev105
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: lev105 @ 2021-02-12 7:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1898 bytes --]
There is an updated pull request by lev105 against master on the void-packages repository
https://github.com/lev105/void-packages master
https://github.com/void-linux/void-packages/pull/28685
Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28685.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-28685.patch --]
[-- Type: text/x-diff, Size: 5070 bytes --]
From 59642036750c902c7ef397bbfdf3d963e83924cf Mon Sep 17 00:00:00 2001
From: Lev Kujawski <int21h@mailbox.org>
Date: Thu, 11 Feb 2021 21:39:56 -0700
Subject: [PATCH] Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
---
...s-when-dev-tty-is-missing-such-as-on.patch | 40 +++++++++++++++
srcpkgs/ksh/template | 51 ++++++++-----------
2 files changed, 61 insertions(+), 30 deletions(-)
create mode 100644 srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-missing-such-as-on.patch
diff --git a/srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-missing-such-as-on.patch b/srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-missing-such-as-on.patch
new file mode 100644
index 00000000000..d9c93b2ba89
--- /dev/null
+++ b/srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-missing-such-as-on.patch
@@ -0,0 +1,40 @@
+From d3499959b1b063be02f1c35f60f22181387c894a Mon Sep 17 00:00:00 2001
+From: Lev Kujawski <int21h@mailbox.org>
+Date: Fri, 12 Feb 2021 00:38:47 -0700
+Subject: [PATCH 4/4] Skip comsub tests when /dev/tty is missing, such as on CI
+ servers
+
+src/cmd/ksh93/tests/bracket.sh:
+- Test for the existence of /dev/tty as a character device and skip
+ comsub tests in its absence.
+- Issue a diagnostic if tests are skipped.
+---
+ src/cmd/ksh93/tests/bracket.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/cmd/ksh93/tests/bracket.sh b/src/cmd/ksh93/tests/bracket.sh
+index 02d76d6..5742c20 100755
+--- src/cmd/ksh93/tests/bracket.sh
++++ src/cmd/ksh93/tests/bracket.sh
+@@ -388,6 +388,10 @@ actual=$(echo begin; [ -n X -a -t ] || test -n X -a -t && echo -t is true; echo
+ [[ $actual == "$expect" ]] || err_exit 'test -t in comsub fails (compound expression)' \
+ "(expected $(printf %q "$expect"), got $(printf %q "$actual"))"
+
++if [[ ! -c /dev/tty ]]
++then
++ print -u2 "\t${Command}[$LINENO]: warning: /dev/tty missing: skipping comsub tests"
++else
+ # This is the more complex case that does redirect stdout within the command substitution to the
+ # actual tty. Thus the [ -t 1 ] test should be true.
+ actual=$(echo begin; exec >/dev/tty; [ -t 1 ] && test -t 1 && [[ -t 1 ]]) \
+@@ -399,6 +403,7 @@ actual=$(echo begin; exec >/dev/tty; [ -t ] && test -t) \
+ || err_exit 'test -t in comsub with exec >/dev/tty fails'
+ actual=$(echo begin; exec >/dev/tty; [ -n X -a -t ] && test -n X -a -t) \
+ || err_exit 'test -t in comsub with exec >/dev/tty fails (compound expression)'
++fi
+
+ # The POSIX mode should disable the ancient 'test -t' compatibility hack.
+ if [[ -o ?posix ]]
+--
+2.24.3 (Apple Git-128)
+
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b0..0232b8454f8 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,16 +1,15 @@
# Template file for 'ksh'
pkgname=ksh
-version=2020.0.0
-revision=1
-wrksrc="ast-${version}"
-build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
+version=1.0.0a
+revision=2
+_commit="37a18bab7173427ce045c9a67772cb98eb678cb7"
+wrksrc="${pkgname}-${_commit}"
short_desc="AT&T's Korn shell (ksh93)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
-checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
+distfiles="https://github.com/ksh93/ksh/archive/${_commit}.tar.gz"
+checksum=2ec6700a3c1ef688409a9339acb745e72902717b9e719e7937cdcccaa140e16d
nocross=yes
register_shell="/bin/ksh"
@@ -19,30 +18,22 @@ alternatives="
ksh:ksh.1:/usr/share/man/man1/ksh93.1
"
-build_options="static"
-if [ "$build_option_static" ]; then
- LDFLAGS+=" -static"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
- makedepends+=" musl-fts-devel"
-esac
+do_build() {
+ ./bin/package make
+}
-post_extract() {
- sed -i -e 's/= library/= static_library/' \
- -e 's/install: true/install: false/' src/lib/*/meson.build
- sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
- if [ "$build_option_static" ]; then
- # Drop tests that use .so
- sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
- sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
- fi
+do_check() {
+ ./bin/shtests
}
-post_install() {
- mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
- mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
+
+do_install() {
+ ARCH=$(./bin/package)
+ vmkdir usr/bin
+ mv arch/${ARCH}/bin/ksh ${DESTDIR}/usr/bin/ksh93
+ vmkdir usr/share/man/man1
+ mv arch/${ARCH}/man/man1/sh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
vmkdir usr/share/ksh
- vcopy src/cmd/ksh93/fun usr/share/ksh/functions
- vlicense LICENSE
+ vcopy arch/${ARCH}/fun usr/share/ksh/functions
+ rmdir ${DESTDIR}/usr/lib
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Upgrade the Korn shell to the new upstream
2021-02-12 4:49 [PR PATCH] Upgrade the Korn shell to the new upstream lev105
` (5 preceding siblings ...)
2021-02-12 7:54 ` [PR PATCH] [Updated] " lev105
@ 2021-02-12 8:15 ` lev105
2021-02-12 8:18 ` lev105
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: lev105 @ 2021-02-12 8:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1898 bytes --]
There is an updated pull request by lev105 against master on the void-packages repository
https://github.com/lev105/void-packages master
https://github.com/void-linux/void-packages/pull/28685
Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28685.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-28685.patch --]
[-- Type: text/x-diff, Size: 5104 bytes --]
From d2b09f5207ba7354cacdf0f93e206c7e771de713 Mon Sep 17 00:00:00 2001
From: Lev Kujawski <int21h@mailbox.org>
Date: Thu, 11 Feb 2021 21:39:56 -0700
Subject: [PATCH] Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
---
...s-when-dev-tty-is-broken-such-as-on-.patch | 40 +++++++++++++++
srcpkgs/ksh/template | 51 ++++++++-----------
2 files changed, 61 insertions(+), 30 deletions(-)
create mode 100644 srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-broken-such-as-on-.patch
diff --git a/srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-broken-such-as-on-.patch b/srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-broken-such-as-on-.patch
new file mode 100644
index 00000000000..1927d37429b
--- /dev/null
+++ b/srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-broken-such-as-on-.patch
@@ -0,0 +1,40 @@
+From 8dda3d1d8cd27ed312f4a605d71d0f95fffa3eb5 Mon Sep 17 00:00:00 2001
+From: Lev Kujawski <int21h@mailbox.org>
+Date: Fri, 12 Feb 2021 00:38:47 -0700
+Subject: [PATCH 4/4] Skip comsub tests when /dev/tty is broken, such as on CI
+ servers
+
+src/cmd/ksh93/tests/bracket.sh:
+- Test for the existence of /dev/tty as a writable character device
+ and skip comsub tests in its absence.
+- Issue a diagnostic if tests are skipped.
+---
+ src/cmd/ksh93/tests/bracket.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/cmd/ksh93/tests/bracket.sh b/src/cmd/ksh93/tests/bracket.sh
+index 02d76d6..cb83e52 100755
+--- a/src/cmd/ksh93/tests/bracket.sh
++++ b/src/cmd/ksh93/tests/bracket.sh
+@@ -388,6 +388,10 @@ actual=$(echo begin; [ -n X -a -t ] || test -n X -a -t && echo -t is true; echo
+ [[ $actual == "$expect" ]] || err_exit 'test -t in comsub fails (compound expression)' \
+ "(expected $(printf %q "$expect"), got $(printf %q "$actual"))"
+
++if [[ ! -c /dev/tty ]] || [[ ! -w /dev/tty ]]
++then
++ print -u2 "\t${Command}[$LINENO]: warning: /dev/tty broken: skipping comsub tests"
++else
+ # This is the more complex case that does redirect stdout within the command substitution to the
+ # actual tty. Thus the [ -t 1 ] test should be true.
+ actual=$(echo begin; exec >/dev/tty; [ -t 1 ] && test -t 1 && [[ -t 1 ]]) \
+@@ -399,6 +403,7 @@ actual=$(echo begin; exec >/dev/tty; [ -t ] && test -t) \
+ || err_exit 'test -t in comsub with exec >/dev/tty fails'
+ actual=$(echo begin; exec >/dev/tty; [ -n X -a -t ] && test -n X -a -t) \
+ || err_exit 'test -t in comsub with exec >/dev/tty fails (compound expression)'
++fi
+
+ # The POSIX mode should disable the ancient 'test -t' compatibility hack.
+ if [[ -o ?posix ]]
+--
+2.24.3 (Apple Git-128)
+
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b0..0232b8454f8 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,16 +1,15 @@
# Template file for 'ksh'
pkgname=ksh
-version=2020.0.0
-revision=1
-wrksrc="ast-${version}"
-build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
+version=1.0.0a
+revision=2
+_commit="37a18bab7173427ce045c9a67772cb98eb678cb7"
+wrksrc="${pkgname}-${_commit}"
short_desc="AT&T's Korn shell (ksh93)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
-checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
+distfiles="https://github.com/ksh93/ksh/archive/${_commit}.tar.gz"
+checksum=2ec6700a3c1ef688409a9339acb745e72902717b9e719e7937cdcccaa140e16d
nocross=yes
register_shell="/bin/ksh"
@@ -19,30 +18,22 @@ alternatives="
ksh:ksh.1:/usr/share/man/man1/ksh93.1
"
-build_options="static"
-if [ "$build_option_static" ]; then
- LDFLAGS+=" -static"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
- makedepends+=" musl-fts-devel"
-esac
+do_build() {
+ ./bin/package make
+}
-post_extract() {
- sed -i -e 's/= library/= static_library/' \
- -e 's/install: true/install: false/' src/lib/*/meson.build
- sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
- if [ "$build_option_static" ]; then
- # Drop tests that use .so
- sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
- sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
- fi
+do_check() {
+ ./bin/shtests
}
-post_install() {
- mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
- mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
+
+do_install() {
+ ARCH=$(./bin/package)
+ vmkdir usr/bin
+ mv arch/${ARCH}/bin/ksh ${DESTDIR}/usr/bin/ksh93
+ vmkdir usr/share/man/man1
+ mv arch/${ARCH}/man/man1/sh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
vmkdir usr/share/ksh
- vcopy src/cmd/ksh93/fun usr/share/ksh/functions
- vlicense LICENSE
+ vcopy arch/${ARCH}/fun usr/share/ksh/functions
+ rmdir ${DESTDIR}/usr/lib
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Upgrade the Korn shell to the new upstream
2021-02-12 4:49 [PR PATCH] Upgrade the Korn shell to the new upstream lev105
` (6 preceding siblings ...)
2021-02-12 8:15 ` lev105
@ 2021-02-12 8:18 ` lev105
2021-02-12 9:00 ` lev105
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: lev105 @ 2021-02-12 8:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1898 bytes --]
There is an updated pull request by lev105 against master on the void-packages repository
https://github.com/lev105/void-packages master
https://github.com/void-linux/void-packages/pull/28685
Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28685.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-28685.patch --]
[-- Type: text/x-diff, Size: 5100 bytes --]
From e44ed2d05b461ef395c718bb2e8cdb6e031a7609 Mon Sep 17 00:00:00 2001
From: Lev Kujawski <int21h@mailbox.org>
Date: Thu, 11 Feb 2021 21:39:56 -0700
Subject: [PATCH] Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
---
...s-when-dev-tty-is-broken-such-as-on-.patch | 40 +++++++++++++++
srcpkgs/ksh/template | 51 ++++++++-----------
2 files changed, 61 insertions(+), 30 deletions(-)
create mode 100644 srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-broken-such-as-on-.patch
diff --git a/srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-broken-such-as-on-.patch b/srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-broken-such-as-on-.patch
new file mode 100644
index 00000000000..8349c5579e4
--- /dev/null
+++ b/srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-broken-such-as-on-.patch
@@ -0,0 +1,40 @@
+From 8dda3d1d8cd27ed312f4a605d71d0f95fffa3eb5 Mon Sep 17 00:00:00 2001
+From: Lev Kujawski <int21h@mailbox.org>
+Date: Fri, 12 Feb 2021 00:38:47 -0700
+Subject: [PATCH 4/4] Skip comsub tests when /dev/tty is broken, such as on CI
+ servers
+
+src/cmd/ksh93/tests/bracket.sh:
+- Test for the existence of /dev/tty as a writable character device
+ and skip comsub tests in its absence.
+- Issue a diagnostic if tests are skipped.
+---
+ src/cmd/ksh93/tests/bracket.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/cmd/ksh93/tests/bracket.sh b/src/cmd/ksh93/tests/bracket.sh
+index 02d76d6..cb83e52 100755
+--- src/cmd/ksh93/tests/bracket.sh
++++ src/cmd/ksh93/tests/bracket.sh
+@@ -388,6 +388,10 @@ actual=$(echo begin; [ -n X -a -t ] || test -n X -a -t && echo -t is true; echo
+ [[ $actual == "$expect" ]] || err_exit 'test -t in comsub fails (compound expression)' \
+ "(expected $(printf %q "$expect"), got $(printf %q "$actual"))"
+
++if [[ ! -c /dev/tty ]] || [[ ! -w /dev/tty ]]
++then
++ print -u2 "\t${Command}[$LINENO]: warning: /dev/tty broken: skipping comsub tests"
++else
+ # This is the more complex case that does redirect stdout within the command substitution to the
+ # actual tty. Thus the [ -t 1 ] test should be true.
+ actual=$(echo begin; exec >/dev/tty; [ -t 1 ] && test -t 1 && [[ -t 1 ]]) \
+@@ -399,6 +403,7 @@ actual=$(echo begin; exec >/dev/tty; [ -t ] && test -t) \
+ || err_exit 'test -t in comsub with exec >/dev/tty fails'
+ actual=$(echo begin; exec >/dev/tty; [ -n X -a -t ] && test -n X -a -t) \
+ || err_exit 'test -t in comsub with exec >/dev/tty fails (compound expression)'
++fi
+
+ # The POSIX mode should disable the ancient 'test -t' compatibility hack.
+ if [[ -o ?posix ]]
+--
+2.24.3 (Apple Git-128)
+
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b0..0232b8454f8 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,16 +1,15 @@
# Template file for 'ksh'
pkgname=ksh
-version=2020.0.0
-revision=1
-wrksrc="ast-${version}"
-build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
+version=1.0.0a
+revision=2
+_commit="37a18bab7173427ce045c9a67772cb98eb678cb7"
+wrksrc="${pkgname}-${_commit}"
short_desc="AT&T's Korn shell (ksh93)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
-checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
+distfiles="https://github.com/ksh93/ksh/archive/${_commit}.tar.gz"
+checksum=2ec6700a3c1ef688409a9339acb745e72902717b9e719e7937cdcccaa140e16d
nocross=yes
register_shell="/bin/ksh"
@@ -19,30 +18,22 @@ alternatives="
ksh:ksh.1:/usr/share/man/man1/ksh93.1
"
-build_options="static"
-if [ "$build_option_static" ]; then
- LDFLAGS+=" -static"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
- makedepends+=" musl-fts-devel"
-esac
+do_build() {
+ ./bin/package make
+}
-post_extract() {
- sed -i -e 's/= library/= static_library/' \
- -e 's/install: true/install: false/' src/lib/*/meson.build
- sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
- if [ "$build_option_static" ]; then
- # Drop tests that use .so
- sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
- sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
- fi
+do_check() {
+ ./bin/shtests
}
-post_install() {
- mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
- mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
+
+do_install() {
+ ARCH=$(./bin/package)
+ vmkdir usr/bin
+ mv arch/${ARCH}/bin/ksh ${DESTDIR}/usr/bin/ksh93
+ vmkdir usr/share/man/man1
+ mv arch/${ARCH}/man/man1/sh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
vmkdir usr/share/ksh
- vcopy src/cmd/ksh93/fun usr/share/ksh/functions
- vlicense LICENSE
+ vcopy arch/${ARCH}/fun usr/share/ksh/functions
+ rmdir ${DESTDIR}/usr/lib
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Upgrade the Korn shell to the new upstream
2021-02-12 4:49 [PR PATCH] Upgrade the Korn shell to the new upstream lev105
` (7 preceding siblings ...)
2021-02-12 8:18 ` lev105
@ 2021-02-12 9:00 ` lev105
2021-02-14 3:02 ` lev105
2021-02-14 6:29 ` [PR PATCH] [Closed]: " lev105
10 siblings, 0 replies; 12+ messages in thread
From: lev105 @ 2021-02-12 9:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1898 bytes --]
There is an updated pull request by lev105 against master on the void-packages repository
https://github.com/lev105/void-packages master
https://github.com/void-linux/void-packages/pull/28685
Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28685.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-28685.patch --]
[-- Type: text/x-diff, Size: 5292 bytes --]
From 148b94d4038afcb437217307956d1e579cbc7f48 Mon Sep 17 00:00:00 2001
From: Lev Kujawski <int21h@mailbox.org>
Date: Thu, 11 Feb 2021 21:39:56 -0700
Subject: [PATCH] Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
---
...s-when-dev-tty-is-broken-such-as-on-.patch | 48 +++++++++++++++++
srcpkgs/ksh/template | 51 ++++++++-----------
2 files changed, 69 insertions(+), 30 deletions(-)
create mode 100644 srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-broken-such-as-on-.patch
diff --git a/srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-broken-such-as-on-.patch b/srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-broken-such-as-on-.patch
new file mode 100644
index 00000000000..a3619603d96
--- /dev/null
+++ b/srcpkgs/ksh/patches/0004-Skip-comsub-tests-when-dev-tty-is-broken-such-as-on-.patch
@@ -0,0 +1,48 @@
+From 1f8fdba05e093d184974dbfb0293a0b831df2cb1 Mon Sep 17 00:00:00 2001
+From: Lev Kujawski <int21h@mailbox.org>
+Date: Fri, 12 Feb 2021 00:38:47 -0700
+Subject: [PATCH 4/4] Skip comsub tests when /dev/tty is broken, such as on CI
+ servers
+
+src/cmd/ksh93/tests/bracket.sh:
+- Test for the existence of /dev/tty as a writable character device
+ and skip comsub tests in its absence.
+- Issue a diagnostic if tests are skipped.
+---
+ src/cmd/ksh93/tests/bracket.sh | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/src/cmd/ksh93/tests/bracket.sh b/src/cmd/ksh93/tests/bracket.sh
+index 02d76d6..fac4e6a 100755
+--- src/cmd/ksh93/tests/bracket.sh
++++ src/cmd/ksh93/tests/bracket.sh
+@@ -388,6 +388,17 @@ actual=$(echo begin; [ -n X -a -t ] || test -n X -a -t && echo -t is true; echo
+ [[ $actual == "$expect" ]] || err_exit 'test -t in comsub fails (compound expression)' \
+ "(expected $(printf %q "$expect"), got $(printf %q "$actual"))"
+
++function is_functioning_tty
++{
++ if [[ -c /dev/tty ]] && [[ -w /dev/tty ]]; then
++ >/dev/tty || return
++ print -- TRUE
++ fi
++}
++if [[ $(is_functioning_tty) != "TRUE" ]]
++then
++ print -u2 "\t${Command}[$LINENO]: warning: /dev/tty broken: skipping comsub tests"
++else
+ # This is the more complex case that does redirect stdout within the command substitution to the
+ # actual tty. Thus the [ -t 1 ] test should be true.
+ actual=$(echo begin; exec >/dev/tty; [ -t 1 ] && test -t 1 && [[ -t 1 ]]) \
+@@ -399,6 +410,8 @@ actual=$(echo begin; exec >/dev/tty; [ -t ] && test -t) \
+ || err_exit 'test -t in comsub with exec >/dev/tty fails'
+ actual=$(echo begin; exec >/dev/tty; [ -n X -a -t ] && test -n X -a -t) \
+ || err_exit 'test -t in comsub with exec >/dev/tty fails (compound expression)'
++fi
++unset -f is_functioning_tty
+
+ # The POSIX mode should disable the ancient 'test -t' compatibility hack.
+ if [[ -o ?posix ]]
+--
+2.24.3 (Apple Git-128)
+
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b0..0232b8454f8 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,16 +1,15 @@
# Template file for 'ksh'
pkgname=ksh
-version=2020.0.0
-revision=1
-wrksrc="ast-${version}"
-build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
+version=1.0.0a
+revision=2
+_commit="37a18bab7173427ce045c9a67772cb98eb678cb7"
+wrksrc="${pkgname}-${_commit}"
short_desc="AT&T's Korn shell (ksh93)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
-checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
+distfiles="https://github.com/ksh93/ksh/archive/${_commit}.tar.gz"
+checksum=2ec6700a3c1ef688409a9339acb745e72902717b9e719e7937cdcccaa140e16d
nocross=yes
register_shell="/bin/ksh"
@@ -19,30 +18,22 @@ alternatives="
ksh:ksh.1:/usr/share/man/man1/ksh93.1
"
-build_options="static"
-if [ "$build_option_static" ]; then
- LDFLAGS+=" -static"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
- makedepends+=" musl-fts-devel"
-esac
+do_build() {
+ ./bin/package make
+}
-post_extract() {
- sed -i -e 's/= library/= static_library/' \
- -e 's/install: true/install: false/' src/lib/*/meson.build
- sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
- if [ "$build_option_static" ]; then
- # Drop tests that use .so
- sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
- sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
- fi
+do_check() {
+ ./bin/shtests
}
-post_install() {
- mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
- mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
+
+do_install() {
+ ARCH=$(./bin/package)
+ vmkdir usr/bin
+ mv arch/${ARCH}/bin/ksh ${DESTDIR}/usr/bin/ksh93
+ vmkdir usr/share/man/man1
+ mv arch/${ARCH}/man/man1/sh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
vmkdir usr/share/ksh
- vcopy src/cmd/ksh93/fun usr/share/ksh/functions
- vlicense LICENSE
+ vcopy arch/${ARCH}/fun usr/share/ksh/functions
+ rmdir ${DESTDIR}/usr/lib
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Upgrade the Korn shell to the new upstream
2021-02-12 4:49 [PR PATCH] Upgrade the Korn shell to the new upstream lev105
` (8 preceding siblings ...)
2021-02-12 9:00 ` lev105
@ 2021-02-14 3:02 ` lev105
2021-02-14 6:29 ` [PR PATCH] [Closed]: " lev105
10 siblings, 0 replies; 12+ messages in thread
From: lev105 @ 2021-02-14 3:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1898 bytes --]
There is an updated pull request by lev105 against master on the void-packages repository
https://github.com/lev105/void-packages master
https://github.com/void-linux/void-packages/pull/28685
Upgrade the Korn shell to the new upstream
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28685.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-28685.patch --]
[-- Type: text/x-diff, Size: 2867 bytes --]
From 558de389b636ff4bb06c6407433870d23f73095d Mon Sep 17 00:00:00 2001
From: Lev Kujawski <int21h@mailbox.org>
Date: Thu, 11 Feb 2021 21:39:56 -0700
Subject: [PATCH] Upgrade the Korn shell to the new upstream
Unfortunately, the Korn shell 2020 project has ground to a halt and
AT&T has reverted its changes due to numerous unfixed performance
regressions and bugs. However, there is a new Korn shell project at
github.com/ksh93/ksh that has restarted development with a focus on
bug fixing and preserving documented Korn shell functionality.
---
srcpkgs/ksh/template | 51 ++++++++++++++++++--------------------------
1 file changed, 21 insertions(+), 30 deletions(-)
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b0..5d28f752d96 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,16 +1,15 @@
# Template file for 'ksh'
pkgname=ksh
-version=2020.0.0
-revision=1
-wrksrc="ast-${version}"
-build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
+version=1.0.0a
+revision=2
+_commit="37a18bab7173427ce045c9a67772cb98eb678cb7"
+wrksrc="${pkgname}-${_commit}"
short_desc="AT&T's Korn shell (ksh93)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
-checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
+distfiles="https://github.com/ksh93/ksh/archive/${_commit}.tar.gz"
+checksum=2ec6700a3c1ef688409a9339acb745e72902717b9e719e7937cdcccaa140e16d
nocross=yes
register_shell="/bin/ksh"
@@ -19,30 +18,22 @@ alternatives="
ksh:ksh.1:/usr/share/man/man1/ksh93.1
"
-build_options="static"
-if [ "$build_option_static" ]; then
- LDFLAGS+=" -static"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
- makedepends+=" musl-fts-devel"
-esac
+do_build() {
+ ./bin/package make
+}
-post_extract() {
- sed -i -e 's/= library/= static_library/' \
- -e 's/install: true/install: false/' src/lib/*/meson.build
- sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
- if [ "$build_option_static" ]; then
- # Drop tests that use .so
- sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
- sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
- fi
+do_check() {
+ script -e -c ./bin/shtests /dev/null
}
-post_install() {
- mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
- mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
+
+do_install() {
+ ARCH=$(./bin/package)
+ vmkdir usr/bin
+ mv arch/${ARCH}/bin/ksh ${DESTDIR}/usr/bin/ksh93
+ vmkdir usr/share/man/man1
+ mv arch/${ARCH}/man/man1/sh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
vmkdir usr/share/ksh
- vcopy src/cmd/ksh93/fun usr/share/ksh/functions
- vlicense LICENSE
+ vcopy arch/${ARCH}/fun usr/share/ksh/functions
+ rmdir ${DESTDIR}/usr/lib
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Closed]: Upgrade the Korn shell to the new upstream
2021-02-12 4:49 [PR PATCH] Upgrade the Korn shell to the new upstream lev105
` (9 preceding siblings ...)
2021-02-14 3:02 ` lev105
@ 2021-02-14 6:29 ` lev105
10 siblings, 0 replies; 12+ messages in thread
From: lev105 @ 2021-02-14 6:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1745 bytes --]
There's a closed pull request on the void-packages repository
Upgrade the Korn shell to the new upstream
https://github.com/void-linux/void-packages/pull/28685
Description:
The Korn shell 2020 project has ground to a halt and AT&T has reverted its
changes due to numerous unfixed performance regressions and bugs. The new
Korn shell project at github.com/ksh93/ksh has restarted development with a
focus on bug fixing and preserving Korn shell functionality.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-02-14 6:29 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-12 4:49 [PR PATCH] Upgrade the Korn shell to the new upstream lev105
2021-02-12 5:18 ` [PR PATCH] [Updated] " lev105
2021-02-12 5:24 ` lev105
2021-02-12 5:26 ` lev105
2021-02-12 6:19 ` lev105
2021-02-12 6:39 ` lev105
2021-02-12 7:54 ` [PR PATCH] [Updated] " lev105
2021-02-12 8:15 ` lev105
2021-02-12 8:18 ` lev105
2021-02-12 9:00 ` lev105
2021-02-14 3:02 ` lev105
2021-02-14 6:29 ` [PR PATCH] [Closed]: " lev105
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).