* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/, net-analyzer/ndoutils/files/
@ 2024-12-19 3:07 Michael Orlitzky
0 siblings, 0 replies; 2+ messages in thread
From: Michael Orlitzky @ 2024-12-19 3:07 UTC (permalink / raw
To: gentoo-commits
commit: 7387af9d368a0110e469ca756e809f38efb00c88
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 19 03:05:46 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 03:05:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7387af9d
net-analyzer/ndoutils: drop 2.1.3-r4
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
net-analyzer/ndoutils/Manifest | 1 -
.../ndoutils/files/ndoutils-2.0.0-asprintf.patch | 16 --
.../files/secure-install-permissions.patch | 183 ---------------------
net-analyzer/ndoutils/ndoutils-2.1.3-r4.ebuild | 102 ------------
4 files changed, 302 deletions(-)
diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest
index f96b584772be..39089d59b9c6 100644
--- a/net-analyzer/ndoutils/Manifest
+++ b/net-analyzer/ndoutils/Manifest
@@ -1,2 +1 @@
-DIST ndoutils-2.1.3.tar.gz 2182999 BLAKE2B 390548b9018d4434d5d0f69abee1d1a11f4e240150941f7f2f9e2662eb2cdb2f29b24244e094d5bdf8bfaf6c3be7bc8ebd9e6d510d66edad8bc9cf3245d5c2c3 SHA512 727f2051876ff32cafaf9993a69b721ae4ea81031fade12262dbb4c5399c601f3c1af362d9d550e1d6d56fac8fe044d515dc10fc43e7d4d3e981bc9a89db88de
DIST ndoutils-2.1.4.tar.gz 2188648 BLAKE2B 751e206c6f2827c1a1277e7b5f1d72285c21fa22a8f50d7c488c35ad66353392279bf9f6ecdce978874d0c90da15a95369f46f758994d33b861154161919e98b SHA512 cb6991d9d79f4c438833035fb8434b1cf0f5c27393506a422c134c2c49a5eec2a9f068a59a304515bba62b4f114204b86ec1e2cd7f68b61b329ac1a7b30ef5eb
diff --git a/net-analyzer/ndoutils/files/ndoutils-2.0.0-asprintf.patch b/net-analyzer/ndoutils/files/ndoutils-2.0.0-asprintf.patch
deleted file mode 100644
index 21cf837ba36d..000000000000
--- a/net-analyzer/ndoutils/files/ndoutils-2.0.0-asprintf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This is a fix for the QA warnings that result from using asprintf()
-without defining it. That happens because asprintf() is a GNU
-extension, but somehow gets used before _GNU_SOURCE is defined.
-
-Upstream-Bug: https://github.com/NagiosEnterprises/ndoutils/issues/43
-
---- a/include/config.h.in
-+++ b/include/config.h.in
-@@ -9,6 +9,7 @@
- #ifndef _CONFIG_H
- #define _CONFIG_H
-
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <stdlib.h>
-
diff --git a/net-analyzer/ndoutils/files/secure-install-permissions.patch b/net-analyzer/ndoutils/files/secure-install-permissions.patch
deleted file mode 100644
index a4c50ab6cedc..000000000000
--- a/net-analyzer/ndoutils/files/secure-install-permissions.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From 18ef12037f4a68772d6840cbaa08aa2da07d2891 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sat, 2 Mar 2024 19:30:54 -0500
-Subject: [PATCH 1/2] configure.ac: don't install binaries as
- ndo2db_user:ndo2db_group
-
-In configure.ac we were adding two flags to INSTALL_OPTS that change
-the owner:group of all installed files to ndo2db_user:ndo2db_group.
-This is often a security vulnerability, since executables (we have a
-few) are typically installed into everyone's PATH. If root ever
-executes them, the ndo2db_user can take advantage of the situation to
-run malicious code as root.
-
-Fortunately the change in ownership is not really needed. We simply
-drop the INSTALL_OPTS, which are used for nothing else, allowing our
-files to be installed as the user who is doing the installing. When
-installing to one of the system PATHs, that will almost always be
-root.
----
- Makefile.in | 9 ++++-----
- configure.ac | 2 --
- docs/docbook/en-en/Makefile.in | 1 -
- src/Makefile.in | 31 +++++++++++++++----------------
- 4 files changed, 19 insertions(+), 24 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 58c9f0f..68774c2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -37,7 +37,6 @@ INSTALL=@INSTALL@
- GREP=@GREP@
- EGREP=@EGREP@
-
--INSTALL_OPTS=@INSTALL_OPTS@
- OPSYS=@opsys@
- DIST=@dist_type@
-
-@@ -98,10 +97,10 @@ install:
- @echo ""
-
- install-config:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR)
-- $(INSTALL) -m 644 $(INSTALL_OPTS) config/ndo2db.cfg-sample $(DESTDIR)$(CFGDIR)
-- $(INSTALL) -m 644 $(INSTALL_OPTS) config/ndomod.cfg-sample $(DESTDIR)$(CFGDIR)
-+ $(INSTALL) -m 775 -d $(DESTDIR)$(CFGDIR)
-+ $(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR)
-+ $(INSTALL) -m 644 config/ndo2db.cfg-sample $(DESTDIR)$(CFGDIR)
-+ $(INSTALL) -m 644 config/ndomod.cfg-sample $(DESTDIR)$(CFGDIR)
- @echo ""
- @echo "*** Config files installed ***"
- @echo ""
-diff --git a/configure.ac b/configure.ac
-index 58b47a4..3279397 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -317,8 +317,6 @@ AC_ARG_WITH(ndo2db_user,AC_HELP_STRING([--with-ndo2db-user=<user>],[sets user na
- AC_ARG_WITH(ndo2db_group,AC_HELP_STRING([--with-ndo2db-group=<group>],[sets group name to run NDO2DB]),ndo2db_group=$withval,ndo2db_group=nagios)
- AC_SUBST(ndo2db_user)
- AC_SUBST(ndo2db_group)
--INSTALL_OPTS="-o $ndo2db_user -g $ndo2db_group"
--AC_SUBST(INSTALL_OPTS)
-
-
- dnl Does the user want to check for systemd?
-diff --git a/docs/docbook/en-en/Makefile.in b/docs/docbook/en-en/Makefile.in
-index d72b68c..29e1e1e 100644
---- a/docs/docbook/en-en/Makefile.in
-+++ b/docs/docbook/en-en/Makefile.in
-@@ -13,7 +13,6 @@ BINDIR=@bindir@
- LIBEXECDIR=@libexecdir@
- DATAROOTDIR=@datarootdir@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
-
-
- all:
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 532cc82..352a768 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -26,7 +26,6 @@ exec_prefix=@exec_prefix@
- PIPEDIR=@localstatedir@
- BINDIR=@bindir@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
-
- CC=@CC@
-
-@@ -126,9 +125,9 @@ distclean: clean
- devclean: distclean
-
- install: install-4x
-- $(INSTALL) -m 774 $(INSTALL_OPTS) file2sock $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 774 $(INSTALL_OPTS) log2ndo $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 774 $(INSTALL_OPTS) sockdebug $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 774 file2sock $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 774 log2ndo $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 774 sockdebug $(DESTDIR)$(BINDIR)
- @echo ""
- @echo " Hint: NDOUtils Installation against Nagios v4.x"
- @echo " completed."
-@@ -147,20 +146,20 @@ install: install-4x
- @echo ""
-
- install-2x:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR)
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-2x $(DESTDIR)$(BINDIR)/ndo2db
-- $(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-2x.o $(DESTDIR)$(BINDIR)/ndomod.o
-+ $(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR)
-+ $(INSTALL) -m 775 -d $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 ndo2db-2x $(DESTDIR)$(BINDIR)/ndo2db
-+ $(INSTALL) -m 755 ndomod-2x.o $(DESTDIR)$(BINDIR)/ndomod.o
-
- install-3x:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR)
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-3x $(DESTDIR)$(BINDIR)/ndo2db
-- $(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-3x.o $(DESTDIR)$(BINDIR)/ndomod.o
-+ $(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR)
-+ $(INSTALL) -m 775 -d $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 ndo2db-3x $(DESTDIR)$(BINDIR)/ndo2db
-+ $(INSTALL) -m 755 ndomod-3x.o $(DESTDIR)$(BINDIR)/ndomod.o
-
- install-4x:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR)
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-4x $(DESTDIR)$(BINDIR)/ndo2db
-- $(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-4x.o $(DESTDIR)$(BINDIR)/ndomod.o
-+ $(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR)
-+ $(INSTALL) -m 775 -d $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 ndo2db-4x $(DESTDIR)$(BINDIR)/ndo2db
-+ $(INSTALL) -m 755 ndomod-4x.o $(DESTDIR)$(BINDIR)/ndomod.o
-
---
-2.43.0
-
-From 69a80d6a9bf1196ffcfffa7f756633bb13a62b5f Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sat, 2 Mar 2024 19:52:47 -0500
-Subject: [PATCH 2/2] src/Makefile.in: install all executables with mode 0755
-
-Three executables -- file2sock, log2ndo, and sockdebug -- are
-currently being installed group-writable but not
-world-executable. This is in contrast with the other two executables,
-ndo2db and ndomod.o, that are installed mode 0755.
-
-Having recently removed the INSTALL_OPTS that were altering the
-owner:group of these files, there is no longer any security risk to
-mode 0774. However, 0755 is more consistent with both the rest of our
-executables, and with the typical permissions on /usr/bin that arise
-from the (extremely common) umask of 0022.
-
-We change these three to 0755 for a little bit of extra peace of mind.
-
-changes. Lines starting # with '#' will be ignored, and an empty
-message aborts the commit. # # Date: Sat Mar 2 19:52:47 2024 -0500 #
-src/Makefile.in #
----
- src/Makefile.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 352a768..e6a1816 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -125,9 +125,9 @@ distclean: clean
- devclean: distclean
-
- install: install-4x
-- $(INSTALL) -m 774 file2sock $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 774 log2ndo $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 774 sockdebug $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 file2sock $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 log2ndo $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 sockdebug $(DESTDIR)$(BINDIR)
- @echo ""
- @echo " Hint: NDOUtils Installation against Nagios v4.x"
- @echo " completed."
---
-2.43.0
-
diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r4.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r4.ebuild
deleted file mode 100644
index 32d8d3bd8c57..000000000000
--- a/net-analyzer/ndoutils/ndoutils-2.1.3-r4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-
-DESCRIPTION="Nagios addon to store Nagios data in a database"
-HOMEPAGE="https://github.com/NagiosEnterprises/ndoutils"
-SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="
- dev-db/mysql-connector-c
- dev-perl/DBD-mysql
- dev-perl/DBI"
-
-# The default value of the --with-ndo2db-{user,group} flag is "nagios".
-# For unrelated reasons, we actually patch out the build-time dependency
-# on the user/group, but it should still be there at runtime.
-RDEPEND="${DEPEND}
- acct-user/nagios
- acct-group/nagios
- virtual/mysql"
-
-PATCHES=(
- "${FILESDIR}"/format-security.patch
- "${FILESDIR}"/ndoutils-2.0.0-asprintf.patch
- "${FILESDIR}"/sample-config-piddir.patch
- "${FILESDIR}"/openrc-init.patch
- "${FILESDIR}"/secure-install-permissions.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-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.
- #
- # Oh, and the build fails without --enable-mysql, so don't try.
- #
- 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"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/, net-analyzer/ndoutils/files/
@ 2024-12-19 3:07 Michael Orlitzky
0 siblings, 0 replies; 2+ messages in thread
From: Michael Orlitzky @ 2024-12-19 3:07 UTC (permalink / raw
To: gentoo-commits
commit: c8c054f0466ec205c28a56a876de653c069dc264
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 19 02:59:48 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 03:01:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c054f0
net-analyzer/ndoutils: add 2.1.4
Closes: https://bugs.gentoo.org/946581
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
net-analyzer/ndoutils/Manifest | 1 +
.../ndoutils/files/c23-compatibility.patch | 40 ++++++++
net-analyzer/ndoutils/ndoutils-2.1.4.ebuild | 103 +++++++++++++++++++++
3 files changed, 144 insertions(+)
diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest
index cfd355276a0c..f96b584772be 100644
--- a/net-analyzer/ndoutils/Manifest
+++ b/net-analyzer/ndoutils/Manifest
@@ -1 +1,2 @@
DIST ndoutils-2.1.3.tar.gz 2182999 BLAKE2B 390548b9018d4434d5d0f69abee1d1a11f4e240150941f7f2f9e2662eb2cdb2f29b24244e094d5bdf8bfaf6c3be7bc8ebd9e6d510d66edad8bc9cf3245d5c2c3 SHA512 727f2051876ff32cafaf9993a69b721ae4ea81031fade12262dbb4c5399c601f3c1af362d9d550e1d6d56fac8fe044d515dc10fc43e7d4d3e981bc9a89db88de
+DIST ndoutils-2.1.4.tar.gz 2188648 BLAKE2B 751e206c6f2827c1a1277e7b5f1d72285c21fa22a8f50d7c488c35ad66353392279bf9f6ecdce978874d0c90da15a95369f46f758994d33b861154161919e98b SHA512 cb6991d9d79f4c438833035fb8434b1cf0f5c27393506a422c134c2c49a5eec2a9f068a59a304515bba62b4f114204b86ec1e2cd7f68b61b329ac1a7b30ef5eb
diff --git a/net-analyzer/ndoutils/files/c23-compatibility.patch b/net-analyzer/ndoutils/files/c23-compatibility.patch
new file mode 100644
index 000000000000..39d568acd73b
--- /dev/null
+++ b/net-analyzer/ndoutils/files/c23-compatibility.patch
@@ -0,0 +1,40 @@
+From c9e6b3476a36c9be81714c87ff75d3d1986e376d Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 18 Dec 2024 21:29:56 -0500
+Subject: [PATCH] include/queue.h: ensure prototypes match implementations
+
+In the latest C23 standard, the prototype
+
+ int get_queue_id();
+
+indicates that get_queue_id takes no arguments. This of course
+disagrees with its implementation, which takes one argument. C23 will
+be the default mode in GCC-15, where this leads to a build failure:
+
+ queue.c:57:5: error: conflicting types for 'get_queue_id'; have 'int(int)'
+ 57 | int get_queue_id(int id) {
+ | ^~~~~~~~~~~~
+ In file included from queue.c:30:
+ ../include/queue.h:40:5: note: previous declaration of 'get_queue_id' with
+ type 'int(void)'
+ 40 | int get_queue_id();
+ | ^~~~~~~~~~~~
+
+To fix it, we update the prototype for get_queue_id().
+---
+ include/queue.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/queue.h b/include/queue.h
+index 5f94e4d..4219c5b 100644
+--- a/include/queue.h
++++ b/include/queue.h
+@@ -37,7 +37,7 @@ struct queue_msg
+ void del_queue();
+
+ /* initialize new queue or open existing */
+-int get_queue_id();
++int get_queue_id(int);
+
+ /* insert into queue */
+ void push_into_queue(char*);
diff --git a/net-analyzer/ndoutils/ndoutils-2.1.4.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.4.ebuild
new file mode 100644
index 000000000000..3dbb09ef8ec0
--- /dev/null
+++ b/net-analyzer/ndoutils/ndoutils-2.1.4.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Nagios addon to store Nagios data in a database"
+HOMEPAGE="https://github.com/NagiosEnterprises/ndoutils"
+SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+DEPEND="
+ dev-db/mysql-connector-c
+ dev-perl/DBD-mysql
+ dev-perl/DBI"
+
+# The default value of the --with-ndo2db-{user,group} flag is "nagios".
+# For unrelated reasons, we actually patch out the build-time dependency
+# on the user/group, but it should still be there at runtime.
+RDEPEND="${DEPEND}
+ acct-user/nagios
+ acct-group/nagios
+ virtual/mysql"
+
+PATCHES=(
+ "${FILESDIR}"/format-security.patch
+ "${FILESDIR}"/sample-config-piddir.patch
+ "${FILESDIR}"/openrc-init.patch
+ "${FILESDIR}"/c23-compatibility.patch
+)
+
+src_prepare() {
+ default
+
+ # ./configure is ancient and doesn't know that e.g. riscv exists
+ eautoreconf
+}
+
+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.
+ #
+ # Oh, and the build fails without --enable-mysql, so don't try.
+ #
+ 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"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-12-19 3:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-19 3:07 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/, net-analyzer/ndoutils/files/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2024-12-19 3:07 Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox