mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-04 00:08:09 -07:00
sys-process/procps: Ignore failure in sysctl
Don't error for close_stream failure if the config line begins with "-" Closes: https://bugs.gentoo.org/969014 Bug: https://gitlab.com/procps-ng/procps/-/issues/410 Signed-off-by: Ulrich Müller <ulm@gentoo.org>
This commit is contained in:
Ulrich Müller
@@ -0,0 +1,21 @@
|
||||
Don't error for close_stream failure if the config line begins with "-"
|
||||
https://bugs.gentoo.org/969014
|
||||
https://gitlab.com/procps-ng/procps/-/issues/410
|
||||
|
||||
--- procps-ng-4.0.5/src/sysctl.c
|
||||
+++ procps-ng-4.0.5/src/sysctl.c
|
||||
@@ -623,9 +623,12 @@ static int WriteSetting(
|
||||
if (0 < fprintf(fp, "%s\n", value))
|
||||
rc = EXIT_SUCCESS;
|
||||
if (close_stream(fp) != 0) {
|
||||
- xwarn(_("setting key \"%s\""), dotted_key);
|
||||
+ xwarn(_("setting key \"%s\"%s"),
|
||||
+ dotted_key, (ignore_failure?_(", ignoring"):""));
|
||||
free(dotted_key);
|
||||
- return EXIT_FAILURE;
|
||||
+ if (!ignore_failure)
|
||||
+ rc = EXIT_FAILURE;
|
||||
+ return rc;
|
||||
}
|
||||
}
|
||||
}
|
||||
135
sys-process/procps/procps-4.0.5-r4.ebuild
Normal file
135
sys-process/procps/procps-4.0.5-r4.ebuild
Normal file
@@ -0,0 +1,135 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools flag-o-matic multilib-minimal toolchain-funcs
|
||||
|
||||
DESCRIPTION="Standard informational utilities and process-handling tools"
|
||||
HOMEPAGE="https://gitlab.com/procps-ng/procps"
|
||||
# Per e.g. https://gitlab.com/procps-ng/procps/-/releases/v4.0.5, the dist tarballs
|
||||
# are still hosted on SF.
|
||||
SRC_URI="https://downloads.sourceforge.net/${PN}-ng/${PN}-ng-${PV}.tar.xz"
|
||||
S="${WORKDIR}"/${PN}-ng-${PV}
|
||||
|
||||
# See bug #913210
|
||||
LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
|
||||
SLOT="0/1-ng"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
IUSE="elogind +kill modern-top +ncurses nls selinux static-libs skill systemd test unicode"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="
|
||||
elogind? ( sys-auth/elogind )
|
||||
elibc_musl? ( sys-libs/error-standalone )
|
||||
ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode(+)?] )
|
||||
selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
|
||||
systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
!<app-i18n/man-pages-l10n-4.2.0-r1
|
||||
!<app-i18n/man-pages-de-2.12-r1
|
||||
!<app-i18n/man-pages-pl-0.7-r1
|
||||
!<app-i18n/man-pages-zh_CN-1.6.4.2
|
||||
kill? (
|
||||
!sys-apps/coreutils[kill]
|
||||
!sys-apps/util-linux[kill]
|
||||
)
|
||||
"
|
||||
BDEPEND="
|
||||
elogind? ( virtual/pkgconfig )
|
||||
elibc_musl? ( virtual/pkgconfig )
|
||||
ncurses? ( virtual/pkgconfig )
|
||||
systemd? ( virtual/pkgconfig )
|
||||
test? ( dev-util/dejagnu )
|
||||
"
|
||||
|
||||
# bug #898830
|
||||
QA_CONFIG_IMPL_DECL_SKIP=( makedev )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-4.0.4-xfail-pmap-test.patch
|
||||
"${FILESDIR}"/${PN}-4.0.5-sysctl-manpage.patch # bug #565304
|
||||
"${FILESDIR}"/${PN}-4.0.5-fix-tests-multilib.patch
|
||||
"${FILESDIR}"/${PN}-4.0.5-top-legacy-config-vuln.patch # bug #958286
|
||||
"${FILESDIR}"/${PN}-4.0.5-macos.patch
|
||||
"${FILESDIR}"/${PN}-4.0.5-pgrep-old-linux-headers.patch # bug #911375
|
||||
"${FILESDIR}"/${PN}-4.0.5-pidwait-half.patch # bug #959706
|
||||
"${FILESDIR}"/${PN}-4.0.5-pgrep-pidwait.patch
|
||||
"${FILESDIR}"/${PN}-4.0.5-sysctl-ignore_failure.patch # bug #969014
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Only needed for fix-tests-multilib.patch and pgrep-old-linux-headers.patch
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
|
||||
# bug #471102
|
||||
append-lfs-flags
|
||||
|
||||
# Workaround for bug #947680, can be dropped w/ >4.0.5
|
||||
if use elibc_musl ; then
|
||||
append-cflags "$($(tc-getPKG_CONFIG) --cflags error-standalone)"
|
||||
append-libs "$($(tc-getPKG_CONFIG) --libs error-standalone)"
|
||||
fi
|
||||
|
||||
local myeconfargs=(
|
||||
# No elogind multilib support
|
||||
$(multilib_native_use_with elogind)
|
||||
$(multilib_native_use_enable kill)
|
||||
$(multilib_native_use_enable modern-top)
|
||||
$(multilib_native_enable pidof)
|
||||
$(multilib_native_enable pidwait)
|
||||
$(multilib_native_use_with ncurses)
|
||||
# bug #794997
|
||||
$(multilib_native_use_enable !elibc_musl w)
|
||||
$(use_enable nls)
|
||||
$(use_enable selinux libselinux)
|
||||
$(use_enable static-libs static)
|
||||
$(use_with systemd)
|
||||
$(use_enable skill)
|
||||
)
|
||||
|
||||
if use ncurses; then
|
||||
# Only pass whis when we are building the 'watch' command
|
||||
myeconfargs+=( $(multilib_native_use_enable unicode watch8bit) )
|
||||
fi
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
local ps="${BUILD_DIR}/src/ps/pscommand"
|
||||
if [[ $("${ps}" --no-headers -o cls -q $$) == IDL ]]; then
|
||||
# bug #708230
|
||||
ewarn "Skipping tests due to SCHED_IDLE"
|
||||
else
|
||||
# bug #461302
|
||||
emake check </dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
|
||||
dodoc "${S}"/sysctl.conf
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
# We keep ps and kill in /bin per bug #565304.
|
||||
dodir /bin
|
||||
mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
|
||||
if use kill; then
|
||||
mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
find "${ED}" -type f -name '*.la' -delete || die
|
||||
}
|
||||
Reference in New Issue
Block a user