Hello community, here is the log from the commit of package pdksh for openSUSE:Factory checked in at Fri Mar 19 10:09:04 CET 2010. -------- --- pdksh/pdksh.changes 2010-03-05 21:34:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/pdksh/pdksh.changes 2010-03-09 09:23:38.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 9 09:22:21 CET 2010 - werner@suse.de + +- bzip2ed sources +- use spec file macros +- refresh patches + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pdksh-5.2.14.tar.gz New: ---- pdksh-5.2.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdksh.spec ++++++ --- /var/tmp/diff_new_pack.EgcLNo/_old 2010-03-19 10:08:22.000000000 +0100 +++ /var/tmp/diff_new_pack.EgcLNo/_new 2010-03-19 10:08:22.000000000 +0100 @@ -23,13 +23,14 @@ License: GPLv2+ ; Public Domain, Freeware Group: System/Shells BuildRequires: update-alternatives -PreReq: /bin/ln /etc/bash.bashrc update-alternatives +PreReq: /bin/ln /bin/rm /etc/bash.bashrc /bin/true +PreReq: update-alternatives AutoReqProv: on Version: 5.2.14 -Release: 928 +Release: 929 Summary: Public Domain Korn Shell BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: pdksh-5.2.14.tar.gz +Source: pdksh-5.2.14.tar.bz2 Patch: pdksh-5.2.14.dif Patch1: pdksh-5.2.14-patches.1 Patch2: pdksh-5.2.14-patches.2 @@ -43,7 +44,7 @@ %prep %setup -%patch1 -p 2 -b .patches.1 +%patch1 -p 0 -b .patches.1 %patch2 -p 0 -b .patches.2 %patch3 -p 0 -b .10711 %patch4 -p 0 -b .73718 @@ -51,28 +52,29 @@ %build export CFLAGS="$RPM_OPT_FLAGS -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" -./configure --prefix=/usr --verbose --mandir=%{_mandir} --bindir=/bin +./configure --prefix=/%{_exec_prefix} --verbose --mandir=%{_mandir} --bindir=/bin make %install -make install bindir=$RPM_BUILD_ROOT/bin mandir=$RPM_BUILD_ROOT/%{_mandir}/man1 -mv $RPM_BUILD_ROOT/bin/ksh $RPM_BUILD_ROOT/bin/pdksh -mv $RPM_BUILD_ROOT%{_mandir}/man1/ksh.1 $RPM_BUILD_ROOT%{_mandir}/man1/pdksh.1 -mkdir -p $RPM_BUILD_ROOT/usr/bin -ln -sf /bin/pdksh $RPM_BUILD_ROOT/usr/bin/pdksh +make install bindir=%{buildroot}/bin mandir=%{buildroot}/%{_mandir}/man1 +mv %{buildroot}/bin/ksh %{buildroot}/bin/pdksh +mv %{buildroot}%{_mandir}/man1/ksh.1 %{buildroot}%{_mandir}/man1/pdksh.1 +mkdir -p %{buildroot}/usr/bin +ln -sf /bin/pdksh %{buildroot}/usr/bin/pdksh # create ghost files -touch $RPM_BUILD_ROOT/bin/ksh $RPM_BUILD_ROOT/%{_bindir}/ksh \ - $RPM_BUILD_ROOT/%{_mandir}/man1/ksh.1.gz +ln -sf /bin/true %{buildroot}/bin/ksh +ln -sf /bin/true %{buildroot}/%{_bindir}/ksh +ln -sf ../man1/pdksh.1.gz %{buildroot}/%{_mandir}/man1/ksh.1.gz %post test -e etc/bash.bashrc && ln -sf bash.bashrc etc/ksh.kshrc || true -/usr/sbin/update-alternatives --install /bin/ksh ksh /bin/pdksh 15 \ - --slave /usr/bin/ksh usr-bin-ksh /bin/pdksh \ +%{_sbindir}/update-alternatives --install /bin/ksh ksh /bin/pdksh 15 \ + --slave %{_bindir}/ksh usr-bin-ksh /bin/pdksh \ --slave %{_mandir}/man1/ksh.1.gz ksh.1.gz %{_mandir}/man1/pdksh.1.gz %preun -if [ $1 -eq 0 ]; then - /usr/sbin/update-alternatives --remove ksh /bin/pdksh +if test $1 -eq 0 ; then + %{_sbindir}/update-alternatives --remove ksh /bin/pdksh fi %postun @@ -86,12 +88,10 @@ %defattr(-,root,root) %doc BUG-REPORTS NEWS NOTES PROJECTS README /bin/pdksh -#%%if %{suse_version} >= 1120 -%ghost /bin/ksh -%ghost %{_bindir}/ksh -%ghost %{_mandir}/man1/ksh.1.gz -#%%endif -/usr/bin/pdksh +%ghost %verify(not link) /bin/ksh +%ghost %verify(not link) %{_bindir}/ksh +%{_bindir}/pdksh +%ghost %verify(not link) %{_mandir}/man1/ksh.1.gz %doc %{_mandir}/man1/pdksh.1.gz %changelog ++++++ pdksh-5.2.14-patches.1 ++++++ --- /var/tmp/diff_new_pack.EgcLNo/_old 2010-03-19 10:08:22.000000000 +0100 +++ /var/tmp/diff_new_pack.EgcLNo/_new 2010-03-19 10:08:22.000000000 +0100 @@ -3,55 +3,9 @@ - output of "jobs" command is filled with ^A characters (jobs.c); - "typeset -r foo=bar" fails saying foo is readonly (var.c). -Apply from the pdksh-5.2.14 directory using - patch -p2 < thisFile - ---- old-versions/pdksh-5.2.14/shf.c Wed Jul 28 17:32:55 1999 -+++ /tmp/shf.c Wed Jul 28 17:37:05 1999 -@@ -355,7 +355,6 @@ - shf->rp = nbuf + (shf->rp - shf->buf); - shf->wp = nbuf + (shf->wp - shf->buf); - shf->rbsize += shf->wbsize; -- shf->wbsize += shf->wbsize; - shf->wnleft += shf->wbsize; - shf->wbsize *= 2; - shf->buf = nbuf; - - ---- old-versions/pdksh-5.2.14/var.c Tue May 11 11:57:02 1999 -+++ /tmp/var.c Thu Sep 16 17:29:42 1999 -@@ -353,7 +353,9 @@ - const char *s; - int error_ok; - { -- if (vq->flag & RDONLY) { -+ int no_ro_check = error_ok & 0x4; -+ error_ok &= ~0x4; -+ if ((vq->flag & RDONLY) && !no_ro_check) { - warningf(TRUE, "%s: is read only", vq->name); - if (!error_ok) - errorf(null); -@@ -715,13 +717,13 @@ - if (val != NULL) { - if (vp->flag&INTEGER) { - /* do not zero base before assignment */ -- setstr(vp, val, KSH_UNWIND_ERROR); -+ setstr(vp, val, KSH_UNWIND_ERROR | 0x4); - /* Done after assignment to override default */ - if (base > 0) - vp->type = base; - } else - /* setstr can't fail (readonly check already done) */ -- setstr(vp, val, KSH_RETURN_ERROR); -+ setstr(vp, val, KSH_RETURN_ERROR | 0x4); - } - - /* only x[0] is ever exported, so use vpbase */ - - ---- old-versions/pdksh-5.2.14/jobs.c Tue Jul 13 14:20:56 1999 -+++ /tmp/jobs.c Tue Aug 3 15:39:43 1999 -@@ -219,8 +219,7 @@ +--- jobs.c ++++ jobs.c 1999-08-03 15:39:43.000000000 +0000 +@@ -219,8 +219,7 @@ static Proc *new_proc ARGS((void)); static void check_job ARGS((Job *j)); static void put_job ARGS((Job *j, int where)); static void remove_job ARGS((Job *j, const char *where)); @@ -61,7 +15,7 @@ /* initialize job control */ void -@@ -294,10 +293,17 @@ +@@ -294,10 +293,17 @@ j_exit() && procpid == kshpid))))) { killed = 1; @@ -82,7 +36,7 @@ #endif /* JOBS */ } } -@@ -497,7 +503,7 @@ +@@ -497,7 +503,7 @@ exchild(t, flags, close_fd) put_job(j, PJ_PAST_STOPPED); } @@ -91,7 +45,7 @@ /* create child process */ forksleep = 1; -@@ -508,7 +514,7 @@ +@@ -508,7 +514,7 @@ exchild(t, flags, close_fd) forksleep <<= 1; } if (i < 0) { @@ -100,7 +54,7 @@ remove_job(j, "fork failed"); #ifdef NEED_PGRP_SYNC if (j_sync_open) { -@@ -823,11 +829,10 @@ +@@ -823,11 +829,10 @@ j_kill(cp, sig) } if (j->pgrp == 0) { /* started when !Flag(FMONITOR) */ @@ -116,7 +70,7 @@ } else { #ifdef JOBS if (j->state == PSTOPPED && (sig == SIGTERM || sig == SIGHUP)) -@@ -1825,50 +1830,17 @@ +@@ -1825,50 +1830,17 @@ put_job(j, where) * * If jobs are compiled in then this routine expects sigchld to be blocked. */ @@ -174,5 +128,42 @@ + rval = -1; + return rval; } - - +--- shf.c ++++ shf.c 1999-07-28 17:37:05.000000000 +0000 +@@ -355,7 +355,6 @@ shf_emptybuf(shf, flags) + shf->rp = nbuf + (shf->rp - shf->buf); + shf->wp = nbuf + (shf->wp - shf->buf); + shf->rbsize += shf->wbsize; +- shf->wbsize += shf->wbsize; + shf->wnleft += shf->wbsize; + shf->wbsize *= 2; + shf->buf = nbuf; +--- var.c ++++ var.c 1999-09-16 17:29:42.000000000 +0000 +@@ -353,7 +353,9 @@ setstr(vq, s, error_ok) + const char *s; + int error_ok; + { +- if (vq->flag & RDONLY) { ++ int no_ro_check = error_ok & 0x4; ++ error_ok &= ~0x4; ++ if ((vq->flag & RDONLY) && !no_ro_check) { + warningf(TRUE, "%s: is read only", vq->name); + if (!error_ok) + errorf(null); +@@ -715,13 +717,13 @@ typeset(var, set, clr, field, base) + if (val != NULL) { + if (vp->flag&INTEGER) { + /* do not zero base before assignment */ +- setstr(vp, val, KSH_UNWIND_ERROR); ++ setstr(vp, val, KSH_UNWIND_ERROR | 0x4); + /* Done after assignment to override default */ + if (base > 0) + vp->type = base; + } else + /* setstr can't fail (readonly check already done) */ +- setstr(vp, val, KSH_RETURN_ERROR); ++ setstr(vp, val, KSH_RETURN_ERROR | 0x4); + } + + /* only x[0] is ever exported, so use vpbase */ ++++++ pdksh-5.2.14-patches.2 ++++++ --- /var/tmp/diff_new_pack.EgcLNo/_old 2010-03-19 10:08:22.000000000 +0100 +++ /var/tmp/diff_new_pack.EgcLNo/_new 2010-03-19 10:08:22.000000000 +0100 @@ -1,7 +1,5 @@ -Index: exec.c -=================================================================== ---- exec.c.orig 1999-07-13 18:53:46.000000000 +0200 -+++ exec.c 2009-12-02 19:56:14.000000000 +0100 +--- exec.c ++++ exec.c 2001-01-29 10:06:57.000000000 +0000 @@ -76,6 +76,7 @@ execute(t, flags) { int i; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org