commit: 23b789c312b096b2e0adad5ed8406441ffcc974b Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Mon Jan 13 06:11:56 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Mon Jan 13 06:26:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b789c3
net-analyzer/mk-livestatus: Version 1.5.0_p22 - Update HOMEPAGE/SRC_URI and use HTTPS - EAPI=7 - Add USE=boost - Add USE=re2 - Move SRC_TEST out of global scope - Drop failing test api/perl/t/20-Monitoring-Livestatus-test_socket.t - Export CC/CXX (or it will default to anything it can find) - icigna => icinga(!) - Drop python_foreach_impl as the build system supports only one implementation anyway Package-Manager: Portage-2.3.84, Repoman-2.3.20 Bug: https://bugs.gentoo.org/show_bug.cgi?id=671792 Closes: https://bugs.gentoo.org/show_bug.cgi?id=358565 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-analyzer/mk-livestatus/Manifest | 1 + .../files/mk-livestatus-1.5.0_p22-rm.patch | 10 ++ net-analyzer/mk-livestatus/metadata.xml | 2 + .../mk-livestatus/mk-livestatus-1.5.0_p22.ebuild | 166 +++++++++++++++++++++ 4 files changed, 179 insertions(+) diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest index f76e15d2407..fef9de860f0 100644 --- a/net-analyzer/mk-livestatus/Manifest +++ b/net-analyzer/mk-livestatus/Manifest @@ -1,3 +1,4 @@ DIST mk-livestatus-1.2.8p10.tar.gz 453496 BLAKE2B 5c6cb41dff2d3cc29837088c18c6f7e4bfa6a5a9a3802adafe86fb28523bfc8037fc0c69770861612568db5fc8b61569663c3033201c6293b6da2dba3de55100 SHA512 ff25c2a8d0105fdd156bc922b56df10e3497361620671dc73242db0a7b57fbd34955b5f4fbd9954602c8011b1f6a5ebd4e278df7c3e66639d74110fd0035682d DIST mk-livestatus-1.2.8p16.tar.gz 453565 BLAKE2B 73b4f2d245740e9427af391691a3873b2930bbef1de2b147cefdde1b84f24e7acf61aa748a8adaad4290c77d9b1c7aef7540c69d44c420522c5d56115127b49b SHA512 32d4bc014c008ac7afbdca53e6b3e0d71f8eee5f41f4a0299a8e14cee2a1ea93216fe04c4ff9aa7d7b927dde8e63d186f09a2847665851f1063e699cf73a8df4 DIST mk-livestatus-1.2.8p26.tar.gz 453508 BLAKE2B 75338c65b2c323d4ef2637ef2507f6f213bd3b58a32c0bd377a3c0c0ead34c75394539eaec08d40ee9ea16ca2534158ee4c6823387f3fc3648a02a22d86e0395 SHA512 8afeb6e750d7eb310380153af91f9c6f889f6e350e26dc97f923a49b2e3cc6c0b866f893664ad5d9fd9c0e8671b0a69e1267e464e4de9faf75a2eb24536ae014 +DIST mk-livestatus-1.5.0p22.tar.gz 477418 BLAKE2B fcb33852fafd6ddbbae5fc2989dd694200dc046386e3add07afed0051c2299828afdd13c7e13a862edf10ecd25d522817d1248b05b0bc73cce4e6f4962ec0f1d SHA512 a689d20230651e4cc6708f678fda9c34a4834b68580bff3b012eb7ec7ff2bbd70dff85121e73665ab0266831f36338bd0976731f7d4a68a2595757dccbcac9b6 diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch new file mode 100644 index 00000000000..5c267ae2f4c --- /dev/null +++ b/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch @@ -0,0 +1,10 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -201,7 +201,6 @@ + install-data-local: + $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir) +- rm -f $(DESTDIR)$(pkglibdir)/liblivestatus.a + + clean-local: + rm -rf *~ compile_commands.json cppcheck-result.xml html diff --git a/net-analyzer/mk-livestatus/metadata.xml b/net-analyzer/mk-livestatus/metadata.xml index 29e9ad4c81c..4a90a3fdc4d 100644 --- a/net-analyzer/mk-livestatus/metadata.xml +++ b/net-analyzer/mk-livestatus/metadata.xml @@ -15,5 +15,7 @@ </maintainer> <use> <flag name="nagios4">Generate a <pkg>net-analyzer/nagios</pkg>-4 compatible plugin</flag> + <flag name="boost">Use <pkg>dev-libs/boost</pkg> for ASIO support</flag> + <flag name="re2">Use <pkg>dev-libs/re2</pkg> for regex support</flag> </use> </pkgmetadata> diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22.ebuild new file mode 100644 index 00000000000..4ad850f4877 --- /dev/null +++ b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python2_7 ) +inherit autotools perl-module python-single-r1 toolchain-funcs + +DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data" +HOMEPAGE="https://checkmk.com/"; +SRC_URI="https://checkmk.com/support/${PV/_}/${P/_}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="boost examples nagios4 perl python re2 test" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + !sys-apps/ucspi-unix:0 + boost? ( dev-libs/boost ) + perl? ( + dev-lang/perl:0 + virtual/perl-Digest-MD5:0 + virtual/perl-Scalar-List-Utils:0 + >=virtual/perl-Thread-Queue-2.11:0 + virtual/perl-Encode:0 + dev-perl/JSON-XS:0 + ) + python? ( ${PYTHON_DEPS} ) + re2? ( dev-libs/re2:= ) +" +DEPEND=" + ${RDEPEND} + perl? ( + dev-perl/Module-Install:0 + virtual/perl-ExtUtils-MakeMaker:0 + virtual/perl-File-Path:0 + virtual/perl-File-Spec:0 + virtual/perl-File-Temp:0 + test? ( + dev-perl/File-Copy-Recursive:0 + dev-perl/Test-Pod:0 + dev-perl/Test-Perl-Critic:0 + dev-perl/Test-Pod-Coverage:0 + dev-perl/Perl-Critic:0 + dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0 + dev-perl/Perl-Critic-Deprecated:0 + dev-perl/Perl-Critic-Nits:0 + ) + ) +" + +PATCHES=( + "${FILESDIR}"/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch + "${FILESDIR}"/${PN}-1.5.0_p22-rm.patch +) +S=${WORKDIR}/${P/_} + +src_prepare() { + default + + # Use system Module::Install instead, it will be copied to $S by + # Module::install itself. + rm -rf api/perl/inc || die + + # failing test + rm -rf api/perl/t/20-Monitoring-Livestatus-test_socket.t || die + + if use perl; then + # Ensure patches are not applied twice + unset PATCHES + perl-module_src_prepare + fi + + eautoreconf +} + +src_configure() { + tc-export CC CXX + + econf \ + $(use_with boost boost-asio) \ + $(use_with nagios4) \ + $(use_with re2) + + if use perl; then + cd api/perl || die + perl-module_src_configure + fi +} + +src_compile() { + default + + if use perl; then + cd api/perl || die + perl-module_src_compile + fi +} + +src_test() { + if use perl; then + cd api/perl || die + + SRC_TEST="parallel" + export TEST_AUTHOR="Test Author" + perl-module_src_test + fi +} + +src_install() { + default + + rm "${ED}"/usr/$(get_libdir)/${PN}/liblivestatus.a || die + + # install a config file showing whats needed to enable livestatus for nagios + cat <<EOF >"${T}"/nagios.cfg +# Ensure all data is set to event brokers +event_broker_options=-1 +broker_module=${EPREFIX%/}/usr/$(get_libdir)/${PN}/livestatus.o +EOF + # same for icinga + cat <<EOF >"${T}"/icinga.cfg +define module{ + module_name ${PN} + module_type neb + path /usr/$(get_libdir)/${PN}/livestatus.o + args /var/lib/icinga/rw/live + } +EOF + insinto /usr/share/${PN} + doins "${T}"/{nagios,icinga}.cfg + + if use perl; then + cd api/perl || die + perl-module_src_install + cd "${S}" + + if use examples; then + docinto / + newdoc api/perl/README README.perl + + docinto examples + dodoc api/perl/examples/dump.pl + fi + fi + + if use python; then + python_domodule api/python/livestatus.py + + if use examples; then + docinto / + newdoc api/python/README README.python + + docinto examples + dodoc api/python/{example,example_multisite,make_nagvis_map}.py + fi + fi +} + +pkg_postinst() { + elog "Sample configurations for icinga and nagios are available in" + elog "/usr/share/${PN}" +}
