* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/
@ 2015-08-12 4:36 Jeroen Roovers
0 siblings, 0 replies; 10+ messages in thread
From: Jeroen Roovers @ 2015-08-12 4:36 UTC (permalink / raw
To: gentoo-commits
commit: c1f936ad732e02a74694a26274277a8dd7fa0840
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 04:26:48 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 04:34:58 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f936ad
Old.
Package-Manager: portage-2.2.20
net-analyzer/ndoutils/Manifest | 1 -
net-analyzer/ndoutils/ndoutils-1.5.2.ebuild | 64 -----------------------------
2 files changed, 65 deletions(-)
diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest
index 272f39b..9f9ca5c 100644
--- a/net-analyzer/ndoutils/Manifest
+++ b/net-analyzer/ndoutils/Manifest
@@ -1,2 +1 @@
-DIST ndoutils-1.5.2.tar.gz 2142271 SHA256 fe80b5d23291b780741f223efe807f690e3414e706844e993bc40913bd09c7f7 SHA512 3aac9917b8a557f8a7a3cd3cc5460e27617cdf0aab6f007da96a0ffecc4b3bbf3b2c08ef57d7daab8f4b6c5ff172b7d11ef74c84b3e84ae67460731209582ca1 WHIRLPOOL b49a4cc2c78010534cc2219b7cec14866a9bf72595e407eecf8b49487e1f4046132dc309d8a706b0eb688509d6a2983edb68a777da7e1ae019344a8dfac4feb1
DIST ndoutils-2.0.0.tar.gz 2207263 SHA256 b95047c812fb61465e66a9e1a6d4a42bf00620f334f08a6faf5afe20bdd43ba1 SHA512 c899c9f9d0a14995ae7e3fc9f8566891acef9186cc53f05e4f509e9dd01a19a17d32c746a4a1c125342ebffad65946c7a3ea11da68ce0ff240bd37e85334545c WHIRLPOOL d3e41eb5e2a3ea9a5ca0d24fc8319beaa914d2bcb16c187ab6c5f5a3f133c27756ecdc2b6302a75c015294a1b2c3cc48d3c87a540ae1b9b07a21eb427b45d181
diff --git a/net-analyzer/ndoutils/ndoutils-1.5.2.ebuild b/net-analyzer/ndoutils/ndoutils-1.5.2.ebuild
deleted file mode 100644
index dcb3a24..0000000
--- a/net-analyzer/ndoutils/ndoutils-1.5.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Nagios addon to store Nagios data in a MySQL database"
-HOMEPAGE="http://www.nagios.org"
-SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-
-DEPEND="
- dev-perl/DBD-mysql
- dev-perl/DBI
- virtual/mysql
-"
-RDEPEND="
- ${DEPEND}
- >=net-analyzer/nagios-core-3.0
-"
-
-pkg_setup() {
- enewgroup nagios
- enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.4_beta9-asprintf.patch \
- "${FILESDIR}"/${PN}-2.0.0-sleep.patch
-}
-
-src_configure() {
- econf \
- --sysconfdir=/etc/nagios \
- --enable-mysql
-}
-
-DOCS=(
- 'docs/NDOUTILS DB Model.pdf'
- 'docs/NDOUtils Documentation.pdf'
- Changelog
- README
- REQUIREMENTS
- TODO
- UPGRADING
-)
-
-src_install() {
- default
- emake DESTDIR="${D}" install-config
-
- newinitd "${FILESDIR}"/ndo2db.init-nagios3 ndo2db
-}
-
-pkg_postinst() {
- elog "To include NDO in your Nagios setup you'll need to activate the NDO broker module"
- elog "in /etc/nagios/nagios.cfg:"
- elog "\tbroker_module=/usr/bin/ndomod-3x.o config_file=/etc/nagios/ndomod.cfg"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/
@ 2015-11-17 13:54 Patrice Clement
0 siblings, 0 replies; 10+ messages in thread
From: Patrice Clement @ 2015-11-17 13:54 UTC (permalink / raw
To: gentoo-commits
commit: ff72e2662b249f0ad3c6600a2db4e3ce334f8eb4
Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Mon Oct 26 17:03:27 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 12:05:59 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff72e266
net-analyzer/ndoutils: Notice the user correct location for broker_module
Package-Manager: portage-2.2.20.1
net-analyzer/ndoutils/ndoutils-2.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
index 460c9b7..703f3e9 100644
--- a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
@@ -73,5 +73,5 @@ src_install() {
pkg_postinst() {
elog "To include NDO in your Nagios setup you'll need to activate the NDO broker module"
elog "in /etc/nagios/nagios.cfg:"
- elog "\tbroker_module=/usr/bin/ndomod-3x.o config_file=/etc/nagios/ndomod.cfg"
+ elog "\tbroker_module=/usr/bin/ndomod.o config_file=/etc/nagios/ndomod.cfg"
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/
@ 2015-11-17 13:54 Patrice Clement
0 siblings, 0 replies; 10+ messages in thread
From: Patrice Clement @ 2015-11-17 13:54 UTC (permalink / raw
To: gentoo-commits
commit: 0336cb25f04561af9be77f97aa1beaceb7347f6a
Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Mon Oct 26 17:01:37 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 12:05:18 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0336cb25
net-analyzer/ndoutils: Install binaries appropriate to nagios version
By default, only Nagios v4.x ndo2db and ndomod.o are install which
break using it on Nagios v3.x
Gentoo Bug #564194
Package-Manager: portage-2.2.20.1
net-analyzer/ndoutils/ndoutils-2.0.0.ebuild | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
index a7285fe..460c9b7 100644
--- a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -56,6 +56,15 @@ DOCS=(
src_install() {
default
+
+ local itarget
+ if has_version ">=net-analyzer/nagios-core-4.0" ; then
+ itarget="install-4x"
+ else
+ itarget="install-3x"
+ fi
+
+ emake -C src DESTDIR="${D}" "${itarget}"
emake DESTDIR="${D}" install-config
newinitd "${FILESDIR}"/ndo2db.init-nagios3 ndo2db
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/
@ 2015-11-18 5:06 Jeroen Roovers
0 siblings, 0 replies; 10+ messages in thread
From: Jeroen Roovers @ 2015-11-18 5:06 UTC (permalink / raw
To: gentoo-commits
commit: ab1b0b61e8dffc50a29704adbb75bed30b04e7ec
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 05:05:14 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 05:05:14 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab1b0b61
Revert "net-analyzer/ndoutils: Notice the user correct location for broker_module"
This reverts commit ff72e2662b249f0ad3c6600a2db4e3ce334f8eb4.
net-analyzer/ndoutils/ndoutils-2.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
index 703f3e9..460c9b7 100644
--- a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
@@ -73,5 +73,5 @@ src_install() {
pkg_postinst() {
elog "To include NDO in your Nagios setup you'll need to activate the NDO broker module"
elog "in /etc/nagios/nagios.cfg:"
- elog "\tbroker_module=/usr/bin/ndomod.o config_file=/etc/nagios/ndomod.cfg"
+ elog "\tbroker_module=/usr/bin/ndomod-3x.o config_file=/etc/nagios/ndomod.cfg"
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/
@ 2015-11-18 5:06 Jeroen Roovers
0 siblings, 0 replies; 10+ messages in thread
From: Jeroen Roovers @ 2015-11-18 5:06 UTC (permalink / raw
To: gentoo-commits
commit: 42e3e5b395d25cc33a25ac3a8f6d3b3828b1cb9f
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 05:05:23 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 05:05:23 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42e3e5b3
Revert "net-analyzer/ndoutils: Install binaries appropriate to nagios version"
This reverts commit 0336cb25f04561af9be77f97aa1beaceb7347f6a.
net-analyzer/ndoutils/ndoutils-2.0.0.ebuild | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
index 460c9b7..a7285fe 100644
--- a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -56,15 +56,6 @@ DOCS=(
src_install() {
default
-
- local itarget
- if has_version ">=net-analyzer/nagios-core-4.0" ; then
- itarget="install-4x"
- else
- itarget="install-3x"
- fi
-
- emake -C src DESTDIR="${D}" "${itarget}"
emake DESTDIR="${D}" install-config
newinitd "${FILESDIR}"/ndo2db.init-nagios3 ndo2db
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/
@ 2017-11-07 12:35 Michael Orlitzky
0 siblings, 0 replies; 10+ messages in thread
From: Michael Orlitzky @ 2017-11-07 12:35 UTC (permalink / raw
To: gentoo-commits
commit: 855cef11c90e86ca2dd46b52828e86668e42fde3
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 7 00:43:07 2017 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Nov 7 12:34:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855cef11
net-analyzer/ndoutils: add myself as maintainer, update upstream info.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-analyzer/ndoutils/metadata.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/ndoutils/metadata.xml b/net-analyzer/ndoutils/metadata.xml
index 325efab1c50..5c226452120 100644
--- a/net-analyzer/ndoutils/metadata.xml
+++ b/net-analyzer/ndoutils/metadata.xml
@@ -5,7 +5,10 @@
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
+ <maintainer type="person">
+ <email>mjo@gentoo.org</email>
+ </maintainer>
<upstream>
- <remote-id type="sourceforge">nagios</remote-id>
+ <remote-id type="github">NagiosEnterprises/ndoutils</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/
@ 2018-09-23 1:27 Michael Orlitzky
0 siblings, 0 replies; 10+ messages in thread
From: Michael Orlitzky @ 2018-09-23 1:27 UTC (permalink / raw
To: gentoo-commits
commit: 01aa5c86f215262b6ebac3b597553e6d2b487ea7
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 22:50:58 2018 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Sep 23 01:27:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01aa5c86
net-analyzer/ndoutils: replace virtual/mysql build-time dependency.
The ndoutils build system (m4/np_mysqlclient.m4) requires the
mysql_config program at build time but doesn't require any of the
other server files to be present Per bug 665954, I've replaced the
virtual/mysql DEPEND with dev-db/mysql-connector-c.
The mysql virtual is still used in RDEPEND because, as far as I know,
either server is still supported at runtime regardless of the client
library in use.
In an unrelated change, two symlinks were made relative to please
repoman. Their targets were also made executable, since otherwise
you can't run them via the symlinks.
Closes: https://bugs.gentoo.org/665954
Package-Manager: Portage-2.3.40, Repoman-2.3.9
...utils-2.1.3.ebuild => ndoutils-2.1.3-r1.ebuild} | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
similarity index 85%
rename from net-analyzer/ndoutils/ndoutils-2.1.3.ebuild
rename to net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
index 1872b7849d8..57a0389779b 100644
--- a/net-analyzer/ndoutils/ndoutils-2.1.3.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,11 +14,12 @@ KEYWORDS="~amd64 ~ppc ~x86"
# We require the "nagios" user from net-analyzer/nagios-core at build
# time.
-DEPEND="dev-perl/DBD-mysql
+DEPEND="dev-db/mysql-connector-c
+ dev-perl/DBD-mysql
dev-perl/DBI
- >=net-analyzer/nagios-core-4
+ >=net-analyzer/nagios-core-4"
+RDEPEND="${DEPEND}
virtual/mysql"
-RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}-${P}"
@@ -74,12 +75,17 @@ src_install() {
# The documentation isn't installed by the build system
dodoc -r docs/html
- # Use symlinks because the installdb/upgradedb scripts use relative
- # paths to the SQL queries.
insinto "/usr/share/${PN}"
doins -r db
- dosym "/usr/share/${PN}/db/installdb" /usr/bin/ndoutils-installdb
- dosym "/usr/share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb
+
+ # 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() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/
@ 2019-03-11 4:48 Aaron Bauman
0 siblings, 0 replies; 10+ messages in thread
From: Aaron Bauman @ 2019-03-11 4:48 UTC (permalink / raw
To: gentoo-commits
commit: 271e99d26a8c028fe7cefeed5719a4af5bc223bf
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Mar 9 18:04:08 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 04:46:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=271e99d2
net-analyzer/ndoutils: use HTTPS
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
index 57a0389779b..018e14d53e3 100644
--- a/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz"
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/
@ 2019-08-31 21:35 Michael Orlitzky
0 siblings, 0 replies; 10+ messages in thread
From: Michael Orlitzky @ 2019-08-31 21:35 UTC (permalink / raw
To: gentoo-commits
commit: 4d68327b17f6b5058ac7112f1dd0b7dcf73c89c7
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 21:00:23 2019 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 21:34:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d68327b
net-analyzer/ndoutils: sync localstatedir with nagios-core.
The latest revision of nagios-core moves its localstatedir to
/var/lib/nagios. Because ndoutils is a bit wacky, the simplest
way to keep it working is to force a rebuild of ndoutils with
the same localstatedir and PID directory.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../{ndoutils-2.1.3-r1.ebuild => ndoutils-2.1.3-r2.ebuild} | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
similarity index 89%
rename from net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
rename to net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
index 018e14d53e3..784309fee43 100644
--- a/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
DEPEND="dev-db/mysql-connector-c
dev-perl/DBD-mysql
dev-perl/DBI
- >=net-analyzer/nagios-core-4"
+ >=net-analyzer/nagios-core-4.4.5"
RDEPEND="${DEPEND}
virtual/mysql"
@@ -42,16 +42,16 @@ PATCHES=(
src_configure() {
# The localstatedir is where our socket will be created by the
- # nagios daemon, so we put it in /var/nagios where the "nagios" user
- # will be able to write.
+ # 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, the the piddir also needs
+ # drops permissions before creating it, so the piddir also needs
# to be writable by the nagios user.
econf --enable-mysql \
- --localstatedir=/var/nagios \
+ --localstatedir=/var/lib/nagios \
--sysconfdir=/etc/nagios \
- --with-piddir=/var/nagios
+ --with-piddir=/var/lib/nagios
}
src_compile() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/
@ 2022-12-06 21:25 David Seifert
0 siblings, 0 replies; 10+ messages in thread
From: David Seifert @ 2022-12-06 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 5fe6d7a57c71ca4098559207fb78f589e966a708
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 21:25:33 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 21:25:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fe6d7a5
net-analyzer/ndoutils: update EAPI 6 -> 8
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...ls-2.1.3-r2.ebuild => ndoutils-2.1.3-r3.ebuild} | 59 ++++++++++------------
1 file changed, 27 insertions(+), 32 deletions(-)
diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild
similarity index 70%
rename from net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
rename to net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild
index 784309fee43a..044cb36975f4 100644
--- a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+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"
@@ -14,30 +16,19 @@ KEYWORDS="~amd64 ~ppc ~x86"
# We require the "nagios" user from net-analyzer/nagios-core at build
# time.
-DEPEND="dev-db/mysql-connector-c
+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"
+ "${FILESDIR}"/format-security.patch
+ "${FILESDIR}"/ndoutils-2.0.0-asprintf.patch
+ "${FILESDIR}"/sample-config-piddir.patch
+ "${FILESDIR}"/openrc-init.patch
)
src_configure() {
@@ -58,34 +49,38 @@ 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
+ 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
- systemd_newunit "startup/default-service" "${PN}.service"
+ newinitd startup/openrc-init ndo2db
+ newconfd startup/openrc-conf ndo2db
- # The documentation isn't installed by the build system
- dodoc -r docs/html
-
- insinto "/usr/share/${PN}"
+ insinto /usr/share/ndoutils
doins -r db
# These need to be executable...
- exeinto "/usr/share/${PN}/db"
+ 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/${PN}/db/installdb" /usr/bin/ndoutils-installdb
- dosym "../share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb
+ dosym ../share/ndoutils/db/installdb /usr/bin/ndoutils-installdb
+ dosym ../share/ndoutils/db/upgradedb /usr/bin/ndoutils-upgradedb
+
+ keepdir /var/lib/nagios
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-12-06 21:25 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-11 4:48 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2022-12-06 21:25 David Seifert
2019-08-31 21:35 Michael Orlitzky
2018-09-23 1:27 Michael Orlitzky
2017-11-07 12:35 Michael Orlitzky
2015-11-18 5:06 Jeroen Roovers
2015-11-18 5:06 Jeroen Roovers
2015-11-17 13:54 Patrice Clement
2015-11-17 13:54 Patrice Clement
2015-08-12 4:36 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox