From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/, sys-process/psmisc/files/
Date: Thu, 27 Oct 2016 06:06:06 +0000 (UTC) [thread overview]
Message-ID: <1477548363.ae5bdaaaf75418e01d27856b8d3a612631a72b80.polynomial-c@gentoo> (raw)
commit: ae5bdaaaf75418e01d27856b8d3a612631a72b80
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 06:05:46 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 06:06:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae5bdaaa
sys-process/psmisc: Removed old.
Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-process/psmisc/Manifest | 2 -
.../psmisc/files/psmisc-22.16-fuser-pic.patch | 17 --
.../psmisc/files/psmisc-22.20-selinux.patch | 263 ---------------------
sys-process/psmisc/psmisc-22.16.ebuild | 56 -----
sys-process/psmisc/psmisc-22.20.ebuild | 56 -----
sys-process/psmisc/psmisc-22.21-r2.ebuild | 57 -----
6 files changed, 451 deletions(-)
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index e2c163e..e25cc4f 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,3 +1 @@
-DIST psmisc-22.16-r1.tar.gz 468223 SHA256 38ba34e9ddbfa755f9b7c54a4e1733e12d65121891dacda941f21d856ab41da8 SHA512 f6805f2fdd07f06a1f2ad70be065636a842dd73f4ec176b8173d7486d737561330a52392cf8712aa509fa303a174775a41a0fd73e89dad3a2958fa1d7e5b97f9 WHIRLPOOL 056dff216ac303e18af7fa1ed0a4fc97d91b701a7e69cce599079a13a478206107521d7fc2693eaca97c7c65c9417475c8c499b59a74f9d275a47afdd6a04254
-DIST psmisc-22.20.tar.gz 432501 SHA256 b17224e2385f6a799ffebba27eb7870771d42555e86814ef56b6d7e955765514 SHA512 5565163651c90afeb146c3305fddefc544bcd4cd5e98917fd57a9920e76c22e4bc0a197618539475a1410cfec9dd168b69983b2210a3ad9fc54368e9220503a6 WHIRLPOOL 97826e7d6d5def8a631a0726c3c1c8f67ab4f5f5b39e67d4a915f2741d8914b6c83d69293daacf25e92cef37990e1463ef7dc0843b47d5b0bfb1e3745fde669d
DIST psmisc-22.21.tar.gz 457702 SHA256 97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae WHIRLPOOL cbd4af3e54ce01f43558184b57a24e44dfb6e05d8438bd11e2308ee62535bb93dc417b08e66603966cc5912d7fa88c29df1529995a42e2a8b7c3da663b01681f
diff --git a/sys-process/psmisc/files/psmisc-22.16-fuser-pic.patch b/sys-process/psmisc/files/psmisc-22.16-fuser-pic.patch
deleted file mode 100644
index 935332c..00000000
--- a/sys-process/psmisc/files/psmisc-22.16-fuser-pic.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/401851
-https://sourceforge.net/tracker/?func=detail&aid=3504801&group_id=15273&atid=115273
-
-the x86 asm code is not PIC friendly, so disable it and fall back to the
-gcc builtin for doing prefetching
-
---- src/lists.h
-+++ src/lists.h
-@@ -68,7 +68,7 @@
- asm volatile ("lfetch [%0]" :: "r" (x))
- #elif defined(__powerpc64__)
- asm volatile ("dcbt 0,%0" :: "r" (x))
--#elif !defined(__CYGWIN__) && defined(__i386__)
-+#elif !defined(__CYGWIN__) && !defined(__PIC__) && defined(__i386__)
- asm volatile ("661:\n\t"
- ".byte 0x8d,0x74,0x26,0x00\n"
- "\n662:\n"
diff --git a/sys-process/psmisc/files/psmisc-22.20-selinux.patch b/sys-process/psmisc/files/psmisc-22.20-selinux.patch
deleted file mode 100644
index b4ac010..00000000
--- a/sys-process/psmisc/files/psmisc-22.20-selinux.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-From 89fa40f0a55096a62809e852244d7db3f445b0cd Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@enc.com.au>
-Date: Sun, 7 Oct 2012 10:52:46 +1100
-Subject: [PATCH] pstree compiles with SE Linux
-
-pstree failed to compile with SE Linux enabled because one of the
-scontext was missed and without it enabled the bug doesn't appear.
-
-pstree is now re-worked so scontext is defined as a dummy meaning
-most of the code except the reall SE Linux specific stuff is compilied
-meaning this sort of thing shouldn't happen too much again.
-
-Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=437332
-Bug-Sourceforge: https://sourceforge.net/p/psmisc/bugs/54/
----
- src/pstree.c | 69 ++++++------------------------------------------------------
- 1 file changed, 6 insertions(+), 63 deletions(-)
-
-diff --git a/src/pstree.c b/src/pstree.c
-index db57244..b9a01cf 100644
---- a/src/pstree.c
-+++ b/src/pstree.c
-@@ -47,6 +47,8 @@
-
- #ifdef WITH_SELINUX
- #include <selinux/selinux.h>
-+#else
-+typedef void* security_context_t; /* DUMMY to remove most ifdefs */
- #endif /*WITH_SELINUX */
-
- extern const char *__progname;
-@@ -81,9 +83,7 @@ typedef struct _proc {
- pid_t pid;
- pid_t pgid;
- uid_t uid;
--#ifdef WITH_SELINUX
- security_context_t scontext;
--#endif /*WITH_SELINUX */
- char flags;
- struct _child *children;
- struct _proc *parent;
-@@ -131,16 +131,14 @@ static int *more = NULL;
-
- static int print_args = 0, compact = 1, user_change = 0, pids = 0, pgids = 0,
- show_parents = 0, by_pid = 0, trunc = 1, wait_end = 0;
--#ifdef WITH_SELINUX
- static int show_scontext = 0;
--#endif /*WITH_SELINUX */
- static int output_width = 132;
- static int cur_x = 1;
- static char last_char = 0;
- static int dumped = 0; /* used by dump_by_user */
- static int charlen = 0; /* length of character */
-
--static void fix_orphans(void);
-+static void fix_orphans(security_context_t scontext);
- /*
- * Allocates additional buffer space for width and more as needed.
- * The first call will allocate the first buffer.
-@@ -229,15 +227,12 @@ static int out_int(int x)
- return digits;
- }
-
--#ifdef WITH_SELINUX
- static void out_scontext(security_context_t scontext)
- {
- out_string("`");
- out_string(scontext);
- out_string("'");
- }
--#endif /*WITH_SELINUX */
--
-
- static void out_newline(void)
- {
-@@ -259,12 +254,8 @@ static PROC *find_proc(pid_t pid)
- return NULL;
- }
-
--#ifdef WITH_SELINUX
- static PROC *new_proc(const char *comm, pid_t pid, uid_t uid,
- security_context_t scontext)
--#else /*WITH_SELINUX */
--static PROC *new_proc(const char *comm, pid_t pid, uid_t uid)
--#endif /*WITH_SELINUX */
- {
- PROC *new;
-
-@@ -279,9 +270,7 @@ static PROC *new_proc(const char *comm, pid_t pid, uid_t uid)
- new->flags = 0;
- new->argc = 0;
- new->argv = NULL;
--#ifdef WITH_SELINUX
- new->scontext = scontext;
--#endif /*WITH_SELINUX */
- new->children = NULL;
- new->parent = NULL;
- new->next = list;
-@@ -364,24 +353,14 @@ rename_proc(PROC *this, const char *comm, uid_t uid)
- }
- }
- }
--#ifdef WITH_SELINUX
- static void
- add_proc(const char *comm, pid_t pid, pid_t ppid, pid_t pgid, uid_t uid,
- const char *args, int size, char isthread, security_context_t scontext)
--#else /*WITH_SELINUX */
--static void
--add_proc(const char *comm, pid_t pid, pid_t ppid, pid_t pgid, uid_t uid,
-- const char *args, int size, char isthread)
--#endif /*WITH_SELINUX */
- {
- PROC *this, *parent;
-
- if (!(this = find_proc(pid)))
--#ifdef WITH_SELINUX
- this = new_proc(comm, pid, uid, scontext);
--#else /*WITH_SELINUX */
-- this = new_proc(comm, pid, uid);
--#endif /*WITH_SELINUX */
- else {
- rename_proc(this, comm, uid);
- }
-@@ -393,11 +372,7 @@ add_proc(const char *comm, pid_t pid, pid_t ppid, pid_t pgid, uid_t uid,
- if (isthread)
- this->flags |= PFLAG_THREAD;
- if (!(parent = find_proc(ppid))) {
--#ifdef WITH_SELINUX
- parent = new_proc("?", ppid, 0, scontext);
--#else /*WITH_SELINUX */
-- parent = new_proc("?", ppid, 0);
--#endif
- }
- if (pid != 0) {
- add_child(parent, this);
-@@ -494,12 +469,10 @@ dump_tree(PROC * current, int level, int rep, int leaf, int last,
- else
- (void) out_int(current->uid);
- }
--#ifdef WITH_SELINUX
- if (show_scontext) {
- out_char(info++ ? ',' : '(');
- out_scontext(current->scontext);
- }
--#endif /*WITH_SELINUX */
- if ((swapped && print_args && current->argc < 0) || (!swapped && info))
- out_char(')');
- if ((current->flags & PFLAG_HILIGHT) && (tmp = tgetstr("me", NULL)))
-@@ -520,11 +493,7 @@ dump_tree(PROC * current, int level, int rep, int leaf, int last,
- }
- }
- }
--#ifdef WITH_SELINUX
- if (show_scontext || print_args || !current->children)
--#else /*WITH_SELINUX */
-- if (print_args || !current->children)
--#endif /*WITH_SELINUX */
- {
- while (closing--)
- out_char(']');
-@@ -533,11 +502,7 @@ dump_tree(PROC * current, int level, int rep, int leaf, int last,
- ensure_buffer_capacity(level);
- more[level] = !last;
-
--#ifdef WITH_SELINUX
- if (show_scontext || print_args)
--#else /*WITH_SELINUX */
-- if (print_args)
--#endif /*WITH_SELINUX */
- {
- width[level] = swapped + (comm_len > 1 ? 0 : -1);
- count=0;
-@@ -653,8 +618,8 @@ static void read_proc(void)
- pid_t pid, ppid, pgid;
- int fd, size;
- int empty;
--#ifdef WITH_SELINUX
- security_context_t scontext = NULL;
-+#ifdef WITH_SELINUX
- int selinux_enabled = is_selinux_enabled() > 0;
- #endif /*WITH_SELINUX */
-
-@@ -726,21 +691,12 @@ static void read_proc(void)
- while ((dt = readdir(taskdir)) != NULL) {
- if ((thread = atoi(dt->d_name)) != 0) {
- if (thread != pid) {
--#ifdef WITH_SELINUX
- if (print_args)
- add_proc(threadname, thread, pid, pgid, st.st_uid,
- threadname, strlen (threadname) + 1, 1,scontext);
- else
- add_proc(threadname, thread, pid, pgid, st.st_uid,
- NULL, 0, 1, scontext);
--#else /*WITH_SELINUX */
-- if (print_args)
-- add_proc(threadname, thread, pid, pgid, st.st_uid,
-- threadname, strlen (threadname) + 1, 1);
-- else
-- add_proc(threadname, thread, pid, pgid, st.st_uid,
-- NULL, 0, 1);
--#endif /*WITH_SELINUX */
- }
- }
- }
-@@ -749,11 +705,7 @@ static void read_proc(void)
- }
- free(taskpath);
- if (!print_args)
--#ifdef WITH_SELINUX
- add_proc(comm, pid, ppid, pgid, st.st_uid, NULL, 0, 0, scontext);
--#else /*WITH_SELINUX */
-- add_proc(comm, pid, ppid, pgid, st.st_uid, NULL, 0, 0);
--#endif /*WITH_SELINUX */
- else {
- sprintf(path, "%s/%d/cmdline", PROC_BASE, pid);
- if ((fd = open(path, O_RDONLY)) < 0) {
-@@ -770,13 +722,8 @@ static void read_proc(void)
- size--;
- if (size)
- buffer[size++] = 0;
--#ifdef WITH_SELINUX
- add_proc(comm, pid, ppid, pgid, st.st_uid,
- buffer, size, 0, scontext);
--#else /*WITH_SELINUX */
-- add_proc(comm, pid, ppid, pgid, st.st_uid,
-- buffer, size, 0);
--#endif /*WITH_SELINUX */
- }
- }
- }
-@@ -787,7 +734,7 @@ static void read_proc(void)
- }
- }
- (void) closedir(dir);
-- fix_orphans();
-+ fix_orphans(scontext);
- if (print_args)
- free(buffer);
- if (empty) {
-@@ -796,7 +743,7 @@ static void read_proc(void)
- }
- }
-
--static void fix_orphans(void)
-+static void fix_orphans(security_context_t scontext)
- {
- /* When using kernel 3.3 with hidepid feature enabled on /proc
- * then we need fake root pid and gather all the orphan processes
-@@ -807,11 +754,7 @@ static void fix_orphans(void)
- PROC *root, *walk;
-
- if (!(root = find_proc(ROOT_PID))) {
--#ifdef WITH_SELINUX
- root = new_proc("?", ROOT_PID, 0, scontext);
--#else /*WITH_SELINUX */
-- root = new_proc("?", ROOT_PID, 0);
--#endif
- }
- for (walk = list; walk; walk = walk->next) {
- if (walk->pid == 1 || walk->pid == 0)
---
-1.7.12
-
diff --git a/sys-process/psmisc/psmisc-22.16.ebuild b/sys-process/psmisc/psmisc-22.16.ebuild
deleted file mode 100644
index 162bdec..00000000
--- a/sys-process/psmisc/psmisc-22.16.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 -> ${P}-r1.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}"/${PN}-22.16-fuser-pic.patch #394443
-}
-
-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 "${ED}"/usr/bin/fuser "${ED}"/bin || die
-}
diff --git a/sys-process/psmisc/psmisc-22.20.ebuild b/sys-process/psmisc/psmisc-22.20.ebuild
deleted file mode 100644
index 21d2d44..00000000
--- a/sys-process/psmisc/psmisc-22.20.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-
-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 arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-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}-selinux.patch #437332
-}
-
-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; use * wildcard for #458250
- dodir /bin
- mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
-}
diff --git a/sys-process/psmisc/psmisc-22.21-r2.ebuild b/sys-process/psmisc/psmisc-22.21-r2.ebuild
deleted file mode 100644
index a2894e7..00000000
--- a/sys-process/psmisc/psmisc-22.21-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-
-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 arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-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}-fuser_typo_fix.patch"
- epatch "${FILESDIR}/${P}-sysmacros.patch"
-}
-
-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; use * wildcard for #458250
- dodir /bin
- mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
-}
next reply other threads:[~2016-10-27 6:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-27 6:06 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-08-14 13:03 [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/, sys-process/psmisc/files/ Lars Wendler
2018-09-24 11:27 Lars Wendler
2021-02-06 15:18 Lars Wendler
2022-10-28 7:01 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477548363.ae5bdaaaf75418e01d27856b8d3a612631a72b80.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox