Hello community,
here is the log from the commit of package ksh
checked in at Fri Apr 7 16:54:32 CEST 2006.
--------
--- ksh/ksh.changes 2006-01-25 21:37:15.000000000 +0100
+++ ksh/ksh.changes 2006-04-06 18:34:51.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Apr 6 16:42:10 CEST 2006 - werner@suse.de
+
+- Handle multi byte characters within macro expansion (bug #158669)
+
+-------------------------------------------------------------------
+Mon Mar 27 16:23:05 CEST 2006 - werner@suse.de
+
+- Update to ksh 93r
+
+-------------------------------------------------------------------
Old:
----
INIT.2005-02-02.tar.bz2
ast-ksh.2005-02-02.tar.bz2
New:
----
INIT.2006-02-14.tar.bz2
ast-ksh.2006-02-14.tar.bz2
ksh93-shift_ijs.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ksh.spec ++++++
--- /var/tmp/diff_new_pack.IPMFHu/_old 2006-04-07 16:54:01.000000000 +0200
+++ /var/tmp/diff_new_pack.IPMFHu/_new 2006-04-07 16:54:01.000000000 +0200
@@ -1,11 +1,11 @@
#
-# spec file for package ksh (Version 93q)
+# spec file for package ksh (Version 93r)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
@@ -16,17 +16,18 @@
Group: System/Shells
PreReq: /bin/ln /bin/bash
Autoreqprov: on
-Version: 93q
-Release: 15
+Version: 93r
+Release: 2
Summary: Korn Shell
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: INIT.2005-02-02.tar.bz2
-Source1: ast-ksh.2005-02-02.tar.bz2
+Source: INIT.2006-02-14.tar.bz2
+Source1: ast-ksh.2006-02-14.tar.bz2
Source2: Agreement
Source3: Warning
Patch: ksh93.dif
Patch1: workaround-stupid-build-system.diff
Patch2: ksh-qemu.patch
+Patch3: ksh93-shift_ijs.dif
%description
The original Korn Shell. The ksh is an sh-compatible command
@@ -67,6 +68,7 @@
%ifarch %arm
%patch2
%endif
+%patch3
%build
#
@@ -77,8 +79,12 @@
IGNORE="$IGNORE -Wno-char-subscripts -Wno-uninitialized -Wno-implicit"
#
#
- CCFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing -g -pipe $IGNORE"
- HOSTTYPE=${RPM_ARCH%*-linux*}
+ FAETURE="-DSHOPT_SYSRC=1 -DSHOPT_REMOTE=1 -DSHOPT_CMDLIB_BLTIN=1"
+ #
+ #
+ CCFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing -g -pipe $IGNORE $FAETURE"
+ LDFLAGS="-lm"
+ HOSTTYPE=${RPM_ARCH%%*-linux*}
CC=gcc
mam_cc_L=use
export CCFLAGS LDFLAGS CC mam_cc_L
@@ -150,10 +156,10 @@
popd
cp lib/package/LICENSES/ast LICENSE
mv src/cmd/ksh93/OBSOLETE src/cmd/ksh93/OBSOLETE.mm
- cat src/cmd/ksh93/builtins.mm | troff -Tascii -t -mm | grotty -bou > Builtins
- cat src/cmd/ksh93/PROMO.mm | troff -Tascii -t -mm | grotty -bou > PROMO
- cat src/cmd/ksh93/OBSOLETE.mm | troff -Tascii -t -mm | grotty -bou > OBSOLETE
- cat src/cmd/ksh93/sh.memo | troff -Tascii -t -mm | grotty -bou > MEMORANDUM
+ cat src/cmd/ksh93/builtins.mm | sed 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' | troff -Tascii8 -t -mm | grotty -bou > Builtins
+ cat src/cmd/ksh93/PROMO.mm | sed 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' | troff -Tascii8 -t -mm | grotty -bou > PROMO
+ cat src/cmd/ksh93/OBSOLETE.mm | sed 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' | troff -Tascii8 -t -mm | grotty -bou > OBSOLETE
+ cat src/cmd/ksh93/sh.memo | sed 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' | troff -Tascii8 -t -mm | grotty -bou > MEMORANDUM
cp %{SOURCE3} .
%post
@@ -197,6 +203,10 @@
/usr/include/ast/
%changelog -n ksh
+* Thu Apr 06 2006 - werner@suse.de
+- Handle multi byte characters within macro expansion (bug #158669)
+* Mon Mar 27 2006 - werner@suse.de
+- Update to ksh 93r
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Tue Dec 20 2005 - werner@suse.de
++++++ INIT.2005-02-02.tar.bz2 -> INIT.2006-02-14.tar.bz2 ++++++
++++ 13367 lines of diff (skipped)
++++++ ast-ksh.2005-02-02.tar.bz2 -> ast-ksh.2006-02-14.tar.bz2 ++++++
++++ 34788 lines of diff (skipped)
++++++ ksh93-shift_ijs.dif ++++++
--- src/cmd/ksh93/sh/lex.c
+++ src/cmd/ksh93/sh/lex.c 2006-04-06 15:58:08.000000000 +0000
@@ -293,11 +293,14 @@
{
switch(*len = mbsize(_Fcin.fcptr))
{
- case -1: /* bogus multiByte char - parse as bytes? */
- case 0: /* NULL byte */
+ case -1: /* bogus multiByte char - parse as bytes? */
+ case 0: /* NULL byte */
+ *len = 1;
case 1:
- lexState = state[curChar=fcget()];
- break;
+ if ((curChar = fcget()) == 0)
+ curChar = fcfill();
+ lexState = state[curChar];
+ break;
default:
/*
* None of the state tables contain entries
@@ -1596,6 +1599,36 @@
{
if(n!=S_NL)
{
+#if SHOPT_MULTIBYTE
+ if(mbwide())
+ {
+ do
+ {
+ ssize_t len;
+ switch((len = mbsize(_Fcin.fcptr)))
+ {
+ case -1: /* bogus multiByte char - parse as bytes? */
+ case 0: /* NULL byte */
+ case 1:
+ n = state[fcget()];
+ break;
+ default:
+ /*
+ * None of the state tables contain
+ * entries for multibyte characters,
+ * however, they should be treated
+ * the same as any other alph
+ * character. Therefore, we'll use
+ * the state of the 'a' character.
+ */
+ mbchar(_Fcin.fcptr);
+ n = state['a'];
+ }
+ }
+ while(n == 0);
+ }
+ else
+#endif /* SHOPT_MULTIBYTE */
/* skip over regular characters */
while((n=state[fcget()])==0);
}
--- src/cmd/ksh93/sh/macro.c
+++ src/cmd/ksh93/sh/macro.c 2006-04-06 16:02:40.000000000 +0000
@@ -266,7 +266,38 @@
cp = fcseek(0);
while(1)
{
+#if SHOPT_MULTIBYTE
+ if(mbwide())
+ {
+ do
+ {
+ ssize_t len;
+ switch((len = mbsize(cp)))
+ {
+ case -1: /* bogus multiByte char - parse as bytes? */
+ case 0: /* NULL byte */
+ case 1:
+ n = state[*(unsigned char*)cp++];
+ break;
+ default:
+ /*
+ * None of the state tables contain
+ * entries for multibyte characters,
+ * however, they should be treated
+ * the same as any other alph
+ * character. Therefore, we'll use
+ * the state of the 'a' character.
+ */
+ cp += len;
+ n = state['a'];
+ }
+ }
+ while(n == 0);
+ }
+ else
+#endif /* SHOPT_MULTIBYTE */
while((n=state[*(unsigned char*)cp++])==0);
+
if(n==S_NL || n==S_QUOTE || n==S_RBRA)
continue;
if(c=(cp-1)-fcseek(0))
@@ -395,8 +426,42 @@
cp++;
while(1)
{
- while((n=state[*(unsigned char*)cp++])==0);
- c = (cp-1) - first;
+#if SHOPT_MULTIBYTE
+ if (mbwide())
+ {
+ ssize_t len;
+ do
+ {
+ switch((len = mbsize(cp)))
+ {
+ case -1: /* bogus multiByte char - parse as bytes? */
+ case 0: /* NULL byte */
+ len = 1;
+ case 1:
+ n = state[*(unsigned char*)cp++];
+ break;
+ default:
+ /*
+ * None of the state tables contain entries
+ * for multibyte characters. However, they
+ * should be treated the same as any other
+ * alpha character, so we'll use the state
+ * which would normally be assigned to the
+ * 'a' character.
+ */
+ cp += len;
+ n = state['a'];
+ }
+ }
+ while(n == 0);
+ c = (cp-len) - first;
+ }
+ else
+#endif /* SHOPT_MULTIBYTE */
+ {
+ while((n=state[*(unsigned char*)cp++])==0);
+ c = (cp-1) - first;
+ }
switch(n)
{
case S_ESC:
--- src/lib/libcmd/Mamfile
+++ src/lib/libcmd/Mamfile 2006-04-06 16:08:42.000000000 +0000
@@ -444,7 +444,7 @@
prev cat.c
meta cat.o %.c>%.o cat.c cat
prev cat.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2006 AT&T Knowledge Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\" -D_PACKAGE_ast -D_BLD_cmd -c cat.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2006 AT&T Knowledge Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\" -D_PACKAGE_ast -D_BLD_cmd -DSHOPT_MULTIBYTE -c cat.c
done cat.o generated
make chgrp.o
prev chgrp.c
--- src/lib/libcmd/cat.c
+++ src/lib/libcmd/cat.c 2006-04-06 16:09:45.000000000 +0000
@@ -133,8 +133,39 @@
while (endbuff)
{
cpold = cp;
- /* skip over ASCII characters */
+ /* skip over ASCII and multi byte characters */
+#if SHOPT_MULTIBYTE
+ if(mbwide())
+ {
+ do
+ {
+ ssize_t len;
+ switch((len = mbsize(cp)))
+ {
+ case -1: /* bogus multiByte char - parse as bytes? */
+ case 0: /* NULL byte */
+ case 1:
+ n = states[*cp++];
+ break;
+ default:
+ /*
+ * None of the state tables contain
+ * entries for multibyte characters,
+ * however, they should be treated
+ * the same as any other alph
+ * character. Therefore, we'll use
+ * the state of the 'a' character.
+ */
+ cp += len;
+ n = states['a'];
+ }
+ }
+ while(n == 0);
+ }
+ else
+#endif /* SHOPT_MULTIBYTE */
while ((n = states[*cp++]) == 0);
+
if (n==T_ENDBUF)
{
if (cp>endbuff)
++++++ ksh93.dif ++++++
--- /var/tmp/diff_new_pack.IPMFHu/_old 2006-04-07 16:54:07.000000000 +0200
+++ /var/tmp/diff_new_pack.IPMFHu/_new 2006-04-07 16:54:07.000000000 +0200
@@ -1,193 +1,5 @@
---- src/cmd/INIT/make.probe
-+++ src/cmd/INIT/make.probe Fri Feb 4 13:55:51 2005
-@@ -30,8 +30,8 @@
- probe_libdir="shlib lib"
- probe_nmflags="'' -p -B"
- probe_optimize="-O"
--probe_pic="-Kpic -KPIC -fpic -pic +z"
--probe_PIC="-Kpic -KPIC -fpic -fPIC -pic -PIC +z +Z"
-+probe_pic="-Kpic -KPIC -fPIC -fpic -pic +z"
-+probe_PIC="-Kpic -KPIC -fPIC -fpic -PIC -pic +z +Z"
- probe_readonly="-R -Krodata -xMerge -Wa,-r"
- probe_shared="'' -G -b -c -shared -Wl,dll"
- probe_shared_nostart="-nostartfiles"
---- src/cmd/ksh93/builtins.mm
-+++ src/cmd/ksh93/builtins.mm Fri Feb 4 13:55:51 2005
-@@ -1,11 +1,12 @@
- .ds DT July 9, 1993 \" use troff -mm
--.PM BP
-+.\" .PM BP
- .nr C 3
- .nr N 2
- .SA 1 \" right justified
- .TL "311466-6713" "49059-6" \" charging case filing case
- Guidelines for writing \f5ksh-93\fP built-in commands
- .AU "David G. Korn" DGK FP 11267 8062 D-237 "(research!dgk)"
-+.AF
- .TM 11267-930???-93 \" technical memo + TM numbers
- .MT 4
- .AS 2 \" abstract start for TM
---- src/cmd/ksh93/edit/edit.c
-+++ src/cmd/ksh93/edit/edit.c Fri Feb 4 15:37:44 2005
-@@ -50,6 +50,10 @@
- #include "history.h"
- #include "edit.h"
-
-+#if defined(linux) && defined(SIGWINCH)
-+int got_sigwinch = 0;
-+#endif
-+
- #if SHOPT_MULTIBYTE
- # define is_print(c) ((c&~STRIP) || isprint(c))
- #else
-@@ -380,6 +384,7 @@
- */
-
- # ifdef TIOCGETC
-+int
- tty_alt(register int fd)
- {
- register Edit_t *ep = (Edit_t*)(sh_getinterp()->ed_context);
-@@ -428,6 +433,7 @@
- # define IEXTEN 0
- # endif /* IEXTEN */
-
-+int
- tty_alt(register int fd)
- {
- register Edit_t *ep = (Edit_t*)(sh_getinterp()->ed_context);
-@@ -604,6 +610,10 @@
- {
- ep->e_hismax = ep->e_hismin = ep->e_hloff = 0;
- }
-+#if defined(linux) && defined(SIGWINCH)
-+ sh.sigflag[SIGWINCH] |= SH_SIGFAULT;
-+ (void)signal(SIGWINCH,sh_fault);
-+#endif
- ep->e_hline = ep->e_hismax;
- ep->e_wsize = ed_window()-2;
- ep->e_crlf = 1;
-@@ -724,6 +734,7 @@
- * this case. This is not necessary for systems that can handle
- * sfpkrd() correctly (i,e., those that support poll() or select()
- */
-+#include
- int ed_read(void *context, int fd, char *buff, int size, int reedit)
- {
- register Edit_t *ep = (Edit_t*)context;
-@@ -902,6 +913,7 @@
- {
- register int n, c;
- char readin[LOOKAHEAD+1];
-+
- if(!ep->e_lookahead)
- {
- ed_flush(ep);
-@@ -1308,3 +1320,16 @@
- strcpy(ed->e_macro,"_??");
- return((void*)ed);
- }
-+
-+#if defined(linux)
-+void ed_check_sigwinch(void *context)
-+{
-+# if defined(SIGWINCH)
-+ register Edit_t *ep = (Edit_t*)context;
-+ if (got_sigwinch == 0)
-+ return;
-+ ep->e_wsize = ed_window()-2;
-+ got_sigwinch = 0;
-+# endif
-+}
-+#endif
---- src/cmd/ksh93/include/edit.h
-+++ src/cmd/ksh93/include/edit.h Fri Feb 4 15:38:14 2005
-@@ -190,6 +190,9 @@
- extern int ed_viread(void*, int, char*, int, int);
- extern int ed_read(void*, int, char*, int, int);
- extern int ed_emacsread(void*, int, char*, int, int);
-+#if defined(linux)
-+extern void ed_check_sigwinch(void*);
-+#endif
- #if KSHELL
- extern int ed_macro(Edit_t*,int);
- extern int ed_expand(Edit_t*, char[],int*,int*,int,int);
---- src/cmd/ksh93/sh/fault.c
-+++ src/cmd/ksh93/sh/fault.c Fri Feb 4 15:39:12 2005
-@@ -54,6 +54,10 @@
- }
- #endif
-
-+#if defined(linux)
-+extern int got_sigwinch;
-+#endif
-+
- /*
- * Most signals caught or ignored by the shell come here
- */
-@@ -68,6 +72,10 @@
- signal(sig, sh_fault);
- sig &= ~SH_TRAP;
- #ifdef SIGWINCH
-+# if defined(linux)
-+ if(sig==SIGWINCH && sh_isstate(SH_INTERACTIVE))
-+ got_sigwinch = 1;
-+# else
- if(sig==SIGWINCH && !sh_isoption(SH_POSIX))
- {
- int rows=0, cols=0;
-@@ -77,6 +85,7 @@
- if(rows)
- nv_putval(LINES, (char*)&rows, NV_INTEGER);
- }
-+# endif
- #endif /* SIGWINCH */
-
- /* handle ignored signals */
---- src/cmd/ksh93/sh/io.c
-+++ src/cmd/ksh93/sh/io.c Fri Feb 4 15:39:45 2005
-@@ -1103,6 +1103,9 @@
- char *xp=0;
- #endif
- NOT_USED(handle);
-+#if defined(linux)
-+ ed_check_sigwinch(sh.ed_context);
-+#endif
- # if SHOPT_ESH
- if(sh_isoption(SH_EMACS) || sh_isoption(SH_GMACS))
- readf = ed_emacsread;
---- src/cmd/ksh93/sh/main.c
-+++ src/cmd/ksh93/sh/main.c Fri Feb 4 13:55:51 2005
-@@ -204,6 +204,27 @@
- }
- /* make sure PWD is set up correctly */
- path_pwd(1);
-+#if defined(linux)
-+ name = "";
-+ if(!sh_isoption(SH_NOEXEC))
-+ {
-+ if(!sh_isoption(SH_NOPROFILE) && !sh_isoption(SH_PRIVILEGED) && sh_isoption(SH_RC))
-+ name = sh_mactry("/etc/ksh.kshrc");
-+ }
-+# ifdef PATH_BFPATH
-+ if(*name && (fdin = path_open(name,NIL(Pathcomp_t*))) >= 0)
-+# else
-+ if(*name && (fdin = path_open(name,"")) >= 0)
-+# endif
-+ {
-+ char *cp, *saveid = error_info.id;
-+ cp = error_info.id = strdup(name);
-+ shp->st.filename = path_fullname(stakptr(PATH_OFFSET));
-+ exfile(shp,iop,fdin);
-+ error_info.id = saveid;
-+ free(cp);
-+ }
-+#endif
- name = "";
- if(!sh_isoption(SH_NOEXEC))
- {
--- src/cmd/ksh93/sh/suid_exec.c
-+++ src/cmd/ksh93/sh/suid_exec.c Fri Feb 4 13:55:51 2005
++++ src/cmd/ksh93/sh/suid_exec.c 2006-03-24 18:49:39.000000000 +0100
@@ -64,7 +64,11 @@
#define THISPROG "/etc/suid_exec"
#define DEFSHELL "/bin/sh"
@@ -200,24 +12,51 @@
static int in_dir(const char*, const char*);
static int endsh(const char*);
#ifndef _lib_setregid
---- src/lib/libast/port/astwinsize.c
-+++ src/lib/libast/port/astwinsize.c Fri Feb 4 13:55:51 2005
-@@ -36,6 +36,12 @@
- #define sleep ______sleep
- #endif
+--- src/lib/libast/features/align.c
++++ src/lib/libast/features/align.c 2006-03-24 18:50:43.000000000 +0100
+@@ -32,6 +32,7 @@
+ #include "FEATURE/common"
-+#if defined(linux) && _sys_ioctl
-+# undef ioctl
-+# include
-+# define ioctl ______ioctl
-+#endif
-+
- #if defined(TIOCGWINSZ)
- #if _sys_stream && _sys_ptem
- #include
+ #include
++#include
+
+ union _u_
+ {
+--- src/lib/libast/features/botch.c
++++ src/lib/libast/features/botch.c 2006-03-24 18:51:25.000000000 +0100
+@@ -27,6 +27,7 @@
+ * generate ast traps for botched standard prototypes
+ */
+
++#include
+ #include
+
+ #include "FEATURE/lib"
+--- src/lib/libast/misc/procopen.c
++++ src/lib/libast/misc/procopen.c 2006-03-24 18:49:39.000000000 +0100
+@@ -523,7 +523,7 @@
+ if (!fork())
+ {
+ sfsprintf(path, sizeof(path), "%d", getppid());
+- execlp("trace", "trace", "-p", path, NiL);
++ execlp("trace", "trace", "-p", path, NULL);
+ _exit(EXIT_NOTFOUND);
+ }
+ sleep(2);
+--- src/lib/libast/sfio/sfstrtof.h
++++ src/lib/libast/sfio/sfstrtof.h 2006-03-24 18:49:39.000000000 +0100
+@@ -53,7 +53,7 @@
+
+ #if !defined(S2F_function)
+ #define S2F_function _sfdscan
+-#define S2F_static 1
++#define S2F_static -1
+ #define S2F_type 2
+ #define S2F_scan 1
+ #ifndef elementsof
--- src/lib/libcmd/chmod.c
-+++ src/lib/libcmd/chmod.c Fri Feb 4 13:55:51 2005
-@@ -165,7 +165,7 @@
++++ src/lib/libcmd/chmod.c 2006-03-24 18:49:39.000000000 +0100
+@@ -164,7 +164,7 @@
int (*chmodf)(const char*, mode_t);
int notify = 0;
int ignore = 0;
@@ -225,8 +64,8 @@
+#if !defined(linux) && _lib_lchmod
int chlink = 0;
#endif
-
-@@ -191,7 +191,7 @@
+ struct stat st;
+@@ -194,7 +194,7 @@
force = 1;
continue;
case 'h':
@@ -235,8 +74,8 @@
chlink = 1;
#endif
continue;
-@@ -238,7 +238,7 @@
- error(ERROR_exit(1), "%s: invalid mode", amode);
+@@ -248,7 +248,7 @@
+ }
}
chmodf =
-#if _lib_lchmod
@@ -244,25 +83,3 @@
chlink ? lchmod :
#endif
chmod;
---- src/lib/libast/sfio/sfstrtof.h
-+++ src/lib/libast/sfio/sfstrtof.h 2005-04-13 16:07:44.045671034 +0000
-@@ -53,7 +53,7 @@
-
- #if !defined(S2F_function)
- #define S2F_function _sfdscan
--#define S2F_static 1
-+#define S2F_static -1
- #define S2F_type 2
- #define S2F_scan 1
- #ifndef elementsof
---- src/lib/libast/misc/procopen.c
-+++ src/lib/libast/misc/procopen.c 2005-04-13 16:27:33.409799760 +0000
-@@ -523,7 +523,7 @@
- if (!fork())
- {
- sfsprintf(path, sizeof(path), "%d", getppid());
-- execlp("trace", "trace", "-p", path, NiL);
-+ execlp("trace", "trace", "-p", path, NULL);
- _exit(EXIT_NOTFOUND);
- }
- sleep(2);
++++++ workaround-stupid-build-system.diff ++++++
--- /var/tmp/diff_new_pack.IPMFHu/_old 2006-04-07 16:54:08.000000000 +0200
+++ /var/tmp/diff_new_pack.IPMFHu/_new 2006-04-07 16:54:08.000000000 +0200
@@ -1,5 +1,5 @@
--- src/cmd/INIT/Mamfile
-+++ src/cmd/INIT/Mamfile 2005-12-16 17:37:36.000000000 +0100
++++ src/cmd/INIT/Mamfile 2006-03-24 16:37:10.000000000 +0100
@@ -5,7 +5,7 @@
setv ARFLAGS cr
setv AS as
@@ -19,8 +19,8 @@
setv TAR tar
setv YACC yacc
--- src/cmd/ksh93/Mamfile
-+++ src/cmd/ksh93/Mamfile 2005-12-16 18:09:28.000000000 +0100
-@@ -8,7 +8,7 @@
++++ src/cmd/ksh93/Mamfile 2006-03-24 16:44:08.000000000 +0100
+@@ -7,7 +7,7 @@
setv ARFLAGS cr
setv AS as
setv ASFLAGS
@@ -29,7 +29,7 @@
setv mam_cc_FLAGS
setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?}
setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
-@@ -30,7 +30,7 @@
+@@ -29,7 +29,7 @@
setv NMAKEFLAGS
setv PR pr
setv PRFLAGS
@@ -38,25 +38,25 @@
setv SILENT
setv TAR tar
setv YACC yacc
-@@ -688,7 +688,7 @@
+@@ -690,7 +690,7 @@
done sh/main.c
meta main.o %.c>%.o sh/main.c main
prev sh/main.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG??} -I. -Iinclude -I${INSTALLROOT}/include/ast -DSHOPT_BRACEPAT -D_PACKAGE_ast -DSHOPT_ESH -DSHOPT_KIA -D_BLD_shell -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DKSHELL -DSHOPT_SUID_EXEC -DSHOPT_DYNAMIC -DSHOPT_OO -c sh/main.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${INSTALLROOT}/include/ast -DSHOPT_BRACEPAT -D_PACKAGE_ast -DSHOPT_ESH -DSHOPT_KIA -D_BLD_shell -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DKSHELL -DSHOPT_SUID_EXEC -DSHOPT_DYNAMIC -DSHOPT_OO -c sh/main.c
+-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -DSHOPT_BRACEPAT -D_PACKAGE_ast -DSHOPT_ESH -DSHOPT_KIA -D_BLD_shell -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DKSHELL -DSHOPT_SUID_EXEC -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_OO -c sh/main.c
++exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -DSHOPT_BRACEPAT -D_PACKAGE_ast -DSHOPT_ESH -DSHOPT_KIA -D_BLD_shell -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DKSHELL -DSHOPT_SUID_EXEC -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_OO -c sh/main.c
done main.o generated
make nvdisc.o
make sh/nvdisc.c
-@@ -1102,7 +1102,7 @@
+@@ -1109,7 +1109,7 @@
done sh/trestore.c
meta trestore.o %.c>%.o sh/trestore.c trestore
prev sh/trestore.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG??} -I. -Iinclude -I${INSTALLROOT}/include/ast -D_BLD_shell -DKSHELL -D_PACKAGE_ast -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_KIA -DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c sh/trestore.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${INSTALLROOT}/include/ast -D_BLD_shell -DKSHELL -D_PACKAGE_ast -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_KIA -DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c sh/trestore.c
+-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_BLD_shell -DKSHELL -D_PACKAGE_ast -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_KIA -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c sh/trestore.c
++exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_BLD_shell -DKSHELL -D_PACKAGE_ast -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_KIA -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c sh/trestore.c
done trestore.o generated
make waitevent.o
make sh/waitevent.c
-@@ -1337,7 +1337,7 @@
+@@ -1356,7 +1356,7 @@
prev ${mam_libsecdb}
prev +lintl
prev ${mam_libdl}
@@ -65,7 +65,7 @@
done ksh generated
make shcomp
make shcomp.o
-@@ -1361,7 +1361,7 @@
+@@ -1380,7 +1380,7 @@
prev ${mam_libdl}
setv CC.DLL -UCC.DLL
setv SH_DICT -DSH_DICT="\"libshell\""
@@ -75,7 +75,7 @@
make suid_exec
make suid_exec.o
--- src/lib/libast/Mamfile
-+++ src/lib/libast/Mamfile 2005-12-16 17:42:52.000000000 +0100
++++ src/lib/libast/Mamfile 2006-03-24 16:48:51.000000000 +0100
@@ -5,7 +5,7 @@
setv ARFLAGS cr
setv AS as
@@ -94,11 +94,11 @@
setv SILENT
setv TAR tar
setv YACC yacc
-@@ -532,7 +532,7 @@
+@@ -531,7 +531,7 @@
done misc/fastfind.c
meta fastfind.o %.c>%.o misc/fastfind.c fastfind
prev misc/fastfind.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG??} -I. -Icomp -Imisc -Iinclude -Istd -D_PACKAGE_ast -c misc/fastfind.c
+-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Imisc -Iinclude -Istd -D_PACKAGE_ast -c misc/fastfind.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd -D_PACKAGE_ast -c misc/fastfind.c
done fastfind.o generated
make hashalloc.o
@@ -107,53 +107,52 @@
done port/mc.c
meta mc.o %.c>%.o port/mc.c mc
prev port/mc.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG??} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c port/mc.c
+-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c port/mc.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c port/mc.c
done mc.o generated
make liberror.o
make misc/liberror.c
-@@ -2771,7 +2771,7 @@
+@@ -2805,7 +2805,7 @@
done comp/spawnveg.c
meta spawnveg.o %.c>%.o comp/spawnveg.c spawnveg
prev comp/spawnveg.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG??} -I. -Icomp -Iinclude -Istd -D_PACKAGE_ast -c comp/spawnveg.c
+-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iinclude -Istd -D_PACKAGE_ast -c comp/spawnveg.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd -D_PACKAGE_ast -c comp/spawnveg.c
done spawnveg.o generated
make vfork.o
make comp/vfork.c
-@@ -4104,7 +4104,7 @@
+@@ -4155,7 +4155,7 @@
done sfio/sfrd.c
meta sfrd.o %.c>%.o sfio/sfrd.c sfrd
prev sfio/sfrd.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG??} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfrd.c
+-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfrd.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfrd.c
done sfrd.o generated
make sfread.o
make sfio/sfread.c
-@@ -4260,7 +4260,7 @@
+@@ -4311,7 +4311,7 @@
done sfio/sfvprintf.c
meta sfvprintf.o %.c>%.o sfio/sfvprintf.c sfvprintf
prev sfio/sfvprintf.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG??} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfvprintf.c
+-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfvprintf.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfvprintf.c
done sfvprintf.o generated
make sfvscanf.o
make sfio/sfvscanf.c
-@@ -6888,64 +6888,37 @@
+@@ -6939,64 +6939,37 @@
make ${INSTALLROOT}/include/ast/fmtmsg.h
prev comp/fmtmsg.h
prev ast_lib.h
-exec - case ${mam_cc_HOSTTYPE} in
--exec - win32.*)proto -p -s -l ${INSTALLROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/fmtmsg.h > 1.${COTEMP}.x
+-exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/fmtmsg.h > 1.${COTEMP}.x
-exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/fmtmsg.h 1.${COTEMP}.x
-exec - then rm -f 1.${COTEMP}.x
-exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/fmtmsg.h
-exec - fi
-exec - ;;
-exec - *) silent grep -l 'define[ ][ ]*_[hl][di][rb]_fmtmsg' ast_lib.h > /dev/null || {
--exec - proto -p -s -l ${INSTALLROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/fmtmsg.h > 1.${COTEMP}.x
+exec - silent grep -l 'define[ ][ ]*_[hl][di][rb]_fmtmsg' ast_lib.h > /dev/null || {
-+exec - proto -p -s -l ${INSTALLROOT}/lib/package/ast.lic "-o since=1985,author=gsf+dgk+kpv" comp/fmtmsg.h > 1.${COTEMP}.x
+ exec - proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/fmtmsg.h > 1.${COTEMP}.x
exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/fmtmsg.h 1.${COTEMP}.x
exec - then rm -f 1.${COTEMP}.x
exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/fmtmsg.h
@@ -167,15 +166,15 @@
prev comp/libgen.h
prev ast_lib.h
-exec - case ${mam_cc_HOSTTYPE} in
--exec - win32.*)proto -p -s -l ${INSTALLROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/libgen.h > 1.${COTEMP}.x
+-exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/libgen.h > 1.${COTEMP}.x
-exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/libgen.h 1.${COTEMP}.x
-exec - then rm -f 1.${COTEMP}.x
-exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/libgen.h
-exec - fi
-exec - ;;
-exec - *) silent grep -l 'define[ ][ ]*_[hl][di][rb]_libgen' ast_lib.h > /dev/null || {
-+exec - silent grep -l 'define[ ][ ]*_[hl][di][rb]_libgen' ast_lib.h > /dev/null || {
- exec - proto -p -s -l ${INSTALLROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/libgen.h > 1.${COTEMP}.x
++exec - silent grep -l 'define[ ][ ]*_[hl][di][rb]_libgen' ast_lib.h > /dev/null || {
+ exec - proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/libgen.h > 1.${COTEMP}.x
exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/libgen.h 1.${COTEMP}.x
exec - then rm -f 1.${COTEMP}.x
exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/libgen.h
@@ -189,15 +188,15 @@
prev comp/syslog.h
prev ast_lib.h
-exec - case ${mam_cc_HOSTTYPE} in
--exec - win32.*)proto -p -s -l ${INSTALLROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/syslog.h > 1.${COTEMP}.x
+-exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/syslog.h > 1.${COTEMP}.x
-exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/syslog.h 1.${COTEMP}.x
-exec - then rm -f 1.${COTEMP}.x
-exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/syslog.h
-exec - fi
-exec - ;;
-exec - *) silent grep -l 'define[ ][ ]*_[hl][di][rb]_syslog' ast_lib.h > /dev/null || {
-+exec - silent grep -l 'define[ ][ ]*_[hl][di][rb]_syslog' ast_lib.h > /dev/null || {
- exec - proto -p -s -l ${INSTALLROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/syslog.h > 1.${COTEMP}.x
++exec - silent grep -l 'define[ ][ ]*_[hl][di][rb]_syslog' ast_lib.h > /dev/null || {
+ exec - proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/syslog.h > 1.${COTEMP}.x
exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/syslog.h 1.${COTEMP}.x
exec - then rm -f 1.${COTEMP}.x
exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/syslog.h
@@ -209,8 +208,8 @@
prev ${INSTALLROOT}/include/prototyped.h implicit
done ${INSTALLROOT}/include/ast/syslog.h generated
--- src/lib/libcmd/Mamfile
-+++ src/lib/libcmd/Mamfile 2005-12-16 17:38:00.000000000 +0100
-@@ -8,7 +8,7 @@
++++ src/lib/libcmd/Mamfile 2006-03-24 16:49:45.000000000 +0100
+@@ -7,7 +7,7 @@
setv ARFLAGS cr
setv AS as
setv ASFLAGS
@@ -219,7 +218,7 @@
setv mam_cc_FLAGS ${mam_cc_DLL}
setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?}
setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
-@@ -30,7 +30,7 @@
+@@ -29,7 +29,7 @@
setv NMAKEFLAGS
setv PR pr
setv PRFLAGS
@@ -228,18 +227,18 @@
setv SILENT
setv TAR tar
setv YACC yacc
-@@ -385,7 +385,7 @@
- done id.c
+@@ -540,7 +540,7 @@
+ prev id.c
meta id.o %.c>%.o id.c id
prev id.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG??} -I. -I${INSTALLROOT}/include/ast -DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2005 AT&T Corp.][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\" -c id.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${INSTALLROOT}/include/ast -DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2005 AT&T Corp.][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\" -c id.c
+-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2006 AT&T Knowledge Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\" -c id.c
++exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2006 AT&T Knowledge Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\" -c id.c
done id.o generated
make join.o
- make join.c
+ prev join.c
--- src/lib/libdll/Mamfile
-+++ src/lib/libdll/Mamfile 2005-12-16 17:38:06.000000000 +0100
-@@ -8,7 +8,7 @@
++++ src/lib/libdll/Mamfile 2006-03-24 16:50:04.000000000 +0100
+@@ -7,7 +7,7 @@
setv ARFLAGS cr
setv AS as
setv ASFLAGS
@@ -248,7 +247,7 @@
setv mam_cc_FLAGS ${mam_cc_DLL}
setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?}
setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
-@@ -30,7 +30,7 @@
+@@ -29,7 +29,7 @@
setv NMAKEFLAGS
setv PR pr
setv PRFLAGS
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...