summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2017-01-17 16:30:21 +0100
committerLars Wendler <polynomial-c@gentoo.org>2017-01-17 17:23:07 +0100
commit468f718419a9f61fe2d11473f9a3ce79f7474a34 (patch)
tree6d1aaca0ea171148ac4951b41d1a93324ca5b420 /sys-process/procps/files
parentsys-process/procps: Removed unused patch from SRC_URI. (diff)
downloadgentoo-468f718419a9f61fe2d11473f9a3ce79f7474a34.tar.gz
gentoo-468f718419a9f61fe2d11473f9a3ce79f7474a34.tar.bz2
gentoo-468f718419a9f61fe2d11473f9a3ce79f7474a34.zip
sys-process/procps: Removed old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sys-process/procps/files')
-rw-r--r--sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch60
-rw-r--r--sys-process/procps/files/procps-3.3.10-tests-no-tty.patch122
2 files changed, 0 insertions, 182 deletions
diff --git a/sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch b/sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch
deleted file mode 100644
index 697674861bf..00000000000
--- a/sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://bugs.gentoo.org/404389
-
-From 92071e963e6ff50f0e221dde286f3229267b2ff9 Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@enc.com.au>
-Date: Sat, 24 Jan 2015 18:53:29 +1100
-Subject: [PATCH] pmap: print process even if smaps unreadable
-
-pmap would previously print the process name if
-/proc/PID/smaps could be opened, even if subsequent
-reads failed. This actually occurs with other users
-PIDs.
-
-Kernel 3.18rc1 introduced a change where the file could
-not been opened, meaning pmap -X 1 previously showed
-the process name and nothing else but NOW shows nothing
-make check failed because of this.
-
-This change prints the process name even before trying to open
-the file, returning it to previous behaviour.
-Thanks to Vincent Bernat for some analysis.
-
-References:
- https://bugs.debian.org/775624
- https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=29a40ace841cba9b661711f042d1821cdc4ad47c
-
-Signed-off-by: Craig Small <csmall@enc.com.au>
----
- NEWS | 1 +
- pmap.c | 8 ++++----
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/pmap.c b/pmap.c
-index c83617c..17e0e30 100644
---- a/pmap.c
-+++ b/pmap.c
-@@ -533,6 +533,10 @@ static int one_proc(proc_t * p)
- */
- int maxcmd = 0xfffff;
-
-+ escape_command(cmdbuf, p, sizeof cmdbuf, &maxcmd,
-+ ESC_ARGS | ESC_BRACKETS);
-+ printf("%u: %s\n", p->tgid, cmdbuf);
-+
- if (x_option || X_option || c_option) {
- sprintf(buf, "/proc/%u/smaps", p->tgid);
- if ((fp = fopen(buf, "r")) == NULL)
-@@ -543,10 +547,6 @@ static int one_proc(proc_t * p)
- return 1;
- }
-
-- escape_command(cmdbuf, p, sizeof cmdbuf, &maxcmd,
-- ESC_ARGS | ESC_BRACKETS);
-- printf("%u: %s\n", p->tgid, cmdbuf);
--
- if (X_option || c_option) {
- print_extended_maps(fp);
- return 0;
---
-2.4.0
-
diff --git a/sys-process/procps/files/procps-3.3.10-tests-no-tty.patch b/sys-process/procps/files/procps-3.3.10-tests-no-tty.patch
deleted file mode 100644
index 7a774e5f2ef..00000000000
--- a/sys-process/procps/files/procps-3.3.10-tests-no-tty.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-https://bugs.gentoo.org/461302
-
-From 4050148a4533e8a79cef0d7dcd0c058d78c48a31 Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@enc.com.au>
-Date: Sat, 9 May 2015 17:48:12 +1000
-Subject: [PATCH] Fix some sched and tty tests
-
-The ps sched test has been disabled. There are too many
-odd build farms this fails in strange ways.
-
-Other odd build farms have no tty and so some tests check
-for no tty and skip if not found.
----
- testsuite/config/unix.exp | 9 +++++++++
- testsuite/pgrep.test/pgrep.exp | 11 +++++++----
- testsuite/pkill.test/pkill.exp | 3 +--
- testsuite/ps.test/ps_output.exp | 2 --
- testsuite/ps.test/ps_sched_batch.exp | 16 +++++++++-------
- 5 files changed, 26 insertions(+), 15 deletions(-)
-
-diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp
-index 522efb1..1318e9a 100644
---- a/testsuite/config/unix.exp
-+++ b/testsuite/config/unix.exp
-@@ -146,3 +146,12 @@ proc kill_testproc { } {
- kill_process $testproc2_pid
- file delete $testproc_path
- }
-+
-+proc get_tty {} {
-+ if { [catch { set raw_tty [ exec tty ] } msg]} {
-+ warning "No TTY found"
-+ return ""
-+ }
-+ regexp "/dev/(.+)" $raw_tty > tty
-+ return $tty
-+}
-diff --git a/testsuite/pgrep.test/pgrep.exp b/testsuite/pgrep.test/pgrep.exp
-index 152b6ec..1c6cec6 100644
---- a/testsuite/pgrep.test/pgrep.exp
-+++ b/testsuite/pgrep.test/pgrep.exp
-@@ -9,8 +9,7 @@ set not_uid [ expr { $uid + 1 } ]
- set gid [ exec id -g ]
- set not_gid [ expr { $gid + 1 } ]
- set ps "${topdir}ps/pscommand"
--set raw_tty [ exec tty ]
--regexp "/dev/(.+)" $raw_tty > tty
-+set tty [ get_tty ]
-
- set test "pgprep with no arguments"
- spawn $pgrep
-@@ -80,8 +79,12 @@ spawn $pgrep -s 1 $testproc_comm
- expect_blank "$test"
-
- set test "pgrep matches on tty"
--spawn $pgrep -t $tty $testproc_comm
--expect_pass "$test" "^$testproc1_pid\\s+$testproc2_pid\\s*$"
-+if { $tty == "" } {
-+ untested "$test"
-+} else {
-+ spawn $pgrep -t $tty $testproc_comm
-+ expect_pass "$test" "^$testproc1_pid\\s+$testproc2_pid\\s*$"
-+}
-
- set test "pgrep doesn't match with bogus tty"
- spawn $pgrep -t glass $testproc_comm
-diff --git a/testsuite/pkill.test/pkill.exp b/testsuite/pkill.test/pkill.exp
-index 5eece7d..c583cbe 100644
---- a/testsuite/pkill.test/pkill.exp
-+++ b/testsuite/pkill.test/pkill.exp
-@@ -9,8 +9,7 @@ set not_uid [ expr { $uid + 1 } ]
- set gid [ exec id -g ]
- set not_gid [ expr { $gid + 1 } ]
- set ps "${topdir}ps/pscommand"
--set raw_tty [ exec tty ]
--regexp "/dev/(.+)" $raw_tty > tty
-+set tty [ get_tty ]
-
- set test "pkill with no arguments"
- spawn $pkill
-diff --git a/testsuite/ps.test/ps_output.exp b/testsuite/ps.test/ps_output.exp
-index 3a6f3d8..1b2c097 100644
---- a/testsuite/ps.test/ps_output.exp
-+++ b/testsuite/ps.test/ps_output.exp
-@@ -9,8 +9,6 @@ set uid [ exec id -u ]
- set not_uid [ expr { $uid + 1 } ]
- set gid [ exec id -g ]
- set not_gid [ expr { $gid + 1 } ]
--set raw_tty [ exec tty ]
--regexp "/dev/(.+)" $raw_tty > tty
-
- # All the fields
- # Cannot do args,cmd,comm
-diff --git a/testsuite/ps.test/ps_sched_batch.exp b/testsuite/ps.test/ps_sched_batch.exp
-index e0c31ff..c58b9a2 100644
---- a/testsuite/ps.test/ps_sched_batch.exp
-+++ b/testsuite/ps.test/ps_sched_batch.exp
-@@ -1,12 +1,14 @@
- #
- # check the ps SCHED_BATCH scheduler policy output
- #
--set ps "${topdir}ps/pscommand"
--set schedbatch "${topdir}testsuite/test-schedbatch"
--
--spawn $schedbatch 18
--
-+# This is too flaky on certain build systems to be
-+# reliable - CS
-+#set ps "${topdir}ps/pscommand"
-+#set schedbatch "${topdir}testsuite/test-schedbatch"
-+#
-+#spawn $schedbatch 18
-+#
- set test "ps SCHED_BATCH scheduler"
--spawn $ps --no-header -o comm,cls,nice -a
--expect_pass "$test" "\\s+test-schedbatch\\s+B\\s+18"
-+#spawn $ps --no-header -o comm,cls,nice -a
-+#expect_pass "$test" "\\s+test-schedbatch\\s+B\\s+18"
- untested "$test"
---
-2.4.0
-