From 7ac0d8a808e724ac25186f755f13086b9f7d7b60 Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Aug 21 2020 17:47:41 +0000 Subject: groups/211.native_packages_cmdline.group: tcsh: bump to v6.22.00 Signed-off-by: Lucio Andrés Illanes Albornoz --- diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group index 3113b60..efc9437 100644 --- a/groups/211.native_packages_cmdline.group +++ b/groups/211.native_packages_cmdline.group @@ -165,8 +165,8 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")"; : ${PKG_TAR_VERSION:=1.32}; : ${PKG_TAR_URL:=https://ftp.gnu.org/gnu/tar/tar-${PKG_TAR_VERSION}.tar.gz}; : ${PKG_TCSH_DEPENDS:="ncurses"}; -: ${PKG_TCSH_SHA256SUM:=b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d}; -: ${PKG_TCSH_VERSION:=6.20.00}; +: ${PKG_TCSH_SHA256SUM:=69fef68006ba219d1c156ea810e9781c416d2e9a1d2f1a6f91e44a529ec97dfe}; +: ${PKG_TCSH_VERSION:=6.22.00}; : ${PKG_TCSH_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/tcsh/tcsh-${PKG_TCSH_VERSION}.tar.gz}; : ${PKG_THE_SILVER_SEARCHER_DEPENDS:="libz pcre xz"}; : ${PKG_THE_SILVER_SEARCHER_SHA256SUM:=d9621a878542f3733b5c6e71c849b9d1a830ed77cb1a1f6c2ea441d4b0643170}; diff --git a/patches/tcsh-6.20.00.local.patch b/patches/tcsh-6.20.00.local.patch deleted file mode 100644 index 32b3332..0000000 --- a/patches/tcsh-6.20.00.local.patch +++ /dev/null @@ -1,212 +0,0 @@ ---- tcsh-6.20.00.orig/configure 2018-06-21 16:23:41.803468940 +0200 -+++ tcsh-6.20.00/configure 2018-06-21 16:24:12.059836489 +0200 -@@ -4289,7 +4289,7 @@ - return 0; - } - _ACEOF --for ac_lib in '' termlib termcap curses ncurses; do -+for ac_lib in '' termlib termcap curses ncurses tinfo; do - if test -z "$ac_lib"; then - ac_res="none required" - else ---- tcsh-6.20.00/config_f.h.orig 2016-04-16 17:44:18.000000000 +0200 -+++ tcsh-6.20.00/config_f.h 2016-12-18 02:01:28.699635400 +0100 -@@ -139,11 +139,9 @@ - * This can be much slower and no memory statistics will be - * provided. - */ --#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) -+ -+/* always use the system malloc. seriously guys. */ - # define SYSMALLOC --#else --# undef SYSMALLOC --#endif - - /* - * USE_ACCESS Use access(2) rather than stat(2) when POSIX is defined. ---- tcsh-6.20.00/configure.orig 2016-11-24 16:06:40.000000000 +0100 -+++ tcsh-6.20.00/configure 2016-12-18 01:59:04.537346800 +0100 -@@ -2975,6 +2975,11 @@ - tcsh_config_file=qnx6 - ;; - -+ ## midipix -+ *-midipix*) -+ tcsh_config_file=midipix -+ ;; -+ - * ) - as_fn_error $? "Tcsh can't guess the configuration file name - for \`${host}' systems. ---- tcsh-6.20.00/Makefile.in.orig 2015-08-24 22:09:04.000000000 +0200 -+++ tcsh-6.20.00/Makefile.in 2016-12-18 02:00:06.570196600 +0100 -@@ -24,6 +24,7 @@ - CF=-c - - CPPFLAGS=-I. -I$(srcdir) -+CPPFLAGS_FOR_GETHOST=-I. -I$(srcdir) - - LFLAGS= - # hpux lint -@@ -449,7 +450,7 @@ - - gethost: gethost.c sh.err.h tc.const.h sh.h - rm -f gethost -- ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} $(srcdir)/gethost.c -+ ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS_FOR_GETHOST} ${CFLAGS_FOR_GETHOST} $(srcdir)/gethost.c - - tc.defs.c: gethost host.defs - @rm -f $@.tmp ---- tcsh-6.20.00/sh.h.orig 2016-09-12 18:33:54.000000000 +0200 -+++ tcsh-6.20.00/sh.h 2016-12-18 01:59:27.797673400 +0100 -@@ -338,7 +338,7 @@ - #endif /* POSIX && !WINNT_NATIVE */ - #include - --#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) -+#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(__midipix__) - # if !defined(pyr) && !defined(stellar) - # include - # ifdef _MINIX ---- tcsh-6.20.00/config/midipix.orig 1970-01-01 01:00:00.000000000 +0100 -+++ tcsh-6.20.00/config/midipix 2016-12-18 02:01:44.103473500 +0100 -@@ -0,0 +1,138 @@ -+/* -+ * config.h -- configure various defines for tcsh -+ * -+ * All source files should #include this FIRST. -+ * -+ * This is the config file for midipix systems -+ */ -+ -+#ifndef _h_config -+#define _h_config -+/****************** System dependant compilation flags ****************/ -+/* -+ * POSIX This system supports IEEE Std 1003.1-1988 (POSIX). -+ */ -+#define POSIX -+ -+/* -+ * POSIXJOBS This system supports the optional IEEE Std 1003.1-1988 (POSIX) -+ * job control facilities. -+ */ -+#define POSIXJOBS -+ -+/* -+ * VFORK This machine has a vfork(). -+ * It used to be that for job control to work, this define -+ * was mandatory. This is not the case any more. -+ * If you think you still need it, but you don't have vfork, -+ * define this anyway and then do #define vfork fork. -+ * I do this anyway on a Sun because of yellow pages brain damage, -+ * [should not be needed under 4.1] -+ * and on the iris4d cause SGI's fork is sufficiently "virtual" -+ * that vfork isn't necessary. (Besides, SGI's vfork is weird). -+ * Note that some machines eg. rs6000 have a vfork, but not -+ * with the berkeley semantics, so we cannot use it there either. -+ */ -+#undef VFORK -+ -+/* -+ * BSDJOBS You have BSD-style job control (both process groups and -+ * a tty that deals correctly -+ */ -+#define BSDJOBS -+ -+/* -+ * BSDTIMES You have BSD-style process time stuff (like rusage) -+ * This may or may not be true. For example, Apple Unix -+ * (OREO) has BSDJOBS but not BSDTIMES. -+ */ -+#define BSDTIMES -+ -+/* -+ * BSDLIMIT You have BSD-style resource limit stuff (getrlimit/setrlimit) -+ */ -+#define BSDLIMIT -+ -+/* -+ * TERMIO You have struct termio instead of struct sgttyb. -+ * This is usually the case for SVID systems, where -+ * BSD uses sgttyb. POSIX systems should define this -+ * anyway, even though they use struct termios. -+ */ -+#define TERMIO -+ -+/* -+ * SYSVREL Your machine is SYSV based (HPUX, A/UX) -+ * NOTE: don't do this if you are on a Pyramid -- tcsh is -+ * built in a BSD universe. -+ * Set SYSVREL to 1, 2, 3, or 4, depending the version of System V -+ * you are running. Or set it to 0 if you are not SYSV based -+ * -+ * Note: Linux should work with any SYSVREL < 3. -+ */ -+#define SYSVREL 2 -+ -+/* -+ * YPBUGS Work around Sun YP bugs that cause expansion of ~username -+ * to send command output to /dev/null -+ */ -+#undef YPBUGS -+ -+/* -+ * Get the name space we want. -+ * -+ * The more recent defaults for gcc (e.g. on Red Hat 7.0) -+ * also define _POSIX_C_SOURCE, which throws our code off. -+ */ -+ -+#define __STRICT_ANSI__ -+#ifndef _BSD_SOURCE -+# define _BSD_SOURCE -+#endif -+#ifndef _SVID_SOURCE -+# define _SVID_SOURCE -+#endif -+#ifndef _POSIX_SOURCE -+# define _POSIX_SOURCE -+#endif -+#ifndef _XOPEN_SOURCE -+# define _XOPEN_SOURCE 500 -+#endif -+#ifndef _GNU_SOURCE -+# define _GNU_SOURCE -+#endif -+ -+/* -+ * Large file support from -+ */ -+ -+#ifndef _LARGEFILE_SOURCE -+# define _LARGEFILE_SOURCE -+#endif -+#ifndef _LARGEFILE64_SOURCE -+# define _LARGEFILE64_SOURCE -+#endif -+#ifndef _FILE_OFFSET_BITS -+# define _FILE_OFFSET_BITS 64 -+#endif -+ -+/****************** local defines *********************/ -+#ifndef _PATH_TCSHELL -+#define _PATH_TCSHELL "/bin/tcsh" -+#endif -+#define ECHO_STYLE BOTH_ECHO -+ -+#if !defined(SYSMALLOC) -+# define SYSMALLOC -+#endif -+#if !defined(NISPLUS) -+# define NISPLUS -+#endif -+#if !defined(POSIX) -+# define POSIX -+#endif -+ -+/* midipix allows paths prepended with double slashes (network paths). */ -+#define HAVE_SLASHSLASH 1 -+ -+#endif /* _h_config */ diff --git a/patches/tcsh-6.22.00.local.patch b/patches/tcsh-6.22.00.local.patch new file mode 100644 index 0000000..b2a3a1b --- /dev/null +++ b/patches/tcsh-6.22.00.local.patch @@ -0,0 +1,226 @@ +diff -Nru tcsh-6.22.00.orig/config/midipix tcsh-6.22.00/config/midipix +--- tcsh-6.22.00.orig/config/midipix 1970-01-01 01:00:00.000000000 +0100 ++++ tcsh-6.22.00/config/midipix 2020-08-21 19:12:56.066600827 +0200 +@@ -0,0 +1,138 @@ ++/* ++ * config.h -- configure various defines for tcsh ++ * ++ * All source files should #include this FIRST. ++ * ++ * This is the config file for midipix systems ++ */ ++ ++#ifndef _h_config ++#define _h_config ++/****************** System dependant compilation flags ****************/ ++/* ++ * POSIX This system supports IEEE Std 1003.1-1988 (POSIX). ++ */ ++#define POSIX ++ ++/* ++ * POSIXJOBS This system supports the optional IEEE Std 1003.1-1988 (POSIX) ++ * job control facilities. ++ */ ++#define POSIXJOBS ++ ++/* ++ * VFORK This machine has a vfork(). ++ * It used to be that for job control to work, this define ++ * was mandatory. This is not the case any more. ++ * If you think you still need it, but you don't have vfork, ++ * define this anyway and then do #define vfork fork. ++ * I do this anyway on a Sun because of yellow pages brain damage, ++ * [should not be needed under 4.1] ++ * and on the iris4d cause SGI's fork is sufficiently "virtual" ++ * that vfork isn't necessary. (Besides, SGI's vfork is weird). ++ * Note that some machines eg. rs6000 have a vfork, but not ++ * with the berkeley semantics, so we cannot use it there either. ++ */ ++#undef VFORK ++ ++/* ++ * BSDJOBS You have BSD-style job control (both process groups and ++ * a tty that deals correctly ++ */ ++#define BSDJOBS ++ ++/* ++ * BSDTIMES You have BSD-style process time stuff (like rusage) ++ * This may or may not be true. For example, Apple Unix ++ * (OREO) has BSDJOBS but not BSDTIMES. ++ */ ++#define BSDTIMES ++ ++/* ++ * BSDLIMIT You have BSD-style resource limit stuff (getrlimit/setrlimit) ++ */ ++#define BSDLIMIT ++ ++/* ++ * TERMIO You have struct termio instead of struct sgttyb. ++ * This is usually the case for SVID systems, where ++ * BSD uses sgttyb. POSIX systems should define this ++ * anyway, even though they use struct termios. ++ */ ++#define TERMIO ++ ++/* ++ * SYSVREL Your machine is SYSV based (HPUX, A/UX) ++ * NOTE: don't do this if you are on a Pyramid -- tcsh is ++ * built in a BSD universe. ++ * Set SYSVREL to 1, 2, 3, or 4, depending the version of System V ++ * you are running. Or set it to 0 if you are not SYSV based ++ * ++ * Note: Linux should work with any SYSVREL < 3. ++ */ ++#define SYSVREL 2 ++ ++/* ++ * YPBUGS Work around Sun YP bugs that cause expansion of ~username ++ * to send command output to /dev/null ++ */ ++#undef YPBUGS ++ ++/* ++ * Get the name space we want. ++ * ++ * The more recent defaults for gcc (e.g. on Red Hat 7.0) ++ * also define _POSIX_C_SOURCE, which throws our code off. ++ */ ++ ++#define __STRICT_ANSI__ ++#ifndef _BSD_SOURCE ++# define _BSD_SOURCE ++#endif ++#ifndef _SVID_SOURCE ++# define _SVID_SOURCE ++#endif ++#ifndef _POSIX_SOURCE ++# define _POSIX_SOURCE ++#endif ++#ifndef _XOPEN_SOURCE ++# define _XOPEN_SOURCE 500 ++#endif ++#ifndef _GNU_SOURCE ++# define _GNU_SOURCE ++#endif ++ ++/* ++ * Large file support from ++ */ ++ ++#ifndef _LARGEFILE_SOURCE ++# define _LARGEFILE_SOURCE ++#endif ++#ifndef _LARGEFILE64_SOURCE ++# define _LARGEFILE64_SOURCE ++#endif ++#ifndef _FILE_OFFSET_BITS ++# define _FILE_OFFSET_BITS 64 ++#endif ++ ++/****************** local defines *********************/ ++#ifndef _PATH_TCSHELL ++#define _PATH_TCSHELL "/bin/tcsh" ++#endif ++#define ECHO_STYLE BOTH_ECHO ++ ++#if !defined(SYSMALLOC) ++# define SYSMALLOC ++#endif ++#if !defined(NISPLUS) ++# define NISPLUS ++#endif ++#if !defined(POSIX) ++# define POSIX ++#endif ++ ++/* midipix allows paths prepended with double slashes (network paths). */ ++#define HAVE_SLASHSLASH 1 ++ ++#endif /* _h_config */ +diff -Nru tcsh-6.22.00.orig/config_f.h tcsh-6.22.00/config_f.h +--- tcsh-6.22.00.orig/config_f.h 2019-11-28 17:00:05.000000000 +0100 ++++ tcsh-6.22.00/config_f.h 2020-08-21 19:07:18.052977628 +0200 +@@ -138,11 +138,8 @@ + * This can be much slower and no memory statistics will be + * provided. + */ +-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) ++/* always use the system malloc. seriously guys. */ + # define SYSMALLOC +-#else +-# undef SYSMALLOC +-#endif + + /* + * USE_ACCESS Use access(2) rather than stat(2) when POSIX is defined. +diff -Nru tcsh-6.22.00.orig/configure tcsh-6.22.00/configure +--- tcsh-6.22.00.orig/configure 2019-11-28 17:00:05.000000000 +0100 ++++ tcsh-6.22.00/configure 2020-08-21 19:08:03.600976202 +0200 +@@ -2975,6 +2975,11 @@ + tcsh_config_file=qnx6 + ;; + ++ ## midipix ++ *-midipix*) ++ tcsh_config_file=midipix ++ ;; ++ + * ) + as_fn_error $? "Tcsh can't guess the configuration file name + for \`${host}' systems. +@@ -4284,7 +4289,7 @@ + return 0; + } + _ACEOF +-for ac_lib in '' termlib tinfo termcap curses ncurses; do ++for ac_lib in '' termlib tinfo termcap curses ncurses tinfo; do + if test -z "$ac_lib"; then + ac_res="none required" + else +diff -Nru tcsh-6.22.00.orig/ed.inputl.c tcsh-6.22.00/ed.inputl.c +--- tcsh-6.22.00.orig/ed.inputl.c 2019-11-28 17:00:05.000000000 +0100 ++++ tcsh-6.22.00/ed.inputl.c 2020-08-21 19:22:12.899460169 +0200 +@@ -34,6 +34,8 @@ + #include "ed.defns.h" /* for the function names */ + #include "tw.h" /* for twenex stuff */ + ++#include ++ + #define OKCMD INT_MAX + + /* ed.inputl -- routines to get a single line from the input. */ +diff -Nru tcsh-6.22.00.orig/Makefile.in tcsh-6.22.00/Makefile.in +--- tcsh-6.22.00.orig/Makefile.in 2019-11-28 17:00:05.000000000 +0100 ++++ tcsh-6.22.00/Makefile.in 2020-08-21 19:28:01.686381892 +0200 +@@ -339,6 +339,7 @@ + #CC= cc -h0,ansi,novector,float0 + #CC= lcc -wa + CC_FOR_GETHOST = @CC_FOR_GETHOST@ ++CPPFLAGS_FOR_GETHOST=-I. -I$(srcdir) + ED= ed + AS= as + RM= rm +@@ -447,7 +448,7 @@ + + gethost: gethost.c sh.err.h tc.const.h sh.h + rm -f gethost +- ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} $(srcdir)/gethost.c ++ ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS_FOR_GETHOST} ${CFLAGS_FOR_GETHOST} ${LDFLAGS_FOR_GETHOST} $(srcdir)/gethost.c + + tc.defs.c: gethost host.defs + @rm -f $@.tmp +diff -Nru tcsh-6.22.00.orig/sh.h tcsh-6.22.00/sh.h +--- tcsh-6.22.00.orig/sh.h 2019-11-28 17:00:05.000000000 +0100 ++++ tcsh-6.22.00/sh.h 2020-08-21 19:10:44.030604961 +0200 +@@ -337,7 +337,7 @@ + #endif /* POSIX && !WINNT_NATIVE */ + #include + +-#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) ++#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(__midipix__) + # if !defined(pyr) && !defined(stellar) + # include + # ifdef _MINIX