Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ndoutils/
Date: Sat, 31 Aug 2019 21:35:46
Message-Id: 1567287296.4d68327b17f6b5058ac7112f1dd0b7dcf73c89c7.mjo@gentoo
1 commit: 4d68327b17f6b5058ac7112f1dd0b7dcf73c89c7
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 31 21:00:23 2019 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 31 21:34:56 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d68327b
7
8 net-analyzer/ndoutils: sync localstatedir with nagios-core.
9
10 The latest revision of nagios-core moves its localstatedir to
11 /var/lib/nagios. Because ndoutils is a bit wacky, the simplest
12 way to keep it working is to force a rebuild of ndoutils with
13 the same localstatedir and PID directory.
14
15 Package-Manager: Portage-2.3.69, Repoman-2.3.16
16 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
17
18 .../{ndoutils-2.1.3-r1.ebuild => ndoutils-2.1.3-r2.ebuild} | 12 ++++++------
19 1 file changed, 6 insertions(+), 6 deletions(-)
20
21 diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
22 similarity index 89%
23 rename from net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
24 rename to net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
25 index 018e14d53e3..784309fee43 100644
26 --- a/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
27 +++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
28 @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
29 DEPEND="dev-db/mysql-connector-c
30 dev-perl/DBD-mysql
31 dev-perl/DBI
32 - >=net-analyzer/nagios-core-4"
33 + >=net-analyzer/nagios-core-4.4.5"
34 RDEPEND="${DEPEND}
35 virtual/mysql"
36
37 @@ -42,16 +42,16 @@ PATCHES=(
38
39 src_configure() {
40 # The localstatedir is where our socket will be created by the
41 - # nagios daemon, so we put it in /var/nagios where the "nagios" user
42 - # will be able to write.
43 + # nagios daemon, so we put it in /var/lib/nagios where the "nagios"
44 + # user will be able to write.
45 #
46 # And normally, we would use /run for the pid file, but the daemon
47 - # drops permissions before creating it, the the piddir also needs
48 + # drops permissions before creating it, so the piddir also needs
49 # to be writable by the nagios user.
50 econf --enable-mysql \
51 - --localstatedir=/var/nagios \
52 + --localstatedir=/var/lib/nagios \
53 --sysconfdir=/etc/nagios \
54 - --with-piddir=/var/nagios
55 + --with-piddir=/var/lib/nagios
56 }
57
58 src_compile() {