Date: 2011/12/08 1) Read osh-20111129-p1 CHANGES starting on line 25 below. 2) Download patch via: http://v6shell.org/src/osh-20111129-p1.patch 3) Apply by doing: % cd osh-20111129 % patch -p0 < ../osh-20111129-p1.patch 4) Then, rebuild and reinstall per instructions in INSTALL file. -- Jeffrey Allen Neitzel =================================================================== diff -uNr ../osh-20111129-orig/CHANGES ./CHANGES --- ../osh-20111129-orig/CHANGES 2011-11-29 19:53:31.000000000 +0000 +++ ./CHANGES 2011-12-08 19:56:45.000000000 +0000 @@ -2,6 +2,18 @@ Thompson shell are marked w/ a `C:' in the details below. ------------------------------------------------------------------------------- +[osh-20111129-p1]: +examples/dot.oshrc: + * Re-added missing ';s/ \$//' that git ident removed from version alias. + This removes trailing ' $' as shown in example 1 and 2 below: + + % : example 1 ; version + osh-20111129 (NetBSD 5.1 amd64) $ + + % : example 2 ; version + osh-20111129-p1 (NetBSD 5.1 amd64) + +------------------------------------------------------------------------------- [osh-20111129]: mkconfig, v.c: * Added useful build system info from `uname -srm'. @@ -1660,6 +1672,6 @@ * All releases of osh prior to and including 020214 were authored and maintained by Gunnar Ritter. -Jeffrey Allen Neitzel 2011/11/22 +Jeffrey Allen Neitzel 2011/12/08 -@(#)$Id: 2b23bb102c99e6a1da1d345b80ae332097ffa043 $ +@(#)$Id: 332af7e1d0f2cdeabe4260994f48aeff56165029 $ diff -uNr ../osh-20111129-orig/CHANGES6 ./CHANGES6 --- ../osh-20111129-orig/CHANGES6 2011-11-29 19:53:31.000000000 +0000 +++ ./CHANGES6 2011-12-08 19:56:45.000000000 +0000 @@ -3,6 +3,10 @@ command in porting them to run on modern UNIX systems. ------------------------------------------------------------------------------- +[osh-20111129-p1]: + * No changes. + +------------------------------------------------------------------------------- [osh-20111129]: * No changes. @@ -411,6 +415,6 @@ Date: May 14, 1975 From: Sixth Edition UNIX /usr/source/s1/glob.c -Jeffrey Allen Neitzel 2011/11/22 +Jeffrey Allen Neitzel 2011/12/08 -@(#)$Id: a36fec97ce07b36de26766a88ab629cd2b41454c $ +@(#)$Id: 02db42bc6bb3dcb7676486f8420e1d41d8115175 $ diff -uNr ../osh-20111129-orig/Makefile ./Makefile --- ../osh-20111129-orig/Makefile 2011-11-29 19:53:31.000000000 +0000 +++ ./Makefile 2011-12-08 19:56:45.000000000 +0000 @@ -1,6 +1,6 @@ # Makefile for osh # -# @(#)$Id: 95d9af5f5fa946b84483214776f1464e446e7a59 $ +# @(#)$Id: 1a348b6426b0b09f7cec155e5ef74249cbb347df $ # # Begin CONFIGURATION # @@ -68,8 +68,8 @@ # osh-YYYYMMDD == official release # osh-YYYYMMDD-p[1-9] == patched release # -OSH_DATE= November 22, 2011 -OSH_VERSION= osh-20111129 +OSH_DATE= December 8, 2011 +OSH_VERSION= osh-20111129-p1 OSH= osh SH6= sh6 glob6 diff -uNr ../osh-20111129-orig/examples/dot.oshrc ./examples/dot.oshrc --- ../osh-20111129-orig/examples/dot.oshrc 2011-11-29 19:53:31.000000000 +0000 +++ ./examples/dot.oshrc 2011-12-08 19:56:45.000000000 +0000 @@ -80,11 +80,11 @@ alias v 'echo $v;:' : Version1 if ! { fd2 which what >/dev/null } goto Version2 - alias version "which osh|sed 's/.*/what &/'|osh|head -2|tail -1|sed 's/[ ]*\$Id: //';:" + alias version "which osh|sed 's/.*/what &/'|osh|head -2|tail -1|sed 's/[ ]*\$Id: //;s/ \$//';:" goto NoVersion : Version2 if ! { fd2 which ident >/dev/null } goto NoVersion - alias version "which osh|sed 's/.*/ident &/'|osh|head -2|tail -1|sed 's/[ ]*\$Id: //';:" + alias version "which osh|sed 's/.*/ident &/'|osh|head -2|tail -1|sed 's/[ ]*\$Id: //;s/ \$//';:" : fallthrough : NoVersion ( alias logout ) | wc -c | tr -d ' \t' | grep '^0$' >/dev/null