From 32a6dc445cdacb0c56a242a44e739fb404fdf8da Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Sun, 27 Nov 2022 14:55:12 +0100
Subject: [PATCH] tcsh: update to 6.24.02, switch to gcc-10 and drop locale patch
---
/dev/null | 246 ---------------------------
components/shell/tcsh/tcsh.p5m | 2
components/shell/tcsh/test/results-all.master | 246 +++++++++++++++++++++++++++
components/shell/tcsh/manifests/sample-manifest.p5m | 3
components/shell/tcsh/Makefile | 13
5 files changed, 255 insertions(+), 255 deletions(-)
diff --git a/components/shell/tcsh/Makefile b/components/shell/tcsh/Makefile
index 382a019..9f46d77 100644
--- a/components/shell/tcsh/Makefile
+++ b/components/shell/tcsh/Makefile
@@ -24,18 +24,17 @@
# Copyright (c) 2019, Michal Nowak
#
-BUILD_BITS= 64
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= tcsh
-COMPONENT_VERSION= 6.24.1
-HUMAN_VERSION= 6.24.01
+COMPONENT_VERSION= 6.24.2
+HUMAN_VERSION= 6.24.02
COMPONENT_SUMMARY= Tenex C-shell (tcsh)
COMPONENT_DESCRIPTION= C shell with file name completion and command line editing
COMPONENT_PROJECT_URL= https://github.com/tcsh-org/tcsh
COMPONENT_SRC= $(COMPONENT_NAME)-$(HUMAN_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:5659a1b973b1f947e36238cb17a00210ac4cff3b496f8f851acd77172ab91d7e
+COMPONENT_ARCHIVE_HASH= sha256:6691e15af0719575cad91ce9212c77a754f6c89f0a1f70454625e5e21ba0bdad
COMPONENT_ARCHIVE_URL= https://astron.com/pub/tcsh/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI= shell/tcsh
COMPONENT_CLASSIFICATION= System/Shells
@@ -44,13 +43,13 @@
include $(WS_MAKE_RULES)/common.mk
-# Default GCC opt -O3 fails on GCC 6 & 7: https://bugs.astron.com/view.php?id=80
-gcc_OPT = -O2
+GCC_VERSION= 10
+# Default GCC opt -O3 fails on GCC 7: https://bugs.astron.com/view.php?id=80
+#gcc_OPT = -O2
COMPONENT_PRE_CONFIGURE_ACTION = \
($(CLONEY) $(SOURCE_DIR) $(@D))
-# Strip compilation lines from test output
COMPONENT_TEST_TRANSFORMS = \
' -n "/^\s*[0-9]/p" '
diff --git a/components/shell/tcsh/manifests/sample-manifest.p5m b/components/shell/tcsh/manifests/sample-manifest.p5m
index f11caff..7afddd4 100644
--- a/components/shell/tcsh/manifests/sample-manifest.p5m
+++ b/components/shell/tcsh/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
-# Copyright 2018 <contributor>
+# Copyright 2022 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
diff --git a/components/shell/tcsh/patches/01-locale.patch b/components/shell/tcsh/patches/01-locale.patch
deleted file mode 100644
index 6e03e2c..0000000
--- a/components/shell/tcsh/patches/01-locale.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- tcsh-6.22.04/sh.c.orig Mon Apr 26 16:54:25 2021
-+++ tcsh-6.22.04/sh.c Mon May 17 20:23:51 2021
-@@ -173,17 +173,10 @@
- size_t len;
- int add_LOC = 1;
- int add_lang = 1;
-- char trypath[MAXPATHLEN];
-- struct stat st;
-
- if (path == NULL)
- return;
-
-- (void) xsnprintf(trypath, sizeof(trypath), "%s/C/LC_MESSAGES/tcsh.cat",
-- path);
-- if (stat(trypath, &st) == -1)
-- return;
--
- if ((old = getenv("NLSPATH")) != NULL)
- len = strlen(old) + 1; /* don't forget the colon. */
- else
---- tcsh-6.22.04/sh.func.c.orig Mon Apr 26 16:54:25 2021
-+++ tcsh-6.22.04/sh.func.c Mon May 17 20:26:57 2021
-@@ -2671,6 +2671,8 @@
-
- if (adrof(STRcatalog) != NULL)
- catalog = xasprintf("tcsh.%s", short2str(varval(STRcatalog)));
-+/* for compatibility */
-+#undef NL_CAT_LOCALE
- #ifdef NL_CAT_LOCALE /* POSIX-compliant. */
- /*
- * Check if LC_MESSAGES is set in the environment and use it, if so.
diff --git a/components/shell/tcsh/tcsh.p5m b/components/shell/tcsh/tcsh.p5m
index 08a0726..75e80a1 100644
--- a/components/shell/tcsh/tcsh.p5m
+++ b/components/shell/tcsh/tcsh.p5m
@@ -23,9 +23,9 @@
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=pkg.description value="$(COMPONENT_DESCRIPTION)"
-set name=pkg.human-version value=$(HUMAN_VERSION)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
diff --git a/components/shell/tcsh/test/results-64.master b/components/shell/tcsh/test/results-64.master
deleted file mode 100644
index 6f462ae..0000000
--- a/components/shell/tcsh/test/results-64.master
+++ /dev/null
@@ -1,246 +0,0 @@
- 1: beepcmd skipped (aliases.at:3)
- 2: cwdcmd ok
- 3: jobcmd skipped (aliases.at:19)
- 4: helpcommand skipped (aliases.at:20)
- 5: periodic skipped (aliases.at:21)
- 6: precmd skipped (aliases.at:22)
- 7: postcmd ok
- 8: shell ok
- 9: -b ok
- 10: -c ok
- 11: -d skipped (arguments.at:34)
- 12: -e ok
- 13: -f skipped (arguments.at:46)
- 14: -i ok
- 15: -l skipped (arguments.at:61)
- 16: -m skipped (arguments.at:65)
- 17: -q skipped (arguments.at:71)
- 18: -s ok
- 19: -t ok
- 20: -v ok
- 21: -x ok
- 22: -V skipped (arguments.at:126)
- 23: -X skipped (arguments.at:127)
- 24: --help skipped (arguments.at:130)
- 25: --version skipped (arguments.at:131)
- 26: invalid option ok
- 27: non-option arguments ok
- 28: % skipped (commands.at:3)
- 29: : ok
- 30: @ ok
- 31: alias ok
- 32: alloc skipped (commands.at:80)
- 33: bg skipped (commands.at:81)
- 34: bindkey skipped (commands.at:82)
- 35: break ok
- 36: builtins skipped (commands.at:133)
- 37: bye skipped (commands.at:134)
- 38: cd ok
- 39: complete ok
- 40: continue ok
- 41: dirs ok
- 42: echo ok
- 43: echotc skipped (commands.at:348)
- 44: eval ok
- 45: exec ok
- 46: exit ok
- 47: fg skipped (commands.at:378)
- 48: filetest ok
- 49: foreach ok
- 50: getspath skipped (commands.at:524)
- 51: getxvers skipped (commands.at:525)
- 52: glob ok
- 53: goto ok
- 54: hashstat skipped (commands.at:564)
- 55: history ok
- 56: hup ok
- 57: if ok
- 58: inlib skipped (commands.at:778)
- 59: jobs skipped (commands.at:779)
- 60: kill ok
- 61: limit skipped (commands.at:799)
- 62: log ok
- 63: login skipped (commands.at:813)
- 64: logout ok
- 65: ls-F ok
- 66: migrate skipped (commands.at:893)
- 67: newgrp skipped (commands.at:894)
- 68: nice ok
- 69: nohup ok
- 70: notify skipped (commands.at:925)
- 71: onintr ok
- 72: popd ok
- 73: printenv ok
- 74: pushd ok
- 75: rehash ok
- 76: repeat ok
- 77: rootnode skipped (commands.at:1095)
- 78: sched skipped (commands.at:1096)
- 79: set ok
- 80: setenv ok
- 81: setpath skipped (commands.at:1160)
- 82: setspath skipped (commands.at:1161)
- 83: settc skipped (commands.at:1162)
- 84: setty skipped (commands.at:1163)
- 85: setxvers skipped (commands.at:1164)
- 86: shift ok
- 87: source ok
- 88: stop skipped (commands.at:1246)
- 89: suspend skipped (commands.at:1247)
- 90: switch ok
- 91: telltc skipped (commands.at:1306)
- 92: termname skipped (commands.at:1307)
- 93: time skipped (commands.at:1308)
- 94: umask ok
- 95: unalias ok
- 96: uncomplete ok
- 97: unhash ok
- 98: universe skipped (commands.at:1366)
- 99: unlimit skipped (commands.at:1367)
-100: unset ok
-101: unsetenv ok
-102: ver skipped (commands.at:1399)
-103: wait ok
-104: warp skipped (commands.at:1410)
-105: watchlog skipped (commands.at:1411)
-106: where ok
-107: which ok
-108: while ok
-109: jobs output ok
-110: time output ok
-111: Arithmetic operators ok
-112: Primary expressions ok
-113: history ok
-114: history performance ok
-115: history hup ok
-116: Word splitting ok
-117: Comments skipped (lexical.at:33)
-118: Escaping special characters ok
-119: Preventing substitution ok
-120: History basics ok
-121: Event specification ok
-122: Word selection ok
-123: History modifiers ok
-124: Alias substitution ok
-125: Variable substitution ok
-126: Quoting of expansions in `...` ok
-127: \echo for git_tcsh_completion ok
-128: :gas work as described in the man pages ok
-129: avoid infinite loop in :gas ok
-130: /a.b/c:r doesn't remove path elements ok
-131: $x:q:h does not cause out of memory crash and yields the full string ok
-132: $x:q:t does not cause out of memory crash and yields the full string ok
-133: $x:q:r yields the full string ok
-134: $x:q:e yields nothing ok
-135: EUC-JP multibyte test ok
-136: UTF-8 multibyte test ok
-137: Parenthesis no space ok
-138: Parenthesis space ok
-139: Parenthesis space escaped ok
-140: Parenthesis escaped ok
-141: Command substitution ok
-142: Filename substitution ok
-143: Directory stack substitution ok
-144: Command combinations ok
-145: Command execution ok
-146: $ addsuffix ok
-147: $ afsuser ok
-148: $ ampm ok
-149: $ anyerror ok
-150: $ argv ok
-151: $ autocorrect ok
-152: $ autoexpand ok
-153: $ autolist ok
-154: $ autologout skipped (variables.at:80)
-155: $ backslash_quote ok
-156: $ catalog ok
-157: $ cdpath ok
-158: $ color ok
-159: $ colorcat ok
-160: $ command ok
-161: $ complete ok
-162: $ continue ok
-163: $ continue_args ok
-164: $ correct ok
-165: $ csubstnonl ok
-166: $ cwd ok
-167: $ dextract ok
-168: $ dirsfile ok
-169: $ dirstack ok
-170: $ dspmbyte skipped (variables.at:279)
-171: $ dunique ok
-172: $ echo ok
-173: $ echo_style ok
-174: $ echo_hex ok
-175: $ edit skipped (variables.at:379)
-176: $ ellipsis ok
-177: $ fignore ok
-178: $ filec ok
-179: $ gid ok
-180: $ group ok
-181: $ histchars ok
-182: $ histdup ok
-183: $ histfile ok
-184: $ histlit ok
-185: $ history ok
-186: $ home ok
-187: $ ignoreeof ok
-188: $ implicitcd ok
-189: $ inputmode ok
-190: $ killdup ok
-191: $ killring ok
-192: $ listflags ok
-193: $ listjobs ok
-194: $ listlinks ok
-195: $ listmax ok
-196: $ listmaxrows ok
-197: $ loginsh ok
-198: $ logout ok
-199: $ mail ok
-200: $ cdtohome ok
-201: $ noimplicithome ok
-202: $ matchbeep ok
-203: $ nobeep ok
-204: $ noclobber ok
-205: $ noding ok
-206: $ noglob ok
-207: $ nostat ok
-208: $ notify ok
-209: $ oid skipped (variables.at:782)
-210: $ owd ok
-211: $ path ok
-212: $ printexitvalue ok
-213: $ prompt ok
-214: $ prompt2 ok
-215: $ prompt3 ok
-216: $ promptchars ok
-217: $ pushdtohome ok
-218: $ pushdsilent ok
-219: $ recexact ok
-220: $ recognize_only_executablers ok
-221: $ rmstar ok
-222: $ rprompt ok
-223: $ savedirs ok
-224: $ savehist ok
-225: $ sched ok
-226: $ shell ok
-227: $ shlvl ok
-228: $ status ok
-229: $ symlinks ok
-230: $ tcsh ok
-231: $ term ok
-232: $ time ok
-233: $ tperiod ok
-234: $ tty ok
-235: $ uid ok
-236: $ user ok
-237: $ verbose ok
-238: $ version ok
-239: $ visiblebell ok
-240: $ watch ok
-241: $ who ok
-242: $ wordchars ok
-243: -n ok
-244: $< ok
-190 tests were successful.
-54 tests were skipped.
diff --git a/components/shell/tcsh/test/results-all.master b/components/shell/tcsh/test/results-all.master
new file mode 100644
index 0000000..8034794
--- /dev/null
+++ b/components/shell/tcsh/test/results-all.master
@@ -0,0 +1,246 @@
+ 1: beepcmd skipped (aliases.at:4)
+ 2: cwdcmd ok
+ 3: jobcmd skipped (aliases.at:20)
+ 4: helpcommand skipped (aliases.at:22)
+ 5: periodic skipped (aliases.at:24)
+ 6: precmd skipped (aliases.at:26)
+ 7: postcmd ok
+ 8: shell ok
+ 9: -b ok
+ 10: -c ok
+ 11: -d skipped (arguments.at:35)
+ 12: -e ok
+ 13: -f skipped (arguments.at:47)
+ 14: -i ok
+ 15: -l skipped (arguments.at:62)
+ 16: -m skipped (arguments.at:66)
+ 17: -q skipped (arguments.at:72)
+ 18: -s ok
+ 19: -t ok
+ 20: -v ok
+ 21: -x ok
+ 22: -V skipped (arguments.at:128)
+ 23: -X skipped (arguments.at:130)
+ 24: --help skipped (arguments.at:132)
+ 25: --version skipped (arguments.at:134)
+ 26: invalid option ok
+ 27: non-option arguments FAILED (arguments.at:166)
+ 28: % skipped (commands.at:4)
+ 29: : ok
+ 30: @ ok
+ 31: alias ok
+ 32: alloc skipped (commands.at:81)
+ 33: bg skipped (commands.at:83)
+ 34: bindkey skipped (commands.at:85)
+ 35: break ok
+ 36: builtins skipped (commands.at:137)
+ 37: bye skipped (commands.at:138)
+ 38: cd ok
+ 39: complete ok
+ 40: continue ok
+ 41: dirs ok
+ 42: echo ok
+ 43: echotc skipped (commands.at:351)
+ 44: eval ok
+ 45: exec ok
+ 46: exit ok
+ 47: fg skipped (commands.at:381)
+ 48: filetest FAILED (commands.at:390)
+ 49: foreach ok
+ 50: getspath skipped (commands.at:527)
+ 51: getxvers skipped (commands.at:529)
+ 52: glob ok
+ 53: goto ok
+ 54: hashstat skipped (commands.at:568)
+ 55: history ok
+ 56: hup ok
+ 57: if ok
+ 58: inlib skipped (commands.at:782)
+ 59: jobs skipped (commands.at:784)
+ 60: kill ok
+ 61: limit skipped (commands.at:804)
+ 62: log ok
+ 63: login skipped (commands.at:818)
+ 64: logout ok
+ 65: ls-F ok
+ 66: migrate skipped (commands.at:898)
+ 67: newgrp skipped (commands.at:899)
+ 68: nice ok
+ 69: nohup ok
+ 70: notify skipped (commands.at:930)
+ 71: onintr ok
+ 72: popd ok
+ 73: printenv ok
+ 74: pushd ok
+ 75: rehash ok
+ 76: repeat ok
+ 77: rootnode skipped (commands.at:1100)
+ 78: sched skipped (commands.at:1102)
+ 79: set ok
+ 80: setenv ok
+ 81: setpath skipped (commands.at:1166)
+ 82: setspath skipped (commands.at:1168)
+ 83: settc skipped (commands.at:1170)
+ 84: setty skipped (commands.at:1172)
+ 85: setxvers skipped (commands.at:1174)
+ 86: shift ok
+ 87: source FAILED (commands.at:1251)
+ 88: stop skipped (commands.at:1256)
+ 89: suspend skipped (commands.at:1258)
+ 90: switch ok
+ 91: telltc skipped (commands.at:1317)
+ 92: termname skipped (commands.at:1318)
+ 93: time skipped (commands.at:1319)
+ 94: umask ok
+ 95: unalias ok
+ 96: uncomplete ok
+ 97: unhash ok
+ 98: universe skipped (commands.at:1377)
+ 99: unlimit skipped (commands.at:1379)
+100: unset ok
+101: unsetenv ok
+102: ver skipped (commands.at:1411)
+103: wait ok
+104: warp skipped (commands.at:1422)
+105: watchlog skipped (commands.at:1424)
+106: where ok
+107: which ok
+108: while ok
+109: jobs output ok
+110: time output ok
+111: Arithmetic operators ok
+112: Primary expressions FAILED (expr.at:92)
+113: history ok
+114: history performance ok
+115: history hup ok
+116: Word splitting ok
+117: Comments skipped (lexical.at:34)
+118: Escaping special characters ok
+119: Preventing substitution ok
+120: History basics ok
+121: Event specification ok
+122: Word selection ok
+123: History modifiers ok
+124: Alias substitution ok
+125: Variable substitution ok
+126: Quoting of expansions in `...` ok
+127: \echo for git_tcsh_completion ok
+128: :gas work as described in the man pages ok
+129: avoid infinite loop in :gas ok
+130: /a.b/c:r doesn't remove path elements ok
+131: $x:q:h does not cause out of memory crash and yields the full string ok
+132: $x:q:t does not cause out of memory crash and yields the full string ok
+133: $x:q:r yields the full string ok
+134: $x:q:e yields nothing ok
+135: EUC-JP multibyte test ok
+136: UTF-8 multibyte test ok
+137: -n ok
+138: Parenthesis no space ok
+139: Parenthesis space ok
+140: Parenthesis space escaped ok
+141: Parenthesis escaped ok
+142: $< ok
+143: Command substitution ok
+144: Filename substitution ok
+145: Directory stack substitution ok
+146: Command combinations ok
+147: Command execution ok
+148: $ addsuffix ok
+149: $ afsuser ok
+150: $ ampm ok
+151: $ anyerror ok
+152: $ argv ok
+153: $ autocorrect ok
+154: $ autoexpand ok
+155: $ autolist ok
+156: $ autologout skipped (variables.at:91)
+157: $ backslash_quote ok
+158: $ catalog ok
+159: $ cdpath ok
+160: $ color ok
+161: $ colorcat ok
+162: $ command ok
+163: $ complete ok
+164: $ continue ok
+165: $ continue_args ok
+166: $ correct ok
+167: $ csubstnonl ok
+168: $ cwd ok
+169: $ dextract ok
+170: $ dirsfile ok
+171: $ dirstack ok
+172: $ dspmbyte skipped (variables.at:295)
+173: $ dunique ok
+174: $ echo ok
+175: $ echo_style ok
+176: $ echo_hex ok
+177: $ edit skipped (variables.at:397)
+178: $ ellipsis ok
+179: $ fignore ok
+180: $ filec ok
+181: $ gid ok
+182: $ group ok
+183: $ histchars ok
+184: $ histdup ok
+185: $ histfile ok
+186: $ histlit ok
+187: $ history ok
+188: $ home ok
+189: $ ignoreeof ok
+190: $ implicitcd ok
+191: $ inputmode ok
+192: $ killdup ok
+193: $ killring ok
+194: $ listflags ok
+195: $ listjobs ok
+196: $ listlinks ok
+197: $ listmax ok
+198: $ listmaxrows ok
+199: $ loginsh ok
+200: $ logout ok
+201: $ mail ok
+202: $ cdtohome ok
+203: $ noimplicithome ok
+204: $ matchbeep ok
+205: $ nobeep ok
+206: $ noclobber ok
+207: $ noding ok
+208: $ noglob ok
+209: $ nostat ok
+210: $ notify ok
+211: $ oid skipped (variables.at:820)
+212: $ owd ok
+213: $ path ok
+214: $ printexitvalue ok
+215: $ prompt ok
+216: $ prompt2 ok
+217: $ prompt3 ok
+218: $ promptchars ok
+219: $ pushdtohome ok
+220: $ pushdsilent ok
+221: $ recexact ok
+222: $ recognize_only_executablers ok
+223: $ rmstar ok
+224: $ rprompt ok
+225: $ savedirs ok
+226: $ savehist ok
+227: $ sched ok
+228: $ shell ok
+229: $ shlvl ok
+230: $ status ok
+231: $ symlinks ok
+232: $ tcsh ok
+233: $ term ok
+234: $ time ok
+235: $ tperiod ok
+236: $ tty ok
+237: $ uid ok
+238: $ user ok
+239: $ verbose ok
+240: $ version ok
+241: $ visiblebell ok
+242: $ watch ok
+243: $ who ok
+244: $ wordchars ok
+4 failed unexpectedly.
+54 tests were skipped.
--
Gitblit v1.9.3