Hello community,
here is the log from the commit of package tcsh for openSUSE:Factory checked in
at 2020-11-23 16:39:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tcsh (Old)
and /work/SRC/openSUSE:Factory/.tcsh.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tcsh"
Mon Nov 23 16:39:29 2020 rev:74 rq:849693 version:6.22.03
Changes:
--------
--- /work/SRC/openSUSE:Factory/tcsh/tcsh.changes 2020-07-17
20:46:35.556651281 +0200
+++ /work/SRC/openSUSE:Factory/.tcsh.new.5913/tcsh.changes 2020-11-23
19:06:21.182312475 +0100
@@ -1,0 +2,29 @@
+Fri Nov 20 11:48:50 UTC 2020 - Dr. Werner Fink <wer...@suse.de>
+
+- 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
+ * tcsh-6.22.02-workaround-common.patch
+- Make test suite work
+
+-------------------------------------------------------------------
+Fri Oct 16 10:20:03 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------
Old:
----
tcsh-6.22.02-double_tilde.dif
tcsh-6.22.02-history-merge.dif
tcsh-6.22.02-workaround-common.patch
tcsh-6.22.02.tar.gz
New:
----
tcsh-6.22.03.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tcsh.spec ++++++
--- /var/tmp/diff_new_pack.daVQ5f/_old 2020-11-23 19:06:21.982313256 +0100
+++ /var/tmp/diff_new_pack.daVQ5f/_new 2020-11-23 19:06:21.986313260 +0100
@@ -17,7 +17,7 @@
Name: tcsh
-Version: 6.22.02
+Version: 6.22.03
Release: 0
Summary: The C SHell
License: BSD-3-Clause
@@ -32,10 +32,7 @@
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
-Patch9: tcsh-6.22.02-history-merge.dif
-Patch10: tcsh-6.22.02-double_tilde.dif
BuildRequires: autoconf
BuildRequires: fdupes
BuildRequires: ncurses-devel
@@ -61,10 +58,7 @@
%patch4 -b .colorls
%patch5 -b .dspmbyte
%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
@@ -108,7 +102,6 @@
%endif
./configure --build=${CPU}-suse-linux \
--prefix=/usr \
- --bindir=/bin \
--sysconfdir=/etc \
--localstatedir=/var \
--sharedstatedir=%{_datadir} \
@@ -140,7 +133,7 @@
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
@@ -184,21 +177,23 @@
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
++++++ tcsh-6.15.00-pipe.dif ++++++
--- /var/tmp/diff_new_pack.daVQ5f/_old 2020-11-23 19:06:22.034313306 +0100
+++ /var/tmp/diff_new_pack.daVQ5f/_new 2020-11-23 19:06:22.034313306 +0100
@@ -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;
++++++ tcsh-6.17.06-dspmbyte.dif ++++++
--- /var/tmp/diff_new_pack.daVQ5f/_old 2020-11-23 19:06:22.046313318 +0100
+++ /var/tmp/diff_new_pack.daVQ5f/_new 2020-11-23 19:06:22.046313318 +0100
@@ -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 },
++++++ tcsh-6.18.03-catalogs.dif ++++++
--- /var/tmp/diff_new_pack.daVQ5f/_old 2020-11-23 19:06:22.058313330 +0100
+++ /var/tmp/diff_new_pack.daVQ5f/_new 2020-11-23 19:06:22.058313330 +0100
@@ -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;
++++++ tcsh-6.22.02-local-dotlock.dif ++++++
--- /var/tmp/diff_new_pack.daVQ5f/_old 2020-11-23 19:06:22.070313342 +0100
+++ /var/tmp/diff_new_pack.daVQ5f/_new 2020-11-23 19:06:22.070313342 +0100
@@ -186,7 +186,7 @@
}
/* 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
++++++ tcsh-6.22.02.tar.gz -> tcsh-6.22.03.tar.gz ++++++
++++ 3642 lines of diff (skipped)
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
