* [gentoo-commits] proj/musl:master commit in: sys-process/psmisc/files/, sys-process/psmisc/
@ 2016-11-09 20:10 Aric Belsito
0 siblings, 0 replies; 5+ messages in thread
From: Aric Belsito @ 2016-11-09 20:10 UTC (permalink / raw
To: gentoo-commits
commit: 1eedaf1a58de50c6a5713fd4679e7509f10cc48a
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Nov 9 20:09:32 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Nov 9 20:09:32 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1eedaf1a
sys-process/psmisc: Sync with upstream
Drop r99 postfix.
sys-process/psmisc/Manifest | 4 +-
.../psmisc/files/psmisc-22.21-fuser_typo_fix.patch | 44 ++++++++++++++++++++++
.../psmisc/files/psmisc-22.21-sysmacros.patch | 26 +++++++++++++
...isc-22.21-r99.ebuild => psmisc-22.21-r3.ebuild} | 14 +++++--
4 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index d8fc7ab..d533682 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,4 +1,6 @@
AUX psmisc-22.21-add-limits_h.patch 355 SHA256 363ba4dcc2627d7db260f29a97888fe8b58315fa5317bf3506e685c9fc30e46e SHA512 a26cd96decdbcb7ed8822a5cee74254b428a0ff8b76c972b08be80a345f29bfb915ccd7b3816d1ca0c559ddc7b1a945f49091142abef74e508d57ba487b39c49 WHIRLPOOL 3fc7e0172f709158a19e7f6679d1918f8abd4a085be99537634beff5075eb7527cf9dbf20ed960047b7506ce7800808560245cb76ae87cda27b01d70d0aa14bd
+AUX psmisc-22.21-fuser_typo_fix.patch 1226 SHA256 51c251f07ad0a898a5654fe18d8955e08943025c5df2f73d0f65d00c4b6c3c92 SHA512 c2e46a19959f368935462bc93bde8bf5ee4a3b5530a66255cd9a83be04acbc6246e0a3900efeb1cb9f1bbaf5a1435c0c65d677f643664be25f87662e6048c930 WHIRLPOOL 48c6bc0bd4c4b521be621406d5b52d4df47687307ec681e5c20dfce77db22c7f1db322d40614a9eb59cfa3aebd287af8e23b6ce9cba21dd986f78718669c34e5
+AUX psmisc-22.21-sysmacros.patch 693 SHA256 c3e071e67c808c68acc49edc3b8d7ad665780403ca697e6e74b290816ec91633 SHA512 febac721daad0046eb8367015657904eafaa934dc4b314f19ec487c1953ea2f4ff70e79e7c94473a20e5a69e7ed1eb17a4cfbbac6b102622b12322bb9cc76a09 WHIRLPOOL 394bfdfc37f8ed754092b5868a5bafd1858fdc8ee00b060f0455bd0736ed84288b7bd1aed0d9e17c108fcc166b056dd10547f067be3ee0e25e4b0db9bfd6a509
DIST psmisc-22.21.tar.gz 457702 SHA256 97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae WHIRLPOOL cbd4af3e54ce01f43558184b57a24e44dfb6e05d8438bd11e2308ee62535bb93dc417b08e66603966cc5912d7fa88c29df1529995a42e2a8b7c3da663b01681f
-EBUILD psmisc-22.21-r99.ebuild 1237 SHA256 81cdbeabdc803e1b8c802b62fa7655787958e2f9c53469fa81f97c2686d7f1b1 SHA512 c1b0bcfe3f27e6b3e49ca17d4b07130b3236184b3fc66dae49e35151407083176998d9b87a6fccfb324b5743e9027b516541a067c67f0e1730fe02c4b2f6447d WHIRLPOOL 29cff0f558de06982f499b14a76943dab1e5583a7e65ac265df90679108e5c28336f9a449eb12bf019e4ae619f87e02e823f99c8bacdb64bb259b4b2d1f42f82
+EBUILD psmisc-22.21-r3.ebuild 1439 SHA256 00354a92c6189309051fe34a0a904c4669d7aff9f92600f3153e97e656e8e8b6 SHA512 626ac29a208d3caf05999da9db23eb8a7454984c68513ed83a29d4d1895a20d4859574d6593de65d2946ad1031d0a6d1854013e0151e6dfe5ed8e9e0e5836b87 WHIRLPOOL 22a4a0218cc31a388c52ef1d0e411c336c13cc79b399dffdf29fcb6e598e0e1e0397a7a50f8a822530cc0eccc23f7cf73a8c71b29450c0220f9b2a63945dd930
MISC metadata.xml 326 SHA256 f9e015cc6214350091a0d68a07299ed5e6ad518b10eb91902da25726658623f3 SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c WHIRLPOOL c0a2727f3ee0a38abe0ad2ceb0adf0b476a1fe9ba8435168c457aa0326aa8fb54f25d7828ac11a1f98b9e1066e69112ecb77b02111449680b64073163130bfa5
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
new file mode 100644
index 0000000..5c5fd99
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch
@@ -0,0 +1,44 @@
+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
new file mode 100644
index 0000000..440c5e6
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch
@@ -0,0 +1,26 @@
+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-r99.ebuild b/sys-process/psmisc/psmisc-22.21-r3.ebuild
similarity index 77%
rename from sys-process/psmisc/psmisc-22.21-r99.ebuild
rename to sys-process/psmisc/psmisc-22.21-r3.ebuild
index cc44e77..800f359 100644
--- a/sys-process/psmisc/psmisc-22.21-r99.ebuild
+++ b/sys-process/psmisc/psmisc-22.21-r3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI=5
inherit eutils
@@ -12,10 +12,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
+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
+RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
nls? ( virtual/libintl )
selinux? ( sys-libs/libselinux )"
DEPEND="${RDEPEND}
@@ -24,8 +24,14 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog NEWS README"
+PATCHES=(
+ "${FILESDIR}/${P}-fuser_typo_fix.patch"
+ "${FILESDIR}/${P}-sysmacros.patch"
+ "${FILESDIR}/${P}-add-limits_h.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-add-limits_h.patch
+ epatch "${PATCHES[@]}"
}
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-process/psmisc/files/, sys-process/psmisc/
@ 2019-01-28 13:41 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2019-01-28 13:41 UTC (permalink / raw
To: gentoo-commits
commit: 75fbd9b9e5ef9497cf1d85c85ff2a40a808894bf
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sun Jan 27 21:14:13 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 13:41:21 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=75fbd9b9
sys-process/psmisc: add patchset from alpine to fix breakage
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
.../psmisc/files/psmisc-23.1-include_limits.patch | 45 ++++++++++++++++++++++
.../psmisc/files/psmisc-23.1-musl_ptregs.patch | 45 ++++++++++++++++++++++
sys-process/psmisc/psmisc-23.1-r1.ebuild | 5 +++
3 files changed, 95 insertions(+)
diff --git a/sys-process/psmisc/files/psmisc-23.1-include_limits.patch b/sys-process/psmisc/files/psmisc-23.1-include_limits.patch
new file mode 100644
index 0000000..1b474bc
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.1-include_limits.patch
@@ -0,0 +1,45 @@
+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/psmisc-23.1-musl_ptregs.patch b/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch
new file mode 100644
index 0000000..1b474bc
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch
@@ -0,0 +1,45 @@
+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/psmisc-23.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild
index bad4699..e52f2cb 100644
--- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.1-r1.ebuild
@@ -21,6 +21,11 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
+PATCHES=(
+ "${FILESDIR}"/${P}-include_limits.patch
+ "${FILESDIR}"/${P}-musl_ptregs.patch
+)
+
src_configure() {
local myeconfargs=(
$(use_enable selinux)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-process/psmisc/files/, sys-process/psmisc/
@ 2021-04-13 13:24 Dave Hughes
0 siblings, 0 replies; 5+ messages in thread
From: Dave Hughes @ 2021-04-13 13:24 UTC (permalink / raw
To: gentoo-commits
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 <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/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
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-process/psmisc/files/, sys-process/psmisc/
@ 2021-04-15 12:18 Dave Hughes
0 siblings, 0 replies; 5+ messages in thread
From: Dave Hughes @ 2021-04-15 12:18 UTC (permalink / raw
To: gentoo-commits
commit: 4e0f50f1fb7619279073c85dd5670017120862d8
Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Thu Apr 15 12:18:30 2021 +0000
Commit: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
CommitDate: Thu Apr 15 12:18:30 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=4e0f50f1
sys-process/psmisc: sync with ::gentoo
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>
.../psmisc-23.4-fuser_regression_revert.patch | 45 ++++++++++++++++++++++
.../{psmisc-23.4.ebuild => psmisc-23.4-r1.ebuild} | 5 +++
2 files changed, 50 insertions(+)
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
new file mode 100644
index 0000000..59b2bfc
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch
@@ -0,0 +1,45 @@
+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/psmisc-23.4.ebuild b/sys-process/psmisc/psmisc-23.4-r1.ebuild
similarity index 91%
rename from sys-process/psmisc/psmisc-23.4.ebuild
rename to sys-process/psmisc/psmisc-23.4-r1.ebuild
index 31edc94..7d1b6cc 100644
--- a/sys-process/psmisc/psmisc-23.4.ebuild
+++ b/sys-process/psmisc/psmisc-23.4-r1.ebuild
@@ -22,6 +22,11 @@ BDEPEND=">=sys-devel/libtool-2.2.6b
DOCS=( AUTHORS ChangeLog NEWS README )
+PATCHES=(
+ # https://gitlab.com/psmisc/psmisc/-/issues/35
+ "${FILESDIR}/${PN}-23.4-fuser_regression_revert.patch"
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-process/psmisc/files/, sys-process/psmisc/
@ 2021-05-31 1:21 Georgy Yakovlev
0 siblings, 0 replies; 5+ messages in thread
From: Georgy Yakovlev @ 2021-05-31 1:21 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-31 1:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-28 13:41 [gentoo-commits] proj/musl:master commit in: sys-process/psmisc/files/, sys-process/psmisc/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2021-05-31 1:21 Georgy Yakovlev
2021-04-15 12:18 Dave Hughes
2021-04-13 13:24 Dave Hughes
2016-11-09 20:10 Aric Belsito
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox