mksh: bump

app-shells/mksh/mksh-59c.recipe

@@ -11,14 +11,14 @@ mksh aims to replace pdksh in all but very rare use cases (such as support for \
 checking the Unix mbox) and in all operating environments (thus including \
 patches from pdksh on e.g. Debian)."
 HOMEPAGE="https://www.mirbsd.org/mksh.htm"
-COPYRIGHT="2002-2019 Thorsten Glaser"
+COPYRIGHT="2002-2020 Thorsten Glaser"
 LICENSE="MirOS
 	BSD (3-clause)
 	ISC"
-REVISION="2"
-SOURCE_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R$portVersion.tgz"
-CHECKSUM_SHA256="3d101154182d52ae54ef26e1360c95bc89c929d28859d378cc1c84f3439dbe75"
-SOURCE_DIR="mksh"
+REVISION="1"
+SOURCE_URI="https://github.com/MirBSD/mksh/archive/refs/tags/mksh-R$portVersion.tar.gz"
+CHECKSUM_SHA256="e5942607eb930ba6ce3303c4a0db0733371f210c9ce6d5d4b9cc202c76360343"
+SOURCE_DIR="mksh-mksh-R$portVersion"
 PATCHES="mksh-$portVersion.patchset"
 if [ "$targetArchitecture" != x86_gcc2 ]; then
 	PATCHES+="

app-shells/mksh/patches/mksh-59c.patch

@@ -1,6 +1,6 @@
 --- a/Build.sh
 +++ b/Build.sh
-@@ -1431,9 +1431,6 @@ gcc)
+@@ -1554,9 +1554,6 @@ gcc)
  	# mksh is not written in CFrustFrust!
  	ac_flags 1 no_eh_frame -fno-asynchronous-unwind-tables
  	ac_flags 1 fnostrictaliasing -fno-strict-aliasing

app-shells/mksh/patches/mksh-59c.patchset

@@ -5,23 +5,23 @@ Subject: Update shell profile paths for Haiku
 
 
 diff --git a/Build.sh b/Build.sh
-index be3f711..7d1addf 100644
+index 597d8ca..dadccf5 100644
 --- a/Build.sh
 +++ b/Build.sh
-@@ -2740,7 +2740,7 @@ HAVE_CAN_FSTACKPROTECTORALL	ac_flags
- ==== cpp definitions ====
- DEBUG				dont use in production, wants gcc, implies:
+@@ -2816,7 +2816,7 @@ HAVE_CAN_FSTACKPROTECTORALL	ac_flags
+ DEBUG				don’t use in production, wants gcc, implies:
  DEBUG_LEAKS			enable freeing resources before exiting
+ KSH_VERSIONNAME_VENDOR_EXT	when patching; space+plus+word (e.g. " +SuSE")
 -MKSHRC_PATH			"~/.mkshrc" (do not change)
 +MKSHRC_PATH			"~/config/settings/mkshrc" (do not change)
  MKSH_A4PB			force use of arc4random_pushb
  MKSH_ASSUME_UTF8		(0=disabled, 1=enabled; default: unset)
  MKSH_BINSHPOSIX			if */sh or */-sh, enable set -o posix
 diff --git a/check.t b/check.t
-index d5df4cb..a2ff0e0 100644
+index 311f5c1..67c3f11 100644
 --- a/check.t
 +++ b/check.t
-@@ -8289,7 +8289,7 @@ expected-stderr-pattern:
+@@ -8399,7 +8399,7 @@ expected-stderr-pattern:
  ---
  name: mkshrc-1
  description:
@@ -30,7 +30,7 @@ index d5df4cb..a2ff0e0 100644
  	Part 1: verify user environment is not read (internal)
  stdin:
  	echo x $FNORD
-@@ -8298,9 +8298,9 @@ expected-stdout:
+@@ -8408,9 +8408,9 @@ expected-stdout:
  ---
  name: mkshrc-2a
  description:
@@ -42,7 +42,7 @@ index d5df4cb..a2ff0e0 100644
  	FNORD=42
  env-setup: !HOME=.!ENV=!
  stdin:
-@@ -8310,9 +8310,9 @@ expected-stdout:
+@@ -8420,9 +8420,9 @@ expected-stdout:
  ---
  name: mkshrc-2b
  description:
@@ -54,7 +54,7 @@ index d5df4cb..a2ff0e0 100644
  	FNORD=42
  need-ctty: yes
  arguments: !-i!
-@@ -8326,9 +8326,9 @@ expected-stderr-pattern:
+@@ -8436,9 +8436,9 @@ expected-stderr-pattern:
  ---
  name: mkshrc-3
  description:
@@ -67,10 +67,10 @@ index d5df4cb..a2ff0e0 100644
  env-setup: !HOME=.!ENV=nonexistant!
  stdin:
 diff --git a/dot.mkshrc b/dot.mkshrc
-index 4a3dfea..bfb8f64 100644
+index f06dbc6..9e409d4 100644
 --- a/dot.mkshrc
 +++ b/dot.mkshrc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  # damage or existence of a defect, except proven that it results out
  # of said person's immediate fault when using the work as intended.
  #-
@@ -80,10 +80,10 @@ index 4a3dfea..bfb8f64 100644
  # catch non-mksh, non-lksh, trying to run this file
  case ${KSH_VERSION:-} in
 diff --git a/funcs.c b/funcs.c
-index a42c310..b2a4275 100644
+index ee2c9f6..90abad8 100644
 --- a/funcs.c
 +++ b/funcs.c
-@@ -1815,7 +1815,7 @@ c_read(const char **wp)
+@@ -1816,7 +1816,7 @@ c_read(const char **wp)
  				if (Flag(FTALKING_I) && isatty(fd)) {
  					/*
  					 * set prompt in case this is
@@ -93,11 +93,11 @@ index a42c310..b2a4275 100644
  					set_prompt(PS2, NULL);
  					pprompt(prompt, 0);
 diff --git a/main.c b/main.c
-index cde0616..13ddd03 100644
+index 3154f9f..695b818 100644
 --- a/main.c
 +++ b/main.c
 @@ -38,7 +38,7 @@
- __RCSID("$MirOS: src/bin/mksh/main.c,v 1.351 2019/01/05 13:24:18 tg Exp $");
+ __RCSID("$MirOS: src/bin/mksh/main.c,v 1.374 2020/10/01 20:28:54 tg Exp $");
  
  #ifndef MKSHRC_PATH
 -#define MKSHRC_PATH	"~/.mkshrc"
@@ -105,25 +105,25 @@ index cde0616..13ddd03 100644
  #endif
  
  #ifndef MKSH_DEFAULT_TMPDIR
-@@ -635,7 +635,7 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
+@@ -650,7 +650,7 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
  		break;
  	}
  
 -	/* Disable during .profile/ENV reading */
 +	/* Disable during profile/ENV reading */
- 	restricted_shell = Flag(FRESTRICTED);
+ 	restricted_shell |= Flag(FRESTRICTED);
  	Flag(FRESTRICTED) = 0;
  	errexit = Flag(FERREXIT);
-@@ -652,7 +652,7 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
- 		include(MKSH_SYSTEM_PROFILE, 0, NULL, true);
- 	if (!Flag(FPRIVILEGED)) {
+@@ -693,7 +693,7 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
+ 		baseline_flags[(int)FPRIVILEGED] = Flag(FPRIVILEGED);
+ 	} else {
  		if (Flag(FLOGIN))
 -			include(substitute("$HOME/.profile", 0), 0, NULL, true);
 +			include(substitute("$HOME/config/settings/profile", 0), 0, NULL, true);
  		if (Flag(FTALKING)) {
  			cp = substitute("${ENV:-" MKSHRC_PATH "}", DOTILDE);
  			if (cp[0] != '\0')
-@@ -739,7 +739,7 @@ include(const char *name, int argc, const char **argv, bool intr_ok)
+@@ -781,7 +781,7 @@ include(const char *name, int argc, const char **argv, bool intr_ok)
  			return (exstat & 0xFF);
  		case LINTR:
  			/*
@@ -133,10 +133,10 @@ index cde0616..13ddd03 100644
  			 */
  			if (intr_ok && ((exstat & 0xFF) - 128) != SIGTERM)
 diff --git a/mksh.1 b/mksh.1
-index 2e83428..2e3d0e7 100644
+index 6cfb70c..aeadb91 100644
 --- a/mksh.1
 +++ b/mksh.1
-@@ -6491,13 +6491,13 @@ removed to the history and a new prompt to be printed.
+@@ -6863,13 +6863,13 @@ removed to the history and a new prompt to be printed.
  .El
  .Sh FILES
  .Bl -tag -width XetcXsuid_profile -compact
@@ -144,7 +144,7 @@ index 2e83428..2e3d0e7 100644
 +.It Pa \*(TI/config/settings/mkshrc
  User mkshrc profile (non-privileged interactive shells); see
  .Sx Startup files.
- The location can be changed at compile time (for embedded systems);
+ The location can be changed at compile time (e.g. for embedded systems);
  AOSP Android builds use
  .Pa /system/etc/mkshrc .
 -.It Pa \*(TI/.profile
@@ -153,5 +153,5 @@ index 2e83428..2e3d0e7 100644
  .Sx Startup files
  near the top of this manual.
 -- 
-2.24.1
+2.30.2