Rebase to tcsh-6.24.07

Resolves: #2147466
This commit is contained in:
Jan Macku 2023-01-13 09:08:44 +01:00
parent 4d4b435caf
commit dbd56739e8
5 changed files with 33 additions and 30 deletions

1
.gitignore vendored
View File

@ -17,3 +17,4 @@ tcsh-6.17.00.tar.gz
/tcsh-6.23.02.tar.gz
/tcsh-6.24.00.tar.gz
/tcsh-6.24.01.tar.gz
/tcsh-6.24.07.tar.gz

View File

@ -1 +1 @@
SHA512 (tcsh-6.24.01.tar.gz) = 47425f9bc5ae3df163fe1c9f8a1b1a6c3893b186843d561fb7020c75561587286036cc679212f17fd0f760735d9e01da414e60a69db0ffcb74276f053ea80479
SHA512 (tcsh-6.24.07.tar.gz) = ddea185b64f20041b742e0cb58a93714788acd490b32535709f23ae225eb67c73ca4877ae15799395ab24841ab8cc9ae27f0c8bfcfe8be64950f7a15e77b047a

View File

@ -1,26 +0,0 @@
From 0d6172b290175b667dc2d83528f42b435827fd40 Mon Sep 17 00:00:00 2001
From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
Date: Fri, 29 Apr 2016 16:52:59 +0200
Subject: [PATCH] Inform about no support for 'limit memoryuse' in manpage
This patch has been introduced after request in BZ: #247637
---
tcsh.man | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tcsh.man b/tcsh.man
index 584de6f..f5dc582 100644
--- a/tcsh.man
+++ b/tcsh.man
@@ -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
+
+NOTE: Changing this value has no effect. Support has been removed from Linux kernel v2.6 and newer.
.TP
\fIvmemoryuse\fR
the maximum amount of virtual memory a process
--
2.7.4

View File

@ -0,0 +1,25 @@
From 2a431ea9318111535d37112daeeeccdc4df249ee Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Fri, 13 Jan 2023 09:02:11 +0100
Subject: [PATCH] Inform about no support for 'limit memoryuse' in manpage
Related: #247637
---
tcsh.man.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/tcsh.man.in b/tcsh.man.in
index 24a9629..d405a70 100644
--- a/tcsh.man.in
+++ b/tcsh.man.in
@@ -5960,6 +5960,7 @@ Maximum amount of swap space reserved or used for this user.
Maximum number of threads for this process.
.
.It Ic vmemoryuse
+NOTE: Changing this value has no effect. Support has been removed from Linux kernel v2.6 and newer.
Maximum amount of virtual memory a process
may have allocated to it at a given time (address space).
.
--
2.39.0

View File

@ -12,8 +12,8 @@
Name: tcsh
Summary: An enhanced version of csh, the C shell
Version: 6.24.01
Release: 2%{?dist}
Version: 6.24.07
Release: 1%{?dist}
License: BSD
URL: http://www.tcsh.org/
@ -47,7 +47,7 @@ BuildRequires: ncurses-devel
# Downstream patches -- these should be always included when doing rebase:
# ------------------
Patch100: tcsh-6.20.00-manpage-memoryuse.patch
Patch100: tcsh-6.24.07-manpage-memoryuse.patch
# Downstream patches for RHEL -- patches that we keep only in RHEL for various
@ -177,6 +177,9 @@ fi
# =============================================================================
%changelog
* Fri Jan 13 2023 Jan Macku <jamacku@redhat.com> - 6.24.07-1
- Update to tcsh-6.24.07 (#2147466)
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.24.01-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild