On 2015-12-03 23:04, Aurelien Jarno wrote: > control: tag -1 + fixed-upstream > > On 2015-06-25 13:46, Thomas Lange wrote: > > During this years Debconf I will work on this bug. > > > > There's a thread about this bug at > > http://mx.gw.com/pipermail/tcsh-bugs/2015-May/000930.html > > Indeed, and the fix discussed there has been committed upstream. Please > find attached the extract patch to be put in debian/patches.
I have just done an NMU to fix this longstanding issue. Please find the diff attached. Aurelien -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net
diff -u tcsh-6.18.01/debian/changelog tcsh-6.18.01/debian/changelog
--- tcsh-6.18.01/debian/changelog
+++ tcsh-6.18.01/debian/changelog
@@ -1,3 +1,11 @@
+tcsh (6.18.01-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add debian/patches/gcc-5.patch to support GCC 5, backported from
+ upstream, Closes: #778142.
+
+ -- Aurelien Jarno <aure...@debian.org> Thu, 10 Dec 2015 23:11:47 +0100
+
tcsh (6.18.01-3) unstable; urgency=medium
* disable test, Closes: #760837
diff -u tcsh-6.18.01/debian/patches/series tcsh-6.18.01/debian/patches/series
--- tcsh-6.18.01/debian/patches/series
+++ tcsh-6.18.01/debian/patches/series
@@ -9,0 +10 @@
+gcc-5.patch
only in patch2:
unchanged:
--- tcsh-6.18.01.orig/debian/patches/gcc-5.patch
+++ tcsh-6.18.01/debian/patches/gcc-5.patch
@@ -0,0 +1,29 @@
+commit 05e7406049bd2686dee0ee8d819dcd38eb131f6f
+Author: christos <christos>
+Date: Tue Jul 7 12:24:54 2015 +0000
+
+ make k volatile to prevent gcc-5 memset() optimization (Fridolin Pokorny)
+
+commit 624d3aebb6e6afadb4f35e894d11b5ebe290cd87
+Author: christos <christos>
+Date: Thu May 28 11:47:03 2015 +0000
+
+ avoid gcc-5 optimization malloc + memset = calloc (Fridolin Pokorny)
+
+--- a/tc.alloc.c
++++ b/tc.alloc.c
+@@ -345,10 +345,13 @@
+ {
+ #ifndef lint
+ char *cp;
++ volatile size_t k;
+
+ i *= j;
+ cp = xmalloc(i);
+- memset(cp, 0, i);
++ /* Stop gcc 5.x from optimizing malloc+memset = calloc */
++ k = i;
++ memset(cp, 0, k);
+
+ return ((memalign_t) cp);
+ #else
signature.asc
Description: PGP signature
