Hello community, here is the log from the commit of package tcsh for openSUSE:Factory checked in at 2015-01-23 16:19:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tcsh (Old) and /work/SRC/openSUSE:Factory/.tcsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tcsh" Changes: -------- --- /work/SRC/openSUSE:Factory/tcsh/tcsh.changes 2013-10-23 10:11:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tcsh.new/tcsh.changes 2015-01-23 16:19:34.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 13 17:03:12 UTC 2015 - [email protected] + +- Add patch tcsh-6.18.00-history-file-locking.patch for bsc#901076 + Cluster switch does not started completely packages on other node +- Modified patch tcsh-6.18.01-history-merge.dif to fit with former + +------------------------------------------------------------------- New: ---- tcsh-6.18.00-history-file-locking.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tcsh.spec ++++++ --- /var/tmp/diff_new_pack.0lqo4f/_old 2015-01-23 16:19:37.000000000 +0100 +++ /var/tmp/diff_new_pack.0lqo4f/_new 2015-01-23 16:19:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tcsh # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,7 +41,9 @@ 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 +# PATCH-FIX-SUSE add history file locking (bsc#901076) +Patch9: tcsh-6.18.00-history-file-locking.patch +Patch10: tcsh-6.18.01-history-merge.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -78,7 +80,8 @@ %patch6 -p0 -b .catalogs %patch7 -p0 -b .blk_buf %patch8 -p0 -b .metakey -%patch9 -p0 -b .history +%patch9 -p1 -b .histlock +%patch10 -p0 -b .histmerg %patch -b .0 %build ++++++ tcsh-6.18.00-history-file-locking.patch ++++++ ++++ 684 lines (skipped) ++++++ tcsh-6.18.01-history-merge.dif ++++++ --- /var/tmp/diff_new_pack.0lqo4f/_old 2015-01-23 16:19:37.000000000 +0100 +++ /var/tmp/diff_new_pack.0lqo4f/_new 2015-01-23 16:19:37.000000000 +0100 @@ -5,7 +5,7 @@ /* Prune length of history list to specified size by history variable. */ PG_STATIC void -discardExcess(int histlen) -+discardExcess(int histlen, int mflg) ++discardExcess(int histlen, int flg) { struct Hist *hp, *np; if (histTail == NULL) { @@ -14,7 +14,7 @@ } while (histCount > (unsigned)histlen && (np = histTail) != &Histlist) { - if (eventno - np->Href >= histlen || histlen == 0) -+ if ((eventno - np->Href >= histlen || histlen == 0) && !mflg) ++ if ((eventno - np->Href >= histlen || histlen == 0) && ! (flg & HIST_MERGE)) hremove(np), hfree(np); else break; @@ -23,16 +23,16 @@ 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) ++ if ((eventno - np->Href >= histlen || histlen == 0) || flg & HIST_MERGE) hremove(np), hfree(np); else hp = np; @@ -161,7 +161,7 @@ savehist( } if (sp) - (void) enthist(++eventno, sp, 1, mflg, histlen); + (void) enthist(++eventno, sp, 1, flg, histlen); - discardExcess(histlen); -+ discardExcess(histlen, mflg); ++ discardExcess(histlen, flg); } #define USE_JENKINS_HASH 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
