summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVojtech Vitek (V-Teq) <vvitek@redhat.com>2012-03-20 17:55:54 +0100
committerVojtech Vitek (V-Teq) <vvitek@redhat.com>2012-03-20 18:02:43 +0100
commit6827526b9217cbdd7b0db2ce4d73c4a573045f27 (patch)
treea9b6ac384497e618b51d906b080ac611a41a8054
parent66fbce9c1e3a0237f1d5180f1e90b9452c95d7f1 (diff)
downloadtcsh-rebase-6.19.00-6827526b9217cbdd7b0db2ce4d73c4a573045f27.tar.gz
tcsh-rebase-6.19.00-6827526b9217cbdd7b0db2ce4d73c4a573045f27.tar.xz
tcsh-rebase-6.19.00-6827526b9217cbdd7b0db2ce4d73c4a573045f27.zip
Update to tcsh-6.18.00 - adapt tcsh-6.13.00-memoryuse.patch
-rw-r--r--tcsh-6.13.00-memoryuse.patch30
-rw-r--r--tcsh.spec2
2 files changed, 24 insertions, 8 deletions
diff --git a/tcsh-6.13.00-memoryuse.patch b/tcsh-6.13.00-memoryuse.patch
index 979c477..e78cda3 100644
--- a/tcsh-6.13.00-memoryuse.patch
+++ b/tcsh-6.13.00-memoryuse.patch
@@ -1,13 +1,27 @@
-diff -up tcsh-6.15.00/tcsh.man.memoryuse tcsh-6.15.00/tcsh.man
---- tcsh-6.15.00/tcsh.man.memoryuse 2008-09-03 12:16:48.000000000 +0200
-+++ tcsh-6.15.00/tcsh.man 2008-09-03 12:16:48.000000000 +0200
-@@ -2901,7 +2901,8 @@ the size of the largest core dump that w
+From 4c3740ae5bb48c187f66655f1cddcb55f43566b1 Mon Sep 17 00:00:00 2001
+From: "Vojtech Vitek (V-Teq)" <vvitek@redhat.com>
+Date: Thu, 15 Mar 2012 02:21:37 +0100
+Subject: [PATCH] Add memoryuse note in manpage regarding kernel 2.6 and
+ higher
+
+---
+ tcsh.man | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/tcsh.man b/tcsh.man
+index 8c6c9e1..b0ea99f 100644
+--- a/tcsh.man
++++ b/tcsh.man
+@@ -2941,7 +2941,8 @@ the size of the largest core dump that will be created
.TP
\fImemoryuse\fR
the maximum amount of physical memory a process
-may have allocated to it at a given time
-+may have allocated to it at a given time (this is not implemented in the 2.6 kernel. The value is meaningless
-+and changing this value will have no effect)
++may have allocated to it at a given time (this is not implemented in the 2.6+ kernel,
++so there is no effect introduced by changing this value)
.TP
- \fIheapsize\fR
- the maximum amount of memory a process
+ \fIvmemoryuse\fR
+ the maximum amount of virtual memory a process
+--
+1.7.6.5
+
diff --git a/tcsh.spec b/tcsh.spec
index 1baca73..29b853e 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -130,6 +130,8 @@ fi
tcsh-6.17.00-variable-names.patch,
tcsh-6.17.00-handle-signals-before-flush.patch
tcsh-6.17.00-status-pipeline-backquote-list-of-cmds.patch (reverted!)
+- Modify and adapt the existing patches to the new source code:
+ tcsh-6.13.00-memoryuse.patch
* Thu Feb 16 2012 Vojtech Vitek (V-Teq) <vvitek@redhat.com> - 6.17-19
- Handle pending signals before flush so that the the .history file