Hello community, here is the log from the commit of package ksh checked in at Tue May 9 19:14:12 CEST 2006. -------- --- ksh/ksh.changes 2006-04-19 12:59:08.000000000 +0200 +++ STABLE/ksh/ksh.changes 2006-05-09 11:40:55.000000000 +0200 @@ -1,0 +2,17 @@ +Tue May 9 11:39:59 CEST 2006 - werner@suse.de + +- Change PreRequire /bin/bash to /etc/bash.bashrc (bug #172633) + +------------------------------------------------------------------- +Mon May 8 12:54:39 CEST 2006 - werner@suse.de + +- Correct order of souring order of the users profile and the + system kshrc files (bug #172708) + +------------------------------------------------------------------- +Wed Apr 19 19:24:50 CEST 2006 - werner@suse.de + +- Do not source system rc files if ksh is not interactive +- Correct string from GMT to UTC for Universal Time Coordinates + +------------------------------------------------------------------- New: ---- ksh93-gmt2utc.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksh.spec ++++++ --- /var/tmp/diff_new_pack.Wn7FAe/_old 2006-05-09 19:14:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Wn7FAe/_new 2006-05-09 19:14:05.000000000 +0200 @@ -14,10 +14,10 @@ URL: http://www.research.att.com/~gsf/download/ License: Other License(s), see package Group: System/Shells -PreReq: /bin/ln /bin/bash +PreReq: /bin/ln /etc/bash.bashrc Autoreqprov: on Version: 93r -Release: 5 +Release: 11 Summary: Korn Shell BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: INIT.2006-02-14.tar.bz2 @@ -28,6 +28,7 @@ Patch1: workaround-stupid-build-system.diff Patch2: ksh-qemu.patch Patch3: ksh93-shift_ijs.dif +Patch4: ksh93-gmt2utc.dif %description The original Korn Shell. The ksh is an sh-compatible command @@ -69,6 +70,7 @@ %patch2 %endif %patch3 +%patch4 %build # @@ -116,10 +118,16 @@ popd done base=src/cmd/ksh93 + test=${PWD}/${base}/tests pushd ${root}/${base} - rm -f libshell.a 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") + ${ksh} -static + pushd ${test} + sleep 5 + SHELL=${root}/bin/ksh ${root}/bin/ksh shtests + popd + rm -f ${root}/bin/ksh libshell.a ${ksh} -Wl,-rpath,/%{_lib}/ast popd @@ -203,6 +211,14 @@ /usr/include/ast/ %changelog -n ksh +* Tue May 09 2006 - werner@suse.de +- Change PreRequire /bin/bash to /etc/bash.bashrc (bug #172633) +* Mon May 08 2006 - werner@suse.de +- Correct order of souring order of the users profile and the + system kshrc files (bug #172708) +* Wed Apr 19 2006 - werner@suse.de +- Do not source system rc files if ksh is not interactive +- Correct string from GMT to UTC for Universal Time Coordinates * Wed Apr 19 2006 - werner@suse.de - Fix the patch for the multi byte characters (bug #163665) * Tue Apr 18 2006 - werner@suse.de ++++++ ksh93-gmt2utc.dif ++++++ --- src/lib/libast/tm/tmdata.c +++ src/lib/libast/tm/tmdata.c 2006-04-19 15:52:53.000000000 +0000 @@ -54,7 +54,7 @@ "AM", "PM", - "GMT", "UTC", "UCT", "CUT", + "UTC", "GMT", "UCT", "CUT", "DST", "", "", "", @@ -225,8 +225,8 @@ static Tm_zone_t zone[] = { - 0, "GMT", 0, ( 0 * 60), 0, /* UTC */ 0, "UCT", 0, ( 0 * 60), 0, /* UTC */ + 0, "GMT", 0, ( 0 * 60), 0, /* UTC */ 0, "UTC", 0, ( 0 * 60), 0, /* UTC */ 0, "CUT", 0, ( 0 * 60), 0, /* UTC */ "USA", "HST", 0, (10 * 60), 0, /* Hawaii */ --- src/lib/libast/man/tm.3 +++ src/lib/libast/man/tm.3 2006-04-19 15:55:42.000000000 +0000 @@ -70,7 +70,7 @@ .PP .L time_t values are the number of seconds since the epoch, -.BR "Jan 1 00:00:00 GMT 1970" , +.BR "Jan 1 00:00:00 UTC 1970" , with leap seconds omitted. .PP The global variable @@ -433,7 +433,7 @@ .B z Time zone .I SHHMM -west of GMT offset where +west of UTC offset where .I S is .B + @@ -614,7 +614,7 @@ .TP .B 43-46 .B UTC -time zone names: GMT, UTC, UCT, CUT. +time zone names: UTC, GMT, UCT, CUT. .TP .B 47-50 Daylight savings time suffix names: DST. --- src/lib/libast/man/tmx.3 +++ src/lib/libast/man/tmx.3 2006-04-19 15:54:55.000000000 +0000 @@ -59,7 +59,7 @@ .PP .L time_t values are the number of seconds since the epoch, -.BR "Jan 1 00:00:00 GMT 1970" , +.BR "Jan 1 00:00:00 UTC 1970" , with leap seconds omitted. .PP The global variable @@ -492,7 +492,7 @@ .TP .B 43-46 .B UTC -time zone names: GMT, UTC, UCT, CUT. +time zone names: UTC, GMT, UCT, CUT. .TP .B 47-50 Daylight savings time suffix names: DST. ++++++ ksh93.dif ++++++ --- /var/tmp/diff_new_pack.Wn7FAe/_old 2006-05-09 19:14:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Wn7FAe/_new 2006-05-09 19:14:05.000000000 +0200 @@ -1,3 +1,82 @@ +--- src/cmd/ksh93/sh/main.c ++++ src/cmd/ksh93/sh/main.c 2006-04-20 14:56:26.000000000 +0000 +@@ -125,9 +125,9 @@ + } + + #ifdef S_ISSOCK +-#define REMOTE(m) (S_ISSOCK(m)||!(m)) ++#define REMOTE(m) ((S_ISSOCK((m).st_mode)||!((m).st_mode))&&!((m).st_ino)) + #else +-#define REMOTE(m) !(m) ++#define REMOTE(m) (!((m).st_mode)&&!((m).st_ino)) + #endif + + int sh_main(int ac, char *av[], void (*userinit)(int)) +@@ -192,7 +192,7 @@ + } + if(!sh_isoption(SH_RC) && (sh_isoption(SH_BASH) && !sh_isoption(SH_POSIX) + #if SHOPT_REMOTE +- || !fstat(0, &statb) && REMOTE(statb.st_mode) ++ || !fstat(0, &statb) && REMOTE(statb) + #endif + )) + sh_onoption(SH_RC); +@@ -210,37 +210,42 @@ + } + job_init(sh_isoption(SH_LOGIN_SHELL)); + if(sh_isoption(SH_LOGIN_SHELL) && !sh_isoption(SH_NOPROFILE)) +- { + /* system profile */ + sh_source(shp, iop, e_sysprofile); ++ /* make sure PWD is set up correctly */ ++ path_pwd(1); ++#if SHOPT_SYSRC ++ if(!sh_isoption(SH_NOEXEC)) ++ { ++ if(!sh_isoption(SH_NOUSRPROFILE) && !sh_isoption(SH_PRIVILEGED) && sh_isoption(SH_RC)) ++ { ++#if SHOPT_BASH ++ if(sh_isoption(SH_BASH) && !sh_isoption(SH_POSIX)) ++ sh_source(shp, iop, e_bash_sysrc); ++ else ++#endif ++ sh_source(shp, iop, e_sysrc); ++ } ++ } ++#endif ++ if(sh_isoption(SH_LOGIN_SHELL) && !sh_isoption(SH_NOPROFILE)) ++ { + if(!sh_isoption(SH_NOUSRPROFILE) && !sh_isoption(SH_PRIVILEGED)) + { + char **files = shp->login_files; + while ((name = *files++) && !sh_source(shp, iop, sh_mactry(name))); + } + } +- /* make sure PWD is set up correctly */ +- path_pwd(1); + if(!sh_isoption(SH_NOEXEC)) + { + if(!sh_isoption(SH_NOUSRPROFILE) && !sh_isoption(SH_PRIVILEGED) && sh_isoption(SH_RC)) + { + #if SHOPT_BASH + if(sh_isoption(SH_BASH) && !sh_isoption(SH_POSIX)) +- { +-#if SHOPT_SYSRC +- sh_source(shp, iop, e_bash_sysrc); +-#endif + sh_source(shp, iop, shp->rcfile ? shp->rcfile : sh_mactry((char*)e_bash_rc)); +- } + else + #endif +- { +-#if SHOPT_SYSRC +- sh_source(shp, iop, e_sysrc); +-#endif + sh_source(shp, iop, sh_mactry(nv_getval(ENVNOD))); +- } + } + else if(sh_isoption(SH_INTERACTIVE) && sh_isoption(SH_PRIVILEGED)) + sh_source(shp, iop, e_suidprofile); --- src/cmd/ksh93/sh/suid_exec.c +++ src/cmd/ksh93/sh/suid_exec.c 2006-03-24 18:49:39.000000000 +0100 @@ -64,7 +64,11 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de