From a127f2eaf489d643965b1df48894fecdf29d7cfc Mon Sep 17 00:00:00 2001
From: Matthew T Hoare <matthew.t.hoare@gmail.com>
Date: Sun, 1 Nov 2020 09:36:19 +0000
Subject: [PATCH] testing/oksh: upgrade to 6.8.1

---
 testing/oksh/10-musl-ctrl-define.patch | 17 -----------------
 testing/oksh/APKBUILD                  |  8 +++-----
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 testing/oksh/10-musl-ctrl-define.patch

diff --git a/testing/oksh/10-musl-ctrl-define.patch b/testing/oksh/10-musl-ctrl-define.patch
deleted file mode 100644
index 66b99e30db7..00000000000
--- a/testing/oksh/10-musl-ctrl-define.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Matthew T Hoare <matthew.t.hoare@gmail.com>
-URL: https://github.com/ibara/oksh/issues/49
-Summary: fixes musl compatibility
-----
---- oksh-oksh-6.8/vi.c
-+++ oksh-oksh-6.8/vi.c
-@@ -22,6 +22,10 @@
- #include "sh.h"
- #include "edit.h"
-
-+#ifndef CTRL
-+#define CTRL(c) (c & 0x1f)
-+#endif
-+
- struct edstate {
-	 char *cbuf;  /* main buffer to build the command line */
-	 int cbufsize; /* number of bytes allocated for cbuf */
diff --git a/testing/oksh/APKBUILD b/testing/oksh/APKBUILD
index afa4043f59d..3b2f3d22cb5 100644
--- a/testing/oksh/APKBUILD
+++ b/testing/oksh/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Matthew T Hoare <matthew.t.hoare@gmail.com>
 # Maintainer: Matthew T Hoare <matthew.t.hoare@gmail.com>
 pkgname=oksh
-pkgver=6.8
+pkgver=6.8.1
 pkgrel=0
 pkgdesc="Portable OpenBSD ksh, based on the Public Domain KornShell (pdksh)"
 url="https://github.com/ibara/oksh"
@@ -10,8 +10,7 @@ license="BSD-3-Clause"
 options="!check" # no checks
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
 subpackages="$pkgname-doc"
-source="https://github.com/ibara/oksh/archive/oksh-$pkgver.tar.gz
-	10-musl-ctrl-define.patch"
+source="https://github.com/ibara/oksh/archive/oksh-$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-$pkgname-$pkgver"
 
 build() {
@@ -25,5 +24,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="5dea088247f0b29eecf5ed9b8b6a9b0aa27e5e27fffa06a3cb1cdc44e8d40aa97b998407efe06b36acddbb375e4de0f4e651dda32023c74b1df9423ee1f7136d  oksh-6.8.tar.gz
-4ab5071b6a6aaf94597a42f5c34b7dcf8250402df7dc1dc4fbb4f93439db8fea1f5529c31ca365bc5563108d44f9dde7a6a877fb1236401e67800d85c14a4a23  10-musl-ctrl-define.patch"
+sha512sums="8c008375e85daff9782eed9e1b594c02d95d1f991cefba2fc6fe45b23d0b0e7af5d5099b08770fc136adc2c7be95d4e4baf8c040c608acc4b294dc986c66e28c  oksh-6.8.1.tar.gz"