From a5d8e2b81443538f98e23ffd599417e7ed3ac281 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sun, 9 Nov 2025 11:44:41 +0100 Subject: [PATCH] app-shells/pdsh: add 2.35 Bug: https://bugs.gentoo.org/944175 Signed-off-by: David Seifert --- app-shells/pdsh/Manifest | 1 + app-shells/pdsh/files/pdsh-2.35-c23.patch | 29 ++++++++++ app-shells/pdsh/pdsh-2.35.ebuild | 70 +++++++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 app-shells/pdsh/files/pdsh-2.35-c23.patch create mode 100644 app-shells/pdsh/pdsh-2.35.ebuild diff --git a/app-shells/pdsh/Manifest b/app-shells/pdsh/Manifest index 82503ee9c03e..3e8395c67b85 100644 --- a/app-shells/pdsh/Manifest +++ b/app-shells/pdsh/Manifest @@ -1 +1,2 @@ DIST pdsh-2.34.tar.gz 215708 BLAKE2B dba626c66b9a17536fc02d8482b776d539ee680354326c821dc916735d1fc115226fcf22868407830245067cf45ddf9c997cd8c382b0dde0168d9ed6cb4fcc4d SHA512 2d4e090d97f6bad97ee1dbdf2ee29e4d9603edfd5c92a6935131ef7f7bbff797cceb8ad3a72e3d5995d3d5302eac985d129f4968e3fa6744785a3df2d0fda33c +DIST pdsh-2.35.tar.gz 215457 BLAKE2B 98e6a7a66bcc3e5620293cd609ddbd64c89810776b426fa6fce86ed65fb5e86fc7bb955bfaeb22ad1410a2296d3a82ee80db595f98c20fa71b2b866821014923 SHA512 fcfb72fa6db7d44599c93cee4dbf91acb7dc35e7e4a3da54e21ac4fa5feb0164bb8f2c4293c90cbc085c25f79af71008dc5de05a716a0070a46b1f4f249c47d8 diff --git a/app-shells/pdsh/files/pdsh-2.35-c23.patch b/app-shells/pdsh/files/pdsh-2.35-c23.patch new file mode 100644 index 000000000000..4f0c0f5482a0 --- /dev/null +++ b/app-shells/pdsh/files/pdsh-2.35-c23.patch @@ -0,0 +1,29 @@ +From 01b1a2150e5d2c1a065aeb05a504f1f92b2cc147 Mon Sep 17 00:00:00 2001 +From: Egbert Eich +Date: Sun, 9 Mar 2025 11:12:22 +0100 +Subject: [PATCH] Fix build on C23 compiler (gcc >= 15) + +'true' and 'false' are proper keywords in C23. +This fixes issue #165. + +Signed-off-by: Egbert Eich +--- + src/common/macros.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/common/macros.h b/src/common/macros.h +index 3cab336..ea227ab 100644 +--- a/src/common/macros.h ++++ b/src/common/macros.h +@@ -58,9 +58,11 @@ + + #ifndef _BOOL_DEFINED + # define _BOOL_DEFINED ++# if __STDC_VERSION__ < 202311L + # if !defined (true) && !defined (false) + typedef enum { false, true } bool; + # endif ++# endif + #endif + + #endif /* !_MACROS_INCLUDED */ diff --git a/app-shells/pdsh/pdsh-2.35.ebuild b/app-shells/pdsh/pdsh-2.35.ebuild new file mode 100644 index 000000000000..21de8fcba265 --- /dev/null +++ b/app-shells/pdsh/pdsh-2.35.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A high-performance, parallel remote shell utility" +HOMEPAGE="https://github.com/chaos/pdsh" +SRC_URI="https://github.com/chaos/pdsh/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="crypt readline rsh test" +RESTRICT="!test? ( test )" + +RDEPEND=" + crypt? ( virtual/openssh ) + rsh? ( net-misc/netkit-rsh ) + readline? ( sys-libs/readline:= )" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-util/dejagnu )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.35-c23.patch +) + +pkg_setup() { + PDSH_MODULE_LIST="${PDSH_MODULE_LIST:-netgroup}" + MODULE_CONFIG="" + + local m + local valid_modules=":xcpu:ssh:exec:qshell:genders:nodeupdown:mrsh:mqshell:dshgroups:netgroup:" + + for m in ${PDSH_MODULE_LIST}; do + if [[ "${valid_modules}" == *:${m}:* ]]; then + MODULE_CONFIG="${MODULE_CONFIG} --with-${m}" + fi + done + + elog "Building ${PF} with the following modules:" + elog " ${PDSH_MODULE_LIST}" + elog "This list can be changed in /etc/portage/make.conf by setting" + elog "PDSH_MODULE_LIST=\"module1 module2...\"" +} + +src_prepare() { + default + sed \ + -e '/git describe/d' \ + -e "s|AC_INIT(\[pdsh\],|AC_INIT(\[pdsh\],\[${PV}\])|g" \ + -i configure.ac \ + || die + eautoreconf +} + +src_configure() { + local myconf=( + ${MODULE_CONFIG} + --with-machines + --enable-shared + --disable-static + $(use_with crypt ssh) + $(use_with rsh) + $(use_with readline) + ) + econf "${myconf[@]}" +}