system/mksh: Upstream review; minor tweaks, updated TaC-mksh.txt added

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

3 files changed, 18 insertions, 71 deletions

diff --git a/system/mksh/TaC-mksh.txt b/system/mksh/TaC-mksh.txt
index 5e59d2a528..edc8c825e6 100644
--- a/system/mksh/TaC-mksh.txt
+++ b/system/mksh/TaC-mksh.txt
@@ -12,13 +12,16 @@ if any are found. We don't think so though.)
 All paths are relative to The MirOS Project's CVS repository.
 
 
-The following files form The MirBSD Korn Shell R39c:
-- build system, testsuite
+The following files form The MirBSD Korn Shell R40:
+- build system
   * mksh/Build.sh
+- testsuite driver
   * mksh/check.pl
+- testsuite with code examples
   * mksh/check.t
-- documentation, configuration
+- configuration with code examples
   * mksh/dot.mkshrc
+- documentation
   * mksh/mksh.1
 - source code
   * mksh/edit.c
@@ -77,11 +80,10 @@ distfile, but are not part of it. They are provided for convenience,
 because they are required on many operating environments for mksh or
 some of its features to function:
 - source code
-  * mksh/setmode.c (needed for the optional mknod builtin)
   * mksh/strlcpy.c (always needed)
 
-These files are covered by seperate licences in addition (Appendices
-B and C). Some operating environments already provide their functio-
+These files are covered by seperate licences in addition (Appendix C
+for now). Some operating environments already provide their functio-
 nality, such as the BSDs and OSX libc, or the Debian/freedesktop.org
 libbsd package. The files are not compiled into the resulting binary
 if their respective functionality is already provided.
@@ -91,25 +93,13 @@ The following files belong to mksh in a less close way, as they pro-
 vide additional functionality less closely coupled or not always de-
 sired. These are not included in the mksh distfile:
 - source code
-  * contrib/code/Snippets/arc4random.c (somewhat portable arc4random
-    implementation on top of /dev/urandom - for $RANDOM reads)
-  * contrib/hosted/tg/arc4rootdom.c (an even less portable implemen-
-    tation of a4r_pushb for *WRT/Android/... - for $RANDOM writes)
-  * contrib/hosted/tg/deb/klibc/arc4random.c (part of my klibc patch
-    providing arc4random API on top of jrand48 for small size)
   * src/usr.bin/printf/printf.c (slightly modified UCB printf utili-
     ty code - for the optional, undesired printf(1) builtin)
     *DO NOT* INCLUDE printf AS A SHELL BUILT-IN UNLESS YOU ABSOLUTE-
     LY MUST (otherwise, the preferrable /usr/bin/printf is called)
 
-The arc4rootdom.c file is covered by the MirOS Licence (Appendix A).
-The klibc/arc4random.c file is also covered by The MirOS Licence but
-dual-licenced with klibc's as we hope it gets included. The printf.c
-file is covered by the UCB's three-clause BSD licence (Appendix B).
-
-The arc4random.c file is a conglomerate of The MirOS Licence as well
-as another but many people have touched this code so there are other
-versions of it around with differing terms. See Appendix D for ours.
+The printf.c file is covered by the UCB three-clause BSD licence, as
+shown in Appendix B below.
 
 
 The MirOS Licence also applies as a collective-work copyright on The
@@ -125,7 +115,7 @@ Appendix A - The MirOS Licence (OSI approved)
 ==============================
 
 The MirBSD Korn Shell (mksh) is
-Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 	Thorsten "mirabilos" Glaser <tg@mirbsd.org>
 All rights reserved.
 
@@ -135,10 +125,6 @@ Copyright © 2008, 2009
 Copyright © 2008, 2009
 	Thorsten "mirabilos" Glaser <tg@mirbsd.org>
 
-The arc4random for *WRT, Android, klibc functions are
-Copyright © 2009
-	Thorsten "mirabilos" Glaser <tg@mirbsd.org>
-
 
 Provided that these terms and disclaimer and all copyright notices
 are retained or reproduced in an accompanying document, permission
@@ -164,14 +150,6 @@ Copyright (c) 1989
 	The Regents of the University of California.
 All rights reserved.
 
-setmode.c is
-Copyright (c) 1989, 1993, 1994
-	The Regents of the University of California.
-All rights reserved.
-
-This code is derived from software contributed to Berkeley by
-Dave Borman at Cray Research, Inc.
-
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -221,38 +199,5 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
-Appendix D - Licence of mircvs://contrib/code/Snippets/arc4random.c
-===================================================================
-
-/*-
- * Arc4 random number generator for OpenBSD.
- * Copyright 1996 David Mazieres <dm@lcs.mit.edu>.
- *
- * Modification and redistribution in source and binary forms is
- * permitted provided that due credit is given to the author and the
- * OpenBSD project by leaving this copyright notice intact.
- */
-
-/*-
- * This code is derived from section 17.1 of Applied Cryptography,
- * second edition, [...]
- *
- * RC4 is a registered trademark of RSA Laboratories.
- */
-
-/*-
- * Modified by Robert Connolly from OpenBSD lib/libc/crypt/arc4random.c v1.11.
- * This is arc4random(3) using urandom.
- */
-
-arc4random_uniform() is derived from code written by
-	Damien Miller <djm@openbsd.org>
-published under the ISC licence (see Appendix C).
-
-arc4random.c additionally is Copyright © 2008, 2009
-	Thorsten Glaser <tg@mirbsd.org>
-and covered by the MirOS Licence (see Appendix A).
-
-
 _________________________________________________________________
-$MirOS: www/files/TaC-mksh.txt,v 1.3 2011/03/21 16:22:58 tg Exp $
+$MirOS: www/files/TaC-mksh.txt,v 1.4 2011/06/12 19:19:32 tg Exp $
diff --git a/system/mksh/mksh.SlackBuild b/system/mksh/mksh.SlackBuild
index 98967c41b0..d6f0a02210 100644
--- a/system/mksh/mksh.SlackBuild
+++ b/system/mksh/mksh.SlackBuild
@@ -27,10 +27,11 @@
 # 2011 Mar 20 - initial release
 # 2011 Jun 13 - adapted to R40
 # 2011 Aug 27 - adapted to R40b
+# 2011 Sep 07 - upstream review; minor tweaks, updated TaC-mksh.txt added
 
 PRGNAM=mksh
 VERSION=${VERSION:-R40b}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -75,7 +76,8 @@ if [ "$STATIC" = "yes" ]; then
 fi
 
 if [ "$DIET" = "yes" ]; then
-  CC="diet gcc -nostdinc"
+  CC="diet -Os gcc"
+  SLKCFLAGS="${SLKCFLAGS} -Wall"
 else
   CC="gcc"
 fi
@@ -90,7 +92,7 @@ LDFLAGS=$LDFLAGS \
 CPPFLAGS=$CPPFLAGS \
 CFLAGS=$SLKCFLAGS \
 CC=$CC \
-  sh ../Build.sh -r -c combine
+  sh ../Build.sh -r -c lto
 
 ginstall -D -m 755 mksh $PKG/bin/mksh
 ginstall -D -m 644 ../mksh.1 $PKG/usr/man/man1/mksh.1
diff --git a/system/mksh/mksh.info b/system/mksh/mksh.info
index 568c9a8cd0..8ca33e9b01 100644
--- a/system/mksh/mksh.info
+++ b/system/mksh/mksh.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="markus reichelt"
 EMAIL="slackbuilds@mareichelt.de"
-APPROVED="dsomero"
+APPROVED="dsomero,Erik Hanson"