diff --git a/tcsh-6.19.00-manpage-memoryuse.patch b/tcsh-6.20.00-manpage-memoryuse.patch similarity index 79% rename from tcsh-6.19.00-manpage-memoryuse.patch rename to tcsh-6.20.00-manpage-memoryuse.patch index 427df8f..771b51a 100644 --- a/tcsh-6.19.00-manpage-memoryuse.patch +++ b/tcsh-6.20.00-manpage-memoryuse.patch @@ -1,4 +1,4 @@ -From 87ee44842faf55de9c52cff06a6e0f54c4fc5a0f Mon Sep 17 00:00:00 2001 +From 0d6172b290175b667dc2d83528f42b435827fd40 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Fri, 29 Apr 2016 16:52:59 +0200 Subject: [PATCH] Inform about no support for 'limit memoryuse' in manpage @@ -9,10 +9,10 @@ Subject: [PATCH] Inform about no support for 'limit memoryuse' in manpage 1 file changed, 2 insertions(+) diff --git a/tcsh.man b/tcsh.man -index b79bafe..b70fe14 100644 +index 584de6f..f5dc582 100644 --- a/tcsh.man +++ b/tcsh.man -@@ -2945,6 +2945,8 @@ the size of the largest core dump that will be created +@@ -3014,6 +3014,8 @@ the size of the largest core dump that will be created \fImemoryuse\fR the maximum amount of physical memory a process may have allocated to it at a given time @@ -22,5 +22,5 @@ index b79bafe..b70fe14 100644 \fIvmemoryuse\fR the maximum amount of virtual memory a process -- -2.5.5 +2.7.4 diff --git a/tcsh-6.19.00-tcsh-posix-status.patch b/tcsh-6.20.00-tcsh-posix-status.patch similarity index 92% rename from tcsh-6.19.00-tcsh-posix-status.patch rename to tcsh-6.20.00-tcsh-posix-status.patch index 45c8d1a..6af23dd 100644 --- a/tcsh-6.19.00-tcsh-posix-status.patch +++ b/tcsh-6.20.00-tcsh-posix-status.patch @@ -1,4 +1,4 @@ -From 23189924bb188276b26484a10bbab0ce32029f86 Mon Sep 17 00:00:00 2001 +From c4ec43cec37ea82af6c0ba6bb0a3e8c3e85411ce Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 28 Jul 2014 14:47:33 +0200 Subject: [PATCH] downstream: implement variable tcsh_posix_status @@ -26,7 +26,7 @@ Subject: [PATCH] downstream: implement variable tcsh_posix_status 6 files changed, 39 insertions(+), 1 deletion(-) diff --git a/sh.c b/sh.c -index 0220c89..1b541a9 100644 +index e9dfa81..38d073a 100644 --- a/sh.c +++ b/sh.c @@ -357,6 +357,8 @@ main(int argc, char **argv) @@ -39,7 +39,7 @@ index 0220c89..1b541a9 100644 setcopy(STRhistory, str2short("100"), VAR_READWRITE); sethistory(100); diff --git a/sh.h b/sh.h -index cdb99ac..0c7ecb9 100644 +index 95f439d..a41e2e0 100644 --- a/sh.h +++ b/sh.h @@ -573,6 +573,7 @@ EXTERN int editing IZERO; /* doing filename expansion and line editing */ @@ -51,10 +51,10 @@ index cdb99ac..0c7ecb9 100644 EXTERN int isoutatty IZERO; /* is SHOUT a tty */ EXTERN int isdiagatty IZERO;/* is SHDIAG a tty */ diff --git a/sh.proc.c b/sh.proc.c -index 468bf4a..059d53b 100644 +index 0af5e03..ac6ef5d 100644 --- a/sh.proc.c +++ b/sh.proc.c -@@ -561,7 +561,7 @@ pjwait(struct process *pp) +@@ -564,7 +564,7 @@ pjwait(struct process *pp) do { /* In case of pipelines only the result of the last * command should be taken in account */ @@ -64,7 +64,7 @@ index 468bf4a..059d53b 100644 continue; if (fp->p_reason) diff --git a/sh.set.c b/sh.set.c -index ddb07db..86895d8 100644 +index cf831b2..c155619 100644 --- a/sh.set.c +++ b/sh.set.c @@ -117,6 +117,9 @@ update_vars(Char *vp) @@ -87,7 +87,7 @@ index ddb07db..86895d8 100644 word_chars = STR_WORD_CHARS; if (adrof(STRedit) == 0) diff --git a/tc.const.c b/tc.const.c -index c130ade..6ba9059 100644 +index cb39ab9..4fed182 100644 --- a/tc.const.c +++ b/tc.const.c @@ -44,6 +44,8 @@ Char STRrootdefautologout[] = { '1', '5', '\0' }; @@ -100,10 +100,10 @@ index c130ade..6ba9059 100644 Char STRaout[] = { 'a', '.', 'o', 'u', 't', '\0' }; Char STRtty[] = { 't', 't', 'y', '\0' }; diff --git a/tests/variables.at b/tests/variables.at -index fabe7ab..b20dfac 100644 +index ffa0da2..5fa9239 100644 --- a/tests/variables.at +++ b/tests/variables.at -@@ -970,6 +970,34 @@ AT_CHECK([tcsh -f -c 'echo $?tcsh'], , +@@ -976,6 +976,34 @@ AT_CHECK([tcsh -f -c 'echo $?tcsh'], , AT_CLEANUP @@ -139,5 +139,5 @@ index fabe7ab..b20dfac 100644 AT_DATA([term.csh], -- -2.5.5 +2.7.4 diff --git a/tcsh.spec b/tcsh.spec index b150d5d..7774176 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -46,13 +46,13 @@ BuildRequires: ncurses-devel # Downstream patches -- these should be always included when doing rebase: # ------------------ -Patch100: tcsh-6.19.00-manpage-memoryuse.patch +Patch100: tcsh-6.20.00-manpage-memoryuse.patch # Downstream patches for RHEL -- patches that we keep only in RHEL for various # --------------------------- reasons, but are not enabled in Fedora: %if %{defined rhel} || %{defined centos} -Patch200: tcsh-6.19.00-tcsh-posix-status.patch +Patch200: tcsh-6.20.00-tcsh-posix-status.patch %endif