[p]bosh: Patch added for keyboard problems

[Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Mon Oct 15 15:29:18 2018 +0200
Changeset:	84946331a4d61c4fec6cd301776471c3e6ba0cf9

Modified Files:
	bosh/TODO
	bosh/distinfo
	pbosh/distinfo
Added Files:
	bosh/patches/patch-sh_main.c
	pbosh/patches/patch-sh_main.c

Log Message:
[p]bosh: Patch added for keyboard problems

The reason was that setlocale() was not called on NetBSD.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=84946331a4d61c4fec6cd301776471c3e6ba0cf9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 bosh/TODO                     |  6 +++++-
 bosh/distinfo                 |  1 +
 bosh/patches/patch-sh_main.c  | 24 ++++++++++++++++++++++++
 pbosh/distinfo                |  1 +
 pbosh/patches/patch-sh_main.c | 24 ++++++++++++++++++++++++
 5 files changed, 55 insertions(+), 1 deletion(-)

diffs:
diff --git a/bosh/TODO b/bosh/TODO
index c96c322d69..c0e3cccf50 100644
--- a/bosh/TODO
+++ b/bosh/TODO
@@ -8,4 +8,8 @@
 [X] Add obosh and pbosh variants to this package?
     => No, use separate packages
 [X] Use smake for build
-[ ] Analyze keyboard behaviour for special characters like umlauts
+[X] Analyze keyboard behaviour for special characters like umlauts
+    => setlocale() is not called by the shell (and therefore iswprint() fails)
+       Reason: "/usr/lib/locale" is expected to exist, but not there on NetBSD
+    => Patch added
+    => Problem reported upstream
diff --git a/bosh/distinfo b/bosh/distinfo
index d0db61fba6..da3a39b026 100644
--- a/bosh/distinfo
+++ b/bosh/distinfo
@@ -4,3 +4,4 @@ SHA1 (schily-2018-10-11.tar.bz2) = 7362b695a410cac0f4134dc8784197532a078abd
 RMD160 (schily-2018-10-11.tar.bz2) = 66fa538519e2fb5af6576ff806fccd2e9c578cb0
 SHA512 (schily-2018-10-11.tar.bz2) = e3ea44b2bde6ba91978a3c715c148c48372026762c57943a9d2900329a317b9e69a78226a192ebbc9d204ddf1dfab1688b09974d10402de0a6245e1e361a58ef
 Size (schily-2018-10-11.tar.bz2) = 4305089 bytes
+SHA1 (patch-sh_main.c) = 942d513254972b640b76c3107ce49cb2df93e2c1
diff --git a/bosh/patches/patch-sh_main.c b/bosh/patches/patch-sh_main.c
new file mode 100644
index 0000000000..7c88601d12
--- /dev/null
+++ b/bosh/patches/patch-sh_main.c
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Ensure that setlocale is called on systems without "/usr/lib/locale".
+
+--- sh/main.c.orig	2018-07-31 22:00:57.000000000 +0000
++++ sh/main.c
+@@ -138,10 +138,17 @@ main(c, v, e)
+ 	mypgid = getpgid(mypid);	/* get process group for this shell */
+ 	mysid = getsid(mypid);		/* get process group id of leader */
+ 
++#if	defined(IS_SUN) || defined(DO_SPLIT_ROOT)
+ 	/*
+ 	 * Do locale processing only if /usr is mounted.
++	 * This is to help the single user shell to work.
++	 * Since localedir may not be the same for all target architectures
++	 * we just disable this check for a non-Solaris environment.
+ 	 */
+ 	localedir_exists = (access(localedir, F_OK) == 0);
++#else
++	localedir_exists = TRUE;
++#endif
+ 
+ 	/*
+ 	 * initialize storage allocation
diff --git a/pbosh/distinfo b/pbosh/distinfo
index d0db61fba6..da3a39b026 100644
--- a/pbosh/distinfo
+++ b/pbosh/distinfo
@@ -4,3 +4,4 @@ SHA1 (schily-2018-10-11.tar.bz2) = 7362b695a410cac0f4134dc8784197532a078abd
 RMD160 (schily-2018-10-11.tar.bz2) = 66fa538519e2fb5af6576ff806fccd2e9c578cb0
 SHA512 (schily-2018-10-11.tar.bz2) = e3ea44b2bde6ba91978a3c715c148c48372026762c57943a9d2900329a317b9e69a78226a192ebbc9d204ddf1dfab1688b09974d10402de0a6245e1e361a58ef
 Size (schily-2018-10-11.tar.bz2) = 4305089 bytes
+SHA1 (patch-sh_main.c) = 942d513254972b640b76c3107ce49cb2df93e2c1
diff --git a/pbosh/patches/patch-sh_main.c b/pbosh/patches/patch-sh_main.c
new file mode 100644
index 0000000000..7c88601d12
--- /dev/null
+++ b/pbosh/patches/patch-sh_main.c
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Ensure that setlocale is called on systems without "/usr/lib/locale".
+
+--- sh/main.c.orig	2018-07-31 22:00:57.000000000 +0000
++++ sh/main.c
+@@ -138,10 +138,17 @@ main(c, v, e)
+ 	mypgid = getpgid(mypid);	/* get process group for this shell */
+ 	mysid = getsid(mypid);		/* get process group id of leader */
+ 
++#if	defined(IS_SUN) || defined(DO_SPLIT_ROOT)
+ 	/*
+ 	 * Do locale processing only if /usr is mounted.
++	 * This is to help the single user shell to work.
++	 * Since localedir may not be the same for all target architectures
++	 * we just disable this check for a non-Solaris environment.
+ 	 */
+ 	localedir_exists = (access(localedir, F_OK) == 0);
++#else
++	localedir_exists = TRUE;
++#endif
+ 
+ 	/*
+ 	 * initialize storage allocation