From 132cfe72be4cb40e8698fe9c2ecaef069d642be8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 30 Nov 2020 16:18:32 -0800 Subject: [PATCH] tcsh: update to 6.22.03 Remove upstreamed patch Refresh others. Signed-off-by: Rosen Penev --- utils/tcsh/Makefile | 6 +++--- utils/tcsh/patches/001-sysmalloc.patch | 2 +- utils/tcsh/patches/020-cross.patch | 2 +- utils/tcsh/patches/030-gcc10.patch | 22 ---------------------- 4 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 utils/tcsh/patches/030-gcc10.patch diff --git a/utils/tcsh/Makefile b/utils/tcsh/Makefile index 9960f3cdbb..f2a8ceb05a 100644 --- a/utils/tcsh/Makefile +++ b/utils/tcsh/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tcsh -PKG_VERSION:=6.22.02 -PKG_RELEASE:=2 +PKG_VERSION:=6.22.03 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ @@ -16,7 +16,7 @@ PKG_SOURCE_URL:= \ https://astron.com/pub/tcsh/old \ https://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh \ https://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old -PKG_HASH:=ed287158ca1b00ba477e8ea57bac53609838ebcfd05fcb05ca95021b7ebe885b +PKG_HASH:=be2cfd653d2a0c7f506d2dd14c12324ba749bd484037be6df44a3973f52262b7 PKG_MAINTAINER:=Nuno Goncalves PKG_LICENSE:=BSD-3-Clause diff --git a/utils/tcsh/patches/001-sysmalloc.patch b/utils/tcsh/patches/001-sysmalloc.patch index 7cc7e06c60..f46ce35091 100644 --- a/utils/tcsh/patches/001-sysmalloc.patch +++ b/utils/tcsh/patches/001-sysmalloc.patch @@ -1,4 +1,4 @@ ---- a/config_f.h +--- a/config_f.h +++ b/config_f.h @@ -138,11 +138,8 @@ * This can be much slower and no memory statistics will be diff --git a/utils/tcsh/patches/020-cross.patch b/utils/tcsh/patches/020-cross.patch index b1ed1ec86d..526b3c45eb 100644 --- a/utils/tcsh/patches/020-cross.patch +++ b/utils/tcsh/patches/020-cross.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -447,7 +447,7 @@ pure:$(P) ${OBJS} +@@ -448,7 +448,7 @@ pure:$(P) ${OBJS} gethost: gethost.c sh.err.h tc.const.h sh.h rm -f gethost diff --git a/utils/tcsh/patches/030-gcc10.patch b/utils/tcsh/patches/030-gcc10.patch deleted file mode 100644 index b5a0cf0600..0000000000 --- a/utils/tcsh/patches/030-gcc10.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6974bc35a5cda6eab748e364bd76a860ca66968b Mon Sep 17 00:00:00 2001 -From: zoulasc -Date: Sat, 11 Jan 2020 11:16:51 -0500 -Subject: [PATCH] Remove extra variable definition that cause -fno-common build - to fail (Werner Fink) - ---- - tc.sig.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tc.sig.c b/tc.sig.c -index 77659ca..576605a 100644 ---- a/tc.sig.c -+++ b/tc.sig.c -@@ -56,7 +56,6 @@ int alrmcatch_disabled; /* = 0; */ - int phup_disabled; /* = 0; */ - int pchild_disabled; /* = 0; */ - int pintr_disabled; /* = 0; */ --int handle_interrupt; /* = 0; */ - - int - handle_pending_signals(void)