Hello community, here is the log from the commit of package tcsh for openSUSE:13.1 checked in at 2013-10-23 10:11:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/tcsh (Old) and /work/SRC/openSUSE:13.1/.tcsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tcsh" Changes: -------- --- /work/SRC/openSUSE:13.1/tcsh/tcsh.changes 2013-09-23 11:10:07.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.tcsh.new/tcsh.changes 2013-10-23 10:11:42.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 15 17:05:54 UTC 2013 - [email protected] + +- Add patch tcsh-6.18.01-history-merge.dif which is a backport of + the patch from Stanislav Tokos (bnc#844752) + +------------------------------------------------------------------- New: ---- tcsh-6.18.01-history-merge.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tcsh.spec ++++++ --- /var/tmp/diff_new_pack.xymVyX/_old 2013-10-23 10:11:42.000000000 +0200 +++ /var/tmp/diff_new_pack.xymVyX/_new 2013-10-23 10:11:42.000000000 +0200 @@ -41,6 +41,7 @@ Patch6: tcsh-6.17.10-catalogs.dif Patch7: tcsh-6.18.01-blk_buf.patch Patch8: tcsh-6.18.01-metakey.patch +Patch9: tcsh-6.18.01-history-merge.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -77,6 +78,7 @@ %patch6 -p0 -b .catalogs %patch7 -p0 -b .blk_buf %patch8 -p0 -b .metakey +%patch9 -p0 -b .history %patch -b .0 %build ++++++ tcsh-6.18.01-history-merge.dif ++++++ --- sh.hist.c +++ sh.hist.c 2013-10-15 17:04:45.518796367 +0000 @@ -107,7 +107,7 @@ hremove(struct Hist *hp) /* Prune length of history list to specified size by history variable. */ PG_STATIC void -discardExcess(int histlen) +discardExcess(int histlen, int mflg) { struct Hist *hp, *np; if (histTail == NULL) { @@ -124,7 +124,7 @@ discardExcess(int histlen) break; } while (histCount > (unsigned)histlen && (np = histTail) != &Histlist) { - if (eventno - np->Href >= histlen || histlen == 0) + if ((eventno - np->Href >= histlen || histlen == 0) && !mflg) hremove(np), hfree(np); else break; @@ -133,7 +133,7 @@ discardExcess(int histlen) return; /* don't bother doing the full scan */ for (hp = &Histlist; histCount > (unsigned)histlen && (np = hp->Hnext) != NULL;) - if (eventno - np->Href >= histlen || histlen == 0) + if (eventno - np->Href >= histlen || histlen == 0 || mflg) hremove(np), hfree(np); else hp = np; @@ -161,7 +161,7 @@ savehist( } if (sp) (void) enthist(++eventno, sp, 1, mflg, histlen); - discardExcess(histlen); + discardExcess(histlen, mflg); } #define USE_JENKINS_HASH 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
