old

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 13 insertions, 204 deletions

diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index 8cc4d2b46f04..4a2fb24a6a47 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/psmisc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.132 2012/06/19 06:50:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.133 2012/06/19 06:52:14 ssuominen Exp $
+
+  19 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> -psmisc-22.15.ebuild,
+  -files/psmisc-22.15-COMM_LEN-to-18.patch, -psmisc-22.17.ebuild:
+  old
 
 *psmisc-22.18 (19 Jun 2012)
 
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index c0541f951f94..70dbdba5e643 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -2,28 +2,23 @@
 Hash: SHA1
 
 AUX psmisc-22.13-no-nls.patch 693 RMD160 10170e0d3a593185781c8e5c866b49fd3070beaa SHA1 48a94c3796680fd20103a3938f546ca32246d3e0 SHA256 493e2b1a1a45da3f2334340af58950320108161c6e1fd43bc086b2b85f23a5bc
-AUX psmisc-22.15-COMM_LEN-to-18.patch 2819 RMD160 9b20be171434bf0091f67284b747dd8b9f32d649 SHA1 dba5213fcea739c9796f1f55118aa57de2838725 SHA256 781c5c78c41203d77dddc4b11fe6eea6786517f297c86bd6a844db88ec9341c5
 AUX psmisc-22.16-fuser-pic.patch 598 RMD160 a4849d45221fda30b929492b7516e08062d5e3c9 SHA1 1f46f8ddce4cb4aec02e7bcb9f2b77c0d2c4874a SHA256 075c1406d995cafb4d8fac83b984fc5a0e03215548def65da565c97644a0a817
 DIST psmisc-22.14.tar.gz 382024 RMD160 56a1b2ab415013ac18fa8a49b9cd67dc1f735822 SHA1 dc6fc0ec131c11796d01512bbd80089719b04a66 SHA256 22bbf4561837af475c0d8d14e3b9cab453998c787212c107fac7faf2f281e26e
-DIST psmisc-22.15.tar.gz 390766 RMD160 572c738202061f60ab965ba8f7e0b024d385d647 SHA1 06f507d889afab70ac7ff20fbd419ca2ffcf90c0 SHA256 5fbe908618d7ccf08164a733a361ce9823355fd0da754e53982d842158973754
 DIST psmisc-22.16.tar.gz 465138 RMD160 3f51ae4d93082111cd649513ac85fbc6cfb4586e SHA1 27f1c8deab06e79101af1914ff81a9d561f2fcfe SHA256 ae426d7238e5353fdf51b1d313897c2bbed0023e66e5b4af2be9cd03d87a9d01
-DIST psmisc-22.17.tar.gz 500655 RMD160 a082e51ddaf07580fa4a38d8922fc4c02592d9fc SHA1 5d400710cf030bf7396aec40f53e933942ec8b4a SHA256 34e70139fd0d532eba00de408f2f4843a5fca93278de99db6eb04f3850c6be0d
 DIST psmisc-22.18.tar.gz 492705 RMD160 b38a1b3d007d64a018ef06883a4d23387469de11 SHA1 964f6daa0950b128a0840d9df4dc0b671730a83c SHA256 afa3a44be18db403f6f631d448f89d9d66304c1590e0cf25583a2b65bc0893d0
 EBUILD psmisc-22.14.ebuild 1695 RMD160 53f776d73f61855e088789e0f15cc06ce436cba3 SHA1 ca356ac21b43c7b899a3d8d83c3f1eaa95fe5b23 SHA256 5bc21e953ac9f7b50239668ee09880568fce744a6b766483d4fdc3dfc7397241
-EBUILD psmisc-22.15.ebuild 1384 RMD160 5e486fdb80df6fa78d0e01616b00091ea6d9d97c SHA1 e71fec6a2b4ac128874cc3b750375c646af49592 SHA256 044411a7682dfe0ac748d233aea2948413d371aaead81bfe59652fd00d936bac
 EBUILD psmisc-22.16.ebuild 1417 RMD160 3339506c80f91bc85a6ec6ab4ed1a6115151ba96 SHA1 a38a97fdc2fb17895a5d9158ea8dbc2bfb8875ac SHA256 d45bbbdcb506df0aecaa857fc229b220335c590a34ef6a9b439a1b364a3500bd
-EBUILD psmisc-22.17.ebuild 1327 RMD160 64c7151cb2912f149c16a9f89c3fb3a30af32abd SHA1 e2462a7457a62c96253029bcd26ff96bbf0e0ee1 SHA256 bd4e75ab55ebe651c472c58c6581dc6a1b633635a851239dda7eabc2aaf5c266
 EBUILD psmisc-22.18.ebuild 1327 RMD160 7db23b611efc0ec098c5a117f6d67cd6612d581a SHA1 878faf123e882a5da81c3fc749aed1574f6aa159 SHA256 503bddb2ff8b90c2c26d840b59ecb03f5eb7e5785599748f2c93e11c44c6b4f0
-MISC ChangeLog 21834 RMD160 0c11453d2a1dc485e7ae7dd3aeb66380f340ce9e SHA1 0a06b898867fb2786e3937fef62b32d18bd260dd SHA256 4956936823c897b7baab952dbb719f57235c4dc548e5e3997c7cbbecb86ccfaa
+MISC ChangeLog 21983 RMD160 a2bd225c83585b5182205cc96bed753e1d20cd9c SHA1 68ba13c78ab5aa2a707a17afc49dc1c105402533 SHA256 12642b8dc2589bbdbd023b014c37769de9f0c39650869b3800b16e1de710c624
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP4CA5AAoJEEdUh39IaPFNEAgH+wU68qDWsWgNSYb8y6mWhE1d
-gy0aqcsTHoQ99mU2DIycxKEe6hYWMvCBBArZQ8KxRFXyVPJE4HrYlOdYuWm2g1bC
-/xoLMAowrTLOV9qcjxKVxXvwovhr5bM0wuxcTWlUgllui/TQ8ZwOw9R5tKF/miLb
-MU0e9aKnq4v492PCc4XtqG05XFO9dVdIY9Gwroy/CXgc8OsnKW3nBfw+8WAtKjEZ
-HTPDoVG1/h/VPlqDF/P3ME/AJRBOhqODmAOx1QlFLmbncVzzNAy4fHT1bYx+VNeJ
-Cg2a086tmsCCvN+zPo5/sc/dSqsYsRSXmxVj8fQGVPcmvafZsTLty9rW8FQkFxQ=
-=SKzu
+iQEcBAEBAgAGBQJP4CCPAAoJEEdUh39IaPFN1LYH+gOxKgRAGyuwyHfTbIYV/zuS
+4it+cJLMcDmVwQfWkTbMzw3glgNu8yoxsMJY+MFr9ovdUwZQRvl2FVus/JbnYjft
+XZBcPSfNYxHiGOv48LEfd4TMk5WOofdJgtnKscBgZvJKaZlCgHfa6HAslRxOdxDi
+W12cT34gES81eQ8OJy+WIIS2FXmVvdpElaQJYOb61HtOmvDb6MZH5/6+NtbSUnCl
+qSvplsrMZCCJEIPrdPkKNkr3u7i2IjcGOMW4EXZSNB4aZC9PiBmf+JrYbTFxqH6R
+LXGOiyvZenFmENwE1WJk6NJmtxWqtVCQ0COk4iHQOPT1AXeIwB5o0KVZWcztUn4=
+=uHaI
 -----END PGP SIGNATURE-----
diff --git a/sys-process/psmisc/files/psmisc-22.15-COMM_LEN-to-18.patch b/sys-process/psmisc/files/psmisc-22.15-COMM_LEN-to-18.patch
deleted file mode 100644
index 39a39b4fba8a..000000000000
--- a/sys-process/psmisc/files/psmisc-22.15-COMM_LEN-to-18.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Craig Small <csmall@users.sourceforge.net>
-Date: Fri, 27 Jan 2012 01:02:48 +0000 (+1100)
-Subject: Set COMM_LEN to 18 to include brackets in name
-X-Git-Url: http://psmisc.git.sourceforge.net/git/gitweb.cgi?p=psmisc%2Fpsmisc;a=commitdiff_plain;h=340f81524cb097d814fcf344a3743de17f988e3d;hp=f6fb268d4ac7365cda72fe1e54872c7694ae5fee
-
-Set COMM_LEN to 18 to include brackets in name
-
-Also use strncpy in case the command names grow.
----
-
-diff --git a/src/comm.h b/src/comm.h
-index 956383d..2b780b0 100644
---- a/src/comm.h
-+++ b/src/comm.h
-@@ -1,18 +1,37 @@
--/* comm.h - command name length definition */
--
--/* Copyright 1995 Werner Almesberger. See file COPYING for details. */
--
-+/*
-+ * comm.h - command name length definition 
-+ *
-+ * Copyright 1995 Werner Almesberger
-+ * Copyright 2012 Craig Small <csmall@enc.com.au>
-+ *
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
- 
- #ifndef COMM_H
- #define COMM_H
- 
--#if 0				/* broken in 1.3.xx */
--#include <linux/sched.h>
--#define COMM_LEN sizeof(dummy.comm)
--extern struct task_struct dummy;
--#else
--#define COMM_LEN 16		/* synchronize with size of comm in struct task_struct in
--				   /usr/include/linux/sched.h */
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
- #endif
- 
-+/*
-+ * COMM_LEN should be the same size as TASK_COMM_LEN in the Linux source
-+ * at include/linux/sched.h
-+ * However, that doesn't include the brackets that may be in the field.
-+ */
-+#define COMM_LEN 18
-+
- #endif
-diff --git a/src/pstree.c b/src/pstree.c
-index 452f823..3129f76 100644
---- a/src/pstree.c
-+++ b/src/pstree.c
-@@ -264,7 +264,7 @@ static PROC *new_proc(const char *comm, pid_t pid, uid_t uid)
-         perror("malloc");
-         exit(1);
-     }
--    strcpy(new->comm, comm);
-+    strncpy(new->comm, comm, COMM_LEN);
-     new->pid = pid;
-     new->uid = uid;
-     new->flags = 0;
-@@ -352,7 +352,7 @@ add_proc(const char *comm, pid_t pid, pid_t ppid, uid_t uid,
-         this = new_proc(comm, pid, uid);
- #endif                                /*WITH_SELINUX */
-     else {
--        strcpy(this->comm, comm);
-+        strncpy(this->comm, comm, COMM_LEN);
-         this->uid = uid;
-     }
-     if (args)
diff --git a/sys-process/psmisc/psmisc-22.15.ebuild b/sys-process/psmisc/psmisc-22.15.ebuild
deleted file mode 100644
index 9d18fc9df953..000000000000
--- a/sys-process/psmisc/psmisc-22.15.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.15.ebuild,v 1.3 2012/01/31 16:28:49 vapier Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz"
-
-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="ipv6 nls selinux X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.6b
-	nls? ( sys-devel/gettext )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-COMM_LEN-to-18.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable selinux) \
-		$(use_enable ipv6) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	# peekfd is a fragile crap hack #330631
-	nonfatal emake -C src peekfd || touch src/peekfd{.o,}
-	emake
-}
-
-src_install() {
-	default
-
-	use X || rm -f "${ED}"/usr/bin/pstree.x11
-
-	[[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd
-	[[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
-
-	# fuser is needed by init.d scripts
-	dodir /bin
-	mv -vf "${ED}"/usr/bin/fuser "${ED}"/bin/ || die
-}
diff --git a/sys-process/psmisc/psmisc-22.17.ebuild b/sys-process/psmisc/psmisc-22.17.ebuild
deleted file mode 100644
index 2e6b451d95f3..000000000000
--- a/sys-process/psmisc/psmisc-22.17.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.17.ebuild,v 1.1 2012/06/07 08:58:32 ssuominen Exp $
-
-EAPI=4
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-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="ipv6 nls selinux X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.6b
-	nls? ( sys-devel/gettext )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
-	econf \
-		$(use_enable selinux) \
-		--disable-harden-flags \
-		$(use_enable ipv6) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	# peekfd is a fragile crap hack #330631
-	nonfatal emake -C src peekfd || touch src/peekfd{.o,}
-	emake
-}
-
-src_install() {
-	default
-
-	use X || rm -f "${ED}"/usr/bin/pstree.x11
-
-	[[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd
-	[[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
-
-	# fuser is needed by init.d scripts
-	dodir /bin
-	mv -vf "${ED}"/usr/bin/fuser "${ED}"/bin || die
-}