From eff28e87fb3cab855aaf2d6ce6494fd298ba069957c02239f82299494479bdc7 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 20 Nov 2020 11:54:44 +0000 Subject: [PATCH 1/4] Update to tcsh V6.22.03 OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=106 --- tcsh-6.15.00-pipe.dif | 2 +- tcsh-6.17.06-dspmbyte.dif | 10 +++++----- tcsh-6.18.03-catalogs.dif | 4 ++-- tcsh-6.22.02-double_tilde.dif | 21 --------------------- tcsh-6.22.02-history-merge.dif | 20 -------------------- tcsh-6.22.02-local-dotlock.dif | 2 +- tcsh-6.22.02.tar.gz | 3 --- tcsh-6.22.03.tar.gz | 3 +++ tcsh.changes | 22 ++++++++++++++++++++++ tcsh.spec | 6 +----- 10 files changed, 35 insertions(+), 58 deletions(-) delete mode 100644 tcsh-6.22.02-double_tilde.dif delete mode 100644 tcsh-6.22.02-history-merge.dif delete mode 100644 tcsh-6.22.02.tar.gz create mode 100644 tcsh-6.22.03.tar.gz diff --git a/tcsh-6.15.00-pipe.dif b/tcsh-6.15.00-pipe.dif index ecb1fc0..46b903c 100644 --- a/tcsh-6.15.00-pipe.dif +++ b/tcsh-6.15.00-pipe.dif @@ -4,7 +4,7 @@ --- sh.dol.c +++ sh.dol.c 2016-11-25 08:00:30.455106978 +0000 -@@ -426,6 +426,8 @@ Dgetdol(void) +@@ -428,6 +428,8 @@ Dgetdol(void) size_t cbp = 0; int old_pintr_disabled; diff --git a/tcsh-6.17.06-dspmbyte.dif b/tcsh-6.17.06-dspmbyte.dif index 994279a..ab24f5d 100644 --- a/tcsh-6.17.06-dspmbyte.dif +++ b/tcsh-6.17.06-dspmbyte.dif @@ -52,7 +52,7 @@ # endif /* SETLOCALEBUG */ --- sh.set.c +++ sh.set.c 2016-11-25 08:02:39.616478025 +0000 -@@ -1164,11 +1164,11 @@ update_dspmbyte_vars(void) +@@ -1160,11 +1160,11 @@ update_dspmbyte_vars(void) dstr1 = vp->vec[0]; if(eq (dstr1, STRsjis)) iskcode = 1; @@ -66,7 +66,7 @@ iskcode = 4; else if ((dstr1[0] - '0') >= 0 && (dstr1[0] - '0') <= 3) { iskcode = 0; -@@ -1252,7 +1252,7 @@ update_dspmbyte_vars(void) +@@ -1248,7 +1248,7 @@ update_dspmbyte_vars(void) _enable_mbdisp = 0; dspmbyte_ls = 0; } @@ -75,7 +75,7 @@ { Char mbmapstr[300]; for (lp = 0; lp < 256; lp++) -@@ -1260,7 +1260,7 @@ update_dspmbyte_vars(void) +@@ -1256,7 +1256,7 @@ update_dspmbyte_vars(void) mbmapstr[lp] = 0; setcopy(STRmbytemap, mbmapstr, VAR_READWRITE); } @@ -84,7 +84,7 @@ } /* dspkanji/dspmbyte autosetting */ -@@ -1269,6 +1269,7 @@ void +@@ -1265,6 +1265,7 @@ void autoset_dspmbyte(const Char *pcp) { int i; @@ -92,7 +92,7 @@ static const struct dspm_autoset_Table { Char *n; Char *v; -@@ -1291,13 +1292,18 @@ autoset_dspmbyte(const Char *pcp) +@@ -1287,13 +1288,18 @@ autoset_dspmbyte(const Char *pcp) #if defined(HAVE_NL_LANGINFO) && defined(CODESET) static const struct dspm_autoset_Table dspmc[] = { { STRstarutfstar8, STRutf8 }, diff --git a/tcsh-6.18.03-catalogs.dif b/tcsh-6.18.03-catalogs.dif index 6e26969..c5d6d7d 100644 --- a/tcsh-6.18.03-catalogs.dif +++ b/tcsh-6.18.03-catalogs.dif @@ -143,8 +143,8 @@ if (path == NULL) return; -- (void) xsnprintf(trypath, sizeof(trypath), "%s/en/LC_MESSAGES/tcsh.cat", -+ (void) xsnprintf(trypath, sizeof(trypath), "%s/en/LC_MESSAGES/tcsh", +- (void) xsnprintf(trypath, sizeof(trypath), "%s/C/LC_MESSAGES/tcsh.cat", ++ (void) xsnprintf(trypath, sizeof(trypath), "%s/C/LC_MESSAGES/tcsh", path); if (stat(trypath, &st) == -1) return; diff --git a/tcsh-6.22.02-double_tilde.dif b/tcsh-6.22.02-double_tilde.dif deleted file mode 100644 index c01c330..0000000 --- a/tcsh-6.22.02-double_tilde.dif +++ /dev/null @@ -1,21 +0,0 @@ -Date: Fri, 10 Jul 2020 18:13:45 +0200 -From tcsh-bounces@astron.com Fri Jul 10 16:49:57 2020 -From: Hans Rosenfeld -To: tcsh@astron.com -Subject: [Tcsh] ~~ expansion broken again -Return-Path: -User-Agent: Mutt/1.12.2 (2019-09-21) -Sender: Tcsh - ---- sh.glob.c -+++ sh.glob.c 2017-04-05 12:54:37.623870649 +0000 -@@ -74,6 +74,9 @@ globtilde(Char *s) - { - Char *name, *u, *home, *res; - -+ if (s[1] == '~') -+ return s; -+ - u = s; - for (s++; *s && *s != '/' && *s != ':'; s++) - continue; diff --git a/tcsh-6.22.02-history-merge.dif b/tcsh-6.22.02-history-merge.dif deleted file mode 100644 index 6b9b2d6..0000000 --- a/tcsh-6.22.02-history-merge.dif +++ /dev/null @@ -1,20 +0,0 @@ -Subject: [Tcsh] tcsh 6.22.00 does not merge history (was: Re: tcsh Deadlock with SIGHUP) -Message-ID: <20200223205556.GA2917@panix.com> -References: <20200120140836.GA3123@panix.com> - - ---- - sh.hist.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- sh.hist.c -+++ sh.hist.c 2020-02-24 12:21:37.003639844 +0000 -@@ -1295,7 +1295,7 @@ rechist(Char *fname, int ref) - #endif - } - getexit(osetexit); -- if (setexit()) -+ if (!setexit()) - loadhist(fname, 1); - resexit(osetexit); - } diff --git a/tcsh-6.22.02-local-dotlock.dif b/tcsh-6.22.02-local-dotlock.dif index b269f46..5932922 100644 --- a/tcsh-6.22.02-local-dotlock.dif +++ b/tcsh-6.22.02-local-dotlock.dif @@ -186,7 +186,7 @@ Avoid left over dot lock file after reboot } /* Save history before exiting the shell. */ -@@ -1284,11 +1286,12 @@ rechist(Char *fname, int ref) +@@ -1288,11 +1290,12 @@ rechist(Char *fname, int ref) jmp_buf_t osetexit; if (lock) { #ifndef WINNT_NATIVE diff --git a/tcsh-6.22.02.tar.gz b/tcsh-6.22.02.tar.gz deleted file mode 100644 index 41bb1ea..0000000 --- a/tcsh-6.22.02.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed287158ca1b00ba477e8ea57bac53609838ebcfd05fcb05ca95021b7ebe885b -size 1006405 diff --git a/tcsh-6.22.03.tar.gz b/tcsh-6.22.03.tar.gz new file mode 100644 index 0000000..33493ee --- /dev/null +++ b/tcsh-6.22.03.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2cfd653d2a0c7f506d2dd14c12324ba749bd484037be6df44a3973f52262b7 +size 1012758 diff --git a/tcsh.changes b/tcsh.changes index 244c254..e530894 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Fri Nov 20 11:48:50 UTC 2020 - Dr. Werner Fink + +- Update to tcsh bug fix version V6.22.03 - 20201118 + * Fix $x:q:h and $x:q:t to not crash (alzwded) with strings containing / + * Block SIGHUP while writing history/directory stack (Brett Frankenberger) + * Fixed reversed test that broke history merging (Brett Frankenberger) + * Prevent recursive entry for writing history (Brett Frankenberger) + * alxwded@github, keep track of the :g and :a modifiers per modifier they + affect. + * alzwded@github, fix infinite loop with :gas variable modifier + * PR/88: Add a Q: modifier that preserves empty arguments leaving :q + alone. +- Port the patches to V6.22.03 + * tcsh-6.15.00-pipe.dif + * tcsh-6.17.06-dspmbyte.dif + * tcsh-6.18.03-catalogs.dif + * tcsh-6.22.02-local-dotlock.dif +- Remove patches now upstream + * tcsh-6.22.02-double_tilde.dif + * tcsh-6.22.02-history-merge.dif + ------------------------------------------------------------------- Wed Jul 15 07:34:33 UTC 2020 - Dr. Werner Fink diff --git a/tcsh.spec b/tcsh.spec index f27f91a..1c76943 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -17,7 +17,7 @@ Name: tcsh -Version: 6.22.02 +Version: 6.22.03 Release: 0 Summary: The C SHell License: BSD-3-Clause @@ -34,8 +34,6 @@ Patch5: tcsh-6.17.06-dspmbyte.dif Patch6: tcsh-6.18.03-catalogs.dif Patch7: tcsh-6.22.02-workaround-common.patch Patch8: tcsh-6.22.02-local-dotlock.dif -Patch9: tcsh-6.22.02-history-merge.dif -Patch10: tcsh-6.22.02-double_tilde.dif BuildRequires: autoconf BuildRequires: fdupes BuildRequires: ncurses-devel @@ -63,8 +61,6 @@ correction, a history mechanism, job control, and a C-like syntax. %patch6 -b .catalogs %patch7 -p 1 -b .workaround %patch8 -p 0 -b .dotlock -%patch9 -p 0 -b .histmrg -%patch10 -p0 -b .dbltilde %patch0 -b .0 %build From bd6957e374aa73fb89541bff3d2617d8e25849cecfb163aed0c2fccd51a6094a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 20 Nov 2020 13:07:54 +0000 Subject: [PATCH 2/4] Remove tcsh-6.22.02-workaround-common.patch OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=107 --- tcsh-6.22.02-workaround-common.patch | 11 ----------- tcsh.changes | 1 + tcsh.spec | 2 -- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 tcsh-6.22.02-workaround-common.patch diff --git a/tcsh-6.22.02-workaround-common.patch b/tcsh-6.22.02-workaround-common.patch deleted file mode 100644 index 5ebaf79..0000000 --- a/tcsh-6.22.02-workaround-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tcsh-6.22.02/sh.h -+++ tcsh-6.22.02/sh.h 2020-01-08 12:05:37.346589832 +0000 -@@ -566,7 +566,7 @@ EXTERN int neednote IZERO; /* Need to - EXTERN int noexec IZERO; /* Don't execute, just syntax check */ - EXTERN int pjobs IZERO; /* want to print jobs if interrupted */ - EXTERN int setintr IZERO; /* Set interrupts on/off -> Wait intr... */ --EXTERN int handle_interrupt IZERO;/* Are we currently handling an interrupt? */ -+extern int handle_interrupt IZERO;/* Are we currently handling an interrupt? */ - EXTERN int havhash IZERO; /* path hashing is available */ - EXTERN int editing IZERO; /* doing filename expansion and line editing */ - EXTERN int noediting IZERO; /* initial $term defaulted to noedit */ diff --git a/tcsh.changes b/tcsh.changes index e530894..c84a48d 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -19,6 +19,7 @@ Fri Nov 20 11:48:50 UTC 2020 - Dr. Werner Fink - Remove patches now upstream * tcsh-6.22.02-double_tilde.dif * tcsh-6.22.02-history-merge.dif + * tcsh-6.22.02-workaround-common.patch ------------------------------------------------------------------- Wed Jul 15 07:34:33 UTC 2020 - Dr. Werner Fink diff --git a/tcsh.spec b/tcsh.spec index 1c76943..65717b6 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -32,7 +32,6 @@ Patch2: tcsh-6.16.00-norm-cmd.dif Patch4: tcsh-6.18.03-colorls.dif Patch5: tcsh-6.17.06-dspmbyte.dif Patch6: tcsh-6.18.03-catalogs.dif -Patch7: tcsh-6.22.02-workaround-common.patch Patch8: tcsh-6.22.02-local-dotlock.dif BuildRequires: autoconf BuildRequires: fdupes @@ -59,7 +58,6 @@ correction, a history mechanism, job control, and a C-like syntax. %patch4 -b .colorls %patch5 -b .dspmbyte %patch6 -b .catalogs -%patch7 -p 1 -b .workaround %patch8 -p 0 -b .dotlock %patch0 -b .0 From 5567a70f62ca2a4aa1dc490f203599b1b02eb784e2b91d6c5fd827a9c1c6c623 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 20 Nov 2020 14:46:09 +0000 Subject: [PATCH 3/4] Accepting request 849686 from home:lnussel:usrmove - prepare usrmerge (boo#1029961) OBS-URL: https://build.opensuse.org/request/show/849686 OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=108 --- tcsh.changes | 5 +++++ tcsh.spec | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tcsh.changes b/tcsh.changes index c84a48d..f618d83 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -21,6 +21,11 @@ Fri Nov 20 11:48:50 UTC 2020 - Dr. Werner Fink * tcsh-6.22.02-history-merge.dif * tcsh-6.22.02-workaround-common.patch +------------------------------------------------------------------- +Fri Oct 16 10:20:03 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Wed Jul 15 07:34:33 UTC 2020 - Dr. Werner Fink diff --git a/tcsh.spec b/tcsh.spec index 65717b6..66dcbca 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -102,7 +102,6 @@ correction, a history mechanism, job control, and a C-like syntax. %endif ./configure --build=${CPU}-suse-linux \ --prefix=/usr \ - --bindir=/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --sharedstatedir=%{_datadir} \ @@ -178,21 +177,23 @@ correction, a history mechanism, job control, and a C-like syntax. mkdir -p %{buildroot}%{_prefix}/bin install -m 644 $RPM_SOURCE_DIR/bindkey.tcsh %{buildroot}%{_sysconfdir}/profile.d/ install -m 644 $RPM_SOURCE_DIR/complete.tcsh %{buildroot}%{_sysconfdir}/profile.d/ - rm -f %{buildroot}/bin/csh - rm -f %{buildroot}%{_bindir}/csh - rm -f %{buildroot}%{_bindir}/tcsh rm -f %{buildroot}%{_mandir}/man1/csh.* rm -rf %{buildroot}%{_datadir}/locale/C - ln -sf tcsh %{buildroot}/bin/csh + ln -sf tcsh %{buildroot}/%{_bindir}/csh ln -sf tcsh.1.gz %{buildroot}%{_mandir}/man1/csh.1.gz - ln -sf ../../bin/tcsh %{buildroot}%{_bindir}/csh - ln -sf ../../bin/tcsh %{buildroot}%{_bindir}/tcsh +%if !0%{?usrmerged} + mkdir -p %{buildroot}/bin + ln -s %{_bindir}/tcsh %{buildroot}/bin/tcsh + ln -s %{_bindir}/tcsh %{buildroot}/bin/csh +%endif %files %defattr(-,root,root) %dir %{_docdir}/tcsh +%if !0%{?usrmerged} /bin/csh /bin/tcsh +%endif %config %{_sysconfdir}/profile.d/bindkey.tcsh %config %{_sysconfdir}/profile.d/complete.tcsh %{_bindir}/csh From 2dfbde3fa23a50b2dcaea2b904af8dc4ae2bdbfd2c387a983ee9c5e1c482bfed Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 20 Nov 2020 14:52:13 +0000 Subject: [PATCH 4/4] Make test suite work OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=109 --- tcsh.changes | 1 + tcsh.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tcsh.changes b/tcsh.changes index f618d83..d4c0508 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -20,6 +20,7 @@ Fri Nov 20 11:48:50 UTC 2020 - Dr. Werner Fink * tcsh-6.22.02-double_tilde.dif * tcsh-6.22.02-history-merge.dif * tcsh-6.22.02-workaround-common.patch +- Make test suite work ------------------------------------------------------------------- Fri Oct 16 10:20:03 UTC 2020 - Ludwig Nussel diff --git a/tcsh.spec b/tcsh.spec index 66dcbca..4f2d568 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -133,7 +133,7 @@ correction, a history mechanism, job control, and a C-like syntax. EOF > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! - env -i HOME=$HOME TERM=$TERM TMPDIR=$TMPDIR \ + env -i HOME=$HOME TERM=$TERM TMPDIR=$TMPDIR PATH=$PATH \ SCREENRC=$SCREENRC SCREENDIR=$SCREENDIR \ screen -D -m make check sleep 1