[gentoo-commits] proj/musl:master commit in: sys-process/psmisc/files/, sys-process/psmisc/

["Georgy Yakovlev" <gyakovlev@gentoo.org>]

commit:     867ecd5fb3b1d6e2900627a23ae37e0209da19ca
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon May 31 01:17:03 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon May 31 01:18:29 2021 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=867ecd5f

sys-process/psmisc: treeclean

::gentoo version works, ppc64 ptregs patches no longer needed

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-process/psmisc/Manifest                        |  2 -
 sys-process/psmisc/files/include_limits.patch      | 45 ----------------
 sys-process/psmisc/files/musl_ptregs.patch         | 19 -------
 .../psmisc-23.4-fuser_regression_revert.patch      | 45 ----------------
 sys-process/psmisc/metadata.xml                    | 11 ----
 sys-process/psmisc/psmisc-23.3-r1.ebuild           | 56 -------------------
 sys-process/psmisc/psmisc-23.4-r1.ebuild           | 62 ----------------------
 7 files changed, 240 deletions(-)

diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
deleted file mode 100644
index 972c7e9..0000000
--- a/sys-process/psmisc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-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/include_limits.patch b/sys-process/psmisc/files/include_limits.patch
deleted file mode 100644
index 1b474bc..0000000
--- a/sys-process/psmisc/files/include_limits.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Author: Breno Leitao <brenohl@br.ibm.com>
-Date:   Thu Apr 6 13:59:57 2017 -0300
-
-    peekfd: Include headers for ppc64
-    
-    Currently peekfd fails to build on ppc64le architecture with musl
-    because it does not find reference for __WORDSIZE.
-    
-    This patch just includes reference for this macro if it was not
-    previously defined.
-
-Index: psmisc-22.21/src/peekfd.c
-===================================================================
---- psmisc-22.21.orig/src/peekfd.c
-+++ psmisc-22.21/src/peekfd.c
-@@ -37,6 +37,14 @@
- 
- #include "i18n.h"
- 
-+#if !defined(PATH_MAX)
-+#include <limits.h>
-+#endif
-+
-+#if !defined(__WORDSIZE)
-+#include <bits/reg.h>
-+#endif
-+
- #ifdef I386
- 	#define REG_ORIG_ACCUM orig_eax
- 	#define REG_ACCUM eax
-Index: psmisc-22.21/src/pstree.c
-===================================================================
---- psmisc-22.21.orig/src/pstree.c
-+++ psmisc-22.21/src/pstree.c
-@@ -45,6 +45,10 @@
- #include "i18n.h"
- #include "comm.h"
- 
-+#if !defined(PATH_MAX)
-+#include <limits.h>
-+#endif
-+
- #ifdef WITH_SELINUX
- #include <selinux/selinux.h>
- #else

diff --git a/sys-process/psmisc/files/musl_ptregs.patch b/sys-process/psmisc/files/musl_ptregs.patch
deleted file mode 100644
index e8d4387..0000000
--- a/sys-process/psmisc/files/musl_ptregs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Breno Leitao <brenohl@br.ibm.com>
-Date:   Thu Apr 6 14:03:00 2017 -0300
-
-    peekfd: Avoid pt_regs clash
-
-Index: psmisc-22.21/src/peekfd.c
-===================================================================
---- a/src/peekfd.c.old
-+++ b/src/peekfd.c
-@@ -27,7 +27,9 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/syscall.h>
-+#define pt_regs uapi_pt_regs
- #include <asm/ptrace.h>
-+#undef pt_regs
- #include <byteswap.h>
- #include <endian.h>
- #include <sys/user.h>

diff --git a/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch b/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch
deleted file mode 100644
index 59b2bfc..0000000
--- a/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://gitlab.com/psmisc/psmisc/-/issues/35
-
-diff --git a/ChangeLog b/ChangeLog
-index df45ae3..be20ca0 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -5,8 +5,6 @@ Changes in 23.4
- 	* pstree: fix layout when using -C !24
- 	* pstree: add time namespace !25
- 	* pstree: Dynamically link to selinux and use attr
--	* fuser: Get less confused about duplicate dev_id !10
--	* fuser: Only check pathname on non-block devices !31
- 
- Changes in 23.3
- ===============
-diff --git a/src/fuser.c b/src/fuser.c
-index 03e6237..f9d78db 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -1566,7 +1566,6 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head,
- 	struct stat st, lst;
- 	char *dirpath;
- 	char filepath[PATH_MAX];
--	char real_filepath[PATH_MAX];
- 
- 	if (asprintf(&dirpath, "/proc/%d/%s", pid, dirname) < 0)
-         return;
-@@ -1605,17 +1604,6 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head,
- 			     dev_tmp = dev_tmp->next) {
- 				if (thedev != dev_tmp->device)
- 					continue;
--
--				/* check the paths match if it is not a block device */
--				if (! S_ISBLK(dev_tmp->name->st.st_mode)) {
--				    if (readlink(filepath, real_filepath, PATH_MAX-1) < 0) {
--					if (strncmp(dev_tmp->name->filename, filepath, strlen(dev_tmp->name->filename)) != 0)
--					    continue;
--				    } else {
--					if (strncmp(dev_tmp->name->filename, real_filepath, strlen(dev_tmp->name->filename)) != 0)
--					    continue;
--				    }
--				}
- 				if (access == ACCESS_FILE
- 				    && (lstat(filepath, &lst) == 0)
- 				    && (lst.st_mode & S_IWUSR)) {

diff --git a/sys-process/psmisc/metadata.xml b/sys-process/psmisc/metadata.xml
deleted file mode 100644
index df39eb8..0000000
--- a/sys-process/psmisc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="sourceforge">psmisc</remote-id>
-</upstream>
-</pkgmetadata>

diff --git a/sys-process/psmisc/psmisc-23.3-r1.ebuild b/sys-process/psmisc/psmisc-23.3-r1.ebuild
deleted file mode 100644
index edc88ce..0000000
--- a/sys-process/psmisc/psmisc-23.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}"
-BDEPEND=">=sys-devel/libtool-2.2.6b
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	default
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/include_limits.patch
-		eapply "${FILESDIR}"/musl_ptregs.patch
-	fi
-
-	eapply_user
-}
-
-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
-}

diff --git a/sys-process/psmisc/psmisc-23.4-r1.ebuild b/sys-process/psmisc/psmisc-23.4-r1.ebuild
deleted file mode 100644
index 311f4ee..0000000
--- a/sys-process/psmisc/psmisc-23.4-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="!=app-i18n/man-pages-l10n-4.0.0-r0
-	>=sys-libs/ncurses-5.7-r7:0=
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=sys-devel/libtool-2.2.6b
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=(
-	# https://gitlab.com/psmisc/psmisc/-/issues/35
-	"${FILESDIR}/${PN}-23.4-fuser_regression_revert.patch"
-)
-
-src_prepare() {
-	default
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/include_limits.patch
-		eapply "${FILESDIR}"/musl_ptregs.patch
-	fi
-
-	eapply_user
-}
-
-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
-}