* [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/, sys-process/psmisc/files/
@ 2016-10-27 6:06 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2016-10-27 6:06 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/, sys-process/psmisc/files/
@ 2018-08-14 13:03 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2018-08-14 13:03 UTC (permalink / raw
To: gentoo-commits
commit: a239528ac551de73e621079dc90ff8a79fcbfd1b
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 14 13:03:25 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 13:03:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a239528a
sys-process/psmisc: Removed old.
Package-Manager: Portage-2.3.46, Repoman-2.3.10
sys-process/psmisc/Manifest | 1 -
.../psmisc/files/psmisc-22.21-fuser_typo_fix.patch | 44 ----------------
.../psmisc/files/psmisc-22.21-sysmacros.patch | 26 ----------
sys-process/psmisc/psmisc-22.21-r3.ebuild | 60 ----------------------
sys-process/psmisc/psmisc-23.1.ebuild | 53 -------------------
5 files changed, 184 deletions(-)
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index bfd07c5e614..3e422d1ce55 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,3 +1,2 @@
-DIST psmisc-22.21.tar.gz 457702 BLAKE2B 7e81b695546c3dca6e1ade47bd1cd736ad434eb964608ead3e7d5a3b97f6d3d6c927e8e13ee525e716b66067e5a1573c4f0b8434540b9c66aac6e6b8f15bcfde SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae
DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
DIST psmisc-23.2.tar.xz 298784 BLAKE2B 61d1ad385f176cbe3ca0edcdd41ed026ab52aca4190c31551392cf83d0bf293de22899b13238d7ebeb1627013a2dc734ca91ad7a0a313c9d92b7af662728bf21 SHA512 114dc4d9a4d66374ee75cd6c845230c24540aa1d7562253c6fd5695552698afcf3e2ad2d7e9675addc63201f7e6d9e697287c72a638705194155bec508211dc3
diff --git a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch b/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch
deleted file mode 100644
index 5c5fd990f9c..00000000000
--- a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001
-From: Brad Jorsch <anomie@users.sourceforge.net>
-Date: Fri, 28 Feb 2014 21:55:02 +1100
-Subject: [PATCH] Typo in fuser makes -M on all the time
-
-Brad found that fuser had the -M option on all the time.
-A simple but significant typo caused this, thanks the the patch.
-
-Bug-Debian: http://bugs.debian.org/740275
-
-Signed-off-by: Craig Small <csmall@enc.com.au>
----
- ChangeLog | 4 ++++
- src/fuser.c | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index fd1cccf..e5f784c 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,7 @@
-+Changes in 22.22
-+================
-+ * Fixed typo in fuser which has -M on Debian #740275
-+
- Changes in 22.21
- ================
- * Missing comma in fuser(1) added Debian #702391
-diff --git a/src/fuser.c b/src/fuser.c
-index b485f65..389b302 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
- usage(_("No process specification given"));
-
- /* Check if -M flag was used and if so check mounts */
-- if (opts * OPT_ISMOUNTPOINT) {
-+ if (opts & OPT_ISMOUNTPOINT) {
- check_mountpoints(&mounts, &names_head, &names_tail);
- }
-
---
-2.2.2
-
diff --git a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch b/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch
deleted file mode 100644
index 440c5e62e7e..00000000000
--- a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 367886e1c49238d1a02721f849564d77a163465b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 7 Mar 2016 14:52:22 -0500
-Subject: [PATCH] fuser: include sysmacros.h for makedev
-
-BSD/Linux define makedev in the sysmacros.h header. Include it directly
-instead of relying on types.h pulling it in for us.
----
- src/fuser.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/fuser.c b/src/fuser.c
-index da94d22..380046f 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -36,6 +36,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
-+#include <sys/sysmacros.h>
- #include <sys/wait.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
---
-2.6.2
-
diff --git a/sys-process/psmisc/psmisc-22.21-r3.ebuild b/sys-process/psmisc/psmisc-22.21-r3.ebuild
deleted file mode 100644
index 1414df7d9b4..00000000000
--- a/sys-process/psmisc/psmisc-22.21-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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 ~x86-linux"
-IUSE="ipv6 nls selinux X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
- nls? ( virtual/libintl )
- selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
- >=sys-devel/libtool-2.2.6b
- nls? ( sys-devel/gettext )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-PATCHES=(
- "${FILESDIR}/${P}-fuser_typo_fix.patch"
- "${FILESDIR}/${P}-sysmacros.patch"
-)
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-}
-
-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-23.1.ebuild b/sys-process/psmisc/psmisc-23.1.ebuild
deleted file mode 100644
index e25d09501c9..00000000000
--- a/sys-process/psmisc/psmisc-23.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="ipv6 nls selinux X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
- 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() {
- local myeconfargs=(
- $(use_enable selinux)
- --disable-harden-flags
- $(use_enable ipv6)
- $(use_enable nls)
- )
- econf "${myeconfargs[@]}"
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/, sys-process/psmisc/files/
@ 2018-09-24 11:27 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2018-09-24 11:27 UTC (permalink / raw
To: gentoo-commits
commit: 6c1e6dc1b44372a36852071f5f35b22e686d6cea
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 24 11:13:02 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 11:27:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c1e6dc1
sys-process/psmisc: Revbump to fix "killall -SIG".
Upstream re-released version 23.2 with the killall fixes.
Closes: https://bugs.gentoo.org/664066
Package-Manager: Portage-2.3.49, Repoman-2.3.11
sys-process/psmisc/Manifest | 2 +-
.../psmisc-23.2-killall_options_parsing.patch | 79 ----------------------
.../{psmisc-23.2.ebuild => psmisc-23.2-r1.ebuild} | 6 +-
3 files changed, 2 insertions(+), 85 deletions(-)
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 3e422d1ce55..7d43e8db087 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,2 +1,2 @@
DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
-DIST psmisc-23.2.tar.xz 298784 BLAKE2B 61d1ad385f176cbe3ca0edcdd41ed026ab52aca4190c31551392cf83d0bf293de22899b13238d7ebeb1627013a2dc734ca91ad7a0a313c9d92b7af662728bf21 SHA512 114dc4d9a4d66374ee75cd6c845230c24540aa1d7562253c6fd5695552698afcf3e2ad2d7e9675addc63201f7e6d9e697287c72a638705194155bec508211dc3
+DIST psmisc-23.2.tar.xz 303820 BLAKE2B 6c63a54b91e1e31f812bc47c10937e8767fa2990bef66ee779bf44887625719e7342da05137222a6636df7a0e520c39318faba3e7a1022c54fd9f3f172ecc851 SHA512 a8d4e91443b66de1c4418fd74b5eb6dd42caddc937e75dfb35a4e49b9b35236db779e2a480c1693bcc7feaf0957b1028850134040685e88e6ff7ffcb572e20e8
diff --git a/sys-process/psmisc/files/psmisc-23.2-killall_options_parsing.patch b/sys-process/psmisc/files/psmisc-23.2-killall_options_parsing.patch
deleted file mode 100644
index 48aecb24e5c..00000000000
--- a/sys-process/psmisc/files/psmisc-23.2-killall_options_parsing.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 258ee9166e585f87005d3a9686938a4fa26669f9 Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@enc.com.au>
-Date: Tue, 18 Sep 2018 21:17:00 +1000
-Subject: [PATCH] killall: Another go at option parsing
-
-This now seems to be working. There are some evil hacks, especially for
-the -ve option combination but it seems that we have a winner.
-
-Added a bunch more option parsing tests which picked up -ILL passed but
--VTALRM did not. Not sure why, but length seems my guess
-
-References:
- psmisc/psmisc#13
- psmisc/psmisc#12
----
-
-diff --git a/src/killall.c b/src/killall.c
-index 64c406a..2715515 100644
---- a/src/killall.c
-+++ b/src/killall.c
-@@ -857,7 +857,7 @@ main (int argc, char **argv)
-
- opterr = 0;
- #ifdef WITH_SELINUX
-- while ( (optc = getopt_long(argc,argv,"egy:o:ilqrs:u:vwZ:VIn:",options,NULL)) != -1) {
-+ while ( (optc = getopt_long_only(argc,argv,"egy:o:ilqrs:u:vwZ:VIn:",options,NULL)) != -1) {
- #else
- while ( (optc = getopt_long_only(argc,argv,"egy:o:ilqrs:u:vwVIn:",options,NULL)) != -1) {
- #endif
-@@ -914,7 +914,7 @@ main (int argc, char **argv)
- ignore_case = 1;
- } else {
- sig_num = get_signal (argv[optind]+1, "killall");
-- skip_error=1;
-+ skip_error=optind;
- }
- break;
- case 'V':
-@@ -922,8 +922,10 @@ main (int argc, char **argv)
- if (strcmp(argv[optind-1],"-V") == 0 || strncmp(argv[optind-1],"--",2) == 0) {
- print_version();
- return 0;
-+ } else {
-+ sig_num = get_signal (argv[optind]+1, "killall");
-+ skip_error=optind;
- }
-- sig_num = get_signal (argv[optind]+1, "killall");
- break;
- case 'n': {
- long num;
-@@ -948,6 +950,15 @@ main (int argc, char **argv)
- break;
- #endif /*WITH_SELINUX*/
- case '?':
-+ if (skip_error == optind)
-+ break;
-+ /* Sigh, this is a hack because -ve could be -version or
-+ * -verbose */
-+ if (strncmp(argv[optind-1], "-ve", 3) == 0) {
-+ verbose=1;
-+ exact=1;
-+ break;
-+ }
- /* Signal names are in uppercase, so check to see if the argv
- * is upper case */
- if (argv[optind-1][1] >= 'A' && argv[optind-1][1] <= 'Z') {
-@@ -957,9 +968,6 @@ main (int argc, char **argv)
- if (argv[optind-1][1] >= '0' && argv[optind-1][1] <= '9') {
- sig_num = atoi(argv[optind-1]+1);
- } else {
-- if (skip_error)
-- skip_error=0;
-- else
- usage(NULL);
- }
- }
---
-2.18.0
-
diff --git a/sys-process/psmisc/psmisc-23.2.ebuild b/sys-process/psmisc/psmisc-23.2-r1.ebuild
similarity index 92%
rename from sys-process/psmisc/psmisc-23.2.ebuild
rename to sys-process/psmisc/psmisc-23.2-r1.ebuild
index dd989ab0b6b..2157294a11d 100644
--- a/sys-process/psmisc/psmisc-23.2.ebuild
+++ b/sys-process/psmisc/psmisc-23.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,10 +21,6 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
-PATCHES=(
- "${FILESDIR}/${P}-killall_options_parsing.patch"
-)
-
src_configure() {
local myeconfargs=(
--disable-harden-flags
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/, sys-process/psmisc/files/
@ 2021-02-06 15:18 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2021-02-06 15:18 UTC (permalink / raw
To: gentoo-commits
commit: 731cf3127ec50eb0ae786a923387b67842f4cf4c
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 6 15:15:38 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Feb 6 15:15:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=731cf312
sys-process/psmisc: Removed old
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-process/psmisc/Manifest | 2 -
...misc-23.2-killall_check_truncated_16_char.patch | 122 ---------------------
.../psmisc/files/psmisc-23.2-old_comm_len.patch | 28 -----
sys-process/psmisc/psmisc-23.1-r1.ebuild | 51 ---------
sys-process/psmisc/psmisc-23.2-r2.ebuild | 50 ---------
5 files changed, 253 deletions(-)
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 1230542d82c..972c7e944d8 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,4 +1,2 @@
-DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
-DIST psmisc-23.2.tar.xz 303820 BLAKE2B 6c63a54b91e1e31f812bc47c10937e8767fa2990bef66ee779bf44887625719e7342da05137222a6636df7a0e520c39318faba3e7a1022c54fd9f3f172ecc851 SHA512 a8d4e91443b66de1c4418fd74b5eb6dd42caddc937e75dfb35a4e49b9b35236db779e2a480c1693bcc7feaf0957b1028850134040685e88e6ff7ffcb572e20e8
DIST psmisc-23.3.tar.xz 311896 BLAKE2B f38360dfb037a758633a8ff25af1de70be83ae5b2f2afe856ce237ade7bd2720f7c270c5af884313177022aa70f408dfce0c39e5d847057a6fdba98e3363561c SHA512 791ffef78d87b092d653da98710b338017466a9e1e1935968b9f0194ccef8da941317aa0c39d821d46b20d95d6539ccf78e5ebb71ad1032ae62337a397180d58
DIST psmisc-23.4.tar.xz 370000 BLAKE2B e762171c4d3252421a49b352fadb3e892f66862f003a313a0cc692f973364b06d2652a51d331314462784d94ad55189e74c4d7a023d5d7c917c5e5c05009f46b SHA512 b05781fdb283a6f132bd385d64437f8080e6bc0e11cd2e3e02227678682bb67b3c89edec34a6d067d77312811d072dc60b47ebb32b168c4c69bbc36df643a471
diff --git a/sys-process/psmisc/files/psmisc-23.2-killall_check_truncated_16_char.patch b/sys-process/psmisc/files/psmisc-23.2-killall_check_truncated_16_char.patch
deleted file mode 100644
index bfc2a24d5de..00000000000
--- a/sys-process/psmisc/files/psmisc-23.2-killall_check_truncated_16_char.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 1188315cd037d73bf946a0003b70c6423cc330d2 Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@enc.com.au>
-Date: Wed, 7 Nov 2018 20:13:09 +1100
-Subject: [PATCH] killall: match on 16 character commlen too
-
-The comm length increase meant killall could accomodate the
-larger comm name given out by newer kernels but it meant that
-if a user relied on the previous 16 character truncation then
-processes that used to match would fail.
-
-killall now checks to see if the the comm is the old COMM_LEN
-length and the given name is longer than old COMM_LEN and does
-a truncated match as well.
-
-References:
- https://bugs.debian.org/912748
----
- ChangeLog | 3 +++
- src/killall.c | 69 +++++++++++++++++++++++++++++++++++----------------
- 2 files changed, 50 insertions(+), 22 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 7fd2abd..37962cb 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,6 @@
-+Changes in 23.4
-+===============
-+ * killall: check also truncated 16 char comm names Debian #912748
- Changes in 23.2
- ===============
- * misc: Command names increased from 16 to 64 characters
-diff --git a/src/killall.c b/src/killall.c
-index 2715515..09212a4 100644
---- a/src/killall.c
-+++ b/src/killall.c
-@@ -492,6 +492,49 @@ create_pid_table(int *max_pids, int *pids)
- return pid_table;
- }
-
-+#define strcmp2(A,B,I) (I? strcasecmp((A),(B)):strcmp((A),(B)))
-+#define strncmp2(A,B,L,I) (I? strncasecmp((A),(B),(L)):strncmp((A),(B),(L)))
-+static int match_process_name(
-+ const char *proc_comm,
-+ const int comm_len,
-+ const char *proc_cmdline,
-+ const char *match_name,
-+ const int match_len,
-+ const int got_long
-+ )
-+{
-+ /* process is old length but matching longer */
-+ if (comm_len == OLD_COMM_LEN - 1 && match_len >= OLD_COMM_LEN - 1)
-+ {
-+ if (got_long)
-+ {
-+ return (0 == strncmp2 (match_name, proc_cmdline, OLD_COMM_LEN - 1,
-+ ignore_case));
-+ } else {
-+ return (0 == strncmp2 (match_name, proc_comm, OLD_COMM_LEN - 1,
-+ ignore_case));
-+ }
-+ }
-+
-+ if (comm_len == COMM_LEN - 1 && match_len >= COMM_LEN - 1)
-+ {
-+ if (got_long)
-+ {
-+ return (0 == strncmp2 (match_name, proc_cmdline, COMM_LEN - 1,
-+ ignore_case));
-+ } else {
-+ return (0 == strncmp2 (match_name, proc_comm, COMM_LEN - 1,
-+ ignore_case));
-+ }
-+ }
-+ /* Not old new COMM_LEN so we match all of it */
-+ if (got_long)
-+ {
-+ return (0 == strcmp2 (match_name, proc_cmdline, ignore_case));
-+ }
-+ return (0 == strcmp2 (match_name, proc_comm, ignore_case));
-+}
-+
- #ifdef WITH_SELINUX
- static int
- kill_all(int signal, int name_count, char **namelist, struct passwd *pwent,
-@@ -599,28 +642,10 @@ kill_all (int signal, int name_count, char **namelist, struct passwd *pwent)
- {
- if (!name_info[j].st.st_dev)
- {
-- if (length != COMM_LEN - 1 || name_info[j].name_length < COMM_LEN - 1)
-- {
-- if (ignore_case == 1)
-- {
-- if (strcasecmp (namelist[j], comm))
-- continue;
-- } else {
-- if (strcmp(namelist[j], comm))
-- continue;
-- }
-- } else {
-- if (ignore_case == 1)
-- {
-- if (got_long ? strcasecmp (namelist[j], command) :
-- strncasecmp (namelist[j], comm, COMM_LEN - 1))
-- continue;
-- } else {
-- if (got_long ? strcmp (namelist[j], command) :
-- strncmp (namelist[j], comm, COMM_LEN - 1))
-- continue;
-- }
-- }
-+ if (!match_process_name(comm, length, command, namelist[j],
-+ name_info[j].name_length, got_long))
-+ continue;
-+
- } else {
- int ok = 1;
- if (asprintf (&path, PROC_BASE "/%d/exe", pid_table[i]) < 0)
---
-2.18.1
-
diff --git a/sys-process/psmisc/files/psmisc-23.2-old_comm_len.patch b/sys-process/psmisc/files/psmisc-23.2-old_comm_len.patch
deleted file mode 100644
index ae237e69109..00000000000
--- a/sys-process/psmisc/files/psmisc-23.2-old_comm_len.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e2cf9f3e83e0fc0278ff39a4dfc8e3f2730eebca Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@enc.com.au>
-Date: Wed, 7 Nov 2018 20:19:38 +1100
-Subject: [PATCH] misc: Remember to add comm.h too
-
-The previous commit should have included comm.h too
----
- src/comm.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/comm.h b/src/comm.h
-index b54b998..b10eb36 100644
---- a/src/comm.h
-+++ b/src/comm.h
-@@ -33,4 +33,10 @@
- */
- #define COMM_LEN 64
-
-+/*
-+ * Older kernels had only 16 characters, which means we may have to check this
-+ * too
-+ */
-+#define OLD_COMM_LEN 16
-+
- #endif
---
-2.18.1
-
diff --git a/sys-process/psmisc/psmisc-23.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild
deleted file mode 100644
index 1f826b2f6c3..00000000000
--- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 nls selinux X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
- 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() {
- local myeconfargs=(
- $(use_enable selinux)
- --disable-harden-flags
- $(use_enable ipv6)
- $(use_enable nls)
- )
- econf "${myeconfargs[@]}"
-}
-
-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-23.2-r2.ebuild b/sys-process/psmisc/psmisc-23.2-r2.ebuild
deleted file mode 100644
index c06e9f526a8..00000000000
--- a/sys-process/psmisc/psmisc-23.2-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 nls selinux X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
- nls? ( virtual/libintl )
- selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
- >=sys-devel/libtool-2.2.6b
- nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=(
- "${FILESDIR}/${P}-old_comm_len.patch"
- "${FILESDIR}/${P}-killall_check_truncated_16_char.patch"
-)
-
-src_configure() {
- local myeconfargs=(
- --disable-harden-flags
- $(use_enable ipv6)
- $(use_enable nls)
- $(use_enable selinux)
- )
- econf "${myeconfargs[@]}"
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/, sys-process/psmisc/files/
@ 2022-10-28 7:01 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-10-28 7:01 UTC (permalink / raw
To: gentoo-commits
commit: 1df78d697b62b92988a676d7a89714f9bf1f9716
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 06:55:38 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 06:56:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df78d69
sys-process/psmisc: add 23.5
Closes: https://bugs.gentoo.org/802414
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-process/psmisc/Manifest | 1 +
...psmisc-23.5-fix-killall-pidfd_send_signal.patch | 40 ++++++++++++
sys-process/psmisc/psmisc-23.5.ebuild | 73 ++++++++++++++++++++++
3 files changed, 114 insertions(+)
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index ed6b89da2914..e52f80aa82b4 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1 +1,2 @@
DIST psmisc-23.4.tar.xz 370000 BLAKE2B e762171c4d3252421a49b352fadb3e892f66862f003a313a0cc692f973364b06d2652a51d331314462784d94ad55189e74c4d7a023d5d7c917c5e5c05009f46b SHA512 b05781fdb283a6f132bd385d64437f8080e6bc0e11cd2e3e02227678682bb67b3c89edec34a6d067d77312811d072dc60b47ebb32b168c4c69bbc36df643a471
+DIST psmisc-23.5.tar.xz 394012 BLAKE2B 258b82c9fff3765f33cdcd4150489b3e585a47b9065b1cb4f5b432bea4aa7766aab15b160cfb948df9e835c7ac09a9f185d663ab1cd376bedea53bdaf73fd776 SHA512 e908220350491a595ceaf96025a9aa14d832cacc8901545d0864152053fedaf9dc10f45fb2870aa2a00e4d9d8947243038357e14a82b04ab5d20c53e7f841a8d
diff --git a/sys-process/psmisc/files/psmisc-23.5-fix-killall-pidfd_send_signal.patch b/sys-process/psmisc/files/psmisc-23.5-fix-killall-pidfd_send_signal.patch
new file mode 100644
index 000000000000..0fc9c30a9635
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.5-fix-killall-pidfd_send_signal.patch
@@ -0,0 +1,40 @@
+https://gitlab.com/psmisc/psmisc/-/commit/6892e321e7042e3df60a5501a1c59d076e8a856f
+
+From 6892e321e7042e3df60a5501a1c59d076e8a856f Mon Sep 17 00:00:00 2001
+From: Craig Small <csmall@dropbear.xyz>
+Date: Mon, 18 Jul 2022 20:16:42 +1000
+Subject: [PATCH] killall: use kill if pidfd_send_signal() fails
+
+The pidfd_send_signal() system call appeared in Linux 5.1
+If psmisc is build on a system before then, or a non-Linux
+system, then kill() is used instead. However if psmisc is
+built on a Linux >= 5.1 system but run on a < 5.1 Linux
+system the system call fails and killall doesn't work.
+
+The fix, as proposed by Peter T. Breuer, is to try
+pidfd_send_signal() and if the return value is < 0 and
+errno is ENOSYS then we know at runtime the system call
+failed and we fall through to trusty old kill().
+
+Note, this means that killall on systems below 5.1 still
+have the race PID condition that the pidfd calls fix.
+
+References:
+ https://bugs.debian.org/1015228
+--- a/src/killall.c
++++ b/src/killall.c
+@@ -326,7 +326,12 @@ my_send_signal(
+ {
+ #ifdef __NR_pidfd_send_signal
+ if (pid > 0) /* Not PGID */
+- return syscall(__NR_pidfd_send_signal, pidfd, sig, NULL, 0);
++ {
++ int ret = syscall(__NR_pidfd_send_signal, pidfd, sig, NULL, 0);
++ if (ret >= 0 || errno != ENOSYS)
++ return ret;
++ // fall through if no such syscall
++ }
+ #endif
+ return kill(pid, sig);
+ }
+GitLab
diff --git a/sys-process/psmisc/psmisc-23.5.ebuild b/sys-process/psmisc/psmisc-23.5.ebuild
new file mode 100644
index 000000000000..221b3631be6d
--- /dev/null
+++ b/sys-process/psmisc/psmisc-23.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A set of tools that use the proc filesystem"
+HOMEPAGE="http://psmisc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls selinux test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ !=app-i18n/man-pages-l10n-4.0.0-r0
+ >=sys-libs/ncurses-5.7-r7:=
+ nls? ( virtual/libintl )
+ selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=sys-devel/libtool-2.2.6b
+ nls? ( sys-devel/gettext )
+ test? ( dev-util/dejagnu )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-killall-pidfd_send_signal.patch
+)
+
+src_configure() {
+ if tc-is-cross-compiler ; then
+ # This isn't ideal but upstream don't provide a placement
+ # when malloc is missing anyway, leading to errors like:
+ # pslog.c:(.text.startup+0x108): undefined reference to `rpl_malloc'
+ # See https://sourceforge.net/p/psmisc/bugs/71/
+ # (and https://lists.gnu.org/archive/html/autoconf/2011-04/msg00019.html)
+ export ac_cv_func_malloc_0_nonnull=yes \
+ ac_cv_func_realloc_0_nonnull=yes
+ fi
+
+ # No longer needed in > 23.5
+ # https://gitlab.com/psmisc/psmisc/-/commit/3fac667430341bdcec733da6eacd88b03813467a
+ # bug #802414
+ touch testsuite/global-conf.exp || die
+
+ local myeconfargs=(
+ --disable-harden-flags
+ --enable-ipv6
+ $(use_enable nls)
+ $(use_enable selinux)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-10-28 7:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-14 13:03 [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/, sys-process/psmisc/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2022-10-28 7:01 Sam James
2021-02-06 15:18 Lars Wendler
2018-09-24 11:27 Lars Wendler
2016-10-27 6:06 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox