mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-17 18:06:59 +02:00
Merge pull request #669 from bgilbert/procps
bump(sys-process/procps): sync with upstream
This commit is contained in:
Benjamin Gilbert
GitHub
commit
c0c560b10a
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=configure install prepare test
|
|
||||||
DEPEND=!<sys-apps/sysvinit-2.88-r6 ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209 ) ncurses? ( virtual/pkgconfig ) systemd? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
|
|
||||||
DESCRIPTION=standard informational utilities and process-handling tools
|
|
||||||
EAPI=5
|
|
||||||
HOMEPAGE=http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps
|
|
||||||
IUSE=+ncurses modern-top nls selinux static-libs systemd test unicode
|
|
||||||
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
|
|
||||||
LICENSE=GPL-2
|
|
||||||
RDEPEND=!<sys-apps/sysvinit-2.88-r6 ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209 )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=https://dev.gentoo.org/~polynomial-c/procps-ng-3.3.10.tar.xz
|
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
|
|
||||||
_md5_=69640cce7e8052ad0ad34564ad58909c
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=configure install prepare test
|
|
||||||
DEPEND=ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209 ) ncurses? ( virtual/pkgconfig ) systemd? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
|
|
||||||
DESCRIPTION=standard informational utilities and process-handling tools
|
|
||||||
EAPI=5
|
|
||||||
HOMEPAGE=http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps
|
|
||||||
IUSE=+kill +ncurses modern-top nls selinux static-libs systemd test unicode
|
|
||||||
KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
|
|
||||||
LICENSE=GPL-2
|
|
||||||
RDEPEND=ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209 ) kill? ( !sys-apps/coreutils[kill] !sys-apps/util-linux[kill] ) !<sys-apps/sysvinit-2.88-r6
|
|
||||||
SLOT=0/5
|
|
||||||
SRC_URI=mirror://sourceforge/procps-ng/procps-ng-3.3.11.tar.xz https://gitlab.com/procps-ng/procps/commit/b2f49b105d23c833d733bf7dfb99cb98e4cae383.patch -> procps-3.3.11-remove_Unix98_output_limits.patch
|
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
|
|
||||||
_md5_=3d7857f13ef1f02f982bf4bb378d6174
|
|
||||||
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-process/procps-3.3.15-r1
vendored
Normal file
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-process/procps-3.3.15-r1
vendored
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
DEFINED_PHASES=configure install test
|
||||||
|
DEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd ) elogind? ( virtual/pkgconfig ) ncurses? ( virtual/pkgconfig ) systemd? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
|
||||||
|
DESCRIPTION=standard informational utilities and process-handling tools
|
||||||
|
EAPI=6
|
||||||
|
HOMEPAGE=http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps
|
||||||
|
IUSE=elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode
|
||||||
|
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
|
||||||
|
LICENSE=GPL-2
|
||||||
|
RDEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd ) kill? ( !sys-apps/coreutils[kill] !sys-apps/util-linux[kill] ) !<sys-apps/sysvinit-2.88-r6
|
||||||
|
SLOT=0/6
|
||||||
|
SRC_URI=mirror://sourceforge/procps-ng/procps-ng-3.3.15.tar.xz
|
||||||
|
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
|
||||||
|
_md5_=126f4bed9e6a9c7fc7c59e1343ab8e1d
|
||||||
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=configure install prepare
|
|
||||||
DEPEND=!<sys-apps/sysvinit-2.88-r6 ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209 ) ncurses? ( virtual/pkgconfig ) systemd? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
|
|
||||||
DESCRIPTION=standard informational utilities and process-handling tools
|
|
||||||
EAPI=4
|
|
||||||
HOMEPAGE=http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps
|
|
||||||
IUSE=+ncurses nls selinux static-libs systemd test unicode
|
|
||||||
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
|
|
||||||
LICENSE=GPL-2
|
|
||||||
RDEPEND=!<sys-apps/sysvinit-2.88-r6 ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209 )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=http://pkgs.fedoraproject.org/repo/pkgs/procps-ng/procps-ng-3.3.9.tar.xz/0980646fa25e0be58f7afb6b98f79d74/procps-ng-3.3.9.tar.xz
|
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
|
|
||||||
_md5_=e5e175b80fdd6c24ce5463444715d4b2
|
|
||||||
@ -1,261 +0,0 @@
|
|||||||
# ChangeLog for sys-process/procps
|
|
||||||
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
|
|
||||||
# (auto-generated from git log)
|
|
||||||
|
|
||||||
*procps-3.3.10-r1 (09 Aug 2015)
|
|
||||||
*procps-3.3.9-r2 (09 Aug 2015)
|
|
||||||
*procps-3.3.9 (09 Aug 2015)
|
|
||||||
*procps-3.3.8-r2 (09 Aug 2015)
|
|
||||||
|
|
||||||
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
|
|
||||||
+files/procps-3.3.10-pmap-unreadable.patch,
|
|
||||||
+files/procps-3.3.10-tests-no-tty.patch,
|
|
||||||
+files/procps-3.3.8-kill-neg-pid.patch,
|
|
||||||
+files/procps-3.3.9-sysctl-load-config-files.patch, +metadata.xml,
|
|
||||||
+procps-3.3.8-r2.ebuild, +procps-3.3.9.ebuild, +procps-3.3.9-r2.ebuild,
|
|
||||||
+procps-3.3.10-r1.ebuild:
|
|
||||||
proj/gentoo: Initial commit
|
|
||||||
|
|
||||||
This commit represents a new era for Gentoo:
|
|
||||||
Storing the gentoo-x86 tree in Git, as converted from CVS.
|
|
||||||
|
|
||||||
This commit is the start of the NEW history.
|
|
||||||
Any historical data is intended to be grafted onto this point.
|
|
||||||
|
|
||||||
Creation process:
|
|
||||||
1. Take final CVS checkout snapshot
|
|
||||||
2. Remove ALL ChangeLog* files
|
|
||||||
3. Transform all Manifests to thin
|
|
||||||
4. Remove empty Manifests
|
|
||||||
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
|
|
||||||
5.1. Do not touch files with -kb/-ko keyword flags.
|
|
||||||
|
|
||||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
|
||||||
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
|
|
||||||
tests
|
|
||||||
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
|
|
||||||
project
|
|
||||||
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
|
|
||||||
developer, wrote Git features for the migration
|
|
||||||
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
|
|
||||||
cvs2svn
|
|
||||||
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
|
|
||||||
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
|
|
||||||
work in migration
|
|
||||||
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
|
|
||||||
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
|
|
||||||
the bikeshed
|
|
||||||
|
|
||||||
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml,
|
|
||||||
procps-3.3.10-r1.ebuild:
|
|
||||||
Use https by default
|
|
||||||
|
|
||||||
Convert all URLs for sites supporting encrypted connections from http to
|
|
||||||
https
|
|
||||||
|
|
||||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
|
||||||
|
|
||||||
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
|
|
||||||
Revert DOCTYPE SYSTEM https changes in metadata.xml
|
|
||||||
|
|
||||||
repoman does not yet accept the https version.
|
|
||||||
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
|
|
||||||
|
|
||||||
Bug: https://bugs.gentoo.org/552720
|
|
||||||
|
|
||||||
28 Sep 2015; Mike Frysinger <vapier@gentoo.org> procps-3.3.10-r1.ebuild:
|
|
||||||
use subslot w/ncurses dep #561282
|
|
||||||
|
|
||||||
This also upgrades to EAPI=5.
|
|
||||||
|
|
||||||
01 Oct 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
|
|
||||||
Add missing remote-id type=sourceforge
|
|
||||||
|
|
||||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
|
||||||
|
|
||||||
*procps-3.3.11 (29 Oct 2015)
|
|
||||||
|
|
||||||
29 Oct 2015; Lars Wendler <polynomial-c@gentoo.org> +procps-3.3.11.ebuild:
|
|
||||||
Bump to version 3.3.11
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.23
|
|
||||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
|
|
||||||
29 Oct 2015; Lars Wendler <polynomial-c@gentoo.org> -procps-3.3.8-r2.ebuild,
|
|
||||||
-procps-3.3.9.ebuild:
|
|
||||||
Removed old.
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.23
|
|
||||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
|
|
||||||
30 Oct 2015; Agostino Sarubbo <ago@gentoo.org> procps-3.3.10-r1.ebuild:
|
|
||||||
amd64 stable wrt bug #564430
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.20.1
|
|
||||||
RepoMan-Options: --include-arches="amd64"
|
|
||||||
|
|
||||||
31 Oct 2015; Jeroen Roovers <jer@gentoo.org> procps-3.3.10-r1.ebuild:
|
|
||||||
Stable for PPC64 (bug #564430).
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.23
|
|
||||||
RepoMan-Options: --ignore-arches
|
|
||||||
|
|
||||||
31 Oct 2015; Jeroen Roovers <jer@gentoo.org> procps-3.3.10-r1.ebuild:
|
|
||||||
Stable for HPPA (bug #564430).
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.23
|
|
||||||
RepoMan-Options: --ignore-arches
|
|
||||||
|
|
||||||
01 Nov 2015; Mikle Kolyada <zlogene@gentoo.org> procps-3.3.10-r1.ebuild:
|
|
||||||
x86 stable wrt bug #564430
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.20.1
|
|
||||||
|
|
||||||
*procps-3.3.11-r1 (02 Nov 2015)
|
|
||||||
|
|
||||||
02 Nov 2015; Mike Gilbert <floppym@gentoo.org> -procps-3.3.11.ebuild,
|
|
||||||
+procps-3.3.11-r1.ebuild:
|
|
||||||
Move binaries back to /usr/bin
|
|
||||||
|
|
||||||
Upstream dropped the userbin_execdir variable, so we need to move things
|
|
||||||
around manually.
|
|
||||||
|
|
||||||
See upstream commit 430b559ba2826f80dffa840622ae0fc744000b13.
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.23_p18
|
|
||||||
|
|
||||||
04 Nov 2015; Agostino Sarubbo <ago@gentoo.org> procps-3.3.10-r1.ebuild:
|
|
||||||
ppc stable wrt bug #564430
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.20.1
|
|
||||||
RepoMan-Options: --include-arches="ppc"
|
|
||||||
|
|
||||||
05 Nov 2015; Agostino Sarubbo <ago@gentoo.org> procps-3.3.10-r1.ebuild:
|
|
||||||
sparc stable wrt bug #564430
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.20.1
|
|
||||||
RepoMan-Options: --include-arches="sparc"
|
|
||||||
|
|
||||||
08 Nov 2015; Mikle Kolyada <zlogene@gentoo.org> procps-3.3.10-r1.ebuild:
|
|
||||||
ia64 stable wrt bug #564430
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.20.1
|
|
||||||
|
|
||||||
*procps-3.3.11-r2 (08 Nov 2015)
|
|
||||||
|
|
||||||
08 Nov 2015; William Hubbs <williamh@gentoo.org> +procps-3.3.11-r2.ebuild:
|
|
||||||
revision bump to fix installation locations
|
|
||||||
|
|
||||||
I spoke with Lars Wendler about this, and we agreed that we should be
|
|
||||||
using the --bindir and --sbindir configure switches to install the
|
|
||||||
binaries on / instead of moving things around manually. We also agreed
|
|
||||||
that the binaries in procps are important enough that there is no issue
|
|
||||||
with installing them on /.
|
|
||||||
|
|
||||||
08 Nov 2015; William Hubbs <williamh@gentoo.org> -procps-3.3.11-r1.ebuild:
|
|
||||||
Remove old unstable version
|
|
||||||
|
|
||||||
10 Nov 2015; William Hubbs <williamh@gentoo.org> procps-3.3.11-r2.ebuild:
|
|
||||||
fix eprefix quoting
|
|
||||||
|
|
||||||
14 Nov 2015; Markus Meier <maekke@gentoo.org> procps-3.3.10-r1.ebuild:
|
|
||||||
arm stable, bug #564430
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.24
|
|
||||||
RepoMan-Options: --include-arches="arm"
|
|
||||||
|
|
||||||
15 Nov 2015; Matt Turner <mattst88@gentoo.org> procps-3.3.10-r1.ebuild:
|
|
||||||
alpha stable, bug 564430.
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.20.1
|
|
||||||
|
|
||||||
*procps-3.3.11-r3 (18 Nov 2015)
|
|
||||||
|
|
||||||
18 Nov 2015; Ulrich Müller <ulm@gentoo.org> -procps-3.3.11-r2.ebuild,
|
|
||||||
+procps-3.3.11-r3.ebuild:
|
|
||||||
Move non-essential binaries back to /usr/bin
|
|
||||||
|
|
||||||
Per the base-system lead, this is where they belong.
|
|
||||||
|
|
||||||
Bug: https://bugs.gentoo.org/565304
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.23_p26
|
|
||||||
|
|
||||||
18 Nov 2015; Ulrich Müller <ulm@gentoo.org>
|
|
||||||
+files/procps-3.3.11-sysctl-manpage.patch, procps-3.3.11-r3.ebuild:
|
|
||||||
QA] Fix path in sysctl.8 man page.
|
|
||||||
|
|
||||||
Bug: 565304
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.24
|
|
||||||
|
|
||||||
24 Nov 2015; Mike Frysinger <vapier@gentoo.org> metadata.xml:
|
|
||||||
standardize various metadata.xml style
|
|
||||||
|
|
||||||
24 Nov 2015; Mike Frysinger <vapier@gentoo.org> metadata.xml,
|
|
||||||
procps-3.3.11-r3.ebuild:
|
|
||||||
sys-apps/{coreutils,util-linux}: add USE=kill to install `kill` #566264
|
|
||||||
|
|
||||||
25 Nov 2015; Mike Frysinger <vapier@gentoo.org> procps-3.3.10-r1.ebuild:
|
|
||||||
mark 3.3.10-r1 arm64/m68k/s390/sh stable
|
|
||||||
|
|
||||||
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
|
||||||
Unify quoting in metadata.xml files for machine processing
|
|
||||||
|
|
||||||
Force unified quoting in all metadata.xml files since lxml does not
|
|
||||||
preserve original use of single and double quotes. Ensuring unified
|
|
||||||
quoting before the process allows distinguishing the GLEP 67-related
|
|
||||||
metadata.xml changes from unrelated quoting changes.
|
|
||||||
|
|
||||||
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
|
||||||
Replace all herds with appropriate projects (GLEP 67)
|
|
||||||
|
|
||||||
Replace all uses of herd with appropriate project maintainers, or no
|
|
||||||
maintainers in case of herds requested to be disbanded.
|
|
||||||
|
|
||||||
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
|
||||||
Set appropriate maintainer types in metadata.xml (GLEP 67)
|
|
||||||
|
|
||||||
07 Mar 2016; Mike Frysinger <vapier@gentoo.org> procps-3.3.11-r3.ebuild:
|
|
||||||
enable LFS support #471102
|
|
||||||
|
|
||||||
25 May 2016; Matt Turner <mattst88@gentoo.org> procps-3.3.11-r3.ebuild:
|
|
||||||
alpha stable, bug 583978.
|
|
||||||
|
|
||||||
25 May 2016; Jeroen Roovers <jer@gentoo.org> procps-3.3.11-r3.ebuild:
|
|
||||||
Stable for HPPA (bug #583978).
|
|
||||||
|
|
||||||
Package-Manager: portage-2.3.0_rc1
|
|
||||||
RepoMan-Options: --ignore-arches
|
|
||||||
|
|
||||||
25 May 2016; Jeroen Roovers <jer@gentoo.org> procps-3.3.11-r3.ebuild:
|
|
||||||
Stable for PPC64 (bug #583978).
|
|
||||||
|
|
||||||
Package-Manager: portage-2.3.0_rc1
|
|
||||||
RepoMan-Options: --ignore-arches
|
|
||||||
|
|
||||||
26 May 2016; Lars Wendler <polynomial-c@gentoo.org> procps-3.3.11-r3.ebuild:
|
|
||||||
x86 stable (bug #583978).
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28
|
|
||||||
RepoMan-Options: --include-arches="x86"
|
|
||||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
|
|
||||||
27 May 2016; Lars Wendler <polynomial-c@gentoo.org> procps-3.3.11-r3.ebuild:
|
|
||||||
Removed unused code. Prepare for future EAPI-6 bump.
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28
|
|
||||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
|
|
||||||
27 May 2016; Lars Wendler <polynomial-c@gentoo.org> procps-3.3.11-r3.ebuild:
|
|
||||||
amd64 stable (bug #583978).
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28
|
|
||||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
|
|
||||||
04 Jun 2016; Markus Meier <maekke@gentoo.org> procps-3.3.11-r3.ebuild:
|
|
||||||
arm stable, bug #583978
|
|
||||||
|
|
||||||
Package-Manager: portage-2.3.0_rc1
|
|
||||||
RepoMan-Options: --include-arches="arm"
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,15 +1 @@
|
|||||||
AUX procps-3.3.10-pmap-unreadable.patch 1775 SHA256 d4f34e6f33038f7599f403975bafd7f349013089fa2feda913b3ac9c56830c86 SHA512 d9ee6f9eb8d66b3777f0ec12066dd14d1849eb056b971b36f19612b2bcf60604fc361913b39b82766946f4a0e39907b68054bbc640b09b2e828c794824d79a57 WHIRLPOOL f4becc813b25d96fc778ce31f96494f8de13194a4ec5f7dbf184c99fd36a418f8fe5af0feb04c01b8f636660abe562131081031e868d9a739a1521fc7205e154
|
DIST procps-ng-3.3.15.tar.xz 904416 BLAKE2B 9fc1384df1d51a13bdf3aaad173160a11c5a7e016a8c397a076b5115e350d2c6fd8ff8d9ad5d83b959020bcd6a1ef9e1bca02e9a63d56881816c5c7d7c9a8bc3 SHA512 bc83ccc1941e7be8266588fdfbba17e2424b30163a215873ee6dee96215d66249f5d5e46fec2278d030b42bd7599861c4878360042dacec4c221ce411453747c
|
||||||
AUX procps-3.3.10-tests-no-tty.patch 3841 SHA256 ca0d656d9d52b602874683542941c680cc948985dbbfbab7d731cfb673b42e7e SHA512 299b9272c7746f77f16db09c96b34cf62b74fd63afb8c815bcab07ecfba6c31c2d3a10e54583c899a7ed91e4e22f80f8c46cccb7237e9ad9bf0c94e09167df6a WHIRLPOOL 6f3a217d162235a8db3cb7a8e927e866d27d795e0eca758c6ef43f869fc20009cc7a1623d60e9f72788b18248928cd36a2d17911d9067b84c50c2ac677138ac7
|
|
||||||
AUX procps-3.3.11-sysctl-manpage.patch 941 SHA256 1582675083410838e844e0f4f5b2da5835bb9653aadba42bea0b0f7002dc13d4 SHA512 df8b233bde879fa675742baf8b38d43dd7c306fe52013ace715dff02c126d8c5ea12bd93087da10f5e722294eef59577b264309cbdc6f9f3727fa7111c5db313 WHIRLPOOL dce1e4758eac97eee568acfaeb324b980c7786ffe021ee542b5495c1807e35549c45af03c897a5063f8d8f48395189c29ab014b82ee0961bf792d3ff6e739c8e
|
|
||||||
AUX procps-3.3.8-kill-neg-pid.patch 1446 SHA256 847c21f6619c7aa0f2847726a17595f986ec2fe0f361d95e17812639abe32a79 SHA512 3ed4e83d81f7dd574ff68bbcae9ad9f8649a39d46a17de5fd4297f215d8f70cd28e415b1d3c7b5142e7719343af28f4b393061a60eb012caece81dfe5ff6c271 WHIRLPOOL cf452118312e60a0bab7a4ec87bed9a9d2f5fb8bb563769a0430f11c72348e5be79bdfc031f67f4e97e0bf9b32f6ccd1ac590f392c95ee935b77b857ce1b1739
|
|
||||||
AUX procps-3.3.9-sysctl-load-config-files.patch 400 SHA256 f744a549f9205a47d892687d90096b25098ca91ae5f81879874e07e531d47131 SHA512 f528d5425ef55c3816403f3f0e61c0958726c561565e4702c5f3c09c695dcde4031d8d1aa4b30a621561ea020a66111291a5640ff51d53355d20168a319cf1d9 WHIRLPOOL fcf6b22c58ee21ba6aa49747903d06786a3283235821acf6277e5ed9301899ea389d54674d8ff614b6787a2b3d8c6c296f33017695b4061a6580980562029636
|
|
||||||
DIST procps-3.3.11-remove_Unix98_output_limits.patch 7582 SHA256 0801b971c630d2d68fe87da0b84842169df38cd88d3854da73b0e9bb45572d29 SHA512 8502264cba62475e3fc218dfde6c8ac375ccbf309843cec3000796e7455f41f287692aafd423f301b6c1a7e5f04c708fe30c2dd305ec3345b7a77b3443e35e55 WHIRLPOOL cbdba6dc94a4bec63f9fae8edc396aa5e59551a1606ed7dee56a65fad2e3d75ea5f391105806262f00103386c47434ec656b55bcefdd565313139355fa31ac61
|
|
||||||
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.9.tar.xz 560812 SHA256 00f0cb0fadf968ddf605b0ef119846af07386629244d4f3da711a2cecf4e8663 SHA512 62c7270aa48b4346a3198f306d1cb8474f64650bfb67e8cc6c4d41923e50c31c95b3a0367a464823fb50a6137ec0c6352006292ac85b50caf730ec8ec35eb553 WHIRLPOOL dac97433a87badd40b46e3155bf0e30652ed2961a41bc8fca074357431301d250632215512ad752634c9c4f3273a1c75caba1ecf4f5a3c510bee155660dde166
|
|
||||||
EBUILD procps-3.3.10-r1.ebuild 2042 SHA256 a70015e70d3c13de26991079835fd02260f9216e742d461a469d2def525f4dc8 SHA512 78fa4660ef91978b88712316cff3f67df054a402f3112429e0750e0f27ba9e91f1bfe0bb18e873db4e14201daad74f09042ddb2a159cf815bd1f9e01c6995a85 WHIRLPOOL b0ed270240e22fdbbd6e1c1ef00d44c935fefaa85005d527dfd8dca8866d284a05bf6199b81fb5e46209a86cc77e9865aef5168cb68d7dad84fe94831229bd87
|
|
||||||
EBUILD procps-3.3.11-r3.ebuild 2079 SHA256 45ce296b19a5284b930bbec31304747cf49adf635df8f4f46736b14c41fad650 SHA512 eca293c12539a87e61269e3bdcd3f3ab4dcc925e9aa80b20fecaeb06b0320a1c5fabdf5342311cac675a0ffe9a4adc4025b6fcd71a7e72f2a610e54bc1d04ea7 WHIRLPOOL cfc647108986d385d73313d38e2b92fed0d5b3528c73cccac5d2734f55cc1b23f470f6e975ca75eb84997465397e59d7ac72f155a662ae3ed50eee02226bb207
|
|
||||||
EBUILD procps-3.3.9-r2.ebuild 1802 SHA256 e45e1761eb13baebfc50f0f1f0724a045341142200c564d655a66a80eac91c05 SHA512 13fde1fd1153b1a72e15bf138ece5fb56d80b5a9474638f5b1970113a8d04d59b54ff9d0cebac81fbbf69285667b37829801af1cb794d8f918a7730cd02ca717 WHIRLPOOL 62c07bae9702f97b455944bf9d464806fb4cba93655578ca0c26d4907417c9fbc9da803a6c500851f9412036559e45f257563ada01b15247ed2000e988fe2a21
|
|
||||||
MISC ChangeLog 8823 SHA256 613854e90eac268808c77b19bda74355ed7c71808a646c2f7b0b4e2fb72830b2 SHA512 12371a28b00e21a8c6547efaf58672418fe8a05393665adc77fb505421bbd973f19fe6546ef76bcb24343e3ca631e9909f3a032e0d0c0c20e8ccc3a859010de5 WHIRLPOOL eec2fd2a0108067011404f7e5ed5ad3f16389521a22bbd43c92ac27e83018340f776025368d2ac6c46f717a54dbfe065c62387178e7245d8ca5300d231e88429
|
|
||||||
MISC ChangeLog-2015 35845 SHA256 f4d801d61ca12a455950cfdded1b86257b5bfa68a7d23586d4ae5a7ee23cffcc SHA512 0206dd361fd68c3e16aee9998d4950928add17d47f7159c5cd75cab0aba614f88d4c44a9d9187e6aed33ffff5b57fcf5c918ef3caf4822f6fe51f1435d95710a WHIRLPOOL d84586d47079ec30f5569da1925e2aafc1e54d279e6561ebaf2bb1d010725bc695c859ff78dd9731c40f04d51dd2a6e590e389022c5219dd97a3d2ee5293e5c5
|
|
||||||
MISC metadata.xml 570 SHA256 700c7801cdcdd25b5c65a24ce890def0d4e513d81ef6965c717e7ec4a9931001 SHA512 e4f5a3f955c05409167a1cd240847fc4a578b005ebe834f27bd600d37896539a5b331c0fee85ef1ff96c5a3dc06511e2f0c382a0c400773e47269f4cff4ce0ed WHIRLPOOL 00738c327bc1f084cbd30e188375d0909b0efd4cec44b2ebcd5aa9eb22d6319e659664d8270174a581bb4e7b63c4b91180c83a40bfd45b6abd738b5ab311d92c
|
|
||||||
|
|||||||
@ -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
|
|
||||||
|
|
||||||
@ -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
|
|
||||||
|
|
||||||
@ -0,0 +1,47 @@
|
|||||||
|
https://bugs.gentoo.org/583036
|
||||||
|
http://www.freelists.org/post/procps/Patch-Test-suite-fails-if-procpidsmaps-is-absent,1
|
||||||
|
|
||||||
|
From: tobbs@opentrash.com
|
||||||
|
To: procps@freelists.org
|
||||||
|
Date: Sun, 11 Sep 2016 15:01:29 +0200
|
||||||
|
Subject: [procps] [Patch] Test suite fails if /proc/<pid>/smaps is absent
|
||||||
|
Message-Id: <20160911130129.9A8B3322A81@astra4649.startdedicated.de>
|
||||||
|
|
||||||
|
Summary: Some Linux systems do not have /proc/<pid>/smaps, hence the test
|
||||||
|
suite fails. Attached a patch to skip tests in that case it.
|
||||||
|
|
||||||
|
When pmap is called with either -c, -x, or -x it tries to read
|
||||||
|
/proc/<pid>/smaps (pmap.c, l. 540). If not present it exits.
|
||||||
|
The file /proc/<pid>/smaps exits on Linux systems only if the kernel is
|
||||||
|
compiled with the option CONFIG_PROC_PAGE_MONITOR (see man page proc(5)).
|
||||||
|
|
||||||
|
In the test suite some tests check the output of pmap -X et al, but they
|
||||||
|
fail if /proc/<pid>/smaps is not present, because pmap does not produce
|
||||||
|
their expected output.
|
||||||
|
|
||||||
|
Attached a patch which checks if /proc/<pid>/smaps exits, if not it
|
||||||
|
skipps the test related to it.
|
||||||
|
|
||||||
|
Note: It is unclear what the 'expected' behaviour/output of pmap should
|
||||||
|
be if the file /proc/<pid>/smaps is not present. Maybe add an additional
|
||||||
|
test to check the return code if /proc/<pid>/smaps is absent.
|
||||||
|
|
||||||
|
--- a/testsuite/pmap.test/pmap.exp
|
||||||
|
+++ b/testsuite/pmap.test/pmap.exp
|
||||||
|
@@ -45,6 +45,11 @@
|
||||||
|
spawn $pmap -qd $mypid
|
||||||
|
expect_table $test $pmap_procname $pmap_device_items "\$"
|
||||||
|
|
||||||
|
+if { [ file readable "/proc/self/smaps" ] == 0 } {
|
||||||
|
+ unsupported "Skipping test which require pmap to access /proc/<pid>/smaps, because kernel seems to be compiled without CONFIG_PROC_PAGE_MONITOR."
|
||||||
|
+
|
||||||
|
+} else {
|
||||||
|
+
|
||||||
|
set test "pmap extended output"
|
||||||
|
spawn $pmap -x $mypid
|
||||||
|
expect_table $test $pmap_ext_header $pmap_ext_items $pmap_ext_footer
|
||||||
|
@@ -66,3 +71,4 @@
|
||||||
|
spawn $pmap -XX 1
|
||||||
|
expect_pass $test "$pmap_initname\$"
|
||||||
|
|
||||||
|
+}
|
||||||
@ -1,46 +0,0 @@
|
|||||||
From 396cbc4cf36166217d877e2ff7e0a290758b0bc2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mike Frysinger <vapier@gentoo.org>
|
|
||||||
Date: Thu, 27 Jun 2013 18:37:17 -0400
|
|
||||||
Subject: [PATCH] kill: fix -PID handling
|
|
||||||
|
|
||||||
Commit 19b6f48990b02aeca211b480625b95b2033c1017 tried to fix -PID
|
|
||||||
handling, but the new logic ends up skipping over the arg. This is
|
|
||||||
because getopt increments optind after it processed the -PID (even
|
|
||||||
though it was an unknown option). We need to decrement it by one
|
|
||||||
so the loop at the end of the code will process it for us.
|
|
||||||
|
|
||||||
I also fixed some whitespace errors in that same commit.
|
|
||||||
|
|
||||||
URL: http://code.google.com/p/chromium/issues/detail?id=255209
|
|
||||||
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
||||||
---
|
|
||||||
skill.c | 6 ++++--
|
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/skill.c b/skill.c
|
|
||||||
index fb57305..074c5d7 100644
|
|
||||||
--- a/skill.c
|
|
||||||
+++ b/skill.c
|
|
||||||
@@ -390,7 +390,7 @@ static void __attribute__ ((__noreturn__))
|
|
||||||
else
|
|
||||||
sigopt++;
|
|
||||||
|
|
||||||
- opterr=0; /* suppress errors on -123 */
|
|
||||||
+ opterr = 0; /* suppress errors on -123 */
|
|
||||||
while (loop == 1 && (i = getopt_long(argc, argv, "l::Ls:hV", longopts, NULL)) != -1)
|
|
||||||
switch (i) {
|
|
||||||
case 'l':
|
|
||||||
@@ -423,7 +423,9 @@ static void __attribute__ ((__noreturn__))
|
|
||||||
xwarnx(_("invalid argument %c"), optopt);
|
|
||||||
kill_usage(stderr);
|
|
||||||
}
|
|
||||||
- loop=0;
|
|
||||||
+ /* We need to back off by one since getopt() ate the -PID */
|
|
||||||
+ --optind;
|
|
||||||
+ loop = 0;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
kill_usage(stderr);
|
|
||||||
--
|
|
||||||
1.8.2.1
|
|
||||||
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
http://bugs.gentoo.org/520314
|
|
||||||
http://gitorious.org/procps/procps/commit/7f6efed9bb85d1e212e06985ea3e06720f6ca949
|
|
||||||
|
|
||||||
--- sysctl.c
|
|
||||||
+++ sysctl.c
|
|
||||||
@@ -640,7 +640,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
- if (stat(DEFAULT_PRELOAD, &ts) < 0 && S_ISREG(ts.st_mode)) {
|
|
||||||
+ if (stat(DEFAULT_PRELOAD, &ts) == 0 && S_ISREG(ts.st_mode)) {
|
|
||||||
if (!Quiet)
|
|
||||||
printf(_("* Applying %s ...\n"), DEFAULT_PRELOAD);
|
|
||||||
rc |= Preload(DEFAULT_PRELOAD);
|
|
||||||
@ -6,6 +6,7 @@
|
|||||||
<name>Gentoo Base System</name>
|
<name>Gentoo Base System</name>
|
||||||
</maintainer>
|
</maintainer>
|
||||||
<use>
|
<use>
|
||||||
|
<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
|
||||||
<flag name="kill">Build the kill program</flag>
|
<flag name="kill">Build the kill program</flag>
|
||||||
<flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
|
<flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
|
||||||
<flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
|
<flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
|
||||||
|
|||||||
@ -1,67 +0,0 @@
|
|||||||
# Copyright 1999-2015 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-apps/sysvinit-2.88-r6
|
|
||||||
ncurses? ( >=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
|
|
||||||
}
|
|
||||||
|
|
||||||
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 </dev/null #461302
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
#dodoc sysctl.conf
|
|
||||||
|
|
||||||
mv "${ED}"/usr/bin/pidof "${ED}"/bin/ || die
|
|
||||||
|
|
||||||
# The configure script is completely whacked in the head
|
|
||||||
mv "${ED}"/lib* "${ED}"/usr/ || die
|
|
||||||
gen_usr_ldscript -a procps
|
|
||||||
prune_libtool_files
|
|
||||||
}
|
|
||||||
@ -1,76 +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 flag-o-matic
|
|
||||||
|
|
||||||
DESCRIPTION="standard informational utilities and process-handling tools"
|
|
||||||
HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz
|
|
||||||
https://gitlab.com/procps-ng/procps/commit/b2f49b105d23c833d733bf7dfb99cb98e4cae383.patch -> ${PN}-3.3.11-remove_Unix98_output_limits.patch"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0/5" # libprocps.so
|
|
||||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
|
|
||||||
IUSE="+kill +ncurses modern-top nls selinux static-libs systemd test unicode"
|
|
||||||
|
|
||||||
RDEPEND="ncurses? ( >=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 )"
|
|
||||||
RDEPEND+="
|
|
||||||
kill? (
|
|
||||||
!sys-apps/coreutils[kill]
|
|
||||||
!sys-apps/util-linux[kill]
|
|
||||||
)
|
|
||||||
!<sys-apps/sysvinit-2.88-r6"
|
|
||||||
|
|
||||||
S="${WORKDIR}/${PN}-ng-${PV}"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
|
|
||||||
"${DISTDIR}"/${P}-remove_Unix98_output_limits.patch # 555200
|
|
||||||
"${FILESDIR}"/${P}-sysctl-manpage.patch # 565304
|
|
||||||
)
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${PATCHES[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
|
|
||||||
append-lfs-flags #471102
|
|
||||||
econf \
|
|
||||||
--docdir='$(datarootdir)'/doc/${PF} \
|
|
||||||
$(use_enable kill) \
|
|
||||||
$(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 </dev/null #461302
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
#dodoc sysctl.conf
|
|
||||||
|
|
||||||
dodir /bin
|
|
||||||
mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
|
|
||||||
if use kill; then
|
|
||||||
mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
gen_usr_ldscript -a procps
|
|
||||||
prune_libtool_files
|
|
||||||
}
|
|
||||||
80
sdk_container/src/third_party/portage-stable/sys-process/procps/procps-3.3.15-r1.ebuild
vendored
Normal file
80
sdk_container/src/third_party/portage-stable/sys-process/procps/procps-3.3.15-r1.ebuild
vendored
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
# Copyright 1999-2018 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
inherit toolchain-funcs flag-o-matic
|
||||||
|
|
||||||
|
DESCRIPTION="standard informational utilities and process-handling tools"
|
||||||
|
HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
|
||||||
|
SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0/6" # libprocps.so
|
||||||
|
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
|
||||||
|
IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
|
||||||
|
|
||||||
|
COMMON_DEPEND="
|
||||||
|
elogind? ( sys-auth/elogind )
|
||||||
|
ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
|
||||||
|
selinux? ( sys-libs/libselinux )
|
||||||
|
systemd? ( sys-apps/systemd )
|
||||||
|
"
|
||||||
|
DEPEND="${COMMON_DEPEND}
|
||||||
|
elogind? ( virtual/pkgconfig )
|
||||||
|
ncurses? ( virtual/pkgconfig )
|
||||||
|
systemd? ( virtual/pkgconfig )
|
||||||
|
test? ( dev-util/dejagnu )"
|
||||||
|
RDEPEND="
|
||||||
|
${COMMON_DEPEND}
|
||||||
|
kill? (
|
||||||
|
!sys-apps/coreutils[kill]
|
||||||
|
!sys-apps/util-linux[kill]
|
||||||
|
)
|
||||||
|
!<sys-apps/sysvinit-2.88-r6
|
||||||
|
"
|
||||||
|
|
||||||
|
S="${WORKDIR}/${PN}-ng-${PV}"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
|
||||||
|
"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
|
||||||
|
|
||||||
|
# Upstream fixes
|
||||||
|
)
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
|
||||||
|
append-lfs-flags #471102
|
||||||
|
local myeconfargs=(
|
||||||
|
--docdir='$(datarootdir)'/doc/${PF}
|
||||||
|
$(use_with elogind)
|
||||||
|
$(use_enable kill)
|
||||||
|
$(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)
|
||||||
|
)
|
||||||
|
econf "${myeconfargs[@]}"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_test() {
|
||||||
|
emake check </dev/null #461302
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
default
|
||||||
|
#dodoc sysctl.conf
|
||||||
|
|
||||||
|
dodir /bin
|
||||||
|
mv "${ED%/}"/usr/bin/ps "${ED%/}"/bin/ || die
|
||||||
|
if use kill; then
|
||||||
|
mv "${ED%/}"/usr/bin/kill "${ED}"/bin/ || die
|
||||||
|
fi
|
||||||
|
|
||||||
|
gen_usr_ldscript -a procps
|
||||||
|
find "${D}" -name '*.la' -delete || die
|
||||||
|
}
|
||||||
@ -1,61 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI="4"
|
|
||||||
|
|
||||||
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"
|
|
||||||
|
|
||||||
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 nls selinux static-libs systemd test unicode"
|
|
||||||
|
|
||||||
RDEPEND="!<sys-apps/sysvinit-2.88-r6
|
|
||||||
ncurses? ( >=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 \
|
|
||||||
"${FILESDIR}"/${P}-sysctl-load-config-files.patch
|
|
||||||
sed -i -e 's:systemd-login:systemd:' configure || die #501306
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
econf \
|
|
||||||
--exec-prefix="${EPREFIX}" \
|
|
||||||
--docdir='$(datarootdir)'/doc/${PF} \
|
|
||||||
$(use_with ncurses) \
|
|
||||||
$(use_enable nls) \
|
|
||||||
$(use_enable selinux libselinux) \
|
|
||||||
$(use_enable static-libs static) \
|
|
||||||
$(use_with systemd) \
|
|
||||||
$(use_enable unicode watch8bit)
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
# dodoc sysctl.conf
|
|
||||||
|
|
||||||
mv "${ED}"/usr/bin/pidof "${ED}"/bin/ || die
|
|
||||||
|
|
||||||
# The configure script is completely whacked in the head
|
|
||||||
mv "${ED}"/lib* "${ED}"/usr/ || die
|
|
||||||
gen_usr_ldscript -a procps
|
|
||||||
prune_libtool_files
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user