Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in at 2012-02-07 22:12:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksh", Maintainer is "werner@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2012-01-25 15:02:00.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2012-02-07 22:12:57.000000000 +0100
@@ -1,0 +2,46 @@
+Mon Feb 6 12:01:10 UTC 2012 - werner@suse.de
+
+- Update to 2012-02-02 of ksh93u+ which includes some of our patches
+ and fixes for the observerd memory leaks
+ 12-02-02 A bug in the ulimit option table was fixed.
+ 12-01-26 A bug in which a set command that did not change monitor could
+ effect the behavior of the monitor when monitor mode is on is fixed.
+ 12-01-21 +You can now test whether the shell implements a math function using
+ typeset -f .sh.math.name, where name is the name of the function.
+ 12-01-21 A bug in which typeset -L and typeset -R did not handle multibyte
+ characters correctly has been fixed.
+ 12-01-20 A bug that could cause the shell to hang waiting for an incorrect
+ job pid has been fixed.
+ 12-01-19 A memory leak which occured for a nested command subtiution has been
+ fixed.
+ 12-01-17 A bug in which typeset -u PS1 could enable the uppercase attribute
+ for some other variables, for exampe, HISTFILE has been fixed.
+ 12-01-16 A bug in which .sh.match was not correct after a substring match when
+ the replacement string contained a substring match has been fixed.
+ 12-01-12 +Files that are sourced from profile files are now read and executed
+ one command at a time so that alias definitions take effect as they
+ do for profile files.
+ 12-01-12 A bug in which whence -p would find a function if one existed and
+ there was no command of that name on PATH.
+ 12-01-11 Change b_* prototype (int, char**, void*) => (int, char**, Shbltin_t*).
+ 12-01-05 A bug in which read was not terminating for a signal that had a trap
+ set has been fixed.
+ libast:
+ 12-01-31 spawnveg.c: fix transient bug that made invalid setpgid() call
+ 12-01-27 pathpath.c: fix buffer size math when internal allocation requested
+ 12-01-24 malloc.c: fix _vmkeep() bug that did not return previous state
+ 12-01-23 malloc.c: add VMALLOC_OPTIONS=break to try sbrk() block allocator first
+ 12-01-18 malloc.c: disable multiple regions for tracing or !vmbest or ASO_SIGNAL
+ 12-01-12 sfpkrd.c: add __sun I_PEEK+rsh runtime workaround
+ 12-01-10 shcmd.h: void* => Shbltin_t*
+ 12-01-10 tmxdate.c: handle { n>=1000 } TM_PARTS
+ libcmd:
+ 12-01-10 b_* (int, char**, void*) => (int, char**, Shbltin_t*)
+
+-------------------------------------------------------------------
+Thu Feb 2 11:32:15 UTC 2012 - werner@suse.de
+
+- Fix an off-by-one error which cause that the builtin ulimit may
+ fail (bnc#744355), patch from Li Bin.
+
+-------------------------------------------------------------------
Old:
----
INIT.2012-01-01.tar.bz2
ast-ksh.2012-01-01.tar.bz2
ast-msgcc.2012-01-01.tar.bz2
New:
----
INIT.2012-02-02.tar.bz2
ast-ksh.2012-02-02.tar.bz2
ast-msgcc.2012-02-02.tar.bz2
ksh93-limit-name-len.dif
leak3.sh
ulimit.sh
vmbalance
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ksh.spec ++++++
--- /var/tmp/diff_new_pack.GaRzyS/_old 2012-02-07 22:12:58.000000000 +0100
+++ /var/tmp/diff_new_pack.GaRzyS/_new 2012-02-07 22:12:58.000000000 +0100
@@ -27,7 +27,9 @@
BuildRequires: update-alternatives
%endif
# /bin/ex and /bin/ed required for build
+BuildRequires: awk
BuildRequires: ed
+BuildRequires: strace
BuildRequires: vim
Url: http://www.research.att.com/~gsf/download/
License: CPL-1.0
@@ -43,16 +45,19 @@
Release: 1
Summary: Korn Shell
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: INIT.2012-01-01.tar.bz2
-Source1: ast-ksh.2012-01-01.tar.bz2
-Source2: ast-msgcc.2012-01-01.tar.bz2
+Source: INIT.2012-02-02.tar.bz2
+Source1: ast-ksh.2012-02-02.tar.bz2
+Source2: ast-msgcc.2012-02-02.tar.bz2
Source3: CPL
Source10: leak1.sh
Source11: leak2.sh
Source12: ifs-crash.sh
+Source13: ulimit.sh
+Source14: leak3.sh
Source20: Agreement
Source21: Warning
Source30: rpmlintrc
+Source31: vmbalance
Source42: sigexec.c
Patch: ksh93.dif
Patch1: workaround-stupid-build-system.diff
@@ -76,6 +81,7 @@
Patch19: ksh93-reg.dif
Patch20: ksh93-aso.dif
Patch21: ksh93-vm.dif
+Patch22: ksh93-limit-name-len.dif
Patch42: ksh-locale.patch
%global use_suid_exe 0
%global use_locale 0
@@ -116,13 +122,16 @@
Phong Vo
%prep
+chmod +x %{S:31}
%setup -q -n ksh93 -T -c -a 0 -a 1 -a 2
-find share/ \( -name chef -o -name fudd -o -name piglatin -o -name valley \) -a -type d |\
+if test -d share ; then
+ find share/ \( -name chef -o -name fudd -o -name piglatin -o -name valley \) -a -type d |\
xargs -r rm -vrf
-find share/ ! \( -name libast -o -name libcmd -o -name libdll -o -name libshell \) -a -type f |\
+ find share/ ! \( -name libast -o -name libcmd -o -name libdll -o -name libshell \) -a -type f |\
xargs -r rm -vf
-find share/ -type d -a -empty | xargs -r rm -vrf
-find share/ -type d -a -empty | xargs -r rm -vrf
+ find share/ -type d -a -empty | xargs -r rm -vrf
+ find share/ -type d -a -empty | xargs -r rm -vrf
+fi
%patch
%patch42
%patch1
@@ -150,8 +159,7 @@
%patch19
%patch20
%patch21
-find -type f -a -name Mamfile | \
- xargs sed -ri '/exec.*-I-D/{s@(-I)(-D)([^0]*)(0[^[:blank:]]+)@\1\3@}'
+%patch22
%build
#
@@ -172,6 +180,7 @@
set -- $(readlink $fd)
exec -a $SHELL ./sigexec $SHELL ${1+"$@"}
fi
+ IGNORED=0x$(ps --no-headers -o ignored $$)
AR="ar"
CC=gcc
@@ -312,6 +321,12 @@
HOSTTYPE=linux.$RPM_ARCH
;;
esac
+ for mm in mmap mmap2 mmap64 munmap munmap2 munmap64 ; do
+ if strace -e $mm /bin/true > /dev/null 2>&1 ; then
+ MEMORY="${MEMORY:+${MEMORY},}$mm"
+ fi
+ done
+ MEMORY="${MEMORY:+-e ${MEMORY}}"
RPM_OPT_FLAGS=$(echo "${RPM_OPT_FLAGS}"|sed -r 's/[[:blank:]]+-g[0-9]?/ -g2/g')
UNIVERSE=att
LDFLAGS="-lm"
@@ -319,13 +334,10 @@
cflags -std=gnu99 RPM_OPT_FLAGS
cflags -fPIC RPM_OPT_FLAGS
cflags @$nobuiltin RPM_OPT_FLAGS
- cflags -fno-unwind-tables RPM_OPT_FLAGS
cflags -fno-strict-aliasing RPM_OPT_FLAGS
cflags -fno-zero-initialized-in-bss RPM_OPT_FLAGS
cflags -fno-delete-null-pointer-checks RPM_OPT_FLAGS
- cflags -fno-asynchronous-unwind-tables RPM_OPT_FLAGS
cflags -fno-unsafe-loop-optimizations RPM_OPT_FLAGS
- cflags -fno-reorder-blocks-and-partition RPM_OPT_FLAGS
cflags -fsigned-bitfields RPM_OPT_FLAGS
cflags -fsigned-chars RPM_OPT_FLAGS
cflags -fsigned-zeros RPM_OPT_FLAGS
@@ -431,13 +443,33 @@
ln -sf ${root}/lib ${test}/../
rm -f pty.sh
${root}/bin/ksh.test shtests
- ${root}/bin/ksh.test %{S:10}
- ${root}/bin/ksh.test %{S:11}
- ${root}/bin/ksh.test %{S:12}
+ LANG=POSIX
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:10} 400
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:10} 4000
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:11} 400
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:11} 4000
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:12}
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:13} 400
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:13} 4000
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:14} 400
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:14} 4000
if test $((IGNORED & SIGPIPE)) -eq 0 ; then
- # This may fail in current factory (aka next 11.3)
${root}/bin/ksh.test -c 'g="false"; trap "print -u2 PIPED; \$g && exit 0 ; g=true" PIPE ; while true ; do echo hello ; done' | head -n 10
fi
+ LANG=en_US.UTF-8
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:10} 400
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:10} 4000
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:11} 400
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:11} 4000
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:12}
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:13} 400
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:13} 4000
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:14} 400
+ strace $MEMORY -o '!%{S:31}' ${root}/bin/ksh.test %{S:14} 4000
+ if test $((IGNORED & SIGPIPE)) -eq 0 ; then
+ ${root}/bin/ksh.test -c 'g="false"; trap "print -u2 PIPED; \$g && exit 0 ; g=true" PIPE ; while true ; do echo hello ; done' | head -n 10
+ fi
+ LANG=POSIX
killall -q -s 9 ${root}/bin/ksh.test || true
popd
%endif
++++++ INIT.2012-01-01.tar.bz2 -> INIT.2012-02-02.tar.bz2 ++++++
++++ 3817 lines of diff (skipped)
++++++ ast-ksh.2012-01-01.tar.bz2 -> ast-ksh.2012-02-02.tar.bz2 ++++++
++++ 15139 lines of diff (skipped)
++++++ ast-msgcc.2012-01-01.tar.bz2 -> ast-msgcc.2012-02-02.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/cmd/msgcc/Mamfile new/src/cmd/msgcc/Mamfile
--- old/src/cmd/msgcc/Mamfile 2012-01-04 10:25:04.000000000 +0100
+++ new/src/cmd/msgcc/Mamfile 2012-02-03 21:13:15.000000000 +0100
@@ -1,4 +1,4 @@
-info mam static 00000 1994-07-17 make (AT&T Research) 5.6 2011-12-13
+info mam static 00000 1994-07-17 make (AT&T Research) 5.7 2012-01-21
setv INSTALLROOT ../../..
setv PACKAGE_ast_INCLUDE ${INSTALLROOT}/include/ast
setv PACKAGE_ast_LIB ${INSTALLROOT}/lib
@@ -10,7 +10,7 @@
setv CC cc
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}??}
+setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
setv COTEMP $$
setv CPIO cpio
setv CPIOFLAGS
@@ -44,36 +44,36 @@
prev msgadmin.sh
exec - case static,port:$OPTIND:$RANDOM in
exec - ?*:*:*|*::*|*:*:$RANDOM)
-exec - ;;
-exec - *) if ENV= LC_ALL=C x= $SHELL -nc ': ${list[level]} !(pattern)' 2>/dev/null
-exec - then if grep -q '### .*archaic.* ###'
-exec - then : msgadmin contains archaic constructs :
-exec - else ENV= LC_ALL=C $SHELL -n msgadmin.sh
-exec - fi
-exec - fi
-exec - ;;
+exec - ;;
+exec - *) if ENV= LC_ALL=C x= $SHELL -nc '[[ a || b ]] && : ${list[level]} !(pattern)' 2>/dev/null
+exec - then if grep -q '### .*archaic.* ###'
+exec - then : msgadmin contains archaic constructs :
+exec - else ENV= LC_ALL=C $SHELL -n msgadmin.sh
+exec - fi
+exec - fi
+exec - ;;
exec - esac
exec - case '${mam_cc_SHELLMAGIC}' in
-exec - "") case 201 in
-exec - 0) cp msgadmin.sh msgadmin
-exec - ;;
-exec - *) {
-exec - i=`(read x; echo $x) < msgadmin.sh`
-exec - case $i in
-exec - '#!'*|*'||'*|':'*|'":"'*|"':'"*) echo "$i" ;;
-exec - esac
-exec - cat - msgadmin.sh <<'!'
+exec - "") case 201 in
+exec - 0) cp msgadmin.sh msgadmin
+exec - ;;
+exec - *) {
+exec - i=`(read x; echo $x) < msgadmin.sh`
+exec - case $i in
+exec - '#!'*|*'||'*|':'*|'":"'*|"':'"*) echo "$i" ;;
+exec - esac
+exec - cat - msgadmin.sh <<'!'
exec - USAGE_LICENSE="[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"
exec - !
-exec - } > msgadmin
-exec - ;;
-exec - esac
-exec - ;;
-exec - *) cat - msgadmin.sh > msgadmin <<'!'
+exec - } > msgadmin
+exec - ;;
+exec - esac
+exec - ;;
+exec - *) cat - msgadmin.sh > msgadmin <<'!'
exec - ${mam_cc_SHELLMAGIC}
exec - USAGE_LICENSE="[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"
exec - !
-exec - ;;
+exec - ;;
exec - esac
exec - silent test -w msgadmin -a -x msgadmin || chmod u+w,+x msgadmin
done msgadmin generated
@@ -107,10 +107,6 @@
make ${PACKAGE_ast_INCLUDE}/ast_api.h implicit
done ${PACKAGE_ast_INCLUDE}/ast_api.h dontcare
make ${PACKAGE_ast_INCLUDE}/vmalloc.h implicit
-make ${PACKAGE_ast_INCLUDE}/aso.h implicit
-prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
-prev ${PACKAGE_ast_INCLUDE}/prototyped.h implicit
-done ${PACKAGE_ast_INCLUDE}/aso.h dontcare
prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
make ${PACKAGE_ast_INCLUDE}/ast_std.h implicit
make ${PACKAGE_ast_INCLUDE}/regex.h implicit
@@ -186,7 +182,7 @@
done msgcpp.c
meta msgcpp.o %.c>%.o msgcpp.c msgcpp
prev msgcpp.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"\" -c msgcpp.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"\" -c msgcpp.c
done msgcpp.o generated
bind -lpp
bind -last
@@ -199,36 +195,36 @@
prev msgcc.sh
exec - case static,port:$OPTIND:$RANDOM in
exec - ?*:*:*|*::*|*:*:$RANDOM)
-exec - ;;
-exec - *) if ENV= LC_ALL=C x= $SHELL -nc ': ${list[level]} !(pattern)' 2>/dev/null
-exec - then if grep -q '### .*archaic.* ###'
-exec - then : msgcc contains archaic constructs :
-exec - else ENV= LC_ALL=C $SHELL -n msgcc.sh
-exec - fi
-exec - fi
-exec - ;;
+exec - ;;
+exec - *) if ENV= LC_ALL=C x= $SHELL -nc '[[ a || b ]] && : ${list[level]} !(pattern)' 2>/dev/null
+exec - then if grep -q '### .*archaic.* ###'
+exec - then : msgcc contains archaic constructs :
+exec - else ENV= LC_ALL=C $SHELL -n msgcc.sh
+exec - fi
+exec - fi
+exec - ;;
exec - esac
exec - case '${mam_cc_SHELLMAGIC}' in
-exec - "") case 201 in
-exec - 0) cp msgcc.sh msgcc
-exec - ;;
-exec - *) {
-exec - i=`(read x; echo $x) < msgcc.sh`
-exec - case $i in
-exec - '#!'*|*'||'*|':'*|'":"'*|"':'"*) echo "$i" ;;
-exec - esac
-exec - cat - msgcc.sh <<'!'
+exec - "") case 201 in
+exec - 0) cp msgcc.sh msgcc
+exec - ;;
+exec - *) {
+exec - i=`(read x; echo $x) < msgcc.sh`
+exec - case $i in
+exec - '#!'*|*'||'*|':'*|'":"'*|"':'"*) echo "$i" ;;
+exec - esac
+exec - cat - msgcc.sh <<'!'
exec - USAGE_LICENSE="[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"
exec - !
-exec - } > msgcc
-exec - ;;
-exec - esac
-exec - ;;
-exec - *) cat - msgcc.sh > msgcc <<'!'
+exec - } > msgcc
+exec - ;;
+exec - esac
+exec - ;;
+exec - *) cat - msgcc.sh > msgcc <<'!'
exec - ${mam_cc_SHELLMAGIC}
exec - USAGE_LICENSE="[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"
exec - !
-exec - ;;
+exec - ;;
exec - esac
exec - silent test -w msgcc -a -x msgcc || chmod u+w,+x msgcc
done msgcc generated
@@ -241,7 +237,7 @@
done msgcvt.c
meta msgcvt.o %.c>%.o msgcvt.c msgcvt
prev msgcvt.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"\" -c msgcvt.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"\" -c msgcvt.c
done msgcvt.o generated
exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L${INSTALLROOT}/lib} -o msgcvt msgcvt.o ${mam_libast}
done msgcvt generated
@@ -258,7 +254,7 @@
done msggen.c
meta msggen.o %.c>%.o msggen.c msggen
prev msggen.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"\" -c msggen.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"\" -c msggen.c
done msggen.o generated
exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L${INSTALLROOT}/lib} -o msggen msggen.o ${mam_libast}
done msggen generated
@@ -271,39 +267,39 @@
done msgget.c
meta msgget.o %.c>%.o msgget.c msgget
prev msgget.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"\" -c msgget.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"\" -c msgget.c
done msgget.o generated
exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L${INSTALLROOT}/lib} -o msgget msgget.o ${mam_libast}
done msgget generated
make ${INSTALLROOT}/bin
-exec - if silent test ! -d ${INSTALLROOT}/bin
-exec - then mkdir -p ${INSTALLROOT}/bin
+exec - if silent test ! -d ${INSTALLROOT}/bin
+exec - then mkdir -p ${INSTALLROOT}/bin
exec - fi
done ${INSTALLROOT}/bin generated
make ${INSTALLROOT}/bin/msgadmin
prev ${INSTALLROOT}/bin
prev msgadmin
-exec - test '' = 'msgadmin' || ${STDCMP} 2>/dev/null -s msgadmin ${INSTALLROOT}/bin/msgadmin || { ${STDMV} ${INSTALLROOT}/bin/msgadmin ${INSTALLROOT}/bin/msgadmin.old 2>/dev/null || true; ${STDCP} msgadmin ${INSTALLROOT}/bin/msgadmin ;}
+exec - test '' = 'msgadmin' || ${STDCMP} 2>/dev/null -s msgadmin ${INSTALLROOT}/bin/msgadmin || { ${STDMV} ${INSTALLROOT}/bin/msgadmin ${INSTALLROOT}/bin/msgadmin.old 2>/dev/null || true; ${STDCP} msgadmin ${INSTALLROOT}/bin/msgadmin ;}
done ${INSTALLROOT}/bin/msgadmin generated
make ${INSTALLROOT}/bin/msgcpp
prev msgcpp
-exec - test '' = 'msgcpp' || ${STDCMP} 2>/dev/null -s msgcpp ${INSTALLROOT}/bin/msgcpp || { ${STDMV} ${INSTALLROOT}/bin/msgcpp ${INSTALLROOT}/bin/msgcpp.old 2>/dev/null || true; ${STDCP} msgcpp ${INSTALLROOT}/bin/msgcpp ;}
+exec - test '' = 'msgcpp' || ${STDCMP} 2>/dev/null -s msgcpp ${INSTALLROOT}/bin/msgcpp || { ${STDMV} ${INSTALLROOT}/bin/msgcpp ${INSTALLROOT}/bin/msgcpp.old 2>/dev/null || true; ${STDCP} msgcpp ${INSTALLROOT}/bin/msgcpp ;}
done ${INSTALLROOT}/bin/msgcpp generated
make ${INSTALLROOT}/bin/msgcc
prev msgcc
-exec - test '' = 'msgcc' || ${STDCMP} 2>/dev/null -s msgcc ${INSTALLROOT}/bin/msgcc || { ${STDMV} ${INSTALLROOT}/bin/msgcc ${INSTALLROOT}/bin/msgcc.old 2>/dev/null || true; ${STDCP} msgcc ${INSTALLROOT}/bin/msgcc ;}
+exec - test '' = 'msgcc' || ${STDCMP} 2>/dev/null -s msgcc ${INSTALLROOT}/bin/msgcc || { ${STDMV} ${INSTALLROOT}/bin/msgcc ${INSTALLROOT}/bin/msgcc.old 2>/dev/null || true; ${STDCP} msgcc ${INSTALLROOT}/bin/msgcc ;}
done ${INSTALLROOT}/bin/msgcc generated
make ${INSTALLROOT}/bin/msgcvt
prev msgcvt
-exec - test '' = 'msgcvt' || ${STDCMP} 2>/dev/null -s msgcvt ${INSTALLROOT}/bin/msgcvt || { ${STDMV} ${INSTALLROOT}/bin/msgcvt ${INSTALLROOT}/bin/msgcvt.old 2>/dev/null || true; ${STDCP} msgcvt ${INSTALLROOT}/bin/msgcvt ;}
+exec - test '' = 'msgcvt' || ${STDCMP} 2>/dev/null -s msgcvt ${INSTALLROOT}/bin/msgcvt || { ${STDMV} ${INSTALLROOT}/bin/msgcvt ${INSTALLROOT}/bin/msgcvt.old 2>/dev/null || true; ${STDCP} msgcvt ${INSTALLROOT}/bin/msgcvt ;}
done ${INSTALLROOT}/bin/msgcvt generated
make ${INSTALLROOT}/bin/msggen
prev msggen
-exec - test '' = 'msggen' || ${STDCMP} 2>/dev/null -s msggen ${INSTALLROOT}/bin/msggen || { ${STDMV} ${INSTALLROOT}/bin/msggen ${INSTALLROOT}/bin/msggen.old 2>/dev/null || true; ${STDCP} msggen ${INSTALLROOT}/bin/msggen ;}
+exec - test '' = 'msggen' || ${STDCMP} 2>/dev/null -s msggen ${INSTALLROOT}/bin/msggen || { ${STDMV} ${INSTALLROOT}/bin/msggen ${INSTALLROOT}/bin/msggen.old 2>/dev/null || true; ${STDCP} msggen ${INSTALLROOT}/bin/msggen ;}
done ${INSTALLROOT}/bin/msggen generated
make ${INSTALLROOT}/bin/msgget
prev msgget
-exec - test '' = 'msgget' || ${STDCMP} 2>/dev/null -s msgget ${INSTALLROOT}/bin/msgget || { ${STDMV} ${INSTALLROOT}/bin/msgget ${INSTALLROOT}/bin/msgget.old 2>/dev/null || true; ${STDCP} msgget ${INSTALLROOT}/bin/msgget ;}
+exec - test '' = 'msgget' || ${STDCMP} 2>/dev/null -s msgget ${INSTALLROOT}/bin/msgget || { ${STDMV} ${INSTALLROOT}/bin/msgget ${INSTALLROOT}/bin/msgget.old 2>/dev/null || true; ${STDCP} msgget ${INSTALLROOT}/bin/msgget ;}
done ${INSTALLROOT}/bin/msgget generated
done install virtual
make test
@@ -311,6 +307,6 @@
prev msgcc
make msgcc.tst
done msgcc.tst
-exec - regress msgcc.tst msgcc
+exec - regress msgcc.tst msgcc
done test.msgcc virtual
done test dontcare virtual
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/Mamfile new/src/lib/libpp/Mamfile
--- old/src/lib/libpp/Mamfile 2012-01-04 10:25:12.000000000 +0100
+++ new/src/lib/libpp/Mamfile 2012-02-03 21:13:22.000000000 +0100
@@ -1,4 +1,4 @@
-info mam static 00000 1994-07-17 make (AT&T Research) 5.6 2011-12-13
+info mam static 00000 1994-07-17 make (AT&T Research) 5.7 2012-01-21
setv INSTALLROOT ../../..
setv PACKAGE_ast_INCLUDE ${INSTALLROOT}/include/ast
setv PACKAGE_ast_LIB ${INSTALLROOT}/lib
@@ -10,7 +10,7 @@
setv CC cc
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}??}
+setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
setv COTEMP $$
setv CPIO cpio
setv CPIOFLAGS
@@ -53,13 +53,6 @@
make ${PACKAGE_ast_INCLUDE}/ast_api.h implicit
done ${PACKAGE_ast_INCLUDE}/ast_api.h dontcare
make ${PACKAGE_ast_INCLUDE}/vmalloc.h implicit
-make ${PACKAGE_ast_INCLUDE}/aso.h implicit
-prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
-make ${PACKAGE_ast_INCLUDE}/prototyped.h implicit
-make ${INSTALLROOT}/include/prototyped.h implicit
-done ${INSTALLROOT}/include/prototyped.h dontcare
-done ${PACKAGE_ast_INCLUDE}/prototyped.h dontcare
-done ${PACKAGE_ast_INCLUDE}/aso.h dontcare
prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
make ${PACKAGE_ast_INCLUDE}/ast_std.h implicit
make ${PACKAGE_ast_INCLUDE}/regex.h implicit
@@ -80,7 +73,10 @@
prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
done ${PACKAGE_ast_INCLUDE}/ast_wchar.h dontcare
prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
-prev ${PACKAGE_ast_INCLUDE}/prototyped.h implicit
+make ${PACKAGE_ast_INCLUDE}/prototyped.h implicit
+make ${INSTALLROOT}/include/prototyped.h implicit
+done ${INSTALLROOT}/include/prototyped.h dontcare
+done ${PACKAGE_ast_INCLUDE}/prototyped.h dontcare
done ${PACKAGE_ast_INCLUDE}/regex.h dontcare
make ${PACKAGE_ast_INCLUDE}/getopt.h implicit
make ${PACKAGE_ast_INCLUDE}/ast_getopt.h implicit
@@ -121,7 +117,7 @@
meta ppsym.o %.c>%.o ppsym.c ppsym
prev ppsym.c
setv _BLD_pp -U_BLD_pp
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppsym.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppsym.c
done ppsym.o generated
bind -last
exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ppsym ppsym.o ${mam_libast} ${mam_libast}
@@ -131,33 +127,33 @@
make pp.req
exec - set -
exec - echo 'int main(){return 0;}' > 1.${COTEMP}.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -c 1.${COTEMP}.c &&
-exec - x=`${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc ${LDFLAGS} -o 1.${COTEMP}.x 1.${COTEMP}.o -l'*' 2>&1 | sed -e 's/[][()+@?]/#/g' || :` &&
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -c 1.${COTEMP}.c &&
+exec - x=`${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} -o 1.${COTEMP}.x 1.${COTEMP}.o -l'*' 2>&1 | sed -e 's/[][()+@?]/#/g' || :` &&
exec - {
exec - case "" in
-exec - *?) echo " " ;;
+exec - *?) echo " " ;;
exec - esac
exec - for i in pp ast
-exec - do case $i in
-exec - "pp"|pp)
-exec - ;;
-exec - *) if test -f ${INSTALLROOT}/lib/lib/$i
-exec - then y=`cat ${INSTALLROOT}/lib/lib/$i`
-exec - case $y in
-exec - *-?*) echo "" $y ;;
-exec - esac
-exec - continue
-exec - elif test ! -f ${INSTALLROOT}/lib/lib$i.a
-exec - then case `{ ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc ${LDFLAGS} -o 1.${COTEMP}.x 1.${COTEMP}.o -l$i 2>&1 || echo '' $x ;} | sed -e 's/[][()+@?]/#/g' || :` in
-exec - *$x*) case `{ ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc ${LDFLAGS} -o 1.${COTEMP}.x 1.${COTEMP}.o -l$i 2>&1 || echo '' $x ;} | sed -e 's/[][()+@?]/#/g' || :` in
-exec - *$x*) continue ;;
-exec - esac
-exec - ;;
-exec - esac
-exec - fi
-exec - ;;
-exec - esac
-exec - echo " -l$i"
+exec - do case $i in
+exec - "pp"|pp)
+exec - ;;
+exec - *) if test -f ${INSTALLROOT}/lib/lib/$i
+exec - then y=`cat ${INSTALLROOT}/lib/lib/$i`
+exec - case $y in
+exec - *-?*) echo "" $y ;;
+exec - esac
+exec - continue
+exec - elif test ! -f ${INSTALLROOT}/lib/lib$i.a
+exec - then case `{ ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} -o 1.${COTEMP}.x 1.${COTEMP}.o -l$i 2>&1 || echo '' $x ;} | sed -e 's/[][()+@?]/#/g' || :` in
+exec - *$x*) case `{ ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} -o 1.${COTEMP}.x 1.${COTEMP}.o -l$i 2>&1 || echo '' $x ;} | sed -e 's/[][()+@?]/#/g' || :` in
+exec - *$x*) continue ;;
+exec - esac
+exec - ;;
+exec - esac
+exec - fi
+exec - ;;
+exec - esac
+exec - echo " -l$i"
exec - done
exec - } > pp.req
exec - rm -f 1.${COTEMP}.*
@@ -176,36 +172,36 @@
prev gentab.sh
exec - case static,port:$OPTIND:$RANDOM in
exec - ?*:*:*|*::*|*:*:$RANDOM)
-exec - ;;
-exec - *) if ENV= LC_ALL=C x= $SHELL -nc ': ${list[level]} !(pattern)' 2>/dev/null
-exec - then if grep -q '### .*archaic.* ###'
-exec - then : gentab contains archaic constructs :
-exec - else ENV= LC_ALL=C $SHELL -n gentab.sh
-exec - fi
-exec - fi
-exec - ;;
+exec - ;;
+exec - *) if ENV= LC_ALL=C x= $SHELL -nc '[[ a || b ]] && : ${list[level]} !(pattern)' 2>/dev/null
+exec - then if grep -q '### .*archaic.* ###'
+exec - then : gentab contains archaic constructs :
+exec - else ENV= LC_ALL=C $SHELL -n gentab.sh
+exec - fi
+exec - fi
+exec - ;;
exec - esac
exec - case '${mam_cc_SHELLMAGIC}' in
-exec - "") case 0 in
-exec - 0) cp gentab.sh gentab
-exec - ;;
-exec - *) {
-exec - i=`(read x; echo $x) < gentab.sh`
-exec - case $i in
-exec - '#!'*|*'||'*|':'*|'":"'*|"':'"*) echo "$i" ;;
-exec - esac
-exec - cat - gentab.sh <<'!'
+exec - "") case 0 in
+exec - 0) cp gentab.sh gentab
+exec - ;;
+exec - *) {
+exec - i=`(read x; echo $x) < gentab.sh`
+exec - case $i in
+exec - '#!'*|*'||'*|':'*|'":"'*|"':'"*) echo "$i" ;;
+exec - esac
+exec - cat - gentab.sh <<'!'
exec -
exec - !
-exec - } > gentab
-exec - ;;
-exec - esac
-exec - ;;
-exec - *) cat - gentab.sh > gentab <<'!'
+exec - } > gentab
+exec - ;;
+exec - esac
+exec - ;;
+exec - *) cat - gentab.sh > gentab <<'!'
exec - ${mam_cc_SHELLMAGIC}
exec -
exec - !
-exec - ;;
+exec - ;;
exec - esac
exec - silent test -w gentab -a -x gentab || chmod u+w,+x gentab
done gentab generated
@@ -241,7 +237,7 @@
done ppargs.c
meta ppargs.o %.c>%.o ppargs.c ppargs
prev ppargs.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 1986-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?libpp]"\" -c ppargs.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 1986-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?libpp]"\" -c ppargs.c
done ppargs.o generated
make ppbuiltin.o
make ppbuiltin.c
@@ -255,7 +251,7 @@
done ppbuiltin.c
meta ppbuiltin.o %.c>%.o ppbuiltin.c ppbuiltin
prev ppbuiltin.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppbuiltin.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppbuiltin.c
done ppbuiltin.o generated
make ppcall.o
make ppcall.c
@@ -263,7 +259,7 @@
done ppcall.c
meta ppcall.o %.c>%.o ppcall.c ppcall
prev ppcall.c
-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcall.c
+exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcall.c
done ppcall.o generated
make ppcomment.o
make ppcomment.c
@@ -271,7 +267,7 @@
done ppcomment.c
meta ppcomment.o %.c>%.o ppcomment.c ppcomment
prev ppcomment.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcomment.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcomment.c
done ppcomment.o generated
make ppcontext.o
make ppcontext.c
@@ -279,7 +275,7 @@
done ppcontext.c
meta ppcontext.o %.c>%.o ppcontext.c ppcontext
prev ppcontext.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcontext.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcontext.c
done ppcontext.o generated
make ppcontrol.o
make ppcontrol.c
@@ -288,7 +284,7 @@
done ppcontrol.c
meta ppcontrol.o %.c>%.o ppcontrol.c ppcontrol
prev ppcontrol.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcontrol.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcontrol.c
done ppcontrol.o generated
make ppcpp.o
make ppcpp.c
@@ -313,7 +309,7 @@
done ppcpp.c
meta ppcpp.o %.c>%.o ppcpp.c ppcpp
prev ppcpp.c
-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcpp.c
+exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcpp.c
done ppcpp.o generated
make ppdata.o
make ppdata.c
@@ -321,7 +317,7 @@
done ppdata.c
meta ppdata.o %.c>%.o ppdata.c ppdata
prev ppdata.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppdata.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppdata.c
done ppdata.o generated
make pperror.o
make pperror.c
@@ -329,7 +325,7 @@
done pperror.c
meta pperror.o %.c>%.o pperror.c pperror
prev pperror.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pperror.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pperror.c
done pperror.o generated
make ppexpr.o
make ppexpr.c
@@ -338,7 +334,7 @@
done ppexpr.c
meta ppexpr.o %.c>%.o ppexpr.c ppexpr
prev ppexpr.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppexpr.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppexpr.c
done ppexpr.o generated
make ppfsm.o
make ppfsm.c
@@ -347,7 +343,7 @@
done ppfsm.c
meta ppfsm.o %.c>%.o ppfsm.c ppfsm
prev ppfsm.c
-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppfsm.c
+exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppfsm.c
done ppfsm.o generated
make ppincref.o
make ppincref.c
@@ -355,7 +351,7 @@
done ppincref.c
meta ppincref.o %.c>%.o ppincref.c ppincref
prev ppincref.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppincref.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppincref.c
done ppincref.o generated
make ppinput.o
make ppinput.c
@@ -366,7 +362,7 @@
done ppinput.c
meta ppinput.o %.c>%.o ppinput.c ppinput
prev ppinput.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppinput.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppinput.c
done ppinput.o generated
make ppkey.o
make ppkey.c
@@ -375,13 +371,13 @@
done ppkey.c
meta ppkey.o %.c>%.o ppkey.c ppkey
prev ppkey.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppkey.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppkey.c
done ppkey.o generated
make pplex.o
prev pplex.c
meta pplex.o %.c>%.o pplex.c pplex
prev pplex.c
-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pplex.c
+exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pplex.c
done pplex.o generated
make ppline.o
make ppline.c
@@ -389,7 +385,7 @@
done ppline.c
meta ppline.o %.c>%.o ppline.c ppline
prev ppline.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppline.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppline.c
done ppline.o generated
make ppmacref.o
make ppmacref.c
@@ -397,7 +393,7 @@
done ppmacref.c
meta ppmacref.o %.c>%.o ppmacref.c ppmacref
prev ppmacref.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppmacref.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppmacref.c
done ppmacref.o generated
make ppmisc.o
make ppmisc.c
@@ -405,7 +401,7 @@
done ppmisc.c
meta ppmisc.o %.c>%.o ppmisc.c ppmisc
prev ppmisc.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppmisc.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppmisc.c
done ppmisc.o generated
make ppop.o
make ppop.c
@@ -421,7 +417,7 @@
done ppop.c
meta ppop.o %.c>%.o ppop.c ppop
prev ppop.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppop.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppop.c
done ppop.o generated
make pppragma.o
make pppragma.c
@@ -429,7 +425,7 @@
done pppragma.c
meta pppragma.o %.c>%.o pppragma.c pppragma
prev pppragma.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pppragma.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pppragma.c
done pppragma.o generated
make ppprintf.o
make ppprintf.c
@@ -437,7 +433,7 @@
done ppprintf.c
meta ppprintf.o %.c>%.o ppprintf.c ppprintf
prev ppprintf.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppprintf.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppprintf.c
done ppprintf.o generated
make ppproto.o
make ppproto.c
@@ -453,7 +449,7 @@
done ppproto.c
meta ppproto.o %.c>%.o ppproto.c ppproto
prev ppproto.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppproto.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppproto.c
done ppproto.o generated
make ppsearch.o
make ppsearch.c
@@ -465,7 +461,7 @@
done ppsearch.c
meta ppsearch.o %.c>%.o ppsearch.c ppsearch
prev ppsearch.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppsearch.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppsearch.c
done ppsearch.o generated
make pptrace.o
make pptrace.c
@@ -483,16 +479,16 @@
exec - v/^#define/d
exec - g/PROTOMAIN/d
exec - 1,$s/^#define //
-exec - 1,$s/[ ].*//
-exec - 1,$s/.*/ "&", &,/
+exec - 1,$s/[ ].*//
+exec - 1,$s/.*/ "&", &,/
exec - 1i
exec - /*
-exec - * preprocessor library debug maps
-exec - */
+exec - * preprocessor library debug maps
+exec - */
exec - struct map
exec - {
-exec - char* nam;
-exec - long val;
+exec - char* nam;
+exec - long val;
exec - };
exec - static struct map pplexmap[] =
exec - {
@@ -559,9 +555,9 @@
exec - w
exec - q
exec - !
-exec - if cmp 2>/dev/null -s 1.${COTEMP}.c ppdebug.h
-exec - then rm -f 1.${COTEMP}.c
-exec - else mv 1.${COTEMP}.c ppdebug.h
+exec - if cmp 2>/dev/null -s 1.${COTEMP}.c ppdebug.h
+exec - then rm -f 1.${COTEMP}.c
+exec - else mv 1.${COTEMP}.c ppdebug.h
exec - fi
done ppdebug.h dontcare generated
prev ppfsm.h implicit
@@ -569,7 +565,7 @@
done pptrace.c
meta pptrace.o %.c>%.o pptrace.c pptrace
prev pptrace.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pptrace.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pptrace.c
done pptrace.o generated
exec - ${AR} rc libpp.a ppargs.o ppbuiltin.o ppcall.o ppcomment.o ppcontext.o ppcontrol.o ppcpp.o ppdata.o pperror.o ppexpr.o ppfsm.o ppincref.o ppinput.o ppkey.o pplex.o ppline.o ppmacref.o ppmisc.o ppop.o pppragma.o ppprintf.o ppproto.o ppsearch.o pptrace.o
exec - (ranlib libpp.a) >/dev/null 2>&1 || true
@@ -577,57 +573,57 @@
done pp virtual
prev libpp.a archive
make ${INSTALLROOT}/lib
-exec - if silent test ! -d ${INSTALLROOT}/lib
-exec - then mkdir -p ${INSTALLROOT}/lib
+exec - if silent test ! -d ${INSTALLROOT}/lib
+exec - then mkdir -p ${INSTALLROOT}/lib
exec - fi
done ${INSTALLROOT}/lib generated
make ${INSTALLROOT}/lib/libpp.a archive
prev ${INSTALLROOT}/lib
prev libpp.a archive
-exec - test '' = 'libpp.a' || ${STDCMP} 2>/dev/null -s libpp.a ${INSTALLROOT}/lib/libpp.a || { ${STDMV} ${INSTALLROOT}/lib/libpp.a ${INSTALLROOT}/lib/libpp.a.old 2>/dev/null || true; ${STDCP} libpp.a ${INSTALLROOT}/lib/libpp.a ;}
+exec - test '' = 'libpp.a' || ${STDCMP} 2>/dev/null -s libpp.a ${INSTALLROOT}/lib/libpp.a || { ${STDMV} ${INSTALLROOT}/lib/libpp.a ${INSTALLROOT}/lib/libpp.a.old 2>/dev/null || true; ${STDCP} libpp.a ${INSTALLROOT}/lib/libpp.a ;}
exec - (ranlib ${INSTALLROOT}/lib/libpp.a) >/dev/null 2>&1 || true
done ${INSTALLROOT}/lib/libpp.a generated
make ${INSTALLROOT}/man/man3
-exec - if silent test ! -d ${INSTALLROOT}/man/man3
-exec - then mkdir -p ${INSTALLROOT}/man/man3
+exec - if silent test ! -d ${INSTALLROOT}/man/man3
+exec - then mkdir -p ${INSTALLROOT}/man/man3
exec - fi
done ${INSTALLROOT}/man/man3 generated
make ${INSTALLROOT}/man/man3/pp.3
prev ${INSTALLROOT}/man/man3
make pp.3
done pp.3
-exec - test '' = 'pp.3' || ${STDCMP} 2>/dev/null -s pp.3 ${INSTALLROOT}/man/man3/pp.3 || { ${STDMV} ${INSTALLROOT}/man/man3/pp.3 ${INSTALLROOT}/man/man3/pp.3.old 2>/dev/null || true; ${STDCP} pp.3 ${INSTALLROOT}/man/man3/pp.3 ;}
+exec - test '' = 'pp.3' || ${STDCMP} 2>/dev/null -s pp.3 ${INSTALLROOT}/man/man3/pp.3 || { ${STDMV} ${INSTALLROOT}/man/man3/pp.3 ${INSTALLROOT}/man/man3/pp.3.old 2>/dev/null || true; ${STDCP} pp.3 ${INSTALLROOT}/man/man3/pp.3 ;}
done ${INSTALLROOT}/man/man3/pp.3 generated
make ${INSTALLROOT}/lib/lib
-exec - if silent test ! -d ${INSTALLROOT}/lib/lib
-exec - then mkdir -p ${INSTALLROOT}/lib/lib
+exec - if silent test ! -d ${INSTALLROOT}/lib/lib
+exec - then mkdir -p ${INSTALLROOT}/lib/lib
exec - fi
done ${INSTALLROOT}/lib/lib generated
make ${INSTALLROOT}/lib/lib/pp
prev ${INSTALLROOT}/lib/lib
prev pp.req
-exec - test '' = 'pp.req' || ${STDCMP} 2>/dev/null -s pp.req ${INSTALLROOT}/lib/lib/pp || { ${STDMV} ${INSTALLROOT}/lib/lib/pp ${INSTALLROOT}/lib/lib/pp.old 2>/dev/null || true; ${STDCP} pp.req ${INSTALLROOT}/lib/lib/pp ;}
+exec - test '' = 'pp.req' || ${STDCMP} 2>/dev/null -s pp.req ${INSTALLROOT}/lib/lib/pp || { ${STDMV} ${INSTALLROOT}/lib/lib/pp ${INSTALLROOT}/lib/lib/pp.old 2>/dev/null || true; ${STDCP} pp.req ${INSTALLROOT}/lib/lib/pp ;}
done ${INSTALLROOT}/lib/lib/pp generated
make ${PACKAGE_ast_INCLUDE}
-exec - if silent test ! -d ${PACKAGE_ast_INCLUDE}
-exec - then mkdir -p ${PACKAGE_ast_INCLUDE}
+exec - if silent test ! -d ${PACKAGE_ast_INCLUDE}
+exec - then mkdir -p ${PACKAGE_ast_INCLUDE}
exec - fi
done ${PACKAGE_ast_INCLUDE} generated
make ${PACKAGE_ast_INCLUDE}/pp.h
prev ${PACKAGE_ast_INCLUDE}
prev pp.h
-exec - proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1986,author=gsf' pp.h > 1.${COTEMP}.x
-exec - if cmp 2>/dev/null -s ${PACKAGE_ast_INCLUDE}/pp.h 1.${COTEMP}.x
-exec - then rm -f 1.${COTEMP}.x
-exec - else mv 1.${COTEMP}.x ${PACKAGE_ast_INCLUDE}/pp.h
+exec - proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1986,author=gsf' pp.h > 1.${COTEMP}.x
+exec - if cmp 2>/dev/null -s ${PACKAGE_ast_INCLUDE}/pp.h 1.${COTEMP}.x
+exec - then rm -f 1.${COTEMP}.x
+exec - else mv 1.${COTEMP}.x ${PACKAGE_ast_INCLUDE}/pp.h
exec - fi
done ${PACKAGE_ast_INCLUDE}/pp.h generated
make ${PACKAGE_ast_INCLUDE}/ppkey.h
prev ppkey.h
-exec - proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1986,author=gsf' ppkey.h > 1.${COTEMP}.x
-exec - if cmp 2>/dev/null -s ${PACKAGE_ast_INCLUDE}/ppkey.h 1.${COTEMP}.x
-exec - then rm -f 1.${COTEMP}.x
-exec - else mv 1.${COTEMP}.x ${PACKAGE_ast_INCLUDE}/ppkey.h
+exec - proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1986,author=gsf' ppkey.h > 1.${COTEMP}.x
+exec - if cmp 2>/dev/null -s ${PACKAGE_ast_INCLUDE}/ppkey.h 1.${COTEMP}.x
+exec - then rm -f 1.${COTEMP}.x
+exec - else mv 1.${COTEMP}.x ${PACKAGE_ast_INCLUDE}/ppkey.h
exec - fi
done ${PACKAGE_ast_INCLUDE}/ppkey.h generated
make ${PACKAGE_ast_INCLUDE}/pp.yacc
@@ -652,8 +648,8 @@
exec - #include
exec - int
exec - main(argc, argv)
-exec - int argc;
-exec - char** argv;
+exec - int argc;
+exec - char** argv;
exec - {
exec - printf("%%token /*generated from pp.h*/");
exec - .
@@ -669,7 +665,7 @@
exec - ./${COTEMP}.exe > pp.yacc
exec - rm -f 1.${COTEMP}.c ${COTEMP}.exe
done pp.yacc generated
-exec - test '' = 'pp.yacc' || ${STDCMP} 2>/dev/null -s pp.yacc ${PACKAGE_ast_INCLUDE}/pp.yacc || { ${STDMV} ${PACKAGE_ast_INCLUDE}/pp.yacc ${PACKAGE_ast_INCLUDE}/pp.yacc.old 2>/dev/null || true; ${STDCP} pp.yacc ${PACKAGE_ast_INCLUDE}/pp.yacc ;}
+exec - test '' = 'pp.yacc' || ${STDCMP} 2>/dev/null -s pp.yacc ${PACKAGE_ast_INCLUDE}/pp.yacc || { ${STDMV} ${PACKAGE_ast_INCLUDE}/pp.yacc ${PACKAGE_ast_INCLUDE}/pp.yacc.old 2>/dev/null || true; ${STDCP} pp.yacc ${PACKAGE_ast_INCLUDE}/pp.yacc ;}
done ${PACKAGE_ast_INCLUDE}/pp.yacc generated
make ${PACKAGE_ast_INCLUDE}/ppkey.yacc
make ppkey.yacc
@@ -694,8 +690,8 @@
exec - #include
exec - int
exec - main(argc, argv)
-exec - int argc;
-exec - char** argv;
+exec - int argc;
+exec - char** argv;
exec - {
exec - printf("%%token /*generated from ppkey.h*/");
exec - .
@@ -711,11 +707,11 @@
exec - ./${COTEMP}.exe > ppkey.yacc
exec - rm -f 1.${COTEMP}.c ${COTEMP}.exe
done ppkey.yacc generated
-exec - test '' = 'ppkey.yacc' || ${STDCMP} 2>/dev/null -s ppkey.yacc ${PACKAGE_ast_INCLUDE}/ppkey.yacc || { ${STDMV} ${PACKAGE_ast_INCLUDE}/ppkey.yacc ${PACKAGE_ast_INCLUDE}/ppkey.yacc.old 2>/dev/null || true; ${STDCP} ppkey.yacc ${PACKAGE_ast_INCLUDE}/ppkey.yacc ;}
+exec - test '' = 'ppkey.yacc' || ${STDCMP} 2>/dev/null -s ppkey.yacc ${PACKAGE_ast_INCLUDE}/ppkey.yacc || { ${STDMV} ${PACKAGE_ast_INCLUDE}/ppkey.yacc ${PACKAGE_ast_INCLUDE}/ppkey.yacc.old 2>/dev/null || true; ${STDCP} ppkey.yacc ${PACKAGE_ast_INCLUDE}/ppkey.yacc ;}
done ${PACKAGE_ast_INCLUDE}/ppkey.yacc generated
make ${INSTALLROOT}/lib/probe/C/pp
-exec - if silent test ! -d ${INSTALLROOT}/lib/probe/C/pp
-exec - then mkdir -p ${INSTALLROOT}/lib/probe/C/pp
+exec - if silent test ! -d ${INSTALLROOT}/lib/probe/C/pp
+exec - then mkdir -p ${INSTALLROOT}/lib/probe/C/pp
exec - fi
done ${INSTALLROOT}/lib/probe/C/pp generated
make ${INSTALLROOT}/lib/probe/C/pp/probe
@@ -731,54 +727,54 @@
done probe.sh generated
exec - case static,port:$OPTIND:$RANDOM in
exec - ?*:*:*|*::*|*:*:$RANDOM)
-exec - ;;
-exec - *) if ENV= LC_ALL=C x= $SHELL -nc ': ${list[level]} !(pattern)' 2>/dev/null
-exec - then if grep -q '### .*archaic.* ###'
-exec - then : probe contains archaic constructs :
-exec - else ENV= LC_ALL=C $SHELL -n probe.sh
-exec - fi
-exec - fi
-exec - ;;
+exec - ;;
+exec - *) if ENV= LC_ALL=C x= $SHELL -nc '[[ a || b ]] && : ${list[level]} !(pattern)' 2>/dev/null
+exec - then if grep -q '### .*archaic.* ###'
+exec - then : probe contains archaic constructs :
+exec - else ENV= LC_ALL=C $SHELL -n probe.sh
+exec - fi
+exec - fi
+exec - ;;
exec - esac
exec - case '${mam_cc_SHELLMAGIC}' in
-exec - "") case 0 in
-exec - 0) cp probe.sh probe
-exec - ;;
-exec - *) {
-exec - i=`(read x; echo $x) < probe.sh`
-exec - case $i in
-exec - '#!'*|*'||'*|':'*|'":"'*|"':'"*) echo "$i" ;;
-exec - esac
-exec - cat - probe.sh <<'!'
+exec - "") case 0 in
+exec - 0) cp probe.sh probe
+exec - ;;
+exec - *) {
+exec - i=`(read x; echo $x) < probe.sh`
+exec - case $i in
+exec - '#!'*|*'||'*|':'*|'":"'*|"':'"*) echo "$i" ;;
+exec - esac
+exec - cat - probe.sh <<'!'
exec -
exec - !
-exec - } > probe
-exec - ;;
-exec - esac
-exec - ;;
-exec - *) cat - probe.sh > probe <<'!'
+exec - } > probe
+exec - ;;
+exec - esac
+exec - ;;
+exec - *) cat - probe.sh > probe <<'!'
exec - ${mam_cc_SHELLMAGIC}
exec -
exec - !
-exec - ;;
+exec - ;;
exec - esac
exec - silent test -w probe -a -x probe || chmod u+w,+x probe
done probe generated
-exec - test '' = 'probe' || ${STDCMP} 2>/dev/null -s probe ${INSTALLROOT}/lib/probe/C/pp/probe || { ${STDMV} ${INSTALLROOT}/lib/probe/C/pp/probe ${INSTALLROOT}/lib/probe/C/pp/probe.old 2>/dev/null || true; ${STDCP} probe ${INSTALLROOT}/lib/probe/C/pp/probe ;}
+exec - test '' = 'probe' || ${STDCMP} 2>/dev/null -s probe ${INSTALLROOT}/lib/probe/C/pp/probe || { ${STDMV} ${INSTALLROOT}/lib/probe/C/pp/probe ${INSTALLROOT}/lib/probe/C/pp/probe.old 2>/dev/null || true; ${STDCP} probe ${INSTALLROOT}/lib/probe/C/pp/probe ;}
done ${INSTALLROOT}/lib/probe/C/pp/probe generated
make ${INSTALLROOT}/lib/probe/C/pp/pp.def
make pp.def
done pp.def
-exec - test '' = 'pp.def' || ${STDCMP} 2>/dev/null -s pp.def ${INSTALLROOT}/lib/probe/C/pp/pp.def || { ${STDMV} ${INSTALLROOT}/lib/probe/C/pp/pp.def ${INSTALLROOT}/lib/probe/C/pp/pp.def.old 2>/dev/null || true; ${STDCP} pp.def ${INSTALLROOT}/lib/probe/C/pp/pp.def ;}
+exec - test '' = 'pp.def' || ${STDCMP} 2>/dev/null -s pp.def ${INSTALLROOT}/lib/probe/C/pp/pp.def || { ${STDMV} ${INSTALLROOT}/lib/probe/C/pp/pp.def ${INSTALLROOT}/lib/probe/C/pp/pp.def.old 2>/dev/null || true; ${STDCP} pp.def ${INSTALLROOT}/lib/probe/C/pp/pp.def ;}
done ${INSTALLROOT}/lib/probe/C/pp/pp.def generated
make ${INSTALLROOT}/lib/probe/C/pp/pp.key
make pp.key
done pp.key
-exec - test '' = 'pp.key' || ${STDCMP} 2>/dev/null -s pp.key ${INSTALLROOT}/lib/probe/C/pp/pp.key || { ${STDMV} ${INSTALLROOT}/lib/probe/C/pp/pp.key ${INSTALLROOT}/lib/probe/C/pp/pp.key.old 2>/dev/null || true; ${STDCP} pp.key ${INSTALLROOT}/lib/probe/C/pp/pp.key ;}
+exec - test '' = 'pp.key' || ${STDCMP} 2>/dev/null -s pp.key ${INSTALLROOT}/lib/probe/C/pp/pp.key || { ${STDMV} ${INSTALLROOT}/lib/probe/C/pp/pp.key ${INSTALLROOT}/lib/probe/C/pp/pp.key.old 2>/dev/null || true; ${STDCP} pp.key ${INSTALLROOT}/lib/probe/C/pp/pp.key ;}
done ${INSTALLROOT}/lib/probe/C/pp/pp.key generated
make ${INSTALLROOT}/lib/probe/C/pp/ppsym
prev ppsym
-exec - test '' = 'ppsym' || ${STDCMP} 2>/dev/null -s ppsym ${INSTALLROOT}/lib/probe/C/pp/ppsym || { ${STDMV} ${INSTALLROOT}/lib/probe/C/pp/ppsym ${INSTALLROOT}/lib/probe/C/pp/ppsym.old 2>/dev/null || true; ${STDCP} ppsym ${INSTALLROOT}/lib/probe/C/pp/ppsym ;}
+exec - test '' = 'ppsym' || ${STDCMP} 2>/dev/null -s ppsym ${INSTALLROOT}/lib/probe/C/pp/ppsym || { ${STDMV} ${INSTALLROOT}/lib/probe/C/pp/ppsym ${INSTALLROOT}/lib/probe/C/pp/ppsym.old 2>/dev/null || true; ${STDCP} ppsym ${INSTALLROOT}/lib/probe/C/pp/ppsym ;}
done ${INSTALLROOT}/lib/probe/C/pp/ppsym generated
make ${INSTALLROOT}/lib/probe/C/pp/probe.ini
make probe.ini
@@ -791,22 +787,22 @@
exec - IFS=$ifs
exec - t=$2
exec - set x probe.win32
-exec - while :
-exec - do shift
-exec - case $# in
-exec - 0) break ;;
-exec - esac
-exec - case $1 in
-exec - *probe.$t)
-exec - break
-exec - esac
+exec - while :
+exec - do shift
+exec - case $# in
+exec - 0) break ;;
+exec - esac
+exec - case $1 in
+exec - *probe.$t)
+exec - break
+exec - esac
exec - done
exec - case $1 in
-exec - ?*) cmp -s $1 probe.ini || cp $1 probe.ini ;;
-exec - *) : > probe.ini
+exec - ?*) cmp -s $1 probe.ini || cp $1 probe.ini ;;
+exec - *) : > probe.ini
exec - esac
done probe.ini generated
-exec - test '' = 'probe.ini' || ${STDCMP} 2>/dev/null -s probe.ini ${INSTALLROOT}/lib/probe/C/pp/probe.ini || { ${STDMV} ${INSTALLROOT}/lib/probe/C/pp/probe.ini ${INSTALLROOT}/lib/probe/C/pp/probe.ini.old 2>/dev/null || true; ${STDCP} probe.ini ${INSTALLROOT}/lib/probe/C/pp/probe.ini ;}
+exec - test '' = 'probe.ini' || ${STDCMP} 2>/dev/null -s probe.ini ${INSTALLROOT}/lib/probe/C/pp/probe.ini || { ${STDMV} ${INSTALLROOT}/lib/probe/C/pp/probe.ini ${INSTALLROOT}/lib/probe/C/pp/probe.ini.old 2>/dev/null || true; ${STDCP} probe.ini ${INSTALLROOT}/lib/probe/C/pp/probe.ini ;}
done ${INSTALLROOT}/lib/probe/C/pp/probe.ini generated
done install virtual
make test
++++++ check-build.sh ++++++
--- /var/tmp/diff_new_pack.GaRzyS/_old 2012-02-07 22:13:00.000000000 +0100
+++ /var/tmp/diff_new_pack.GaRzyS/_new 2012-02-07 22:13:00.000000000 +0100
@@ -1,11 +1,11 @@
#!/bin/bash
-test $(ulimit -l) -lt 64 && exit 1
-test $(ulimit -s) -lt 8192 && exit 1
+test $(ulimit -l) -lt 64 && exit 1
+test $(ulimit -s) -lt 8192 && exit 1
if test $(getconf LONG_BIT) -le 32 ; then
- test $(ulimit -m) -lt 6852272 && exit 1
- test $(ulimit -v) -lt 5010688 && exit 1
+ test $(ulimit -m) -lt 3145728 && exit 1
+ test $(ulimit -v) -lt 4194304 && exit 1
else
- test $(ulimit -m) -lt 10471232 && exit 1
- test $(ulimit -v) -lt 6683794 && exit 1
+ test $(ulimit -m) -lt 4194304 && exit 1
+ test $(ulimit -v) -lt 6683794 && exit 1
fi
exit 0
++++++ ksh93-aso.dif ++++++
--- /var/tmp/diff_new_pack.GaRzyS/_old 2012-02-07 22:13:00.000000000 +0100
+++ /var/tmp/diff_new_pack.GaRzyS/_new 2012-02-07 22:13:00.000000000 +0100
@@ -1,42 +1,50 @@
--- src/lib/libast/features/aso
-+++ src/lib/libast/features/aso 2012-01-18 11:31:07.856479000 +0000
-@@ -1,12 +1,17 @@
- # ast atomic scalar operations feature tests
-
- if aso note{ gcc 4.1+ memory atomic operations model }end link{
++++ src/lib/libast/features/aso 2012-02-06 11:25:03.897933168 +0100
+@@ -5,7 +5,10 @@ if aso note{ gcc 4.1+ 64 bit memory atom
+ int main()
+ {
+ uint64_t i = 0;
+- return __sync_fetch_and_add(&i,7);
++ uint32_t j = 0;
++ uint16_t l = 0;
++ uint8_t m = 0;
++ return __sync_fetch_and_add(&i,7)+__sync_fetch_and_add(&j,7)+__sync_fetch_and_add(&l,7)+__sync_fetch_and_add(&m,7);
+ }
+ }end && {
+ #define _aso_cas8(p,o,n) __sync_val_compare_and_swap(p,o,n)
+@@ -27,10 +30,13 @@ if aso note{ gcc 4.1+ 64 bit memory atom
+ #endif
+ }
+ elif aso note{ gcc 4.1+ 32 bit memory atomic operations model }end link{
+ #include
int main()
{
- unsigned int i = 0;
- return __sync_fetch_and_add(&i,7);
-+ uint8_t i = 0;
++ uint32_t i = 0;
+ uint16_t j = 0;
-+ uint32_t l = 0;
-+ uint64_t m = 0;
-+ return __sync_fetch_and_add(&i,7)+__sync_fetch_and_add(&j,7)+__sync_fetch_and_add(&l,7)+__sync_fetch_and_add(&m,7);
++ uint8_t l = 0;
++ return __sync_fetch_and_add(&i,7)+__sync_fetch_and_add(&j,7)+__sync_fetch_and_add(&l,7);
}
}end && {
-+ #include
#define _aso_cas8(p,o,n) __sync_val_compare_and_swap(p,o,n)
- #define _aso_inc8(p) __sync_fetch_and_add(p,1)
- #define _aso_dec8(p) __sync_fetch_and_sub(p,1)
-@@ -26,6 +31,7 @@ if aso note{ gcc 4.1+ memory atomic oper
- #endif
+@@ -45,6 +51,7 @@ elif aso note{ gcc 4.1+ 32 bit memory at
+ #define _aso_casptr(p,o,n) ((void*)__sync_val_compare_and_swap(p,(uint32_t)o,(uint32_t)n))
}
elif aso note{ atomic_cas_64 }end link{
+ #include
#include
int main()
{
-@@ -34,6 +40,7 @@ elif aso note{ atomic_cas_64
- return atomic_cas_64(&i, 0, 1) != 0 || atomic_add_32_nv(&j, 1) != 1;
+@@ -53,6 +60,7 @@ elif aso note{ atomic_cas_64
+ return atomic_cas_64(&i, 0, 1) != 0 || (atomic_add_32_nv(&j, 1) != 1;-1)
}
}end && {
+ #include
#include
#define _aso_cas8(p,o,n) atomic_cas_8(p,o,n)
- #define _aso_inc8(p) atomic_add_8_nv(p,1)
-@@ -54,6 +61,7 @@ elif aso note{ atomic_cas_64
+ #define _aso_inc8(p) (atomic_add_8_nv(p,1)-1)
+@@ -73,6 +81,7 @@ elif aso note{ atomic_cas_64
#endif
}
elif aso note{ atomic_cas_32 }end link{
@@ -44,15 +52,15 @@
#include
int main()
{
-@@ -61,6 +69,7 @@ elif aso note{ atomic_cas_32
- return atomic_cas_32(&i, 0, 1) != 0 || atomic_add_32_nv(&i, 1) != 1;
+@@ -80,6 +89,7 @@ elif aso note{ atomic_cas_32
+ return atomic_cas_32(&i, 0, 1) != 0 || (atomic_add_32_nv(&i, 1) != 1;-1)
}
}end && {
+ #include
#include
#define _aso_cas8(p,o,n) atomic_cas_8(p,o,n)
- #define _aso_inc8(p) atomic_add_8_nv(p,1)
-@@ -74,6 +83,7 @@ elif aso note{ atomic_cas_32
+ #define _aso_inc8(p) (atomic_add_8_nv(p,1)-1)
+@@ -93,6 +103,7 @@ elif aso note{ atomic_cas_32
#define _aso_casptr(p,o,n) ((void*)atomic_cas_32((uint32_t*)p,(uint32_t)o,(uint32_t)n))
}
elif aso -latomic note{ atomic_cas_64 with -latomic }end link{
@@ -60,15 +68,15 @@
#include
int main()
{
-@@ -82,6 +92,7 @@ elif aso -latomic note{ atomi
- return atomic_cas_64(&i, 0, 1) != 0 || atomic_add_32_nv(&j, 1) != 1;
+@@ -101,6 +112,7 @@ elif aso -latomic note{ atomi
+ return atomic_cas_64(&i, 0, 1) != 0 || (atomic_add_32_nv(&j, 1) != 1;-1)
}
}end && {
+ #include
#include
#define _REQ_atomic
#define _aso_cas8(p,o,n) atomic_cas_8(p,o,n)
-@@ -103,6 +114,7 @@ elif aso -latomic note{ atomi
+@@ -122,6 +134,7 @@ elif aso -latomic note{ atomi
#endif
}
elif aso note{ atomic_cas_32 with -latomic }end link{
@@ -76,15 +84,15 @@
#include
int main()
{
-@@ -110,6 +122,7 @@ elif aso note{ atomic_cas_32
- return atomic_cas_32(&i, 0, 1) != 0 || atomic_add_32_nv(&i, 1) != 1;
+@@ -129,6 +142,7 @@ elif aso note{ atomic_cas_32
+ return atomic_cas_32(&i, 0, 1) != 0 || (atomic_add_32_nv(&i, 1) != 1;-1)
}
}end && {
+ #include
#include
#define _REQ_atomic
#define _aso_cas8(p,o,n) atomic_cas_8(p,o,n)
-@@ -124,6 +137,7 @@ elif aso note{ atomic_cas_32
+@@ -143,6 +157,7 @@ elif aso note{ atomic_cas_32
#define _aso_casptr(p,o,n) ((void*)atomic_cas_32((uint32_t*)p,(uint32_t)o,(uint32_t)n))
}
elif aso note{ cas64 }end link{
@@ -92,15 +100,15 @@
#include
int main()
{
-@@ -132,6 +146,7 @@ elif aso note{ cas64 }end lin
- return cas64(&i, 0, 1) != 0 || atomic_add_32_nv(&j, 1) != 1;
+@@ -151,6 +166,7 @@ elif aso note{ cas64 }end lin
+ return cas64(&i, 0, 1) != 0 || (atomic_add_32_nv(&j, 1) != 1;-1)
}
}end && {
+ #include
#include
#define _aso_cas8(p,o,n) cas8(p,o,n)
- #define _aso_inc8(p) atomic_add_8_nv(p,1)
-@@ -152,6 +167,7 @@ elif aso note{ cas64 }end lin
+ #define _aso_inc8(p) (atomic_add_8_nv(p,1)-1)
+@@ -171,6 +187,7 @@ elif aso note{ cas64 }end lin
#endif
}
elif aso note{ cas32 }end link{
@@ -108,11 +116,11 @@
#include
int main()
{
-@@ -159,6 +175,7 @@ elif aso note{ cas32 }end lin
- return cas32(&i, 0, 1) != 0 || atomic_add_32_nv(&i, 1) != 1;
+@@ -178,6 +195,7 @@ elif aso note{ cas32 }end lin
+ return cas32(&i, 0, 1) != 0 || (atomic_add_32_nv(&i, 1) != 1;-1)
}
}end && {
+ #include
#include
#define _aso_cas8(p,o,n) cas8(p,o,n)
- #define _aso_inc8(p) atomic_add_8_nv(p,1)
+ #define _aso_inc8(p) (atomic_add_8_nv(p,1)-1)
++++++ ksh93-limit-name-len.dif ++++++
--- src/cmd/ksh93/include/ulimit.h
+++ src/cmd/ksh93/include/ulimit.h 2012-02-02 11:30:00.242435132 +0000
@@ -157,7 +157,7 @@
typedef struct Limit_s
{
- const char name[16];
+ const char* name;
const char* description;
int index;
const char* conf;
++++++ ksh93-shift_ijs.dif ++++++
--- /var/tmp/diff_new_pack.GaRzyS/_old 2012-02-07 22:13:00.000000000 +0100
+++ /var/tmp/diff_new_pack.GaRzyS/_new 2012-02-07 22:13:00.000000000 +0100
@@ -326,8 +326,8 @@
prev cat.c
meta cat.o %.c>%.o cat.c cat
prev cat.c
--exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?libcmd]"\" -D_BLD_cmd -D_PACKAGE_ast -D_BLD_DEBUG -c cat.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?libcmd]"\" -D_BLD_cmd -D_PACKAGE_ast -D_BLD_DEBUG -DSHOPT_MULTIBYTE -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-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?libcmd]"\" -D_BLD_cmd -D_PACKAGE_ast -D_BLD_DEBUG -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-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?libcmd]"\" -D_BLD_cmd -D_PACKAGE_ast -D_BLD_DEBUG -DSHOPT_MULTIBYTE -c cat.c
done cat.o generated
make chgrp.o
prev chgrp.c
++++++ ksh93-signals.dif ++++++
--- /var/tmp/diff_new_pack.GaRzyS/_old 2012-02-07 22:13:00.000000000 +0100
+++ /var/tmp/diff_new_pack.GaRzyS/_new 2012-02-07 22:13:00.000000000 +0100
@@ -1,14 +1,15 @@
--- src/cmd/ksh93/data/signals.c
-+++ src/cmd/ksh93/data/signals.c 2008-09-11 15:49:02.645531304 +0000
-@@ -18,6 +18,8 @@
++++ src/cmd/ksh93/data/signals.c 2012-02-06 11:16:53.970131637 +0100
+@@ -18,6 +18,9 @@
* *
***********************************************************************/
- #include
+ #include "defs.h"
+#include
+#include
- #include "shtable.h"
- #include "fault.h"
++
+ #if defined(SIGCLD) && !defined(SIGCHLD)
+ # define SIGCHLD SIGCLD
--- src/cmd/ksh93/sh/xec.c
+++ src/cmd/ksh93/sh/xec.c 2007-12-21 13:28:04.000000000 +0100
@@ -2894,6 +2894,7 @@ static pid_t sh_ntfork(Shell_t *shp,cons
++++++ ksh93-suid_exec.dif ++++++
--- /var/tmp/diff_new_pack.GaRzyS/_old 2012-02-07 22:13:00.000000000 +0100
+++ /var/tmp/diff_new_pack.GaRzyS/_new 2012-02-07 22:13:00.000000000 +0100
@@ -13,8 +13,8 @@
const char hist_fname[] = "/.sh_history";
const char e_dot[] = ".";
--- src/cmd/ksh93/sh/suid_exec.c
-+++ src/cmd/ksh93/sh/suid_exec.c 2007-04-02 11:35:09.627236300 +0000
-@@ -62,11 +62,21 @@
++++ src/cmd/ksh93/sh/suid_exec.c 2012-02-03 08:36:40.097933528 +0000
+@@ -62,10 +62,24 @@
#define FDVERIFY 12 /* used to validate /tmp process */
#undef BLKSIZE
#define BLKSIZE sizeof(char*)*1024
@@ -27,18 +27,21 @@
+# define DEFSHELL "/bin/sh"
+#endif
- #if defined(__linux__)
- static void error_exit(const char*) __attribute__ ((noreturn));
++#if defined(__linux__)
++static void error_exit(const char*) __attribute__ ((noreturn));
+#ifndef _lib_setregid
+#define _lib_setregid 1
+#endif
+#ifndef _lib_setreuid
+#define _lib_setreuid 1
+#endif
- #else
++#else
static void error_exit(const char*);
- #endif
-@@ -80,7 +90,7 @@ static int endsh(const char*);
++#endif
+ static int in_dir(const char*, const char*);
+ static int endsh(const char*);
+ #ifndef _lib_setregid
+@@ -76,7 +90,7 @@ static int endsh(const char*);
static int mycopy(int, int);
static void maketemp(char*);
#else
@@ -47,7 +50,7 @@
#endif /* _lib_setreuid */
static const char version[] = "\n@(#)$Id: suid_exec "SH_RELEASE" $\n";
-@@ -225,7 +235,7 @@ int main(int argc,char *argv[])
+@@ -221,7 +235,7 @@ int main(int argc,char *argv[])
if(effuid != ruserid)
mode |= S_ISUID;
}
@@ -56,7 +59,7 @@
{
if(effuid != ruserid || setuid(ruserid) < 0)
mode = S_ISUID;
-@@ -237,13 +247,18 @@ int main(int argc,char *argv[])
+@@ -233,13 +247,18 @@ int main(int argc,char *argv[])
exec:
#endif /* _lib_setreuid */
/* only use SHELL if file is in trusted directory and ends in sh */
@@ -76,7 +79,7 @@
argv[0] = command;
argv[1] = (char*)devfd;
execv(shell,argv);
-@@ -253,7 +268,7 @@ exec:
+@@ -249,7 +268,7 @@ exec:
/*
* return true of shell ends in sh of ksh
*/
@@ -85,7 +88,7 @@
static int endsh(register const char *shell)
{
while(*shell)
-@@ -266,7 +281,20 @@ static int endsh(register const char *sh
+@@ -262,7 +281,20 @@ static int endsh(register const char *sh
return(1);
return(0);
}
@@ -107,13 +110,14 @@
/*
* return true of shell is in <dir> directory
-@@ -345,16 +373,29 @@ int eaccess(register const char *name, r
+@@ -341,16 +373,30 @@ int eaccess(register const char *name, r
}
#ifdef _lib_setreuid
-static void setids(int mode,int owner,int group)
+#include
+#include
++#include
+static void setids(int mode,uid_t owner,gid_t group)
{
- if(mode & S_ISGID)
++++++ ksh93-vm.dif ++++++
--- /var/tmp/diff_new_pack.GaRzyS/_old 2012-02-07 22:13:00.000000000 +0100
+++ /var/tmp/diff_new_pack.GaRzyS/_new 2012-02-07 22:13:00.000000000 +0100
@@ -23,21 +23,7 @@
/* macros to get the data section and size */
#define MMHEAD(file) ROUND(sizeof(Mmvm_t)+strlen(file), ALIGN)
-@@ -135,7 +137,12 @@ static Mmvm_t* mmfix(Mmvm_t* mmvm, Mmdis
- if(mmdc->proj < 0)
- { munmap((Void_t*)mmvm, size);
- mmvm = (Mmvm_t*)mmap(base, size, (PROT_READ|PROT_WRITE),
-- (MAP_FIXED|MAP_SHARED), fd, (off_t)0 );
-+#if (defined(__ia64__) || defined(__s390x__)) && defined(MAP_32BIT)
-+ (MAP_32BIT|MAP_SHARED),
-+#else
-+ (MAP_FIXED|MAP_SHARED),
-+#endif
-+ fd, (off_t)0 );
- }
- else
- { shmdt((Void_t*)mmvm);
-@@ -162,10 +169,18 @@ static int mminit(Mmdisc_t* mmdc)
+@@ -162,10 +164,18 @@ static int mminit(Mmdisc_t* mmdc)
if(mmdc->mmvm) /* already done this */
return 0;
++++++ ksh93.dif ++++++
--- /var/tmp/diff_new_pack.GaRzyS/_old 2012-02-07 22:13:00.000000000 +0100
+++ /var/tmp/diff_new_pack.GaRzyS/_new 2012-02-07 22:13:00.000000000 +0100
@@ -11,7 +11,7 @@
+ prdata.options = sh_optecho + 5;
+# endif
prdata.raw = prdata.echon = 0;
- prdata.sh = ((Shbltin_t*)extra)->shp;
+ prdata.sh = context->shp;
NOT_USED(argc);
@@ -99,7 +103,52 @@ static char* nullarg[] = { 0, 0 };
prdata.sh->universe = 1;
@@ -61,7 +61,7 @@
+ }
+ out:
+# endif
- return(b_print(0,argv,&prdata));
+ return(b_print(0,argv,(Shbltin_t*)&prdata));
+ }
prdata.options = sh_optecho;
prdata.raw = 1;
@@ -148,20 +148,26 @@
#endif
))
sh_onoption(SH_RC);
---- src/cmd/ksh93/sh/suid_exec.c
-+++ src/cmd/ksh93/sh/suid_exec.c 2007-12-20 18:01:26.000000000 +0000
-@@ -65,7 +65,11 @@
- #define THISPROG "/etc/suid_exec"
- #define DEFSHELL "/bin/sh"
-
-+#if defined(__linux__)
-+static void error_exit(const char*) __attribute__ ((noreturn));
-+#else
- static void error_exit(const char*);
-+#endif
- static int in_dir(const char*, const char*);
- static int endsh(const char*);
- #ifndef _lib_setregid
+--- src/cmd/ksh93/sh/xec.c
++++ src/cmd/ksh93/sh/xec.c 2012-01-26 12:07:46.463645375 +0000
+@@ -922,7 +922,7 @@ int sh_exec(register const Shnode_t *t,
+ {
+ case TCOM:
+ {
+- register struct argnod *argp;
++ volatile struct argnod *argp;
+ char *trap;
+ Namval_t *np, *nq, *last_table;
+ struct ionod *io;
+@@ -1027,7 +1027,7 @@ int sh_exec(register const Shnode_t *t,
+ comn = com[argn-1];
+ }
+ io = t->tre.treio;
+- if(shp->envlist = argp = t->com.comset)
++ if((shp->envlist = argp = t->com.comset))
+ {
+ if(argn==0 || (np && nv_isattr(np,(BLT_DCL|BLT_SPC))))
+ {
--- src/cmd/ksh93/tests/attributes.sh
+++ src/cmd/ksh93/tests/attributes.sh 2009-07-09 13:14:05.000000000 +0000
@@ -199,7 +199,7 @@ hello worldhello worldhello world
@@ -333,6 +339,30 @@
_exit(EXIT_NOTFOUND);
}
sleep(2);
+--- src/lib/libast/port/astwinsize.c
++++ src/lib/libast/port/astwinsize.c 2012-02-03 08:58:43.217934605 +0000
+@@ -29,6 +29,10 @@
+ #include
+ #include
+
++#if _sys_ioctl
++#include
++#endif
++
+ #if defined(__STDPP__directive) && defined(__STDPP__hide)
+ __STDPP__directive pragma pp:hide ioctl sleep
+ #else
+@@ -36,10 +40,6 @@ __STDPP__directive pragma pp:hide ioctl
+ #define sleep ______sleep
+ #endif
+
+-#if _sys_ioctl
+-#include
+-#endif
+-
+ #if defined(TIOCGWINSZ)
+ #if _sys_stream && _sys_ptem
+ #include
--- src/lib/libast/sfio/sfstrtof.h
+++ src/lib/libast/sfio/sfstrtof.h 2007-12-20 18:01:26.000000000 +0000
@@ -54,7 +54,7 @@
++++++ leak1.sh ++++++
--- /var/tmp/diff_new_pack.GaRzyS/_old 2012-02-07 22:13:00.000000000 +0100
+++ /var/tmp/diff_new_pack.GaRzyS/_new 2012-02-07 22:13:00.000000000 +0100
@@ -3,33 +3,43 @@
PATH=/bin:/usr/bin:/usr/sbin:/sbin
getSampleInterval() { return 0; }
-typeset -ilu times=4000
+typeset -lui count=${1:-4000}
typeset -ilu leak=0
+typeset -a curstate=(0 0 0)
+typeset -a oldstate=(0 0 0)
+
vm()
{
typeset size
typeset key unit result=""
while read key size unit; do
case "$key" in
- VmSize*) result=${result:+"$result:"}$size ;;
- VmRSS*) result=${result:+"$result:"}$size ;;
- VmData*) result=${result:+"$result:"}$size ;;
+ VmSize*) result=${result:+"$result "}$size ;;
+ VmRSS*) result=${result:+"$result "}$size ;;
+ VmData*) result=${result:+"$result "}$size ;;
esac
done < /proc/$$/status
echo $result
}
-curstate="XXXX:XXXX:XXXX"
-oldstate=$(vm)
+lessequal()
+{
+ typeset -i ret=0
+ ((${curstate[0]} > ${oldstate[0]})) && let ret=1
+ ((${curstate[1]} > ${oldstate[1]})) && let ret=1
+ ((${curstate[2]} > ${oldstate[2]})) && let ret=1
+ return $ret
+}
-while ((times-- > 0))
+oldstate=($(vm))
+while ((count-- > 0))
do
interval=$(getSampleInterval)
- curstate=$(vm)
- [ "$curstate" != "$oldstate" ] && let leak++
- oldstate="$curstate"
+ curstate=($(vm))
+ lessequal || let leak++
+ oldstate=(${curstate[@]})
done
++++++ leak2.sh ++++++
--- /var/tmp/diff_new_pack.GaRzyS/_old 2012-02-07 22:13:00.000000000 +0100
+++ /var/tmp/diff_new_pack.GaRzyS/_new 2012-02-07 22:13:00.000000000 +0100
@@ -3,18 +3,21 @@
foo=0
LoopCountForMEMSAP=0
bla=234
-typeset -lui count=4000
+typeset -lui count=${1:-4000}
typeset -lui leak=0
+typeset -a curstate=(0 0 0)
+typeset -a oldstate=(0 0 0)
+
vm()
{
typeset size
typeset key unit result=""
while read key size unit; do
case "$key" in
- VmSize*) result=${result:+"$result:"}$size ;;
- VmRSS*) result=${result:+"$result:"}$size ;;
- VmData*) result=${result:+"$result:"}$size ;;
+ VmSize*) result=${result:+"$result "}$size ;;
+ VmRSS*) result=${result:+"$result "}$size ;;
+ VmData*) result=${result:+"$result "}$size ;;
esac
done < /proc/$$/status
echo $result
@@ -22,23 +25,39 @@
fusub()
{
- datun=`date +%S`
-# datun=$(date +%S)
- interval=$((10 - datun%10))
+ datum=`date +%S`
+ interval=$((10 - datum%10))
+}
+
+fvsub()
+{
+ datum=$(date +%S)
+ interval=$((10 - datum%10))
}
-curstate="XXXX:XXXX:XXXX"
-oldstate=$(vm)
+lessequal()
+{
+ typeset -i ret=0
+ ((${curstate[0]} > ${oldstate[0]})) && let ret=1
+ ((${curstate[1]} > ${oldstate[1]})) && let ret=1
+ ((${curstate[2]} > ${oldstate[2]})) && let ret=1
+ return $ret
+}
+oldstate=($(vm))
while ((count-- > 0))
do
- foo=$((foo+1))
- datum=`fusub`
-# datum=$(fusub)
+ foo=$((foo+1))
- curstate=$(vm)
- [ "$curstate" != "$oldstate" ] && let leak++
- oldstate="$curstate"
+ if ((count%2 == 0)) ; then
+ datum=`fusub`
+ else
+ datum=$(fvsub)
+ fi
+
+ curstate=($(vm))
+ lessequal || let leak++
+ oldstate=(${curstate[@]})
done
++++++ leak3.sh ++++++
#!/bin/ksh
a_sh=$(mktemp ${TMPDIR:-/tmp}/${0##*/}.XXXXXX) || exit 1
trap "rm -f $a_sh" EXIT
(cat > $a_sh) <<-EOF
#!$SHELL
check_proc_handle ()
{
handleSoftLimit=$(ulimit -n)
echo \$handleSoftLimit > /dev/null
}
check_proc_handle
EOF
chmod +x $a_sh
typeset -lui count=${1:-4000}
while ((count-- > 0))
do
$a_sh
done
++++++ ulimit.sh ++++++
#!/usr/bin/ksh
PATH=/bin:/usr/bin:/usr/sbin:/sbin
typeset -lui count=${1:-4000}
typeset -ilu err=0
trap 'echo "[${0##*/}: error count at $err]"' ERR
while ((count-- > 0))
do
ulimit -s || let err++
ulimit -n || let err++
ulimit -q || let err++
done > /dev/null
echo "[${0##*/}: error count at $err]"
((err == 0)) || exit 1
++++++ vmbalance ++++++
#!/usr/bin/awk -f
#
# vmblance Awk script to detect endless growing memory alloctions
# in endless shell loops using in daemonized shell scripts
#
# Usage:
#
# strace -e mmap,mmap2,munmap -o '|./vmbalance' ksh leak1.sh
#
BEGIN {
FS="([[:blank:]]|[[:punct:]])"
ignore=""
sum=0
allocs=0
frees=0
}
/^mmap(2|64)?\(/ {
if ($0 !~ /.*MAP_PRIVATE\|MAP_ANONYMOUS.*/) {
if (ignore)
ignore=ignore "|" $NF
else
ignore=$NF
} else {
sum+=$4
allocs++
}
}
/^munmap(2|64)?\(/ {
if ($0 !~ ignore) {
sum-=$4
frees++
}
}
END {
print sum " bytes with " allocs " chunks allocated and " frees " chunks freed"
}
++++++ workaround-stupid-build-system.diff ++++++
--- /var/tmp/diff_new_pack.GaRzyS/_old 2012-02-07 22:13:00.000000000 +0100
+++ /var/tmp/diff_new_pack.GaRzyS/_new 2012-02-07 22:13:00.000000000 +0100
@@ -8,7 +8,7 @@
+setv CC gcc
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}??}
+ setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
@@ -27,7 +27,7 @@ setv NMAKE nmake
setv NMAKEFLAGS
setv PR pr
@@ -94,7 +94,7 @@
+setv CC gcc
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}??}
+ setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
@@ -29,7 +29,7 @@ setv NMAKE nmake
setv NMAKEFLAGS
setv PR pr
@@ -104,7 +104,7 @@
setv SILENT
setv TAR tar
setv YACC yacc
-@@ -1346,7 +1346,7 @@ prev +ljobs
+@@ -1337,7 +1337,7 @@ prev +ljobs
prev +li
prev ${mam_libsocket}
prev ${mam_libsecdb}
@@ -113,7 +113,7 @@
done ksh generated
make shcomp
make shcomp.o
-@@ -1370,7 +1370,7 @@ prev ${mam_libsocket}
+@@ -1361,7 +1361,7 @@ prev ${mam_libsocket}
prev ${mam_libsecdb}
setv CC.DLL -UCC.DLL
setv SH_DICT -DSH_DICT="\"libshell\""
@@ -123,16 +123,16 @@
make suid_exec
make suid_exec.o
--- src/lib/libast/Mamfile
-+++ src/lib/libast/Mamfile 2010-08-17 15:00:56.000000000 +0000
++++ src/lib/libast/Mamfile 2012-02-06 10:05:34.917933005 +0000
@@ -5,7 +5,7 @@ setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS
setv ARFLAGS rc
setv AS as
setv ASFLAGS
-setv CC cc
+setv CC gcc
- setv mam_cc_FLAGS ${mam_cc_DLL} -D_BLD_ast
+ setv mam_cc_FLAGS ${mam_cc_DLL} -D_BLD_ast
setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?}
- setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
+ setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
@@ -27,7 +27,7 @@ setv NMAKE nmake
setv NMAKEFLAGS
setv PR pr
@@ -142,7 +142,7 @@
setv SILENT
setv TAR tar
setv YACC yacc
-@@ -1002,7 +1002,7 @@ make lcgen
+@@ -999,7 +999,7 @@ make lcgen
make port/lcgen.c
prev std/stdio.h implicit
done port/lcgen.c
@@ -156,83 +156,80 @@
prev comp/fmtmsg.h
prev ast_lib.h
-exec - case ${mam_cc_HOSTTYPE} in
--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 - 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 - silent grep -l 'define[ ][ ]*_[hl][di][rb]_fmtmsg' ast_lib.h > /dev/null || {
- 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
- exec - fi
--exec - }
--exec - ;;
+ 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
+ exec - fi
+ exec - }
+-exec - ;;
-exec - esac
-+exec - }
prev ${INSTALLROOT}/include/prototyped.h implicit
done ${INSTALLROOT}/include/ast/fmtmsg.h generated
make ${INSTALLROOT}/include/ast/libgen.h
prev comp/libgen.h
prev ast_lib.h
-exec - case ${mam_cc_HOSTTYPE} in
--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 - 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 ${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 - ;;
+ 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
+ exec - fi
+ exec - }
+-exec - ;;
-exec - esac
-+exec - }
prev ${INSTALLROOT}/include/prototyped.h implicit
done ${INSTALLROOT}/include/ast/libgen.h generated
make ${INSTALLROOT}/include/ast/syslog.h
prev comp/syslog.h
prev ast_lib.h
-exec - case ${mam_cc_HOSTTYPE} in
--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 - 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 ${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 - ;;
+ 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
+ exec - fi
+ exec - }
+-exec - ;;
-exec - esac
-+exec - }
prev ast_namval.h implicit
prev ${INSTALLROOT}/include/prototyped.h implicit
done ${INSTALLROOT}/include/ast/syslog.h generated
--- src/lib/libcmd/Mamfile
-+++ src/lib/libcmd/Mamfile 2008-02-14 12:08:37.000000000 +0000
++++ src/lib/libcmd/Mamfile 2012-02-06 10:06:34.179552617 +0000
@@ -7,7 +7,7 @@ setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS
setv ARFLAGS rc
setv AS as
setv ASFLAGS
-setv CC cc
+setv CC gcc
- setv mam_cc_FLAGS ${mam_cc_DLL}
+ setv mam_cc_FLAGS ${mam_cc_DLL}
setv CCFLAGS ${mam_cc_DEBUG}
- setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
+ setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
@@ -29,7 +29,7 @@ setv NMAKE nmake
setv NMAKEFLAGS
setv PR pr
@@ -252,7 +249,7 @@
+setv CC gcc
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}??}
+ setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
@@ -29,7 +29,7 @@ setv NMAKE nmake
setv NMAKEFLAGS
setv PR pr
@@ -263,8 +260,8 @@
setv TAR tar
setv YACC yacc
--- src/lib/libpp/Mamfile
-+++ src/lib/libpp/Mamfile 2012-01-24 18:31:21.979645513 +0000
-@@ -665,7 +665,7 @@ exec - .
++++ src/lib/libpp/Mamfile 2012-01-24 18:31:22.000000000 +0000
+@@ -661,7 +661,7 @@ exec - .
exec - w
exec - q
exec - !
@@ -273,7 +270,7 @@
exec - ./${COTEMP}.exe > pp.yacc
exec - rm -f 1.${COTEMP}.c ${COTEMP}.exe
done pp.yacc generated
-@@ -707,7 +707,7 @@ exec - .
+@@ -703,7 +703,7 @@ exec - .
exec - w
exec - q
exec - !
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org