From e2b14abbe09d37b7b4fd7b22ace280d14e71ac1c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:38:20 +0100
Subject: tcsh: 6.19.00 -> 6.20.00

---
 .../tcsh/avoid-gcc5-wrong-optimisation.patch       | 28 ----------------------
 pkgs/shells/tcsh/default.nix                       | 18 +++++++-------
 pkgs/shells/tcsh/tcsh.glibc-2.24.patch             | 21 ----------------
 3 files changed, 8 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch
 delete mode 100644 pkgs/shells/tcsh/tcsh.glibc-2.24.patch

diff --git a/pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch b/pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch
deleted file mode 100644
index b35d29680af..00000000000
--- a/pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: christos <christos>
-Date: Thu, 28 May 2015 11:47:03 +0000
-Subject: [PATCH] avoid gcc-5 optimization malloc + memset = calloc (Fridolin
-Pokorny)
-
----
-tc.alloc.c | 5 ++++-
-1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tc.alloc.c b/tc.alloc.c
-index b9aec63..c1cb330 100644
---- a/tc.alloc.c
-+++ b/tc.alloc.c
-@@ -348,10 +348,13 @@ calloc(size_t i, size_t j)
- {
- #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
diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix
index 02702510014..da76e2c3027 100644
--- a/pkgs/shells/tcsh/default.nix
+++ b/pkgs/shells/tcsh/default.nix
@@ -3,19 +3,17 @@
 
 stdenv.mkDerivation rec {
   name = "tcsh-${version}";
-  version = "6.19.00";
-  
+  version = "6.20.00";
+
   src = fetchurl {
-    urls = [ 
-             "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${name}.tar.gz" 
-             "ftp://ftp.astron.com/pub/tcsh/${name}.tar.gz" 
-             "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz"
-             ];
-    sha256 = "0jaw51382pqyb6d1kgfg8ir0wd3p5qr2bmg8svcmjhlyp3h73qhj";
+    urls = [
+      "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${name}.tar.gz"
+      "ftp://ftp.astron.com/pub/tcsh/${name}.tar.gz"
+      "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz"
+    ];
+    sha256 = "17ggxkkn5skl0v1x0j6hbv5l0sgnidfzwv16992sqkdm983fg7dq";
   };
 
-  patches = [ ./avoid-gcc5-wrong-optimisation.patch ./tcsh.glibc-2.24.patch ];
-  
   buildInputs = [ ncurses ];
 
   meta = with stdenv.lib;{
diff --git a/pkgs/shells/tcsh/tcsh.glibc-2.24.patch b/pkgs/shells/tcsh/tcsh.glibc-2.24.patch
deleted file mode 100644
index 267d89c8f1b..00000000000
--- a/pkgs/shells/tcsh/tcsh.glibc-2.24.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Proposed patch from Debian bug tracker by Aurelien Jarno <aurel32@debian.org>
-
-diff --git a/sh.proc.c b/sh.proc.c
-index ad07250..5c68409 100644
---- a/sh.proc.c
-+++ b/sh.proc.c
-@@ -47,11 +47,11 @@ RCSID("$tcsh$")
- # define HZ 16
- #endif /* aiws */
- 
--#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
--# if !defined(__ANDROID__)
-+#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GLIBC__)
-+# if !defined(__ANDROID__) && !defined(__GLIBC__)
- #  define BSDWAIT
- # endif
--#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */
-+#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || gnu-linux */
- #ifndef WTERMSIG
- # define WTERMSIG(w)	(((union wait *) &(w))->w_termsig)
- # ifndef BSDWAIT
-- 
cgit 1.4.1