From 468f718419a9f61fe2d11473f9a3ce79f7474a34 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 17 Jan 2017 16:30:21 +0100 Subject: sys-process/procps: Removed old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- sys-process/procps/Manifest | 3 - .../files/procps-3.3.10-pmap-unreadable.patch | 60 ---------- .../procps/files/procps-3.3.10-tests-no-tty.patch | 122 --------------------- sys-process/procps/procps-3.3.10-r1.ebuild | 68 ------------ sys-process/procps/procps-3.3.11-r3.ebuild | 77 ------------- 5 files changed, 330 deletions(-) delete mode 100644 sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch delete mode 100644 sys-process/procps/files/procps-3.3.10-tests-no-tty.patch delete mode 100644 sys-process/procps/procps-3.3.10-r1.ebuild delete mode 100644 sys-process/procps/procps-3.3.11-r3.ebuild diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest index 681956a09428..bcd62c194707 100644 --- a/sys-process/procps/Manifest +++ b/sys-process/procps/Manifest @@ -1,4 +1 @@ -DIST procps-3.3.11-remove_Unix98_output_limits.patch 8390 SHA256 8818abe9e4bfe192030891297fbc39230bd834642248e6277f38451d40ddacf1 SHA512 01763dd7cf55f4ac638a2515c2efd59ea184fbfeac4cc6381654a2df6bc848329c55dd92556d24a4b3b68e711a1af1f757ac347be2934b41791208b4edfedef1 WHIRLPOOL 57ddcf8b9ce92cd4c4b085306f6146cb67c3a74d0bd49619d14f4bf78e63133ef43fe5d9f3ddaeb8760a18175cdb390300742349b23efa0537ad9840c62929ff -DIST procps-ng-3.3.10.tar.xz 657232 SHA256 1759229cd0d97da3d200d5599c4ea82726d61fae9c4b7d3edd52c544962791b7 SHA512 cbfa49e79a88a8e7066a9c316ef089f15fa825c5bfbc22ab8a83f53c6f367a7c586cef9c403e360d373d824c471533a15ddb11cd30c561650e6879fe687e7e4f WHIRLPOOL 723dd1c00578a7fa7e3ff47bed60283c30850cc8ae8069c704ba648792809a67c5944dbfd9b7b0159e0be83215b61e6b71b2d76e65b3619aed54223900ffed9b -DIST procps-ng-3.3.11.tar.xz 815920 SHA256 e9493169a2d2adc0bc045538707310c8e877b385e4e296143b62607d2bb044ed SHA512 8ab4770adeba4c7e3cf75bc189278cf7a162ece0f23b862e7f726faccee11bd4524aec622b895f3b4e0b272a739a327a01e91f48834feea513544f0515b250df WHIRLPOOL 1da50ec4e8be9d76086a1112b00eea0daa39a7e579e846b92c12fea23a8303a7287e2d32d41feae93aad7b138768852b004544731fff882236ee3bd9511154ff DIST procps-ng-3.3.12.tar.xz 845484 SHA256 6ed65ab86318f37904e8f9014415a098bec5bc53653e5d9ab404f95ca5e1a7d4 SHA512 ea816740ff72cc53d99b5d2e78a511b627ea5b295e0efff67605c56d1ab075abc6b0e2da3df4facbfe903fc9d679e892d351b6884a966d37c6f4bfd9141a924b WHIRLPOOL f6ff034c09224fb819cdadc0fc6e456a5e11bffa298a7d005a1089378a6bf19c464bb09d278618daecebcd02228d831efbe4d65a4f9f850f83c9dd030a3ab98b 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 697674861bff..000000000000 --- 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 -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 ---- - 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 7a774e5f2ef1..000000000000 --- 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 -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 - diff --git a/sys-process/procps/procps-3.3.10-r1.ebuild b/sys-process/procps/procps-3.3.10-r1.ebuild deleted file mode 100644 index dbecd11abd99..000000000000 --- a/sys-process/procps/procps-3.3.10-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils toolchain-funcs - -DESCRIPTION="standard informational utilities and process-handling tools" -# http://packages.debian.org/sid/procps -HOMEPAGE="http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps" -# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz" -#FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74" -#SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz" -SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-ng-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="+ncurses modern-top nls selinux static-libs systemd test unicode" - -RDEPEND="!=sys-libs/ncurses-5.7-r7:=[unicode?] ) - selinux? ( sys-libs/libselinux ) - systemd? ( >=sys-apps/systemd-209 )" -DEPEND="${RDEPEND} - ncurses? ( virtual/pkgconfig ) - systemd? ( virtual/pkgconfig ) - test? ( dev-util/dejagnu )" - -S=${WORKDIR}/${PN}-ng-${PV} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209 - epatch "${FILESDIR}"/${P}-pmap-unreadable.patch #404389 - epatch "${FILESDIR}"/${P}-tests-no-tty.patch #461302 - sed -i -e 's:systemd-login:systemd:' configure || die #501306 - epatch_user -} - -src_configure() { - econf \ - --exec-prefix="${EPREFIX}" \ - --docdir='$(datarootdir)'/doc/${PF} \ - $(use_enable modern-top) \ - $(use_with ncurses) \ - $(use_enable nls) \ - $(use_enable selinux libselinux) \ - $(use_enable static-libs static) \ - $(use_with systemd) \ - $(use_enable unicode watch8bit) -} - -src_test() { - emake check