diff options
author | Mike Frysinger <vapier@gentoo.org> | 2013-06-28 03:44:13 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2013-06-28 03:44:13 +0000 |
commit | 9aa544fb88e3ee052a489bcfb0c87c6130d7a802 (patch) | |
tree | 6fadf93bc3b166e60fc95944656ef6edbe1a773a /sys-process/procps | |
parent | VNC and SPICE aren't optional and are always imported so we can't make them o... (diff) | |
download | gentoo-2-9aa544fb88e3ee052a489bcfb0c87c6130d7a802.tar.gz gentoo-2-9aa544fb88e3ee052a489bcfb0c87c6130d7a802.tar.bz2 gentoo-2-9aa544fb88e3ee052a489bcfb0c87c6130d7a802.zip |
Version bump #474078 by teidakankan.
(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-process/procps')
-rw-r--r-- | sys-process/procps/ChangeLog | 8 | ||||
-rw-r--r-- | sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch | 46 | ||||
-rw-r--r-- | sys-process/procps/procps-3.3.8.ebuild | 49 |
3 files changed, 102 insertions, 1 deletions
diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog index 170f769c611d..6f5cd45e2c4e 100644 --- a/sys-process/procps/ChangeLog +++ b/sys-process/procps/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-process/procps # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.85 2013/06/27 21:36:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.86 2013/06/28 03:44:13 vapier Exp $ + +*procps-3.3.8 (28 Jun 2013) + + 28 Jun 2013; Mike Frysinger <vapier@gentoo.org> + +files/procps-3.3.8-kill-neg-pid.patch, +procps-3.3.8.ebuild: + Version bump #474078 by teidakankan. 27 Jun 2013; Mike Frysinger <vapier@gentoo.org> procps-3.3.4.ebuild: Mark m68k stable. diff --git a/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch b/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch new file mode 100644 index 000000000000..00397480ca3b --- /dev/null +++ b/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch @@ -0,0 +1,46 @@ +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 + diff --git a/sys-process/procps/procps-3.3.8.ebuild b/sys-process/procps/procps-3.3.8.ebuild new file mode 100644 index 000000000000..a034f40348a2 --- /dev/null +++ b/sys-process/procps/procps-3.3.8.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.8.ebuild,v 1.1 2013/06/28 03:44:13 vapier Exp $ + +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/ http://gitorious.org/procps" +# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz" +FEDORA_HASH="aecbeeda2ab308f8d09dddcb4cb9a572" +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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" +IUSE="+ncurses nls static-libs unicode" + +RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] )" +DEPEND="${RDEPEND} + ncurses? ( virtual/pkgconfig )" + +S=${WORKDIR}/${PN}-ng-${PV} + +src_prepare() { + epatch "${FILESDIR}"/${P}-kill-neg-pid.patch +} + +src_configure() { + econf \ + --exec-prefix="${EPREFIX}" \ + --docdir='$(datarootdir)'/doc/${PF} \ + $(use_with ncurses) \ + $(use_enable nls) \ + $(use_enable static-libs static) \ + $(use_enable unicode watch8bit) +} + +src_install() { + default +# dodoc sysctl.conf + + # The configure script is completely whacked in the head + mv "${ED}"/lib* "${ED}"/usr/ || die + gen_usr_ldscript -a procps + prune_libtool_files +} |