7ac0d8 groups/211.native_packages_cmdline.group: tcsh: bump to v6.22.00

2 files Authored by Redfoxmoon 4 years ago, Committed by Lucio Andrés Illanes Albornoz 4 years ago,
    groups/211.native_packages_cmdline.group: tcsh: bump to v6.22.00
    
    Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
    
        
groups/211.native_packages_cmdline.group CHANGED
@@ -165,8 +165,8 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
165
165
: ${PKG_TAR_VERSION:=1.32};
166
166
: ${PKG_TAR_URL:=https://ftp.gnu.org/gnu/tar/tar-${PKG_TAR_VERSION}.tar.gz};
167
167
: ${PKG_TCSH_DEPENDS:="ncurses"};
168
- : ${PKG_TCSH_SHA256SUM:=b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d};
169
- : ${PKG_TCSH_VERSION:=6.20.00};
168
+ : ${PKG_TCSH_SHA256SUM:=69fef68006ba219d1c156ea810e9781c416d2e9a1d2f1a6f91e44a529ec97dfe};
169
+ : ${PKG_TCSH_VERSION:=6.22.00};
170
170
: ${PKG_TCSH_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/tcsh/tcsh-${PKG_TCSH_VERSION}.tar.gz};
171
171
: ${PKG_THE_SILVER_SEARCHER_DEPENDS:="libz pcre xz"};
172
172
: ${PKG_THE_SILVER_SEARCHER_SHA256SUM:=d9621a878542f3733b5c6e71c849b9d1a830ed77cb1a1f6c2ea441d4b0643170};
patches/tcsh-6.22.00.local.patch patches/tcsh-6.20.00.local.patch
file renamed
+87 -73
patches/{tcsh-6.20.00.local.patch → tcsh-6.22.00.local.patch} RENAMED
@@ -1,76 +1,6 @@
1
- --- tcsh-6.20.00.orig/configure 2018-06-21 16:23:41.803468940 +0200
2
- +++ tcsh-6.20.00/configure 2018-06-21 16:24:12.059836489 +0200
3
- @@ -4289,7 +4289,7 @@
1
+ diff -Nru tcsh-6.22.00.orig/config/midipix tcsh-6.22.00/config/midipix
2
+ --- tcsh-6.22.00.orig/config/midipix 1970-01-01 01:00:00.000000000 +0100
3
+ +++ tcsh-6.22.00/config/midipix 2020-08-21 19:12:56.066600827 +0200
4
- return 0;
5
- }
6
- _ACEOF
7
- -for ac_lib in '' termlib termcap curses ncurses; do
8
- +for ac_lib in '' termlib termcap curses ncurses tinfo; do
9
- if test -z "$ac_lib"; then
10
- ac_res="none required"
11
- else
12
- --- tcsh-6.20.00/config_f.h.orig 2016-04-16 17:44:18.000000000 +0200
13
- +++ tcsh-6.20.00/config_f.h 2016-12-18 02:01:28.699635400 +0100
14
- @@ -139,11 +139,9 @@
15
- * This can be much slower and no memory statistics will be
16
- * provided.
17
- */
18
- -#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__)
19
- +
20
- +/* always use the system malloc. seriously guys. */
21
- # define SYSMALLOC
22
- -#else
23
- -# undef SYSMALLOC
24
- -#endif
25
-
26
- /*
27
- * USE_ACCESS Use access(2) rather than stat(2) when POSIX is defined.
28
- --- tcsh-6.20.00/configure.orig 2016-11-24 16:06:40.000000000 +0100
29
- +++ tcsh-6.20.00/configure 2016-12-18 01:59:04.537346800 +0100
30
- @@ -2975,6 +2975,11 @@
31
- tcsh_config_file=qnx6
32
- ;;
33
-
34
- + ## midipix
35
- + *-midipix*)
36
- + tcsh_config_file=midipix
37
- + ;;
38
- +
39
- * )
40
- as_fn_error $? "Tcsh can't guess the configuration file name
41
- for \`${host}' systems.
42
- --- tcsh-6.20.00/Makefile.in.orig 2015-08-24 22:09:04.000000000 +0200
43
- +++ tcsh-6.20.00/Makefile.in 2016-12-18 02:00:06.570196600 +0100
44
- @@ -24,6 +24,7 @@
45
- CF=-c
46
-
47
- CPPFLAGS=-I. -I$(srcdir)
48
- +CPPFLAGS_FOR_GETHOST=-I. -I$(srcdir)
49
-
50
- LFLAGS=
51
- # hpux lint
52
- @@ -449,7 +450,7 @@
53
-
54
- gethost: gethost.c sh.err.h tc.const.h sh.h
55
- rm -f gethost
56
- - ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} $(srcdir)/gethost.c
57
- + ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS_FOR_GETHOST} ${CFLAGS_FOR_GETHOST} $(srcdir)/gethost.c
58
-
59
- tc.defs.c: gethost host.defs
60
- @rm -f $@.tmp
61
- --- tcsh-6.20.00/sh.h.orig 2016-09-12 18:33:54.000000000 +0200
62
- +++ tcsh-6.20.00/sh.h 2016-12-18 01:59:27.797673400 +0100
63
- @@ -338,7 +338,7 @@
64
- #endif /* POSIX && !WINNT_NATIVE */
65
- #include <limits.h>
66
-
67
- -#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
68
- +#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(__midipix__)
69
- # if !defined(pyr) && !defined(stellar)
70
- # include <time.h>
71
- # ifdef _MINIX
72
- --- tcsh-6.20.00/config/midipix.orig 1970-01-01 01:00:00.000000000 +0100
73
- +++ tcsh-6.20.00/config/midipix 2016-12-18 02:01:44.103473500 +0100
74
4
@@ -0,0 +1,138 @@
75
5
+/*
76
6
+ * config.h -- configure various defines for tcsh
@@ -210,3 +140,87 @@
210
140
+#define HAVE_SLASHSLASH 1
211
141
+
212
142
+#endif /* _h_config */
143
+ diff -Nru tcsh-6.22.00.orig/config_f.h tcsh-6.22.00/config_f.h
144
+ --- tcsh-6.22.00.orig/config_f.h 2019-11-28 17:00:05.000000000 +0100
145
+ +++ tcsh-6.22.00/config_f.h 2020-08-21 19:07:18.052977628 +0200
146
+ @@ -138,11 +138,8 @@
147
+ * This can be much slower and no memory statistics will be
148
+ * provided.
149
+ */
150
+ -#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__)
151
+ +/* always use the system malloc. seriously guys. */
152
+ # define SYSMALLOC
153
+ -#else
154
+ -# undef SYSMALLOC
155
+ -#endif
156
+
157
+ /*
158
+ * USE_ACCESS Use access(2) rather than stat(2) when POSIX is defined.
159
+ diff -Nru tcsh-6.22.00.orig/configure tcsh-6.22.00/configure
160
+ --- tcsh-6.22.00.orig/configure 2019-11-28 17:00:05.000000000 +0100
161
+ +++ tcsh-6.22.00/configure 2020-08-21 19:08:03.600976202 +0200
162
+ @@ -2975,6 +2975,11 @@
163
+ tcsh_config_file=qnx6
164
+ ;;
165
+
166
+ + ## midipix
167
+ + *-midipix*)
168
+ + tcsh_config_file=midipix
169
+ + ;;
170
+ +
171
+ * )
172
+ as_fn_error $? "Tcsh can't guess the configuration file name
173
+ for \`${host}' systems.
174
+ @@ -4284,7 +4289,7 @@
175
+ return 0;
176
+ }
177
+ _ACEOF
178
+ -for ac_lib in '' termlib tinfo termcap curses ncurses; do
179
+ +for ac_lib in '' termlib tinfo termcap curses ncurses tinfo; do
180
+ if test -z "$ac_lib"; then
181
+ ac_res="none required"
182
+ else
183
+ diff -Nru tcsh-6.22.00.orig/ed.inputl.c tcsh-6.22.00/ed.inputl.c
184
+ --- tcsh-6.22.00.orig/ed.inputl.c 2019-11-28 17:00:05.000000000 +0100
185
+ +++ tcsh-6.22.00/ed.inputl.c 2020-08-21 19:22:12.899460169 +0200
186
+ @@ -34,6 +34,8 @@
187
+ #include "ed.defns.h" /* for the function names */
188
+ #include "tw.h" /* for twenex stuff */
189
+
190
+ +#include <wchar.h>
191
+ +
192
+ #define OKCMD INT_MAX
193
+
194
+ /* ed.inputl -- routines to get a single line from the input. */
195
+ diff -Nru tcsh-6.22.00.orig/Makefile.in tcsh-6.22.00/Makefile.in
196
+ --- tcsh-6.22.00.orig/Makefile.in 2019-11-28 17:00:05.000000000 +0100
197
+ +++ tcsh-6.22.00/Makefile.in 2020-08-21 19:28:01.686381892 +0200
198
+ @@ -339,6 +339,7 @@
199
+ #CC= cc -h0,ansi,novector,float0
200
+ #CC= lcc -wa
201
+ CC_FOR_GETHOST = @CC_FOR_GETHOST@
202
+ +CPPFLAGS_FOR_GETHOST=-I. -I$(srcdir)
203
+ ED= ed
204
+ AS= as
205
+ RM= rm
206
+ @@ -447,7 +448,7 @@
207
+
208
+ gethost: gethost.c sh.err.h tc.const.h sh.h
209
+ rm -f gethost
210
+ - ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} $(srcdir)/gethost.c
211
+ + ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS_FOR_GETHOST} ${CFLAGS_FOR_GETHOST} ${LDFLAGS_FOR_GETHOST} $(srcdir)/gethost.c
212
+
213
+ tc.defs.c: gethost host.defs
214
+ @rm -f $@.tmp
215
+ diff -Nru tcsh-6.22.00.orig/sh.h tcsh-6.22.00/sh.h
216
+ --- tcsh-6.22.00.orig/sh.h 2019-11-28 17:00:05.000000000 +0100
217
+ +++ tcsh-6.22.00/sh.h 2020-08-21 19:10:44.030604961 +0200
218
+ @@ -337,7 +337,7 @@
219
+ #endif /* POSIX && !WINNT_NATIVE */
220
+ #include <limits.h>
221
+
222
+ -#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
223
+ +#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(__midipix__)
224
+ # if !defined(pyr) && !defined(stellar)
225
+ # include <time.h>
226
+ # ifdef _MINIX