mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-04 11:51:14 +02:00
sys-process/psmisc: Sync with Gentoo
It's from Gentoo commit ef1042d390c67938faa924d4283654912f794f3c.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
eafebb6994
commit
846afa7efc
@ -1,3 +1,2 @@
|
||||
DIST psmisc-23.4.tar.xz 370000 BLAKE2B e762171c4d3252421a49b352fadb3e892f66862f003a313a0cc692f973364b06d2652a51d331314462784d94ad55189e74c4d7a023d5d7c917c5e5c05009f46b SHA512 b05781fdb283a6f132bd385d64437f8080e6bc0e11cd2e3e02227678682bb67b3c89edec34a6d067d77312811d072dc60b47ebb32b168c4c69bbc36df643a471
|
||||
DIST psmisc-23.5.tar.xz 394012 BLAKE2B 258b82c9fff3765f33cdcd4150489b3e585a47b9065b1cb4f5b432bea4aa7766aab15b160cfb948df9e835c7ac09a9f185d663ab1cd376bedea53bdaf73fd776 SHA512 e908220350491a595ceaf96025a9aa14d832cacc8901545d0864152053fedaf9dc10f45fb2870aa2a00e4d9d8947243038357e14a82b04ab5d20c53e7f841a8d
|
||||
DIST psmisc-23.6.tar.xz 424736 BLAKE2B 468bf4e84695efcedb832f890b6201b7bc4aca7c5aabaf30e67f4471671421897ee7cd67f01d4b3d60c3e1c63752eb7384e627e75fa7db290cd749da08e2f788 SHA512 4daffbd1726e50d9344f8578dd4c10f0b8f7971929ec667490de31122e5f3828747e1bafb3ed3c37ed7e1758ab9ec43b8f4556b676a416a8efbc7c6c88b6985d
|
||||
DIST psmisc-23.7.tar.xz 432208 BLAKE2B 5064f929bf320c3fe91d3e665479dcb0913b12f4dddd23e49e296509f89e29b5d147b411c33cca9892a43d955c8e431bccf00872ae86a9c9d2545295f05b69d7 SHA512 8180d24355b3b0f3102044916d078b1aa9a1af3d84f1e14db79e33e505390167012adbb1a8a5f47a692f3a14aba1eb5f1f8f37f328392e8635b89966af9b2128
|
||||
|
||||
@ -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)) {
|
||||
@ -1,40 +0,0 @@
|
||||
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
|
||||
@ -1,72 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
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="ipv6 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="
|
||||
>=dev-build/libtool-2.2.6b
|
||||
nls? ( sys-devel/gettext )
|
||||
test? ( dev-util/dejagnu )
|
||||
"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README )
|
||||
|
||||
PATCHES=(
|
||||
# https://gitlab.com/psmisc/psmisc/-/issues/35
|
||||
"${FILESDIR}/${PN}-23.4-fuser_regression_revert.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
|
||||
|
||||
# bug #802414
|
||||
touch testsuite/global-conf.exp || die
|
||||
|
||||
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
|
||||
}
|
||||
@ -12,12 +12,13 @@ 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"
|
||||
IUSE="apparmor nls selinux test X"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
!=app-i18n/man-pages-l10n-4.0.0-r0
|
||||
>=sys-libs/ncurses-5.7-r7:=
|
||||
apparmor? ( sys-libs/libapparmor )
|
||||
nls? ( virtual/libintl )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
"
|
||||
@ -30,10 +31,6 @@ BDEPEND="
|
||||
|
||||
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
|
||||
@ -45,14 +42,12 @@ src_configure() {
|
||||
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=(
|
||||
# Hardening flags are set by our toolchain alraedy. Setting these
|
||||
# in packages means toolchain & users can't set something tougher.
|
||||
--disable-harden-flags
|
||||
--enable-ipv6
|
||||
$(use_enable apparmor)
|
||||
$(use_enable nls)
|
||||
$(use_enable selinux)
|
||||
)
|
||||
Loading…
x
Reference in New Issue
Block a user