From 4e0f61672a4cd8a3d8afc21e9afc2a7acd849976 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Dec 2022 03:12:12 +0000 Subject: gentoo auto-resync : 07:12:2022 - 03:12:11 --- net-analyzer/ndoutils/Manifest | 2 +- net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild | 95 -------------------------- net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild | 90 ++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 96 deletions(-) delete mode 100644 net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild create mode 100644 net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild (limited to 'net-analyzer/ndoutils') diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest index 737a6805475e..1270180b58fd 100644 --- a/net-analyzer/ndoutils/Manifest +++ b/net-analyzer/ndoutils/Manifest @@ -3,5 +3,5 @@ AUX ndoutils-2.0.0-asprintf.patch 438 BLAKE2B 2d32a25467123281f8593b464362a66345 AUX openrc-init.patch 3296 BLAKE2B f07c1c0fda7a0d2e1c3f2b9cbae60568f743d82454179bcb3ee367d8a022a406dd1bf0c775fc9b339524cc5c64e4af6aacb8df8a866809104e39f39d11531f26 SHA512 4beb0e72712909554deaa93aa3fe959e80bed3465f4f0a2153f8b4e994538e6d508e303451cc14425ecb5210845308e9a113f491900a977526327a2701b00eb7 AUX sample-config-piddir.patch 1098 BLAKE2B 467fab110ef030010acf8e130d91ba1f97424c611ef75ed0a7806d5034f1c8a5ecce2c64832a295347fb3e323342f3afc5f5d1fbbc3584f26bd2f3b226cbf3af SHA512 bae06d6571aa55c5b9f0103d9af861f50b31668f06dc9b9a29cdf961741455384d8c762338dbfb3c75e10bacba360ac5a706b6251a6ef5cec8fa0def4c679344 DIST ndoutils-2.1.3.tar.gz 2182999 BLAKE2B 390548b9018d4434d5d0f69abee1d1a11f4e240150941f7f2f9e2662eb2cdb2f29b24244e094d5bdf8bfaf6c3be7bc8ebd9e6d510d66edad8bc9cf3245d5c2c3 SHA512 727f2051876ff32cafaf9993a69b721ae4ea81031fade12262dbb4c5399c601f3c1af362d9d550e1d6d56fac8fe044d515dc10fc43e7d4d3e981bc9a89db88de -EBUILD ndoutils-2.1.3-r2.ebuild 2572 BLAKE2B 29b9f5c3353bc3eb12622ab6bbacb5a62d398a7059c835be0a6e71d66e764188c46971236d96d92d141c7a1ad88a520c8fa0537cde9750fb5f4e8f6a9e467a3b SHA512 82ea4e98d2b97714cfef7155638b4eff269a220330eb9e97767880197f06843e9cdd8775f5df9637ea7d1bebe5eaaba41ba750661d2191d074e3cc266e497c5e +EBUILD ndoutils-2.1.3-r3.ebuild 2573 BLAKE2B 7bcd8d99544612439dc7d29b6b92d3d6acb9171031132171a49af359622d9b332cbb6bdb858c8fa888699ebc911af5e072e31735aa795f7c817082b51984b896 SHA512 9fe667c562f1602c50ca10bf98d3d18a7979031dc3e065b51d17f0fd4f24c7c6d06dfd828c16bbecbf80f2b7f410a5286cb621d3be6f640230cbdcd8e3620f5e MISC metadata.xml 447 BLAKE2B be8b56cbd5627725f06feabb9438129f934e90ee93448dd3154edabc9a32cbe65d0b64c1c2f8c1b9d102b20d21d0a1fb0e10ee5ba96965c239f13439f7ca88b6 SHA512 c712854168abe638e5bbcd7c135ccc2906fe665bc8062fd11caa0a3003c5b6d5ec3e959c8295a74cf471025b0c6b88186261e32d37778222fcb3d72d78badb43 diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild deleted file mode 100644 index 784309fee43a..000000000000 --- a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit systemd - -DESCRIPTION="Nagios addon to store Nagios data in a MySQL database" -HOMEPAGE="https://www.nagios.org/" -SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -# We require the "nagios" user from net-analyzer/nagios-core at build -# time. -DEPEND="dev-db/mysql-connector-c - dev-perl/DBD-mysql - dev-perl/DBI - >=net-analyzer/nagios-core-4.4.5" -RDEPEND="${DEPEND} - virtual/mysql" - -S="${WORKDIR}/${PN}-${P}" - -DOCS=( - Changelog - README - THANKS - TODO - UPGRADING - "docs/NDOUTILS DB Model.pdf" - "docs/NDOUtils Documentation.pdf" -) - -PATCHES=( - "${FILESDIR}/format-security.patch" - "${FILESDIR}/ndoutils-2.0.0-asprintf.patch" - "${FILESDIR}/sample-config-piddir.patch" - "${FILESDIR}/openrc-init.patch" -) - -src_configure() { - # The localstatedir is where our socket will be created by the - # nagios daemon, so we put it in /var/lib/nagios where the "nagios" - # user will be able to write. - # - # And normally, we would use /run for the pid file, but the daemon - # drops permissions before creating it, so the piddir also needs - # to be writable by the nagios user. - econf --enable-mysql \ - --localstatedir=/var/lib/nagios \ - --sysconfdir=/etc/nagios \ - --with-piddir=/var/lib/nagios -} - -src_compile() { - # Avoid "emake all" so that we don't build the stuff for nagios-2.x - # and nagios-3.x, some of which throws QA warnings. We don't use it - # anyway. - pushd src - emake file2sock log2ndo ndo2db-4x ndomod-4x.o sockdebug - popd -} - -src_install() { - default - insinto /etc/nagios - newins config/ndo2db.cfg-sample ndo2db.cfg - newins config/ndomod.cfg-sample ndomod.cfg - newinitd "startup/openrc-init" ndo2db - newconfd "startup/openrc-conf" ndo2db - systemd_newunit "startup/default-service" "${PN}.service" - - # The documentation isn't installed by the build system - dodoc -r docs/html - - insinto "/usr/share/${PN}" - doins -r db - - # These need to be executable... - exeinto "/usr/share/${PN}/db" - doexe db/{installdb,prepsql,upgradedb} - - # Use symlinks because the installdb/upgradedb scripts use relative - # paths to the SQL queries. - dosym "../share/${PN}/db/installdb" /usr/bin/ndoutils-installdb - dosym "../share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb -} - -pkg_postinst() { - elog "To include NDO in your Nagios setup, you'll need to activate" - elog "the NDO broker module in /etc/nagios/nagios.cfg:" - elog " broker_module=/usr/bin/ndomod.o config_file=/etc/nagios/ndomod.cfg" -} diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild new file mode 100644 index 000000000000..044cb36975f4 --- /dev/null +++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd + +DESCRIPTION="Nagios addon to store Nagios data in a MySQL database" +HOMEPAGE="https://www.nagios.org/" +SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +# We require the "nagios" user from net-analyzer/nagios-core at build +# time. +DEPEND=" + dev-db/mysql-connector-c + dev-perl/DBD-mysql + dev-perl/DBI + >=net-analyzer/nagios-core-4.4.5" +RDEPEND="${DEPEND} + virtual/mysql" + +PATCHES=( + "${FILESDIR}"/format-security.patch + "${FILESDIR}"/ndoutils-2.0.0-asprintf.patch + "${FILESDIR}"/sample-config-piddir.patch + "${FILESDIR}"/openrc-init.patch +) + +src_configure() { + # The localstatedir is where our socket will be created by the + # nagios daemon, so we put it in /var/lib/nagios where the "nagios" + # user will be able to write. + # + # And normally, we would use /run for the pid file, but the daemon + # drops permissions before creating it, so the piddir also needs + # to be writable by the nagios user. + econf --enable-mysql \ + --localstatedir=/var/lib/nagios \ + --sysconfdir=/etc/nagios \ + --with-piddir=/var/lib/nagios +} + +src_compile() { + # Avoid "emake all" so that we don't build the stuff for nagios-2.x + # and nagios-3.x, some of which throws QA warnings. We don't use it + # anyway. + emake -C src file2sock log2ndo ndo2db-4x ndomod-4x.o sockdebug +} + +src_install() { + # The documentation isn't installed by the build system + HTML_DOCS=( docs/html/. ) + default + + dodoc Changelog UPGRADING \ + "docs/NDOUTILS DB Model.pdf" "docs/NDOUtils Documentation.pdf" + + systemd_newunit startup/default-service ndoutils.service + + insinto /etc/nagios + newins config/ndo2db.cfg-sample ndo2db.cfg + newins config/ndomod.cfg-sample ndomod.cfg + newinitd startup/openrc-init ndo2db + newconfd startup/openrc-conf ndo2db + + insinto /usr/share/ndoutils + doins -r db + + # These need to be executable... + exeinto /usr/share/ndoutils/db + doexe db/{installdb,prepsql,upgradedb} + + # Use symlinks because the installdb/upgradedb scripts use relative + # paths to the SQL queries. + dosym ../share/ndoutils/db/installdb /usr/bin/ndoutils-installdb + dosym ../share/ndoutils/db/upgradedb /usr/bin/ndoutils-upgradedb + + keepdir /var/lib/nagios +} + +pkg_postinst() { + elog "To include NDO in your Nagios setup, you'll need to activate" + elog "the NDO broker module in /etc/nagios/nagios.cfg:" + elog " broker_module=/usr/bin/ndomod.o config_file=/etc/nagios/ndomod.cfg" +} -- cgit v1.2.3