gentoo auto-resync : 25:02:2024 - 17:40:36

4 files changed, 97 insertions, 4 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index e32203c3935f..fd1f1bdaaaed 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
index e33265c97588..cc4bc056e41a 100644
--- a/net-analyzer/nagios-plugins-linux-madrisan/Manifest
+++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
@@ -1,5 +1,6 @@
-DIST nagios-plugins-linux-madrisan-30.tar.xz 391164 BLAKE2B 3b16d0e61a68153fa90bed4c3540d9457546d2448b3b0da2b9313cd99e9b65f44c6f8d52322500570510171a049759ab85855f262d0581c6f926a96fbfe268dd SHA512 c02f81b6bbd4a0453780d9301a5cd1be67b9640e1b75d06c626a433b6e544fb4649c9b14e8e9a2c84dc6917aaf2011fb9a864ef36fef661bbcd673fa00bc5d57
+AUX nagios-plugins-linux-madrisan-32-rename-with-systemd.patch 3351 BLAKE2B 911021c3f6b566993a26ebc75359b86f8717fd6fb112e8f3fd749a149ca0eecb7fd3073b02d96eb9ce2361190946afaac0d4fb7bf3d2101b6cba04106ee2cbdd SHA512 dceb3f991d8d9ef3b7b05df5a39e444285401e5402874f0d5d3a7553a71238b7899141209739aef0af723929d8020363b10c4869f06f2d2650a7ecbf43c349e6
 DIST nagios-plugins-linux-madrisan-31.tar.xz 401556 BLAKE2B 5eca1e96f14b518d9ab5304bb2a54ba47f194bf22cea8445d7fef0769c3b14c800e4ed24c5c0ca32f0daf53aa81a0bd52234478c606a8d2d1a12e96abb90179c SHA512 34d8ae400766e9c7ddd246998f004a50c87ec9ad8dc13deb8e31fc6fcfa07fbe5af2f091d0523b93d06b26438d1a25240bd82d60946e5897bc257fff7c1b73d0
-EBUILD nagios-plugins-linux-madrisan-30.ebuild 1108 BLAKE2B 2aca6ca84f1342ac0c5aa44e70ad6372d97650bd133335066980a707a0bf0607cba5ede1a8f1cd39c95cd7f3a4d7ed0106407b9d7dda2cffcf23e3756428a455 SHA512 026aa2ff3049aee60ee56d9ea0948cd5b4c0bbdd83be5c7f1a3674bbf39c41ded84f87d87da3b7034cb0a59499263a68d1d620d136c82488c4789dea94f424a8
+DIST nagios-plugins-linux-madrisan-32.tar.xz 402976 BLAKE2B ef66934315f3ddbee1a2d84723477773549c9a5ed731853780ef15b9f44ea462256f730f854d517415dce2b944a4bf0abcbfa0623a7a1faffef4b5bbf162af76 SHA512 42392c123961bb17192344f20973a3d26c74aeef112638384d5b7a687e7117a3378d6efdb07ad15a7309f5db621404602e9c2beb0dcc4e207924d0d3a466ab59
 EBUILD nagios-plugins-linux-madrisan-31.ebuild 1108 BLAKE2B 2aca6ca84f1342ac0c5aa44e70ad6372d97650bd133335066980a707a0bf0607cba5ede1a8f1cd39c95cd7f3a4d7ed0106407b9d7dda2cffcf23e3756428a455 SHA512 026aa2ff3049aee60ee56d9ea0948cd5b4c0bbdd83be5c7f1a3674bbf39c41ded84f87d87da3b7034cb0a59499263a68d1d620d136c82488c4789dea94f424a8
+EBUILD nagios-plugins-linux-madrisan-32.ebuild 1237 BLAKE2B 3ac90c4208a006e04538420c7ba1e1de74bcd999928c13eb9731ec8609367d2fa21de466144147550f3a549a86b8b2f578ac6cc96d3ec45daa2fd0517f6003f7 SHA512 996526fa0d18f42ad56b756c3b092b10f0197718a7d8e069caac4325b5dd5b9b9b40d3a25edd725e460ba9f7a3b94d9b4dbb879b136b7eff30cc8744daef191f
 MISC metadata.xml 613 BLAKE2B c6c247d18381bc631d4c818acbb3051ec35c243519d289816bcd9f9742c45ffa870d552651b0509b8607b8558a35216afaf609a4747df99cba1d4192c251e2f2 SHA512 9648f98d75b34851252c147db60cbdd5d2ca6bcc42555a65170f79adb911ba175f28b1d286e686be7cbb927bb623e09837dd683e42b95cc045507e23ca51b4d9
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-rename-with-systemd.patch b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-rename-with-systemd.patch
new file mode 100644
index 000000000000..f47319dcd39a
--- /dev/null
+++ b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-rename-with-systemd.patch
@@ -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
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-30.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-32.ebuild
index 6e71445b286d..ef628d4e230c 100644
--- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-30.ebuild
+++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,14 +16,19 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="curl varlink"
+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
@@ -38,6 +43,7 @@ src_configure() {
 		# Most options are already defaults for Gentoo
 		--disable-hardening
 		$(use_enable curl libcurl)
+		$(use_enable systemd)
 		$(use_enable varlink libvarlink)
 	)
 	econf "${myconf[@]}"