From fdff0925cbabdd3f022d99c92ecae577a28b6757 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Aug 27 2009 09:27:35 +0000 Subject: updated to 2009-06-30 --- diff --git a/.cvsignore b/.cvsignore index 14e9692..20397ed 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -INIT.2009-05-01.tgz -ast-ksh.2009-05-01.tgz +INIT.2009-06-30.tgz +ast-ksh.2009-06-30.tgz diff --git a/ksh-20090630-jlist.patch b/ksh-20090630-jlist.patch new file mode 100644 index 0000000..87187fb --- /dev/null +++ b/ksh-20090630-jlist.patch @@ -0,0 +1,23 @@ +diff -up ksh-20090630/src/cmd/ksh93/sh/jobs.c.jlist ksh-20090630/src/cmd/ksh93/sh/jobs.c +--- ksh-20090630/src/cmd/ksh93/sh/jobs.c.jlist 2009-04-30 00:07:32.000000000 +0200 ++++ ksh-20090630/src/cmd/ksh93/sh/jobs.c 2009-08-27 08:51:48.028116714 +0200 +@@ -1745,6 +1745,19 @@ static int job_chksave(register pid_t pi + jpold = jp; + jp = jp->next; + } ++ if(jp && (jp==jpold || count<0)) ++ { ++ Sfio_t *log = sfopen((Sfio_t*)0,"/tmp/kshlog","a"); ++ if(log) ++ { ++ fchmod(sffileno(log),S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR|S_IWGRP|S_IWOTH); ++ sfprintf(log,"chksave loop jp==jpold=%d jpold=%p jp->pid=%d pid=%d count=%d\n",jp==jpold,jpold,jp->pid,pid,bck.count); ++ sfclose(log); ++ sfsync(log); ++ errormsg(SH_DICT,ERROR_warn(0),"job list infinite loop -- this should not happen"); ++ abort(); ++ } ++ } + if(jp) + { + r = 0; diff --git a/ksh.spec b/ksh.spec index 15b798f..8bdf08a 100644 --- a/ksh.spec +++ b/ksh.spec @@ -1,20 +1,23 @@ -%define releasedate 2009-05-05 +%define releasedate 2009-06-30 Name: ksh Summary: The Original ATT Korn Shell URL: http://www.kornshell.com/ Group: System Environment/Shells License: CPL -Version: 20090505 -Release: 2%{?dist} +Version: 20090630 +Release: 1%{?dist} Source0: http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz Source1: http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz Source3: kshrc.rhs Source4: dotkshrc -#don't use not wanted/needed builtins +#don't use not wanted/needed builtins - Fedora specific Patch1: ksh-20070328-builtins.patch +#435159 - check if there is looped list +Patch2: ksh-20090630-jlist.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Conflicts: pdksh Requires: coreutils, glibc-common, diffutils @@ -32,6 +35,7 @@ with "sh" (the Bourne Shell). %setup -q -c %setup -q -T -D -a 1 %patch1 -p1 -b .builtins +%patch2 -p1 -b .jlist %build ./bin/package "read" ||: @@ -84,6 +88,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 27 2009 Michal Hlavinka - 20090630-1 +- updated to 2009-06-30 + * Fri Jul 24 2009 Fedora Release Engineering - 20090505-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index caf79a0..1e9f120 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e941c0a95b73c8309e6afff10f79d988 INIT.2009-05-05.tgz -dff46f3e047ac35ac78a81c52938991b ast-ksh.2009-05-05.tgz +9a96103105517702e116ba0267653f84 INIT.2009-06-30.tgz +51c39250763366a68579806bcc77a098 ast-ksh.2009-06-30.tgz