Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e7df4fc70f346945ec25b778153a133373708afd
commit e7df4fc70f346945ec25b778153a133373708afd Author: crazy <[email protected]> Date: Mon Dec 5 14:09:03 2016 +0100 tcsh-6.20.00-1-x86_64 * Version bump diff --git a/source/apps/tcsh/FrugalBuild b/source/apps/tcsh/FrugalBuild index 8b2d1f4..dd9e632 100644 --- a/source/apps/tcsh/FrugalBuild +++ b/source/apps/tcsh/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Krisztian VASAS <[email protected]> pkgname=tcsh -pkgver=6.19.00 -pkgrel=5 +pkgver=6.20.00 +pkgrel=1 pkgdesc="Enhanced version of the Berkeley C shell" url="http://www.tcsh.org/Welcome"; depends=('ncurses>=6.0-12') @@ -11,14 +11,10 @@ groups=('apps') archs=("x86_64") backup=(etc/csh.login) up2date="lynx -dump ftp://ftp.astron.com/pub/tcsh/|Flasttar" -source=(ftp://ftp.astron.com/pub/tcsh/tcsh-$pkgver.tar.gz csh.login \ - gcc5-1.patch gcc5-2.patch glibc2.24.patch) +source=(ftp://ftp.astron.com/pub/tcsh/tcsh-$pkgver.tar.gz csh.login) options+=('scriptlet') -sha1sums=('cdb1abe319fab5d3caff101c393293e5b3607f0c' \ - '12e65f08c100171fcaa70e78737cf95a8f6fa49f' \ - 'd582d56f156b07aa9c605709d1d1e863dad3bb3f' \ - 'a7633f29994c8a0dbd4ab92638a8aecf4225ec47' \ - '893ce6cadf18390dfb824c81cc8e21e91555eedc') +sha1sums=('a77d68434cc4bed731a46a39b9e01523e3a1e98c' \ + '12e65f08c100171fcaa70e78737cf95a8f6fa49f') build() { diff --git a/source/apps/tcsh/gcc5-1.patch b/source/apps/tcsh/gcc5-1.patch deleted file mode 100644 index a8b2aac..0000000 --- a/source/apps/tcsh/gcc5-1.patch +++ /dev/null @@ -1,31 +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 diff --git a/source/apps/tcsh/gcc5-2.patch b/source/apps/tcsh/gcc5-2.patch deleted file mode 100644 index 624ab25..0000000 --- a/source/apps/tcsh/gcc5-2.patch +++ /dev/null @@ -1,25 +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 \ No newline at end of file diff --git a/source/apps/tcsh/glibc2.24.patch b/source/apps/tcsh/glibc2.24.patch deleted file mode 100644 index 855df9b..0000000 --- a/source/apps/tcsh/glibc2.24.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur tcsh-6.19.00/sh.proc.c tcsh-6.19.00-glibc/sh.proc.c ---- tcsh-6.19.00/sh.proc.c 2015-02-22 22:40:14.000000000 +0100 -+++ tcsh-6.19.00-glibc/sh.proc.c 2016-09-28 23:35:47.046815810 +0200 -@@ -47,8 +47,8 @@ - # 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(__GNU__) -+# if !defined(__ANDROID__) && !defined(__GLIBC__) - # define BSDWAIT - # endif - #endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
