commit: eaef5aaf71caab2641d55ba1e4b4f090847cdb8d Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Wed Aug 25 07:23:24 2021 +0000 Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> CommitDate: Wed Aug 25 08:00:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eaef5aaf
sys-cluster/launchmon: EAPI 8, enable tests, fix bashism Closes: https://bugs.gentoo.org/802231 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> .../launchmon-1.0.2_p20210430-fix-bashism.patch | 80 ++++++++++++++++++++++ ....ebuild => launchmon-1.0.2_p20210430-r2.ebuild} | 8 ++- 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/sys-cluster/launchmon/files/launchmon-1.0.2_p20210430-fix-bashism.patch b/sys-cluster/launchmon/files/launchmon-1.0.2_p20210430-fix-bashism.patch new file mode 100644 index 000000000..5088c99e3 --- /dev/null +++ b/sys-cluster/launchmon/files/launchmon-1.0.2_p20210430-fix-bashism.patch @@ -0,0 +1,80 @@ +From 1a651a0bb19ad8c0752b497eed125a901d7f83da Mon Sep 17 00:00:00 2001 +From: Alessandro Barbieri <lssndrbarbi...@gmail.com> +Date: Wed, 25 Aug 2021 09:13:37 +0200 +Subject: [PATCH] fix == bashism + +--- + config/x_ac_handshake.m4 | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- a/config/x_ac_handshake.m4 ++++ b/config/x_ac_handshake.m4 +@@ -50,7 +50,7 @@ AC_DEFUN([X_AC_HANDSHAKE],[ + + #Check for munge availability + PKG_CHECK_MODULES(MUNGE, munge, , [AC_MSG_NOTICE([pkg-config could not find munge])]) +- if test "x$MUNGE_LIBS" == "x"; then ++ if test "x$MUNGE_LIBS" = "x"; then + MUNGE_LIBS=-lmunge + fi + CFLAGS="$CFLAGS $MUNGE_CFLAGS" +@@ -66,26 +66,26 @@ AC_DEFUN([X_AC_HANDSHAKE],[ + + #If the user did not specify security options, then make some choices based on what we have + if test "x$EXPLICIT_SEC" != "xtrue"; then +- if test "x$HAVE_MUNGE" == "xtrue"; then ++ if test "x$HAVE_MUNGE" = "xtrue"; then + MUNGE="true" + else + ENABLE_NULL_ENCRYPTION="true" + fi + fi + +- if test "x$WANT_MUNGE" == "xtrue"; then +- if test "x$HAVE_MUNGE" == "xtrue"; then ++ if test "x$WANT_MUNGE" = "xtrue"; then ++ if test "x$HAVE_MUNGE" = "xtrue"; then + MUNGE="true" + else + AC_MSG_ERROR([Could not find munge]) + fi + fi + +- if test "x$WANT_KEYFILE" == "xtrue"; then ++ if test "x$WANT_KEYFILE" = "xtrue"; then + KEYFILE="true" + fi + +- if test "x$WANT_NOSEC" == "xtrue"; then ++ if test "x$WANT_NOSEC" = "xtrue"; then + ENABLE_NULL_ENCRYPTION="true" + fi + +@@ -100,7 +100,7 @@ AC_DEFUN([X_AC_HANDSHAKE],[ + #if test "x$KEYFILE" != "x"; then + # AC_MSG_ERROR([Keyfile security is not supported at this time]) + #fi +- #if test "x$ENABLE_NULL_ENCRYPTION x$MUNGE" == "xtrue xtrue"; then ++ #if test "x$ENABLE_NULL_ENCRYPTION x$MUNGE" = "xtrue xtrue"; then + # AC_MSG_ERROR([Cannot support multiple security models at this time]) + #fi + #Remove above when expanding to more than munge +@@ -108,15 +108,15 @@ AC_DEFUN([X_AC_HANDSHAKE],[ + AC_DEFINE_UNQUOTED([SEC_KEYDIR], "[$SEC_KEYDIR]",[Directory to store key files in]) + AC_SUBST(MUNGE_CFLAGS) + AC_SUBST(MUNGE_LIBS) +- if test "x$MUNGE" == "xtrue"; then ++ if test "x$MUNGE" = "xtrue"; then + AC_MSG_NOTICE([Enabling munge for security authentication]) + AC_DEFINE([MUNGE], [1], [Use munge for authentication]) + fi +- if test "x$KEYFILE" == "xtrue"; then ++ if test "x$KEYFILE" = "xtrue"; then + AC_MSG_NOTICE([Enabling keyfile for security authentication]) + AC_DEFINE([KEYFILE], [1], [Use keyfile for authentication]) + fi +- if test "x$ENABLE_NULL_ENCRYPTION" == "xtrue"; then ++ if test "x$ENABLE_NULL_ENCRYPTION" = "xtrue"; then + AC_MSG_NOTICE([WARNING: No secure handshake will be used for the COBO layer!!!]); + AC_DEFINE([ENABLE_NULL_ENCRYPTION], [1], [Allow NULL encryption]) + fi]) diff --git a/sys-cluster/launchmon/launchmon-1.0.2_p20210430-r1.ebuild b/sys-cluster/launchmon/launchmon-1.0.2_p20210430-r2.ebuild similarity index 89% rename from sys-cluster/launchmon/launchmon-1.0.2_p20210430-r1.ebuild rename to sys-cluster/launchmon/launchmon-1.0.2_p20210430-r2.ebuild index 0f1da7dba..0d55c8226 100644 --- a/sys-cluster/launchmon/launchmon-1.0.2_p20210430-r1.ebuild +++ b/sys-cluster/launchmon/launchmon-1.0.2_p20210430-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 COMMIT="98ab769c53563f47c4319ce3c98ac394b4870bac" MYPV="$(ver_cut 1-3)" @@ -16,18 +16,22 @@ S="${WORKDIR}/LaunchMON-${COMMIT}" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" -IUSE="+munge tracing-cost" +IUSE="+munge test tracing-cost" RDEPEND=" dev-libs/boost:= dev-libs/libgcrypt dev-libs/libgpg-error virtual/libelf + virtual/mpi munge? ( sys-auth/munge ) " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/${P}-fix-bashism.patch" ) +RESTRICT="!test? ( test )" + src_prepare() { default sed -e "s|m4_esyscmd.*|${MYPV})|g" -i configure.ac || die
