oksh: link ncurses for >= 7.9

oksh 7.9 dropped the NO_CURSES build guard: the screen-clear code is now
guarded by #ifndef SMALL (was #if !defined(SMALL) && !defined(NO_CURSES))
and it calls initcurses()/setupterm(), so a --disable-curses build fails
with emacs.c: 'ERR' undeclared. Gate versions >= 7.9 to build and link the
reusable static musl ncurses (common/ncurses.sh, as zsh does) and configure
without --disable-curses; versions <= 7.8 keep the exact --disable-curses
path so their committed checksums stay valid.

Built and probed on shvr-toolchain:probe-amd64 with CI paths: 7.9 builds,
runs, and reproduces its checksum; a control rebuild of 7.8 still matches
its committed checksum bit-for-bit. Promote 7.9 into versions/oksh.current
(7.9/7.8), add its source + build checksums, and regenerate the .github
matrix.

Author: alganet

.github/actions/downloads/action.yml

@@ -637,6 +637,11 @@ runs:
         shvr_shell: mksh
         shvr_version: "R30"
         cache_path: "mksh/R30"
+    - uses: ./.github/actions/single-download
+      with:
+        shvr_shell: oksh
+        shvr_version: "7.9"
+        cache_path: "oksh/7.9"
     - uses: ./.github/actions/single-download
       with:
         shvr_shell: oksh

.github/workflows/docker.yml

@@ -701,6 +701,10 @@ jobs:
             shell: mksh
             version: "R30"
             cache_path: "mksh/R30"
+          - target: oksh_7.9
+            shell: oksh
+            version: "7.9"
+            cache_path: "oksh/7.9"
           - target: oksh_7.8
             shell: oksh
             version: "7.8"
@@ -1039,8 +1043,8 @@ jobs:
               loksh_7.8
               mksh_R59c
               mksh_R58
+              oksh_7.9
               oksh_7.8
-              oksh_7.7
               osh_0.37.0
               osh_0.36.0
               posh_0.14.5
@@ -1180,6 +1184,7 @@ jobs:
               mksh_R32
               mksh_R31d
               mksh_R30
+              oksh_7.9
               oksh_7.8
               oksh_7.7
               oksh_7.6

checksums/build/oksh_7.9/bin/oksh.sha256sums

@@ -0,0 +1 @@
+d17184677ba7fb40fdf26219164254210e1574a66e9fa44f952616328f038295  oksh

checksums/sources/oksh/7.9.tar.gz.sha256sums

@@ -0,0 +1 @@
+51b2d92515950c959dbf24f6fc33336db8c0526c2a50fee4ca598a18a6114a49  7.9.tar.gz

variants/oksh.sh

@@ -4,6 +4,16 @@
 # SPDX-License-Identifier: ISC
 
 . "${SHVR_DIR_SELF}/common/musl-cross-make.sh"
+. "${SHVR_DIR_SELF}/common/ncurses.sh"
+
+# oksh >= 7.9 dropped the NO_CURSES build guard and unconditionally needs a
+# curses library, so those versions link our static musl ncurses instead of
+# building with --disable-curses. Requires shvr_versioninfo_oksh to have run.
+shvr_oksh_needs_curses ()
+{
+	test "$version_major" -gt 7 ||
+	{ test "$version_major" -eq 7 && test "$version_minor" -ge 9; }
+}
 
 shvr_static_oksh ()
 {
@@ -61,6 +71,11 @@ shvr_download_oksh ()
 	then
 		shvr_fetch "https://github.com/ibara/oksh/releases/download/oksh-$version/oksh-$version.tar.gz" "${build_srcdir}.tar.gz"
 	fi
+
+	if shvr_oksh_needs_curses
+	then
+		shvr_download_ncurses
+	fi
 }
 
 shvr_build_oksh ()
@@ -92,9 +107,20 @@ shvr_build_oksh ()
 		export CFLAGS="-fcommon -frandom-seed=1"
 	fi
 
-	./configure \
-		--disable-curses \
-		--prefix="${SHVR_DIR_OUT}/oksh_$version"
+	if shvr_oksh_needs_curses
+	then
+		shvr_build_ncurses
+		cd "${build_srcdir}"
+		export CFLAGS="${CFLAGS} $(shvr_ncurses_cflags)"
+		export LDFLAGS="${LDFLAGS} $(shvr_ncurses_ldflags)"
+
+		./configure \
+			--prefix="${SHVR_DIR_OUT}/oksh_$version"
+	else
+		./configure \
+			--disable-curses \
+			--prefix="${SHVR_DIR_OUT}/oksh_$version"
+	fi
 
 	make
 

versions/oksh.all

@@ -1,3 +1,4 @@
+7.9
 7.8
 7.7
 7.6

versions/oksh.current

@@ -1,2 +1,2 @@
+7.9
 7.8
-7.7