From d9477095db06b919c38e51b45718994acd6dc2be35ac13c9a8e507a3e6642d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Feb 2025 10:07:38 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main tcsh revision b2974b0a7e4d12db1ce67781f3fe9fce --- bindkey.tcsh | 11 ---- complete.tcsh | 39 ++++++++------ tcsh-6.15.00-pipe.dif | 2 +- tcsh-6.18.03-catalogs.dif | 4 +- tcsh-6.21.00.dif | 78 ++++++++++++++-------------- tcsh-6.22.02-local-dotlock.dif | 4 +- tcsh-6.24.10.tar.gz | 3 -- tcsh-6.24.10.tar.gz.asc | 16 ------ tcsh-6.24.15.tar.gz | 3 ++ tcsh-6.24.15.tar.gz.asc | 16 ++++++ tcsh-skip-utmp-service.dif | 33 ++++++++++++ tcsh.changes | 92 ++++++++++++++++++++++++++++++++++ tcsh.spec | 31 ++++++++---- 13 files changed, 234 insertions(+), 98 deletions(-) delete mode 100644 tcsh-6.24.10.tar.gz delete mode 100644 tcsh-6.24.10.tar.gz.asc create mode 100644 tcsh-6.24.15.tar.gz create mode 100644 tcsh-6.24.15.tar.gz.asc create mode 100644 tcsh-skip-utmp-service.dif diff --git a/bindkey.tcsh b/bindkey.tcsh index d4cb3a0..6d70de4 100644 --- a/bindkey.tcsh +++ b/bindkey.tcsh @@ -31,17 +31,6 @@ bindkey "^[[3~" delete-char bindkey "^[[4~" end-of-line bindkey "^[[5~" history-search-backward bindkey "^[[6~" history-search-forward -if ( ${?MC_SID} == 0 ) then - # - # Those bindings interfere with Midnight Commander - # - bindkey "^M[1~" beginning-of-line - bindkey "^M[2~" yank - bindkey "^M[3~" delete-char - bindkey "^M[4~" end-of-line - bindkey "^M[5~" history-search-backward - bindkey "^M[6~" history-search-forward -endif bindkey -r "\233" bindkey "\2331~" beginning-of-line bindkey "\2332~" yank diff --git a/complete.tcsh b/complete.tcsh index 895aafe..2f2aafc 100644 --- a/complete.tcsh +++ b/complete.tcsh @@ -10,9 +10,8 @@ # 1999/06/28: resort to the order to fit complete.tcsh # found in tcsh-6.08.05, add the mh completes. # - set autolist=ambiguous - set noglob # + unset noglob set hosts foreach _f ("$HOME/.hosts" /etc/csh.hosts "$HOME/.rhosts" /etc/hosts.equiv) if ( -r $_f ) then @@ -33,8 +32,11 @@ else set _manpath="/usr{{/X11/man,/openwin/man,/share/man}/{man,cat},{/man/{man,cat}}}" endif + set _man_sections=(`\ls -1dfUA ${_manpath}*|sed s%/.\*/man%%|sort -u`) + set autolist=ambiguous + set noglob if ( -d /usr/lib/ispell/ ) then - set _hash=(`\ls -1fUA /usr/lib/ispell/|&\sed -rn \\%.\*\\.hash%{s%\.hash%%p}`) + set _hash=(`\ls -1fUA /usr/lib/ispell/|&sed -rn \\%.\*\\.hash%{s%\.hash%%p}`) else set _hash=(english deutsch) endif @@ -170,8 +172,9 @@ endif complete ping p/1/\$hosts/ complete traceroute p/1/\$hosts/ - complete {talk,ntalk,phone,otalk,ytalk} p/1/'`users | tr " " "\012" | uniq`'/ \ - n/*/\`who\ \|\ grep\ \$:1\ \|\ awk\ \'\{\ print\ \$2\ \}\'\`/ + complete {talk,ntalk,phone,otalk,ytalk} \ + p/1/'`users | tr " " "\012" | uniq`'/ \ + n/*/\`who\ \|\ grep\ \$:1\ \|\ awk\ \'\{\ print\ \$2\ \}\'\`/ complete ftp c/-/"(d i g n v)"/ n/-/\$hosts/ p/1/\$hosts/ n/*/n/ complete ncftp c/-/"(a I N)"/ n/-/\$hosts/ p/1/\$hosts/ n/*/n/ @@ -241,6 +244,8 @@ endif delta diffs edit enter fix get help info \ print prs prt rmdel sccsdiff tell unedit \ unget val what)"/ + complete setenv 'p/1/e/' 'c/*:/f/' + # Complete for MH tools already skipped if ( $?SKIP_MH ) goto skip_mh @@ -700,11 +705,14 @@ skip_mh: n@-u@T:$_maildir@ n/-f/f/ n/*/u/ endif - complete man 'n@[0-9n]@`\ls -1fUA ${_manpath}$:-1/|&\sed \\%.\*:%d\;s%\\.$:-1.\*\$%%|\sort -u`@' \ + alias _list_man_pages \ + 'find ${_manpath:h} \( -type f -o -type l \) -printf "%f\n"|&sed -r "\%find:.*:%d;s%([^.]+).([^ ]*?)%\1%g"|sort -u' + complete man 'n@[0-9n]{,p,mp}@`\ls -1fUA ${_manpath}$:-1/|&sed \\%.\*:%d\;s%\\.$:-1.\*\$%%|sort -u`@' \ c@-@"(- f k M P s S t)"@ n@-f@c@ n@-k@x:''@ n/-l/f/ C@./*@f@ n@-[MP]@d@ \ - 'N@-[MP]@`\ls -1 $:-1/man? |&\sed -n s%\\..\\+\$%%p`@' \ - 'n@-[sS]@`\ls -1 ${_manpath:h}|&\sed -n \\%/.\*:%d\;s%man%%p|\sort -u`@' \ - 'n@*@`\find ${_manpath:h} \( -type f -o -type l \) -printf "%f\n"|&\sed -r "\%find:.*:%d;s%([^.]+).([^ ]*?)%\1%g"|\sort -u`@' + 'N@-[MP]@`\ls -1 $:-1/man? |&sed -n s%\\..\\+\$%%p`@' \ + 'n@-[sS]@`\ls -1 ${_manpath:h}|&sed -n \\%/.\*:%d\;s%man%%p|sort -u`@' \ + 'p@1@`echo ${_man_sections};eval _list_man_pages`@' \ + 'n@*@`eval _list_man_pages`@' complete ps c/-t/x:''/ c/-/"(a c C e g k l S t u v w x)"/ \ n/-k/x:''/ N/-k/x:''/ n/*/x:''/ complete compress c/-/"(c f v b)"/ n/-b/x:''/ n/*/f:^*.Z/ @@ -883,13 +891,13 @@ endif complete cat c/--/"(number-nonblank number squeeze-blank show-all \ show-nonprinting show-ends show-tabs help version)"/ \ - c/-/"(b e n s t u v A E T -)"/ n/*/f/ + c/-/"(A b E e n s T t u v -)"/ n/*/f/ complete mv c/--/"(backup force interactive update verbose suffix \ version-control help version)"/ \ - c/-/"(b f i u v S V -)"/ \ + c/-/"(b f i S u V v -)"/ \ n/{-S,--suffix}/x:''/ \ n/{-V,--version-control}/"(t numbered nil existing \ - never simple)"/ n/-/f/ N/-/d/ p/3-/d/ n/*/f/ + never simple)"/ n/-/f/ N/-/d/ p/1/f/ p/2/d/ n/*/f/ complete cp c/--/"(archive backup no-dereference force \ interactive link preserve parents sparse recursive \ symbolic-link suffix update verbose version-control \ @@ -897,14 +905,14 @@ endif c/-/"(a b d f i l P p R r S s u V v x -)"/ \ n/-*r/d/ n/{-S,--suffix}/x:''/ \ n/{-V,--version-control}/"(t numbered nil existing \ - never simple)"/ n/-/f/ N/-/d/ p/3-/d/ n/*/f/ + never simple)"/ n/-/f/ N/-/d/ p/1/f/ p/2/d/ n/*/f/ complete ln c/--/"(backup directory force no-dereference \ interactive symbolic suffix verbose version-control \ help version)"/ \ c/-/"(b d F f i n S s V v -)"/ \ n/{-S,--suffix}/x:''/ \ n/{-V,--version-control}/"(t numbered nil existing \ - never simple)"/ n/-/f/ N/-/x:''/ \ + never simple)"/ n/-*/f/ N/-*/x:''/ \ p/1/f/ p/2/x:''/ complete touch c/--/"(date reference time help version)"/ \ c/-/"(a c d f m r t -)"/ \ @@ -916,7 +924,8 @@ endif n/{-m,--mode}/x:''/ n/*/d/ complete rmdir c/--/"(ignore-fail-on-non-empty parents verbose help \ version)"/ c/-/"(p -)"/ n/*/d/ - + complete env 'c/*=/f/' 'p/1/e/=/' 'p/2/c/' + complete tar c/-[Acru]*/"(b B C f F g G h i l L M N o P \ R S T v V w W X z Z j I)"/ \ c/-[dtx]*/"( B C f F g G i k K m M O p P \ diff --git a/tcsh-6.15.00-pipe.dif b/tcsh-6.15.00-pipe.dif index cfc81a8..76eac2a 100644 --- a/tcsh-6.15.00-pipe.dif +++ b/tcsh-6.15.00-pipe.dif @@ -4,7 +4,7 @@ --- sh.dol.c +++ sh.dol.c 2016-11-25 08:00:30.455106978 +0000 -@@ -462,6 +462,8 @@ Dgetdol(void) +@@ -473,6 +473,8 @@ Dgetdol(void) size_t cbp = 0; int old_pintr_disabled; diff --git a/tcsh-6.18.03-catalogs.dif b/tcsh-6.18.03-catalogs.dif index 3cd473e..3d51f28 100644 --- a/tcsh-6.18.03-catalogs.dif +++ b/tcsh-6.18.03-catalogs.dif @@ -59,8 +59,8 @@ german.cat: ${srcdir}/german/charset ${srcdir}/german/*set[0-9]* @${CATGEN} $(GENCAT) $@ $^ $> --INSTALLED+=${localedir}/gr/LC_MESSAGES/tcsh.cat --${localedir}/gr/LC_MESSAGES/tcsh.cat: greek.cat +-INSTALLED+=${localedir}/el/LC_MESSAGES/tcsh.cat +-${localedir}/el/LC_MESSAGES/tcsh.cat: greek.cat +INSTALLED+=${localedir}/el_GR/LC_MESSAGES/tcsh +${localedir}/el_GR/LC_MESSAGES/tcsh: greek.cat $(MKDIR_P) $(@D) diff --git a/tcsh-6.21.00.dif b/tcsh-6.21.00.dif index e94e399..0eed85f 100644 --- a/tcsh-6.21.00.dif +++ b/tcsh-6.21.00.dif @@ -1,44 +1,20 @@ --- - system/linux | 10 ++++++++++ - config_f.h | 9 +++++++-- + config_f.h | 11 ++++++++--- glob.h | 3 ++- host.defs | 9 +++------ pathnames.h | 2 +- sh.c | 3 +++ + system/linux | 10 ++++++++++ tc.alloc.c | 10 ++++++---- tc.func.c | 8 ++++++-- tc.str.c | 2 +- tc.who.c | 3 +++ tcsh.man.in | 2 +- tw.h | 4 ++++ - 12 files changed, 47 insertions(+), 18 deletions(-) + 12 files changed, 48 insertions(+), 19 deletions(-) ---- system/linux -+++ system/linux 2021-04-27 07:41:53.192829973 +0000 -@@ -99,6 +99,9 @@ - #ifndef _SVID_SOURCE - # define _SVID_SOURCE - #endif -+#ifndef _DEFAULT_SOURCE -+# define _DEFAULT_SOURCE -+#endif - #ifndef _POSIX_SOURCE - # define _POSIX_SOURCE - #endif -@@ -139,4 +142,11 @@ - # define POSIX - #endif - -+#if !defined(PW_SHADOW) -+# define PW_SHADOW -+#endif -+#if !defined(SuSE) -+# define SuSE -+#endif -+ - #endif /* _h_config */ --- config_f.h -+++ config_f.h 2021-04-27 07:41:53.192829973 +0000 ++++ config_f.h 2024-11-28 09:55:11.062052907 +0000 @@ -72,7 +72,12 @@ /* * LOGINFIRST Source ~/.login before ~/.cshrc @@ -63,7 +39,7 @@ /* * COLOR_LS_F Do you want to use builtin color ls-F ? --- glob.h -+++ glob.h 2021-04-27 07:41:53.192829973 +0000 ++++ glob.h 2024-11-28 09:54:10.575159476 +0000 @@ -72,6 +72,7 @@ typedef struct { #define GLOB_NOSYS (-4) /* Implementation does not support function. */ @@ -82,7 +58,7 @@ int glob (const char *, int, int (*)(const char *, int), glob_t *); void globfree (glob_t *); --- host.defs -+++ host.defs 2021-05-28 09:44:03.337584826 +0000 ++++ host.defs 2024-11-28 09:54:10.575159476 +0000 @@ -189,9 +189,8 @@ static void populate(void) #endif } @@ -107,7 +83,7 @@ machtype = "unknown"; #endif --- pathnames.h -+++ pathnames.h 2021-04-27 07:41:53.192829973 +0000 ++++ pathnames.h 2024-11-28 09:54:10.575159476 +0000 @@ -83,7 +83,7 @@ # endif /* !_PATH_DOTLOGIN */ #endif /* sgi || OREO || cray || AMIX || CDC */ @@ -118,7 +94,7 @@ #endif /* _CRAYCOM && !_PATH_TCSHELL */ --- sh.c -+++ sh.c 2021-04-27 07:41:53.192829973 +0000 ++++ sh.c 2024-11-28 09:54:10.579159403 +0000 @@ -1348,6 +1348,9 @@ main(int argc, char **argv) setintr = osetintr; parintr = oparintr; @@ -129,8 +105,32 @@ #ifdef LOGINFIRST if (loginsh) (void) srccat(varval(STRhome), STRsldotlogin); +--- system/linux ++++ system/linux 2024-11-28 09:54:10.575159476 +0000 +@@ -99,6 +99,9 @@ + #ifndef _SVID_SOURCE + # define _SVID_SOURCE + #endif ++#ifndef _DEFAULT_SOURCE ++# define _DEFAULT_SOURCE ++#endif + #ifndef _POSIX_SOURCE + # define _POSIX_SOURCE + #endif +@@ -139,4 +142,11 @@ + # define POSIX + #endif + ++#if !defined(PW_SHADOW) ++# define PW_SHADOW ++#endif ++#if !defined(SuSE) ++# define SuSE ++#endif ++ + #endif /* _h_config */ --- tc.alloc.c -+++ tc.alloc.c 2021-04-27 07:41:53.192829973 +0000 ++++ tc.alloc.c 2024-11-28 09:54:10.579159403 +0000 @@ -518,7 +518,7 @@ smalloc(size_t n) { ptr_t ptr; @@ -171,7 +171,7 @@ #endif /* SYSMALLOC */ --- tc.func.c -+++ tc.func.c 2021-04-27 07:41:53.196829900 +0000 ++++ tc.func.c 2024-11-28 09:54:10.579159403 +0000 @@ -743,9 +743,13 @@ auto_lock(void) handle_pending_signals(); errno = 0; @@ -187,7 +187,7 @@ #else -@@ -1961,7 +1965,7 @@ getremotehost(int dest_fd) +@@ -1965,7 +1969,7 @@ getremotehost(int dest_fd) * have not caught up yet. */ addr.s_addr = inet_addr(name); @@ -197,7 +197,7 @@ else { if (sptr != name) { --- tc.str.c -+++ tc.str.c 2021-04-27 07:41:53.196829900 +0000 ++++ tc.str.c 2024-11-28 09:54:10.579159403 +0000 @@ -347,7 +347,7 @@ s_strlen(const Char *str) { size_t n; @@ -208,7 +208,7 @@ return (n); } --- tc.who.c -+++ tc.who.c 2021-04-27 07:41:53.196829900 +0000 ++++ tc.who.c 2024-11-28 09:54:10.579159403 +0000 @@ -259,6 +259,9 @@ watch_login(int force) } stlast = sta.st_mtime; @@ -220,7 +220,7 @@ #else if ((utmpfd = xopen(TCSH_PATH_UTMP, O_RDONLY|O_LARGEFILE)) < 0) { --- tcsh.man.in -+++ tcsh.man.in 2021-04-27 07:41:53.196829900 +0000 ++++ tcsh.man.in 2024-11-28 09:54:10.579159403 +0000 @@ -1012,7 +1012,7 @@ much like .Ic history-search-backward does. @@ -231,7 +231,7 @@ See also .Ic delete-char-or-list-or-eof . --- tw.h -+++ tw.h 2021-04-27 07:41:53.196829900 +0000 ++++ tw.h 2024-11-28 09:54:10.579159403 +0000 @@ -32,6 +32,10 @@ #ifndef _h_tw #define _h_tw diff --git a/tcsh-6.22.02-local-dotlock.dif b/tcsh-6.22.02-local-dotlock.dif index 604c5e9..f0d377f 100644 --- a/tcsh-6.22.02-local-dotlock.dif +++ b/tcsh-6.22.02-local-dotlock.dif @@ -172,7 +172,7 @@ Avoid left over dot lock file after reboot #endif /* #ifndef _DOTLOCK_H_ */ --- sh.hist.c +++ sh.hist.c 2020-02-19 09:48:57.640589111 +0000 -@@ -1243,9 +1243,11 @@ fmthist(int fmt, ptr_t ptr) +@@ -1230,9 +1230,11 @@ fmthist(int fmt, ptr_t ptr) } static void @@ -186,7 +186,7 @@ Avoid left over dot lock file after reboot } /* Save history before exiting the shell. */ -@@ -1324,11 +1326,12 @@ rechist(Char *fname, int ref) +@@ -1311,11 +1313,12 @@ rechist(Char *fname, int ref) jmp_buf_t osetexit; if (lock) { #ifndef WINNT_NATIVE diff --git a/tcsh-6.24.10.tar.gz b/tcsh-6.24.10.tar.gz deleted file mode 100644 index 95580f1..0000000 --- a/tcsh-6.24.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13475c0fbeb74139d33ed793bf00ffbbb2ac2dc9fb1d44467a410760aba36664 -size 956578 diff --git a/tcsh-6.24.10.tar.gz.asc b/tcsh-6.24.10.tar.gz.asc deleted file mode 100644 index 2ba64fe..0000000 --- a/tcsh-6.24.10.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmQ5PqUACgkQZcJuRx9F -sSNDoBAAnDMfpry6SFb82dqDAn2Egio90Qh0H6DmgPYpwwaeUjCzVDRXrQBZhRRP -t4d7HHvUpdckQSuxYfRyvrk/btful4/I1Eh4R6JeHs7Knztzo5N4OHAom//0eRZ8 -ZpqwjiJLRNC+Gfn+0EPux+lIIoBA8vpbfF5Q/ZhHY6EI2sZtgRlL1gVuvhv6F8dh -hOe1QaPm0aOY3BXvOGIsNpvrUjOzU0wAWkwBEn2mt7PVv9GrMAXdeZfhD38JBtm8 -x+gtDICBxWV4EXp4myOv+rOebUxHDFqGI0/vnXmAvh5uyw/mHZLK5sMzz+GQH2T/ -3HB9McK9V2JNS+uro1JAjMDadf6lq4/eEVjrvmomDeqamQcqGS7gDj9/YrfKd75L -i1A9+fpFad1vUDD7ksjGDBDdnTv3WHALDOtL9Yu+VHbuZ8EeBgsn+LiBtSpCl1Nr -/es1DoZvlljh26iI2iZHJAgspBZ3lxFKLOcF37lN++LdDuhBRYku6E5AzbB7tMzw -jKowySoUIBkhfgC2sCNJJGNVr9XiqZEPjCymiyzYT/vC4u7kKkCL3JB8u/whLefb -ClWdrBNrEFA3r8ysxXH1jPk0ptpdLF15ite3M1+yMdPCjrMq5cTW1+2zjUCdlzCU -6pW0pTjpIWAVECANBtI4nqUfa9F1bydsCUrYkHD3HcPJSiDicmM= -=N0Pf ------END PGP SIGNATURE----- diff --git a/tcsh-6.24.15.tar.gz b/tcsh-6.24.15.tar.gz new file mode 100644 index 0000000..f22f26b --- /dev/null +++ b/tcsh-6.24.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4d0b2a4df320f57a518e44c359ef36bbcf85d64f5146d0cb8ff34984e0d23fd +size 958802 diff --git a/tcsh-6.24.15.tar.gz.asc b/tcsh-6.24.15.tar.gz.asc new file mode 100644 index 0000000..ef7fe59 --- /dev/null +++ b/tcsh-6.24.15.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmeiVUgACgkQZcJuRx9F +sSOHDQ/8CEyuR2AooAK4vwy4292hf4LjR42DBvNFgxWsxTJ1h9qvfCxM4gvp6Egb +XuyBZiKdD6+mZL90/ESpzSPMPhsJcAOyYptgH0XAkgoKkJogVwbjgRGhTDPg6stH +7WwpojYdfEceeycHfZ8wadV1pmqJiybBqbgXx3xbQAIfyN5U+NBu6nep5kmyR6zq +x/3xnnovUGN08EJrdvjrhlyHksVC2yRzh2jWdW44O/1bkM5WYhiQCx52fnTdDO3J +TXFGNGEOWcu+C4XiEFhq+1JBO4wi/lP/zBehzmyhT/TZThNkeHHxwCYVxNr6zJYL +tebnsZfHVihXm9xTsk2lr3zLv50CoU2VDRQTSNP/RVxYcDjLEHcS9rTvbfEu4/Oo +BOZH2fyIaiPy6AeJBx5lP4mvSodKAfMwPRdoj3sH8n8jgbApZflUzrrXnlpE1ltK +fbaHDi5G0aK3s5tJi8t2QhHxwcogckamUWvzXDdVEfOY4MbCBJkZZZifwAS7/Odb +J1/pzVHnSLTyniRnSvqP2IGrMKZnhY7e8D19EHoTJ0aCM/AXRotfSFil/ZTI+gEO +/tYanfr8vOLzuH9MJZrM/vQmUoDlFL03TufU/Wmoi6HjK1+fOgu/kh4BXPtraeT9 +VtddG4YNJODEPImSbumbwrXLWPZGYAq5o00mTBcr/g1kGsrbHNs= +=Z8yG +-----END PGP SIGNATURE----- diff --git a/tcsh-skip-utmp-service.dif b/tcsh-skip-utmp-service.dif new file mode 100644 index 0000000..2be1114 --- /dev/null +++ b/tcsh-skip-utmp-service.dif @@ -0,0 +1,33 @@ +--- + tests/commands.at | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- tests/commands.at ++++ tests/commands.at 2023-12-04 12:21:56.688878232 +0000 +@@ -980,16 +980,16 @@ dnl + dnl log + dnl + +-AT_SETUP([log]) +-AT_KEYWORDS([commands]) +- +-AT_DATA([log.csh], +-[[set watch=(this_user_does_not_exist) +-log +-]]) +-AT_CHECK([tcsh -f log.csh]) +- +-AT_CLEANUP() ++dnl AT_SETUP([log]) ++dnl AT_KEYWORDS([commands]) ++dnl ++dnl AT_DATA([log.csh], ++dnl [[set watch=(this_user_does_not_exist) ++dnl log ++dnl ]]) ++dnl AT_CHECK([tcsh -f log.csh]) ++dnl ++dnl AT_CLEANUP() + + + dnl diff --git a/tcsh.changes b/tcsh.changes index 33d098a..1580eab 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,95 @@ +------------------------------------------------------------------- +Fri Feb 14 11:33:30 UTC 2025 - Dr. Werner Fink + +- Do not interfere Meta with Carriage Return (boo#1170527) + +------------------------------------------------------------------- +Wed Feb 5 07:25:17 UTC 2025 - Dr. Werner Fink + +- Update to tcsh 6.24.15 - 2025-02-04 + * This release provides fixes for some compilation failures + introduced in the previous release +- Port patch tcsh-6.21.00.dif means remove temporary fix now upstream + +------------------------------------------------------------------- +Thu Nov 28 08:44:43 UTC 2024 - Dr. Werner Fink + +- Update to tcsh 6.24.14 - 2024-11-26 + * Fix issues with S-JIS handling (T. Nosaka) + * Handle redirections in bracketed expressions + if { foo > /dev/null } (christos) + * Recognize history searches in history expansion + !?foo (christos) + +------------------------------------------------------------------- +Wed Jun 12 07:48:40 UTC 2024 - Dr. Werner Fink + +- Update to tcsh 6.24.13 - 2024-06-12 + * Fix !^:h and !^:t failing when no / found (Kimmo Suominen) + * Add cross-build support for gethost (josefs10) + * Add support for $?< (Matheus Garcia) +- Port patches + * tcsh-6.15.00-pipe.dif + * tcsh-6.18.03-catalogs.dif + * tcsh-6.21.00.dif + +------------------------------------------------------------------- +Fri Apr 5 09:08:30 UTC 2024 - Dr. Werner Fink + +- Update to tcsh 6.24.12 - 2024-04-05 + * Fix history merge and add a test for it (Werner Fink, Kimmo Suominen) +- Remove patch tcsh-6.24.10-history-merge.dif now solved upstream +- Port patch tcsh-6.22.02-local-dotlock.dif (corrected offsets) + +------------------------------------------------------------------- +Thu Mar 14 07:30:23 UTC 2024 - Dr. Werner Fink + +- Update to tcsh 6.24.11 - 2024-03-14 + * Make nice priority incremental even with setpriority(2) to + match how it worked with nice(3) (Kimmo Suominen) +- Port patch tcsh-6.22.02-local-dotlock.dif + +------------------------------------------------------------------- +Mon Dec 4 12:19:00 UTC 2023 - Dr. Werner Fink + +- Add patch tcsh-skip-utmp-service.dif + * There is currently no API avaible to replace the utmp/wtmp + based builtins watch and who of tcsh + +------------------------------------------------------------------- +Thu Oct 12 11:10:59 UTC 2023 - Dr. Werner Fink + +- Try to make complete for command man faster and support all + separate manual page sections + +------------------------------------------------------------------- +Mon Oct 9 08:08:30 UTC 2023 - Dr. Werner Fink + +- Add some fixes from + https://github.com/tcsh-org/tcsh/blob/master/complete.tcsh + to our complete.tcsh (boo#1215817) + +------------------------------------------------------------------- +Mon Jul 24 08:12:01 UTC 2023 - Dr. Werner Fink + +- Extend tcsh-6.24.10-history-merge.dif + * Add a test case + +------------------------------------------------------------------- +Fri Jul 21 09:19:02 UTC 2023 - Dr. Werner Fink + +- Modify tcsh-6.24.10-history-merge.dif + * Skip workaround but disable fastMergeErase instead to really be + able to merge currently history with history file (bsc#1213484) + +------------------------------------------------------------------- +Fri Jul 14 11:29:02 UTC 2023 - Dr. Werner Fink + +- (Re)add patch tcsh-6.24.10-history-merge.dif + * which is port of an old patch as the problem was not gone + * Make it possible to merge current history with already + written history + ------------------------------------------------------------------- Sat Apr 15 09:32:21 UTC 2023 - Dirk Müller diff --git a/tcsh.spec b/tcsh.spec index 829c006..0203966 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -1,7 +1,7 @@ # # spec file for package tcsh # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: tcsh -Version: 6.24.10 +Version: 6.24.15 Release: 0 Summary: The C SHell License: BSD-3-Clause @@ -34,12 +34,14 @@ Patch2: tcsh-6.16.00-norm-cmd.dif Patch4: tcsh-6.18.03-colorls.dif Patch5: tcsh-6.17.06-dspmbyte.dif Patch6: tcsh-6.18.03-catalogs.dif +Patch7: tcsh-skip-utmp-service.dif Patch8: tcsh-6.22.02-local-dotlock.dif BuildRequires: autoconf BuildRequires: fdupes BuildRequires: ncurses-devel BuildRequires: screen Requires: gawk +Requires: hostname Requires: textutils Recommends: tcsh-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,13 +57,16 @@ correction, a history mechanism, job control, and a C-like syntax. %prep %setup -q -%patch1 -b .pipe -%patch2 -b .normcmd -%patch4 -b .colorls -%patch5 -b .dspmbyte -%patch6 -b .catalogs -%patch8 -p 0 -b .dotlock -%patch0 -b .0 +%patch -P1 -b .pipe +%patch -P2 -b .normcmd +%patch -P4 -b .colorls +%patch -P5 -b .dspmbyte +%patch -P6 -b .catalogs +%if 0%{?suse_version} >= 1699 +%patch -P7 -b .noutmp +%endif +%patch -P8 -p 0 -b .dotlock +%patch -P0 -b .0 %build @@ -93,10 +98,18 @@ correction, a history mechanism, job control, and a C-like syntax. } CC=gcc CFLAGS="%{optflags} -D_GNU_SOURCE -DBUFSIZE=8192 -pipe" +%if 0%{?suse_version} >= 1699 + # + # There is currently no API for using systemd logind + # for watch and who tcsh builtin. + # + CFLAGS="${CFLAGS} -DHAVENOUTMP" +%endif cflags -ftree-loop-linear CFLAGS cflags -Wl,-O2 LDFLAGS cflags -Wl,--as-needed LDFLAGS export CC CFLAGS LDFLAGS + %ifarch %ix86 CPU=i586 %else