Hello community,
here is the log from the commit of package tcsh for openSUSE:Factory checked in
at 2019-10-17 12:17:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tcsh (Old)
and /work/SRC/openSUSE:Factory/.tcsh.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tcsh"
Thu Oct 17 12:17:32 2019 rev:66 rq:738215 version:6.21.00
Changes:
--------
--- /work/SRC/openSUSE:Factory/tcsh/tcsh.changes 2019-10-10
11:47:26.608276988 +0200
+++ /work/SRC/openSUSE:Factory/.tcsh.new.2352/tcsh.changes 2019-10-17
12:17:34.455882032 +0200
@@ -1,0 +2,6 @@
+Mon Oct 14 08:34:04 UTC 2019 - Dr. Werner Fink <wer...@suse.de>
+
+- Fix patch tcsh-6.18.01-history-stderror-jmp.patch to avoid
+ breaks in sourcing standard system files (boo#1153839)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tcsh-6.18.01-history-stderror-jmp.patch ++++++
--- /var/tmp/diff_new_pack.bAliE9/_old 2019-10-17 12:17:35.231880085 +0200
+++ /var/tmp/diff_new_pack.bAliE9/_new 2019-10-17 12:17:35.231880085 +0200
@@ -25,25 +25,32 @@
}
cleanup_push(&unit, open_cleanup);
-@@ -2229,6 +2231,7 @@ dosource_flg(Char **t, struct command *c
+@@ -2225,7 +2227,7 @@ dosource(Char **t, struct command *c)
+ int
+ dosource_flg(Char **t, struct command *c, int flg)
+ {
+- Char *f;
++ Char *f, **globbed;
char *file;
int fd;
int newflg = 0;
-+ size_t omark;
-
- USE(c);
- t++;
-@@ -2249,9 +2252,12 @@ dosource_flg(Char **t, struct command *c
+@@ -2248,12 +2253,17 @@ dosource_flg(Char **t, struct command *c
+ cleanup_push(file, xfree);
xfree(f);
t = glob_all_or_error(t);
- cleanup_push(t, blk_cleanup);
-+ omark = cleanup_push_mark();
+- cleanup_push(t, blk_cleanup);
++ globbed = t;
++ cleanup_push(globbed, blk_cleanup);
fd = srcfile(file, 0, (flg | newflg), t);
- if ((!fd) && (!newflg) && (!bequiet))
+ if ((!fd) && (!newflg) && (!bequiet)) {
-+ omark = cleanup_push_mark();
++ (void)cleanup_push_mark();
stderror(ERR_SYSTEM, file, strerror(errno));
+ }
/* We need to preserve fd and it's cleaning routines on the top of the
* cleaning stack. Don't call cleanup_until() but clean it manually. */
++ cleanup_ignore(globbed);
++ blk_cleanup(globbed);
cleanup_ignore(file);
+ xfree(file);
+
++++++ tcsh-6.18.03-history-merge.dif ++++++
--- /var/tmp/diff_new_pack.bAliE9/_old 2019-10-17 12:17:35.243880055 +0200
+++ /var/tmp/diff_new_pack.bAliE9/_new 2019-10-17 12:17:35.247880045 +0200
@@ -40,7 +40,7 @@
}
#define USE_JENKINS_HASH 1
-@@ -1353,5 +1353,16 @@ void
+@@ -1358,5 +1358,16 @@ void
sethistory(int n)
{
histlen = n;
