Github messages for voidlinux
 help / color / mirror / Atom feed
* [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
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).