commit: 29f9c8423a9247fdc7d594c1ed7372e6c58c32ae
Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Tue Apr 13 13:24:23 2021 +0000
Commit: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
CommitDate: Tue Apr 13 13:24:23 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=29f9c842
sys-process/psmisc: sync with ::gentoo
Package-Manager: Portage-3.0.18, Repoman-3.0.3
RepoMan-Options: --force
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>
sys-process/psmisc/Manifest | 3 +-
sys-process/psmisc/files/musl_ptregs.patch | 19 +++++++++++
...psmisc-23.1-r1.ebuild => psmisc-23.3-r1.ebuild} | 36 ++++++++++++--------
.../{psmisc-23.1-r1.ebuild => psmisc-23.4.ebuild} | 38 ++++++++++++++--------
4 files changed, 68 insertions(+), 28 deletions(-)
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index c193226..972c7e9 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1 +1,2 @@
-DIST psmisc-23.1.tar.xz 296136 BLAKE2B
e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be
SHA512
f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
+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/musl_ptregs.patch
b/sys-process/psmisc/files/musl_ptregs.patch
new file mode 100644
index 0000000..e8d4387
--- /dev/null
+++ b/sys-process/psmisc/files/musl_ptregs.patch
@@ -0,0 +1,19 @@
+Author: Breno Leitao <[email protected]>
+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/psmisc-23.1-r1.ebuild
b/sys-process/psmisc/psmisc-23.3-r1.ebuild
similarity index 53%
copy from sys-process/psmisc/psmisc-23.1-r1.ebuild
copy to sys-process/psmisc/psmisc-23.3-r1.ebuild
index 0b0046d..c4107d2 100644
--- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="A set of tools that use the proc filesystem"
HOMEPAGE="http://psmisc.sourceforge.net/";
@@ -9,42 +9,52 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
+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
+DEPEND="${RDEPEND}"
+BDEPEND=">=sys-devel/libtool-2.2.6b
nls? ( sys-devel/gettext )"
DOCS=( AUTHORS ChangeLog NEWS README )
PATCHES=(
- "${FILESDIR}"/${P}-include_limits.patch
+ "${FILESDIR}"/include_limits.patch
+ "${FILESDIR}"/musl_ptregs.patch
)
+src_prepare() {
+ default
+
+ if use elibc_musl ; then
+ eapply "${FILESDIR}"/musl_ptregs.patch
+ fi
+
+ eapply_user
+}
+
src_configure() {
local myeconfargs=(
- $(use_enable selinux)
--disable-harden-flags
$(use_enable ipv6)
$(use_enable nls)
+ $(use_enable selinux)
)
econf "${myeconfargs[@]}"
}
-src_compile() {
- emake
-}
-
src_install() {
default
- use X || rm -f "${ED%/}"/usr/bin/pstree.x11
+ 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
+ mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
}
diff --git a/sys-process/psmisc/psmisc-23.1-r1.ebuild
b/sys-process/psmisc/psmisc-23.4.ebuild
similarity index 50%
rename from sys-process/psmisc/psmisc-23.1-r1.ebuild
rename to sys-process/psmisc/psmisc-23.4.ebuild
index 0b0046d..be543f1 100644
--- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="A set of tools that use the proc filesystem"
HOMEPAGE="http://psmisc.sourceforge.net/";
@@ -9,42 +9,52 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
+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=
+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}
- >=sys-devel/libtool-2.2.6b
+DEPEND="${RDEPEND}"
+BDEPEND=">=sys-devel/libtool-2.2.6b
nls? ( sys-devel/gettext )"
DOCS=( AUTHORS ChangeLog NEWS README )
PATCHES=(
- "${FILESDIR}"/${P}-include_limits.patch
+ "${FILESDIR}"/include_limits.patch
)
+src_prepare() {
+ default
+
+ if use elibc_musl ; then
+ "${FILESDIR}"/musl_ptregs.patch
+ fi
+
+ eapply_user
+}
+
src_configure() {
local myeconfargs=(
- $(use_enable selinux)
--disable-harden-flags
$(use_enable ipv6)
$(use_enable nls)
+ $(use_enable selinux)
)
econf "${myeconfargs[@]}"
}
-src_compile() {
- emake
-}
-
src_install() {
default
- use X || rm -f "${ED%/}"/usr/bin/pstree.x11
+ 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
+ mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
}
