Hello community, here is the log from the commit of package ksh checked in at Tue Jul 4 16:40:03 CEST 2006. -------- --- ksh/ksh.changes 2006-06-27 12:08:44.000000000 +0200 +++ ksh/ksh.changes 2006-07-04 16:18:25.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 4 12:53:42 CEST 2006 - werner@suse.de + +- Builtin cut: allow last line without newline (#189231) +- Utility shcomp: fix segfault and install it (#189778) + +------------------------------------------------------------------- New: ---- ksh93-cut.dif ksh93-shcomp.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksh.spec ++++++ --- /var/tmp/diff_new_pack.Atw16C/_old 2006-07-04 16:39:44.000000000 +0200 +++ /var/tmp/diff_new_pack.Atw16C/_new 2006-07-04 16:39:44.000000000 +0200 @@ -17,7 +17,7 @@ PreReq: /bin/ln /etc/bash.bashrc Autoreqprov: on Version: 93r -Release: 15 +Release: 16 Summary: Korn Shell BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: INIT.2006-02-14.tar.bz2 @@ -33,6 +33,8 @@ Patch6: ksh93-vi.dif Patch7: ksh93-profile.dif Patch8: ksh93-splice.dif +Patch9: ksh93-cut.dif +Patch10: ksh93-shcomp.dif %description The original Korn Shell. The ksh is an sh-compatible command @@ -79,6 +81,8 @@ %patch6 %patch7 %patch8 +%patch9 +%patch10 %build # @@ -130,13 +134,25 @@ pushd ${root}/${base} ksh=$(grep -e '-o ksh' $log | tail -n 1 |\ sed "s@+ cc@gcc@;s@-o ksh@-o ${root}/bin/ksh@;s@[a-zA-Z0-9_/\.-]*lib\([a-z]\+\)\.a@-l\1@g") + shcomp=$(grep -e '-o shcomp' $log | tail -n 1 |\ + sed "s@+ cc@gcc@;s@-o shcomp@-o ${root}/bin/shcomp@;s@[a-zA-Z0-9_/\.-]*lib\([a-z]\+\)\.a@-l\1@g") ${ksh} -static pushd ${test} sleep 5 SHELL=${root}/bin/ksh ${root}/bin/ksh shtests popd - rm -f ${root}/bin/ksh libshell.a + ${shcomp} -static + pushd ${root}/bin + set -- $(PATH=$PATH:. shcomp --version 2>&1) + eval version=\${$#} + PATH=$PATH:. shcomp --nroff 2>&1 | \ + sed 's/\(\.TH .*\)/\1 "2003-03-02" "" "Korn shell utilities"/' > ../man/man1/shcomp.1 + popd + rm -f libshell.a + rm -f ${root}/bin/ksh + rm -f ${root}/bin/shcomp ${ksh} -Wl,-rpath,/%{_lib}/ast + ${shcomp} -Wl,-rpath,/%{_lib}/ast popd %install @@ -152,9 +168,11 @@ mkdir ${RPM_BUILD_ROOT}%{_mandir}/man1 mkdir ${RPM_BUILD_ROOT}%{_mandir}/man3 install bin/ksh ${RPM_BUILD_ROOT}/%{_lib}/ast/ + install bin/shcomp ${RPM_BUILD_ROOT}/%{_lib}/ast/ ln -sf /bin/true ${RPM_BUILD_ROOT}/bin/ksh ln -sf /bin/true ${RPM_BUILD_ROOT}/usr/bin/ksh ln -sf /%{_lib}/ast/ksh ${RPM_BUILD_ROOT}/usr/bin/rksh + ln -sf /%{_lib}/ast/shcomp ${RPM_BUILD_ROOT}/usr/bin/shcomp cp -a lib/*.so.* ${RPM_BUILD_ROOT}/%{_lib}/ast/ for so in ${RPM_BUILD_ROOT}/%{_lib}/ast/*.so.*.* ; do so=${so##*/} @@ -163,6 +181,7 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/ast/*.so.* install lib/*.a ${RPM_BUILD_ROOT}%{_libdir}/ast/ install man/man1/sh.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/ksh.1 + install man/man1/shcomp.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/shcomp.1 for man in man/man3/*.3 ; do man=${man##*/} ast=${man}ast @@ -201,12 +220,14 @@ %defattr(-,root,root) %doc LICENSE src/cmd/ksh93/COMPATIBILITY src/cmd/ksh93/RELEASE* %doc Builtins PROMO OBSOLETE MEMORANDUM -%doc %{_mandir}/man1/ksh.1.gz +%doc %{_mandir}/man1/*.1.gz %ghost %verify(not link) /bin/ksh %ghost %verify(not link) /usr/bin/ksh /usr/bin/rksh +/usr/bin/shcomp %dir /%{_lib}/ast/ /%{_lib}/ast/ksh +/%{_lib}/ast/shcomp /%{_lib}/ast/*.so.* %files -n ksh-devel @@ -219,6 +240,9 @@ /usr/include/ast/ %changelog -n ksh +* Tue Jul 04 2006 - werner@suse.de +- Builtin cut: allow last line without newline (#189231) +- Utility shcomp: fix segfault and install it (#189778) * Tue Jun 27 2006 - werner@suse.de - No segmentation fault if ksh uses shared command libray (#188404) * Tue Jun 20 2006 - werner@suse.de ++++++ ksh93-cut.dif ++++++ --- src/lib/libcmd/cut.c +++ src/lib/libcmd/cut.c 2006-07-03 18:58:50.000000000 +0000 @@ -248,10 +248,13 @@ inp = sfreserve(fdin,cuthdr->reclen, -1); else inp = sfgetr(fdin, '\n', 0); + if(!(len=cuthdr->reclen)) { + len = sfvalue(fdin); + if (len && !inp) /* this lonely line does not end with newline */ + inp = sfgetr(fdin, 0, SF_LASTR); + } if(!inp) break; - if(!(len=cuthdr->reclen)) - len = sfvalue(fdin); if((ncol = skip = *(lp = cuthdr->list)) == 0) ncol = *++lp; while(1) ++++++ ksh93-shcomp.dif ++++++ --- src/cmd/ksh93/sh/tdump.c +++ src/cmd/ksh93/sh/tdump.c 2006-07-04 14:12:33.000000000 +0000 @@ -205,6 +205,8 @@ else sfputu(outfile,0); iop = iop->ionxt; + if(!iop) + break; if(iop->iovname) p_string(iop->iovname); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org
participants (1)
-
root@suse.de