commit: cb227551e5510721913ddea554eb12e4a736a5f4 Author: Louis Sautier <sbraz <AT> gentoo <DOT> org> AuthorDate: Mon Aug 10 15:25:48 2020 +0000 Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org> CommitDate: Mon Aug 10 15:27:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb227551
net-analyzer/nagios-plugins-linux-madrisan: remove old Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org> .../nagios-plugins-linux-madrisan/Manifest | 1 - ...-plugins-linux-madrisan-25-fix-fno-common.patch | 37 --------------- ...-plugins-linux-madrisan-25-fix-musl-build.patch | 35 -------------- .../nagios-plugins-linux-madrisan-25-r1.ebuild | 53 ---------------------- 4 files changed, 126 deletions(-) diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest index cb6c6ac7f9a..1eb1d2cf780 100644 --- a/net-analyzer/nagios-plugins-linux-madrisan/Manifest +++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest @@ -1,3 +1,2 @@ -DIST nagios-plugins-linux-madrisan-25.tar.xz 371712 BLAKE2B 60637426d9ced289a1acdf61c3e7c5a2b3227afb20079ef93d445057b2127d12a6c76ab5a780571ac8bdd6ac3b55de2761722236d2ed7a057ab84559d97610e9 SHA512 64961a16e24802d66c48d0c33bd63d75aba8492f38dd83a57ee2e7cb728cf6876c7869622256c4249a9e9da39b744a332df6ecad80f6039861887bb5c8d806ec DIST nagios-plugins-linux-madrisan-26.tar.xz 379480 BLAKE2B e30fa00c029506ffd76e9c16f409f62f00ab481894d6b35dd34470dab5f2a18b2fc18bd06ae5e6a7179ed23f36c785c9a403258b9066e5a08f6a139ab0192088 SHA512 61c523ddf7a98ae01caf543a7e38903478346ce380884a7cd2a2e592db806e73fb996675aa701e2bbf57b31ed062886daba4af70cc2875e1c296537de01c588d DIST nagios-plugins-linux-madrisan-27.tar.xz 385324 BLAKE2B ef207e365d044fefa8c0dbef7aae8a50ec9b6c70d60d069574ed423646d1e936e0bd6bbb316070d94f354236f815e508da4ec1b298e89958c8393a041f98a908 SHA512 5d93912f2237449e29e963cca260fbe7a735f47e7c2752402e2f371289e2875e4fea35f191705d7a2f01ac49381e039b720f43c8c794e85ee0bbbb01d212a10a diff --git a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-fno-common.patch b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-fno-common.patch deleted file mode 100644 index 74bddd66e74..00000000000 --- a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-fno-common.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4936ca25f3e9a2875ce063033e5e8f3a3590dab2 Mon Sep 17 00:00:00 2001 -From: Davide Madrisan <[email protected]> -Date: Mon, 27 Jan 2020 22:00:41 +0100 -Subject: [PATCH] The build fails when '-fno-common' is added to CFLAGS - -As reported by 'sbraz', the build stops with the error message: - - (.bss+0x8): multiple definition of `program_name' - (.bss+0x0): multiple definition of `program_name_short' - -This flag will be apparently enabled by default in gcc 10. - -Fix this build problem by correctly referencing as extern both -the variables in the header file. - -Signed-off-by: Davide Madrisan <[email protected]> ---- - include/progname.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/progname.h b/include/progname.h -index 576ed16..847122a 100644 ---- a/include/progname.h -+++ b/include/progname.h -@@ -25,10 +25,10 @@ extern "C" { - #endif - - /* String containing name the program is called with. */ -- const char *program_name; -+ extern const char *program_name; - - /* String containing a short version of 'program_name'. */ -- const char *program_name_short; -+ extern const char *program_name_short; - - /* Set program_name, based on argv[0]. - argv0 must be a string allocated with indefinite extent, and must not be diff --git a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-musl-build.patch b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-musl-build.patch deleted file mode 100644 index 3220be24731..00000000000 --- a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-musl-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 72547f774641d3ed881cc957a6d6c20d5e3370ec -Author: Louis Sautier <[email protected]> -Date: Mon Apr 20 16:40:08 2020 +0200 - - Fix build with musl by including limits.h when PATH_MAX is used - - Otherwise, the build fails with: - error: PATH_MAX undeclared (first use in this function) - - Bug: https://bugs.gentoo.org/717038 - -diff --git a/lib/processes.c b/lib/processes.c -index cb006ca..e65992d 100644 ---- a/lib/processes.c -+++ b/lib/processes.c -@@ -26,6 +26,7 @@ - #include <ctype.h> - #include <dirent.h> - #include <errno.h> -+#include <limits.h> - #include <pwd.h> - #include <stdio.h> - #include <stdlib.h> -diff --git a/plugins/check_fc.c b/plugins/check_fc.c -index b798377..cfaafa5 100644 ---- a/plugins/check_fc.c -+++ b/plugins/check_fc.c -@@ -22,6 +22,7 @@ - #include <dirent.h> - #include <errno.h> - #include <getopt.h> -+#include <limits.h> - #include <stdint.h> - #include <stdio.h> - #include <stdlib.h> diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild deleted file mode 100644 index e56c277678f..00000000000 --- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="curl" - -DEPEND="curl? ( net-misc/curl:0= )" -RDEPEND="${DEPEND}" - -# https://github.com/madrisan/nagios-plugins-linux/issues/48 -# Will be in the next release -# https://github.com/madrisan/nagios-plugins-linux/pull/52 -PATCHES=( - "${FILESDIR}/${P}-fix-fno-common.patch" - "${FILESDIR}/${P}-fix-musl-build.patch" -) - -S="${WORKDIR}/${MY_P}" - -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) - ) - econf "${myconf[@]}" -} - -src_test() { - emake check VERBOSE=1 -}
