Date: Saturday, February 25, 2017 @ 15:31:17
Author: lfleischer
Revision: 213778
upgpkg: tcsh 6.20.00-1
Upstream update.
Modified:
tcsh/trunk/PKGBUILD
Deleted:
tcsh/trunk/0001-avoid-gcc-5-optimization-malloc-memset-calloc-Fridol.patch
tcsh/trunk/0002-make-k-volatile-to-prevent-gcc-5-memset-optimization.patch
tcsh/trunk/tcsh-6.17.00-ls-colors-var.patch
-----------------------------------------------------------------+
0001-avoid-gcc-5-optimization-malloc-memset-calloc-Fridol.patch | 32
----------
0002-make-k-volatile-to-prevent-gcc-5-memset-optimization.patch | 26 --------
PKGBUILD | 16 -----
tcsh-6.17.00-ls-colors-var.patch | 13 ----
4 files changed, 3 insertions(+), 84 deletions(-)
Deleted: 0001-avoid-gcc-5-optimization-malloc-memset-calloc-Fridol.patch
===================================================================
--- 0001-avoid-gcc-5-optimization-malloc-memset-calloc-Fridol.patch
2017-02-25 15:26:05 UTC (rev 213777)
+++ 0001-avoid-gcc-5-optimization-malloc-memset-calloc-Fridol.patch
2017-02-25 15:31:17 UTC (rev 213778)
@@ -1,32 +0,0 @@
-From 624d3aebb6e6afadb4f35e894d11b5ebe290cd87 Mon Sep 17 00:00:00 2001
-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;
-+ 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
---
-2.4.5
-
Deleted: 0002-make-k-volatile-to-prevent-gcc-5-memset-optimization.patch
===================================================================
--- 0002-make-k-volatile-to-prevent-gcc-5-memset-optimization.patch
2017-02-25 15:26:05 UTC (rev 213777)
+++ 0002-make-k-volatile-to-prevent-gcc-5-memset-optimization.patch
2017-02-25 15:31:17 UTC (rev 213778)
@@ -1,26 +0,0 @@
-From 05e7406049bd2686dee0ee8d819dcd38eb131f6f Mon Sep 17 00:00:00 2001
-From: christos <christos>
-Date: Tue, 7 Jul 2015 12:24:54 +0000
-Subject: [PATCH] make k volatile to prevent gcc-5 memset() optimization
- (Fridolin Pokorny)
-
----
- tc.alloc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tc.alloc.c b/tc.alloc.c
-index c1cb330..f68a8c5 100644
---- a/tc.alloc.c
-+++ b/tc.alloc.c
-@@ -348,7 +348,7 @@ calloc(size_t i, size_t j)
- {
- #ifndef lint
- char *cp;
-- size_t k;
-+ volatile size_t k;
-
- i *= j;
- cp = xmalloc(i);
---
-2.4.5
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-25 15:26:05 UTC (rev 213777)
+++ PKGBUILD 2017-02-25 15:31:17 UTC (rev 213778)
@@ -3,8 +3,8 @@
# Contributor: Judd Vinet <jvi...@zeroflux.org>
pkgname=tcsh
-pkgver=6.19.00
-pkgrel=3
+pkgver=6.20.00
+pkgrel=1
pkgdesc='Enhanced version of the Berkeley C shell.'
arch=('i686' 'x86_64')
url='http://www.tcsh.org/Welcome'
@@ -14,22 +14,12 @@
'etc/csh.login')
install='tcsh.install'
source=("ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz";
- '0001-avoid-gcc-5-optimization-malloc-memset-calloc-Fridol.patch'
- '0002-make-k-volatile-to-prevent-gcc-5-memset-optimization.patch'
'csh.cshrc'
'csh.login')
-md5sums=('f5f854833578647795bc906dd4bcb5d5'
- '2a28679d1cc9db48720f69ea55e19cdb'
- '8b63b83ae940706cce8db7ecda023441'
+md5sums=('59d40ef40a68e790d95e182069431834'
'7ca0fe6d1a1b9a0093f632499d4fb112'
'4869b9da87c79854e2cc97241f125853')
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i
../0001-avoid-gcc-5-optimization-malloc-memset-calloc-Fridol.patch
- patch -p1 -i
../0002-make-k-volatile-to-prevent-gcc-5-memset-optimization.patch
-}
-
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
Deleted: tcsh-6.17.00-ls-colors-var.patch
===================================================================
--- tcsh-6.17.00-ls-colors-var.patch 2017-02-25 15:26:05 UTC (rev 213777)
+++ tcsh-6.17.00-ls-colors-var.patch 2017-02-25 15:31:17 UTC (rev 213778)
@@ -1,13 +0,0 @@
---- tw.color.c.orig 2008-10-17 16:57:33.000000000 -0300
-+++ tw.color.c 2010-10-18 23:34:36.764372377 -0300
-@@ -86,6 +86,10 @@
- VAR(NOS, "ow", ""), /* Other writable dir (o+w) but not
sticky */
- VAR(NOS, "st", ""), /* Sticky dir (+t) but not other
writable */
- VAR(NOS, "rs", "0"), /* Reset to normal color */
-+ VAR(NOS, "hl", ""), /* Regular file with more than one link
*/
-+ VAR(NOS, "ca", ""), /* File with capability */
-+ VAR(NOS, "mh", ""), /* MULTIHARDLINK */
-+ VAR(NOS, "cl", ""), /* CLRTOEOL */
- };
-
- enum FileType {
