net-analyzer/nagios-plugins-linux-madrisan: add 32

Signed-off-by: Louis Sautier <sbraz@gentoo.org>
This commit is contained in:
Louis Sautier
2024-02-25 15:14:48 +01:00
parent b8caf1c42a
commit df8740de9a
3 changed files with 141 additions and 0 deletions

View File

@@ -1,2 +1,3 @@
DIST nagios-plugins-linux-madrisan-30.tar.xz 391164 BLAKE2B 3b16d0e61a68153fa90bed4c3540d9457546d2448b3b0da2b9313cd99e9b65f44c6f8d52322500570510171a049759ab85855f262d0581c6f926a96fbfe268dd SHA512 c02f81b6bbd4a0453780d9301a5cd1be67b9640e1b75d06c626a433b6e544fb4649c9b14e8e9a2c84dc6917aaf2011fb9a864ef36fef661bbcd673fa00bc5d57
DIST nagios-plugins-linux-madrisan-31.tar.xz 401556 BLAKE2B 5eca1e96f14b518d9ab5304bb2a54ba47f194bf22cea8445d7fef0769c3b14c800e4ed24c5c0ca32f0daf53aa81a0bd52234478c606a8d2d1a12e96abb90179c SHA512 34d8ae400766e9c7ddd246998f004a50c87ec9ad8dc13deb8e31fc6fcfa07fbe5af2f091d0523b93d06b26438d1a25240bd82d60946e5897bc257fff7c1b73d0
DIST nagios-plugins-linux-madrisan-32.tar.xz 402976 BLAKE2B ef66934315f3ddbee1a2d84723477773549c9a5ed731853780ef15b9f44ea462256f730f854d517415dce2b944a4bf0abcbfa0623a7a1faffef4b5bbf162af76 SHA512 42392c123961bb17192344f20973a3d26c74aeef112638384d5b7a687e7117a3378d6efdb07ad15a7309f5db621404602e9c2beb0dcc4e207924d0d3a466ab59

View File

@@ -0,0 +1,86 @@
https://github.com/madrisan/nagios-plugins-linux/commit/63914284097e3a59e3407bf894376b859a0d1a2e
From 63914284097e3a59e3407bf894376b859a0d1a2e Mon Sep 17 00:00:00 2001
From: Davide Madrisan <d.madrisan@proton.me>
Date: Tue, 30 Jan 2024 18:57:16 +0100
Subject: [PATCH] fix(configure): rename cmdline option --with-systemd
Rename --with-systemd to --enable-systemd for consistency
with the other optional boolean options.
Signed-off-by: Davide Madrisan <d.madrisan@proton.me>
--- a/configure.ac
+++ b/configure.ac
@@ -337,7 +337,7 @@ AC_CHECK_DECLS([CPU_ALLOC], [], [],
dnl Check for libcurl
AC_ARG_ENABLE([libcurl],
- AS_HELP_STRING([--enable-libcurl], [Enable libcurl]))
+ AS_HELP_STRING([--enable-libcurl], [enable libcurl]))
AS_IF([test "x$enable_libcurl" = "xyes"], [
LIBCURL_CHECK_CONFIG([], [7.40.0], [],
[AC_MSG_ERROR([Missing required libcurl >= 7.40.0])])
@@ -346,27 +346,9 @@ AS_IF([test "x$enable_libcurl" = "xyes"], [
AM_CONDITIONAL(HAVE_LIBCURL, [test "$libcurl_cv_lib_curl_usable" = "yes"])
], [AM_CONDITIONAL(HAVE_LIBCURL, false)])
-dnl Check for systemd-login libraries
-AC_ARG_WITH([systemd],
- AS_HELP_STRING([--without-systemd], [do not build with systemd support]),
- [], [with_systemd=check]
-)
-have_systemd=no
-AS_IF([test "x$with_systemd" != "xno"], [
- PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [have_systemd=yes], [have_systemd=no])
- AS_CASE([$with_systemd:$have_systemd],
- [yes:no],
- [AC_MSG_ERROR([systemd expected but libsystemd not found])],
- [*:yes],
- AC_DEFINE([HAVE_LIBSYSTEMD], [1], [Define if libsystemd is available])
- AC_DEFINE([USE_SYSTEMD], [1], [Define if systemd support is wanted ])
- )
-])
-AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$have_systemd" = "xyes"])
-
dnl Check for libvarlink
AC_ARG_ENABLE([libvarlink],
- AS_HELP_STRING([--enable-libvarlink], [Enable libvarlink]))
+ AS_HELP_STRING([--enable-libvarlink], [enable libvarlink]))
AS_IF([test "x$enable_libvarlink" = "xyes"], [
PKG_CHECK_EXISTS([libvarlink],
[PKG_CHECK_MODULES(LIBVARLINK, [libvarlink >= 18],
@@ -394,6 +376,24 @@ AS_IF([test "x$enable_libprocps" = "xyes"], [
])
AM_CONDITIONAL(HAVE_LIBPROCPS, [test "$have_libprocps" = "yes"])
+dnl Check for systemd-login libraries
+AC_ARG_ENABLE([systemd],
+ AS_HELP_STRING([--enable-systemd], [enable systemd related features]),
+ [], [enable_systemd=check]
+)
+have_systemd=no
+AS_IF([test "x$enable_systemd" != "xno"], [
+ PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [have_systemd=yes], [have_systemd=no])
+ AS_CASE([$enable_systemd:$have_systemd],
+ [yes:no],
+ [AC_MSG_ERROR([systemd expected but libsystemd not found])],
+ [*:yes],
+ AC_DEFINE([HAVE_LIBSYSTEMD], [1], [Define if libsystemd is available])
+ AC_DEFINE([USE_SYSTEMD], [1], [Define if systemd support is wanted])
+ )
+])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$have_systemd" = "xyes"])
+
dnl Add the option '--with-proc-meminfo=PATH'
AC_ARG_WITH(proc-meminfo,
AS_HELP_STRING([--with-proc-meminfo=PATH],
@@ -604,3 +604,9 @@ if test "$have_libvarlink" = "yes"; then
echo " VARLINK_ADDRESS = $VARLINK_ADDRESS"
echo
fi
+
+if test "$have_systemd" = "yes"; then
+ echo "Optional systemd library support is enabled:"
+ echo " SYSTEMD_CFLAGS = $SYSTEMD_CFLAGS"
+ echo " SYSTEMD_LIBS = $SYSTEMD_LIBS"
+fi

View File

@@ -0,0 +1,54 @@
# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools
MY_PN="nagios-plugins-linux"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Additional and alternative Nagios plugins for Linux"
HOMEPAGE="https://github.com/madrisan/nagios-plugins-linux"
SRC_URI="https://github.com/madrisan/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz -> ${P}.tar.xz"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="curl systemd varlink"
DEPEND="
curl? ( net-misc/curl:0= )
systemd? ( sys-apps/systemd:= )
varlink? ( dev-libs/libvarlink:= )
"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${P}-rename-with-systemd.patch"
)
src_prepare() {
default
# Avoid collision with net-analyzer/monitoring-plugins
# and net-analyzer/nagios-plugins
sed -ri "s/check_(load|swap|uptime|users)/&_madrisan/" plugins/Makefile.am || die
eautoreconf
}
src_configure() {
local myconf=(
--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins"
# Most options are already defaults for Gentoo
--disable-hardening
$(use_enable curl libcurl)
$(use_enable systemd)
$(use_enable varlink libvarlink)
)
econf "${myconf[@]}"
}
src_test() {
emake check VERBOSE=1
}