[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/, net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 9c5839b123bc6d8ddb7d5aea92c257449a63e54b
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Apr  1 16:45:39 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Apr  1 16:45:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c5839b1

net-analyzer/nagios-core: fix build (testfail) on musl

Upstream patch replaces uint by unsigned int.

Closes: https://bugs.gentoo.org/928032
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../nagios-core/files/nagios-core-4.5.1-musl.patch | 98 ++
 net-analyzer/nagios-core/nagios-core-4.5.1.ebuild  |  2 +
 2 files changed, 100 insertions(+)

diff --git a/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch 
b/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch
new file mode 100644
index ..eda71db9bcd4
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch
@@ -0,0 +1,98 @@
+From 19602faf7111203b748a4dc9ccaf3111586a8e96 Mon Sep 17 00:00:00 2001
+From: Sebastian Wolf 
+Date: Fri, 29 Mar 2024 17:01:52 -0400
+Subject: [PATCH 1/2] Fix #952 - s/uint/unsigned int/g
+
+---
+ Changelog |  4 
+ lib/t-utils.c | 10 +-
+ lib/test-dkhash.c |  2 +-
+ 3 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/Changelog b/Changelog
+index ec3cd64fc..fcf4742f2 100644
+--- a/Changelog
 b/Changelog
+@@ -2,6 +2,10 @@
+ Nagios Core 4 Change Log
+ 
+ 
++4.5.2 - 2024-04-30
++--
++* Fix build when compiling against musl libc (#952) (Sebastian Wolf)
++
+ 4.5.1 - 2024-02-28
+ ---
+ * Fix text rendering in Configuration -> Command Expansion when the command 
ends in whitespace (Thanks Joran LEREEC for reporting this issue) (Dylan 
Anderson)
+diff --git a/lib/t-utils.c b/lib/t-utils.c
+index badab7c03..123f114c8 100644
+--- a/lib/t-utils.c
 b/lib/t-utils.c
+@@ -1,8 +1,8 @@
+ #include "t-utils.h"
+ 
+ const char *cyan = "", *red = "", *green = "", *yellow = "", *reset = "";
+-uint passed, failed, t_verbose = 0;
+-static uint t_depth;
++unsigned int passed, failed, t_verbose = 0;
++static unsigned int t_depth;
+ static const char *indent_str = "  ";
+ 
+ /* can't be used when a or b has side-effects, but we don't care here */
+@@ -27,9 +27,9 @@ void t_set_colors(int force)
+   }
+ }
+ 
+-static void t_indent(uint depth)
++static void t_indent(unsigned int depth)
+ {
+-  uint i;
++  unsigned int i;
+   for (i = 0; i < depth; i++) {
+   printf("%s", indent_str);
+   }
+@@ -136,7 +136,7 @@ int ok_int(int a, int b, const char *name)
+   return TEST_FAIL;
+ }
+ 
+-int ok_uint(uint a, uint b, const char *name)
++int ok_unsigned int(unsigned int a, unsigned int b, const char *name)
+ {
+   if (a == b) {
+   t_pass("%s", name);
+diff --git a/lib/test-dkhash.c b/lib/test-dkhash.c
+index 6db1d7a92..15c2b676c 100644
+--- a/lib/test-dkhash.c
 b/lib/test-dkhash.c
+@@ -68,7 +68,7 @@ static struct test_data *ddup(int x, int i, int j)
+ }
+ 
+ struct dkhash_check {
+-  uint entries, count, max, added, removed;
++  unsigned int entries, count, max, added, removed;
+   int ent_delta, addrm_delta;
+ };
+ 
+
+From c4f56318e6ecfab85d592ea302d747c80be5f557 Mon Sep 17 00:00:00 2001
+From: Sebastian Wolf 
+Date: Fri, 29 Mar 2024 17:04:29 -0400
+Subject: [PATCH 2/2] derp
+
+---
+ lib/t-utils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/t-utils.c b/lib/t-utils.c
+index 123f114c8..24098655f 100644
+--- a/lib/t-utils.c
 b/lib/t-utils.c
+@@ -136,7 +136,7 @@ int ok_int(int a, int b, const char *name)
+   return TEST_FAIL;
+ }
+ 
+-int ok_unsigned int(unsigned int a, unsigned int b, const char *name)
++int ok_uint(unsigned int a, unsigned int b, const char *name)
+ {
+   if (a == b) {
+   t_pass("%s", name);

diff --git a/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild
index 8e54a1b53013..968007cec951 100644
--- a/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild
@@ -90,6 +90,8 @@ RDEPEND="${CONFIGURE_DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${P}-musl.patch" )
+
 src_configure() {
local myconf
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 33880b0d964a99ebb8398239146195bf9b0f857f
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Mar  2 23:46:53 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Mar  3 01:17:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33880b0d

net-analyzer/nagios-core: add 4.5.1

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest |   1 +
 net-analyzer/nagios-core/nagios-core-4.5.1.ebuild | 266 ++
 2 files changed, 267 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 14f94979bf22..6a4ac48da0dc 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,2 +1,3 @@
 DIST nagios-4.4.14.tar.gz 11341108 BLAKE2B 
254b17fdd90670701d42f4bc90c741592bc21f0813903e5cdcaa671c9b4b7eb32964ae56acf56567198bb8b6d96ce7539bf343b870a4732a46d31557d161a1c1
 SHA512 
dd7ddaf114ac6451b5f157f36bdba27068e94dcfe583cc217f220162b013341984622828574feda8c3c0990388a03ab886791a3188e56bf2eb6b3f8c777c3641
+DIST nagios-4.5.1.tar.gz 11540195 BLAKE2B 
8fa4654a2e7f218d65c8a318418002f09b0e118f44382030900587881d9fac868e8b4416be8e9fb2ae7aecb9555719ef29bc88fd95067d84aecca4bacf28
 SHA512 
71b57d4e0bd2971e8e62b7013c406888d0afd40bc23b032ee9bfdb6e2b3cb083746c5259ef997df241249d2ddaafd6ba5a6470527feddf02e03da32cc0c724b9
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild
new file mode 100644
index ..8e54a1b53013
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+MY_P="${PN/-core}-${PV}"
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi (USE=apache2_modules_cgi)
+#   * mod_cgid (USE=apache2_modules_cgid)
+#   * mod_fcgid (www-apache/mod_fcgid)
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+
+# The dependencies checked by the configure script. All of these are
+# also runtime dependencies; that's why ./configure checks for them.
+CONFIGURE_DEPEND="acct-group/nagios
+   acct-user/nagios
+   virtual/mailx
+   dev-lang/perl:="
+
+# In addition to the things that the ./configure script checks for,
+# we also need to be able to unzip stuff on the build host.
+#
+# We need the apache/lighttpd groups in src_install() for the things
+# installed as the --with-command-group argument, so they go here too.
+# The groups are also needed at runtime, but that is ensured by apache
+# and lighttpd themselves being in RDEPEND.
+BDEPEND="${CONFIGURE_DEPEND}
+   apache2? ( acct-group/apache )
+   lighttpd? ( acct-group/lighttpd )
+   web? ( app-arch/unzip )"
+
+# This is linked into /usr/bin/nagios{,tats}
+DEPEND="dev-libs/libltdl:0"
+
+RDEPEND="${CONFIGURE_DEPEND}
+   ${DEPEND}
+   web? (
+   media-libs/gd[jpeg,png]
+   lighttpd? ( www-servers/lighttpd[php] )
+   apache2? (
+   || (
+   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
+

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: ef501e7a93dfaf327c71ae17a41b37adae6ff120
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Feb 18 22:45:41 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Feb 18 22:49:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef501e7a

net-analyzer/nagios-core: drop 4.4.10

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest  |   1 -
 net-analyzer/nagios-core/nagios-core-4.4.10.ebuild | 266 -
 2 files changed, 267 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index cf2bd00ffeb1..14f94979bf22 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,2 @@
-DIST nagios-4.4.10.tar.gz 11339491 BLAKE2B 
300ffe4abb41c1dc67b6a4976158eae503f9f55593ad492a70a6915e112ad3949d0e0cd0ec2f06a29540544fbcf79495652dd912f1a8e688056c21bbb58ed6d4
 SHA512 
fc8d8203d53c4ec87a831cec0564c9bdb553a43675b974616ce6444340b2170b82091259d495b458ab57b0cce0ab23ab30df09b05d71107ff264462c0ebb37fc
 DIST nagios-4.4.14.tar.gz 11341108 BLAKE2B 
254b17fdd90670701d42f4bc90c741592bc21f0813903e5cdcaa671c9b4b7eb32964ae56acf56567198bb8b6d96ce7539bf343b870a4732a46d31557d161a1c1
 SHA512 
dd7ddaf114ac6451b5f157f36bdba27068e94dcfe583cc217f220162b013341984622828574feda8c3c0990388a03ab886791a3188e56bf2eb6b3f8c777c3641
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
deleted file mode 100644
index dd7e014a712a..
--- a/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-MY_P="${PN/-core}-${PV}"
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi (USE=apache2_modules_cgi)
-#   * mod_cgid (USE=apache2_modules_cgid)
-#   * mod_fcgid (www-apache/mod_fcgid)
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-
-# The dependencies checked by the configure script. All of these are
-# also runtime dependencies; that's why ./configure checks for them.
-CONFIGURE_DEPEND="acct-group/nagios
-   acct-user/nagios
-   virtual/mailx
-   dev-lang/perl:="
-
-# In addition to the things that the ./configure script checks for,
-# we also need to be able to unzip stuff on the build host.
-#
-# We need the apache/lighttpd groups in src_install() for the things
-# installed as the --with-command-group argument, so they go here too.
-# The groups are also needed at runtime, but that is ensured by apache
-# and lighttpd themselves being in RDEPEND.
-BDEPEND="${CONFIGURE_DEPEND}
-   apache2? ( acct-group/apache )
-   lighttpd? ( acct-group/lighttpd )
-   web? ( app-arch/unzip )"
-
-# This is linked into /usr/bin/nagios{,tats}
-DEPEND="dev-libs/libltdl:0"
-
-RDEPEND="${CONFIGURE_DEPEND}
-   ${DEPEND}
-   web? (
-   media-libs/gd[jpeg,png]
-   lighttpd? ( www-servers/lighttpd[php] )
-   apache2? (
-   || (
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Sam James]

commit: 5f40268c2a4a6d18eac0c9b34dc8d8a66df04122
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 18 22:42:26 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 18 22:42:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f40268c

net-analyzer/nagios-core: Stabilize 4.4.14 sparc, #924931

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
index 2fa1e11b8f60..14dbc007802e 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Arthur Zamarin]

commit: 7bdd5b6eecd034a989aad04395175a242f4d803f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Feb 18 19:57:11 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Feb 18 19:57:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bdd5b6e

net-analyzer/nagios-core: Stabilize 4.4.14 ppc64, #924931

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
index 717cd631..2fa1e11b8f60 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Arthur Zamarin]

commit: c2d5fa5d4c5db53f078da9bc73a768cab5e20a00
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Feb 18 19:57:10 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Feb 18 19:57:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d5fa5d

net-analyzer/nagios-core: Stabilize 4.4.14 x86, #924931

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
index bf68fd9a8dbc..717cd631 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Arthur Zamarin]

commit: 95bb2592131e9d36c68dd3d3e517647df7579c36
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Feb 18 19:57:08 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Feb 18 19:57:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95bb2592

net-analyzer/nagios-core: Stabilize 4.4.14 amd64, #924931

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.14.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
index 1f5a40a99885..bf68fd9a8dbc 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 49960b1873c0fdbfcfa57a81b046b05ba2d44eb2
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Sep  9 23:37:12 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Sep  9 23:37:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49960b18

net-analyzer/nagios-core: add 4.4.14, drop 4.4.13

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest   | 2 +-
 .../{nagios-core-4.4.13.ebuild => nagios-core-4.4.14.ebuild}| 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 88d50abd8235..cf2bd00ffeb1 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,3 @@
 DIST nagios-4.4.10.tar.gz 11339491 BLAKE2B 
300ffe4abb41c1dc67b6a4976158eae503f9f55593ad492a70a6915e112ad3949d0e0cd0ec2f06a29540544fbcf79495652dd912f1a8e688056c21bbb58ed6d4
 SHA512 
fc8d8203d53c4ec87a831cec0564c9bdb553a43675b974616ce6444340b2170b82091259d495b458ab57b0cce0ab23ab30df09b05d71107ff264462c0ebb37fc
-DIST nagios-4.4.13.tar.gz 11341150 BLAKE2B 
04e2b261536755806f54a4308ba7f615fe055182f91171ddbae47a23d8a0362c33ce2cb4ce50bb75d4a6f170a9ce5892f30181b7c77a6968707f8965ac5f3a28
 SHA512 
43808bf2f9460d2d0fcac6aea8492cf7abc18a527c671e3a8e776ee3563bb91be1f5f384cfc3943157a355596ce4e1516e3ebc54d51c30479054180b01dfe3e8
+DIST nagios-4.4.14.tar.gz 11341108 BLAKE2B 
254b17fdd90670701d42f4bc90c741592bc21f0813903e5cdcaa671c9b4b7eb32964ae56acf56567198bb8b6d96ce7539bf343b870a4732a46d31557d161a1c1
 SHA512 
dd7ddaf114ac6451b5f157f36bdba27068e94dcfe583cc217f220162b013341984622828574feda8c3c0990388a03ab886791a3188e56bf2eb6b3f8c777c3641
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.13.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
similarity index 100%
rename from net-analyzer/nagios-core/nagios-core-4.4.13.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.4.14.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: b9874c5dbbcb0bd7398b1573cb3405e876496607
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Jun 19 21:44:28 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Jun 19 21:54:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9874c5d

net-analyzer/nagios-core: add 4.4.13

Closes: https://bugs.gentoo.org/908842
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest  |   1 +
 net-analyzer/nagios-core/nagios-core-4.4.13.ebuild | 266 +
 2 files changed, 267 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 4550c9f26511..88d50abd8235 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,2 +1,3 @@
 DIST nagios-4.4.10.tar.gz 11339491 BLAKE2B 
300ffe4abb41c1dc67b6a4976158eae503f9f55593ad492a70a6915e112ad3949d0e0cd0ec2f06a29540544fbcf79495652dd912f1a8e688056c21bbb58ed6d4
 SHA512 
fc8d8203d53c4ec87a831cec0564c9bdb553a43675b974616ce6444340b2170b82091259d495b458ab57b0cce0ab23ab30df09b05d71107ff264462c0ebb37fc
+DIST nagios-4.4.13.tar.gz 11341150 BLAKE2B 
04e2b261536755806f54a4308ba7f615fe055182f91171ddbae47a23d8a0362c33ce2cb4ce50bb75d4a6f170a9ce5892f30181b7c77a6968707f8965ac5f3a28
 SHA512 
43808bf2f9460d2d0fcac6aea8492cf7abc18a527c671e3a8e776ee3563bb91be1f5f384cfc3943157a355596ce4e1516e3ebc54d51c30479054180b01dfe3e8
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.13.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.13.ebuild
new file mode 100644
index ..1f5a40a99885
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.13.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+MY_P="${PN/-core}-${PV}"
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi (USE=apache2_modules_cgi)
+#   * mod_cgid (USE=apache2_modules_cgid)
+#   * mod_fcgid (www-apache/mod_fcgid)
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+
+# The dependencies checked by the configure script. All of these are
+# also runtime dependencies; that's why ./configure checks for them.
+CONFIGURE_DEPEND="acct-group/nagios
+   acct-user/nagios
+   virtual/mailx
+   dev-lang/perl:="
+
+# In addition to the things that the ./configure script checks for,
+# we also need to be able to unzip stuff on the build host.
+#
+# We need the apache/lighttpd groups in src_install() for the things
+# installed as the --with-command-group argument, so they go here too.
+# The groups are also needed at runtime, but that is ensured by apache
+# and lighttpd themselves being in RDEPEND.
+BDEPEND="${CONFIGURE_DEPEND}
+   apache2? ( acct-group/apache )
+   lighttpd? ( acct-group/lighttpd )
+   web? ( app-arch/unzip )"
+
+# This is linked into /usr/bin/nagios{,tats}
+DEPEND="dev-libs/libltdl:0"
+
+RDEPEND="${CONFIGURE_DEPEND}
+   ${DEPEND}
+   web? (
+   media-libs/gd[jpeg,png]
+   lighttpd? ( www-servers/lighttpd[php] )
+   apache2? (
+   || (
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: bce66aecf73ed7827fa58d106e24cb61e01f4f26
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Jun 10 11:39:15 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Jun 10 11:39:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bce66aec

net-analyzer/nagios-core: drop 4.4.7

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest |   1 -
 net-analyzer/nagios-core/nagios-core-4.4.7.ebuild | 266 --
 2 files changed, 267 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 9ce24011d558..4550c9f26511 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,2 @@
 DIST nagios-4.4.10.tar.gz 11339491 BLAKE2B 
300ffe4abb41c1dc67b6a4976158eae503f9f55593ad492a70a6915e112ad3949d0e0cd0ec2f06a29540544fbcf79495652dd912f1a8e688056c21bbb58ed6d4
 SHA512 
fc8d8203d53c4ec87a831cec0564c9bdb553a43675b974616ce6444340b2170b82091259d495b458ab57b0cce0ab23ab30df09b05d71107ff264462c0ebb37fc
-DIST nagios-4.4.7.tar.gz 11340759 BLAKE2B 
4316e6cfc7f576d0fe5ba075aba2931dc850c97fe84b124eceeefaa6c01563c0639c8cecf751e086d5a6f9c0a1079f7e9bd013f961956d7d59536dea4516cf86
 SHA512 
92adc74e687bcbbd742075c8c7222d42c90795a4eb7582e3f1f492349db8200c61f390bf3c4cab4b023c5c111353a43f5dd687b0ee5ab6a8775444e06d42517b
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
deleted file mode 100644
index 9483f0dda9d3..
--- a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-MY_P="${PN/-core}-${PV}"
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi (USE=apache2_modules_cgi)
-#   * mod_cgid (USE=apache2_modules_cgid)
-#   * mod_fcgid (www-apache/mod_fcgid)
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-
-# The dependencies checked by the configure script. All of these are
-# also runtime dependencies; that's why ./configure checks for them.
-CONFIGURE_DEPEND="acct-group/nagios
-   acct-user/nagios
-   virtual/mailx
-   dev-lang/perl:="
-
-# In addition to the things that the ./configure script checks for,
-# we also need to be able to unzip stuff on the build host.
-#
-# We need the apache/lighttpd groups in src_install() for the things
-# installed as the --with-command-group argument, so they go here too.
-# The groups are also needed at runtime, but that is ensured by apache
-# and lighttpd themselves being in RDEPEND.
-BDEPEND="${CONFIGURE_DEPEND}
-   apache2? ( acct-group/apache )
-   lighttpd? ( acct-group/lighttpd )
-   web? ( app-arch/unzip )"
-
-# This is linked into /usr/bin/nagios{,tats}
-DEPEND="dev-libs/libltdl:0"
-
-RDEPEND="${CONFIGURE_DEPEND}
-   ${DEPEND}
-   web? (
-   media-libs/gd[jpeg,png]
-   lighttpd? ( www-servers/lighttpd[php] )
-   apache2? (
-   || (
-   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
-

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Arthur Zamarin]

commit: b00c3cf7a660fd665e84e6bb755a33a4d943ce3f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  9 18:16:23 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 18:16:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b00c3cf7

net-analyzer/nagios-core: Stabilize 4.4.10 sparc, #908133

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
index e9222a1c1a1c..712bba954d18 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Arthur Zamarin]

commit: debabf9d7c5a6ea08e6cb1ca43211f492a02a2db
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  9 17:54:07 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 17:54:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=debabf9d

net-analyzer/nagios-core: Stabilize 4.4.10 ppc64, #908133

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
index 1f5a40a99885..e9222a1c1a1c 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: f4d7ec13c7326b4fab40f1da01924b4a1ae262a9
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Mar  7 02:22:16 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Mar  7 02:23:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d7ec13

net-analyzer/nagios-core: add 4.4.10, drop 4.4.9

Closes: https://bugs.gentoo.org/899940
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest   | 2 +-
 .../nagios-core/{nagios-core-4.4.9.ebuild => nagios-core-4.4.10.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index d8a5a830ece7..9ce24011d558 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,3 @@
+DIST nagios-4.4.10.tar.gz 11339491 BLAKE2B 
300ffe4abb41c1dc67b6a4976158eae503f9f55593ad492a70a6915e112ad3949d0e0cd0ec2f06a29540544fbcf79495652dd912f1a8e688056c21bbb58ed6d4
 SHA512 
fc8d8203d53c4ec87a831cec0564c9bdb553a43675b974616ce6444340b2170b82091259d495b458ab57b0cce0ab23ab30df09b05d71107ff264462c0ebb37fc
 DIST nagios-4.4.7.tar.gz 11340759 BLAKE2B 
4316e6cfc7f576d0fe5ba075aba2931dc850c97fe84b124eceeefaa6c01563c0639c8cecf751e086d5a6f9c0a1079f7e9bd013f961956d7d59536dea4516cf86
 SHA512 
92adc74e687bcbbd742075c8c7222d42c90795a4eb7582e3f1f492349db8200c61f390bf3c4cab4b023c5c111353a43f5dd687b0ee5ab6a8775444e06d42517b
-DIST nagios-4.4.9.tar.gz 11339450 BLAKE2B 
9f99c889ebd070130cbb8bfdbb91b6b0e340a66134b2f2f20d98df08319f713db5a51a9070199e4f842876e06b52b4b0cb65dd2c40fb26508a184db3a36a5650
 SHA512 
59279cd35f329394481e4b3d3f5c3e2418125adeef98f0a8551c2ccf62720459e54c18f8a914be72fb5c2300ab7a69e115f262bfe3aedcf7226380621b32cd8c
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.9.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
similarity index 99%
rename from net-analyzer/nagios-core/nagios-core-4.4.9.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
index e0583cea138b..1f5a40a99885 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.9.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 7135e536f02938f9980e4f17c1c71960c63fb2ca
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Mar  7 02:21:29 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Mar  7 02:21:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7135e536

net-analyzer/nagios-core: drop 4.4.8

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest |   1 -
 net-analyzer/nagios-core/nagios-core-4.4.8.ebuild | 266 --
 2 files changed, 267 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 55ab91ada6a4..d8a5a830ece7 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,3 @@
 DIST nagios-4.4.7.tar.gz 11340759 BLAKE2B 
4316e6cfc7f576d0fe5ba075aba2931dc850c97fe84b124eceeefaa6c01563c0639c8cecf751e086d5a6f9c0a1079f7e9bd013f961956d7d59536dea4516cf86
 SHA512 
92adc74e687bcbbd742075c8c7222d42c90795a4eb7582e3f1f492349db8200c61f390bf3c4cab4b023c5c111353a43f5dd687b0ee5ab6a8775444e06d42517b
-DIST nagios-4.4.8.tar.gz 11339420 BLAKE2B 
785705824a5a47d5f20ac0f3d756d51d6362e230514e486e1dc1fa10488a9f7ca724cc96635f2965aac1bb9dc76dee3cf2ab4e2c1be77b239540b87d1a139a21
 SHA512 
56448628e54b9467d14978b039fc7b37f48be624757a1bd9fe16810101f3ce4a5d740e1c9c367d2b3a8bc408a56bdf295955d8b73d5d74ee92f4750b908e88a7
 DIST nagios-4.4.9.tar.gz 11339450 BLAKE2B 
9f99c889ebd070130cbb8bfdbb91b6b0e340a66134b2f2f20d98df08319f713db5a51a9070199e4f842876e06b52b4b0cb65dd2c40fb26508a184db3a36a5650
 SHA512 
59279cd35f329394481e4b3d3f5c3e2418125adeef98f0a8551c2ccf62720459e54c18f8a914be72fb5c2300ab7a69e115f262bfe3aedcf7226380621b32cd8c
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.8.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.8.ebuild
deleted file mode 100644
index e0583cea138b..
--- a/net-analyzer/nagios-core/nagios-core-4.4.8.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-MY_P="${PN/-core}-${PV}"
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 classicui lighttpd +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi (USE=apache2_modules_cgi)
-#   * mod_cgid (USE=apache2_modules_cgid)
-#   * mod_fcgid (www-apache/mod_fcgid)
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-
-# The dependencies checked by the configure script. All of these are
-# also runtime dependencies; that's why ./configure checks for them.
-CONFIGURE_DEPEND="acct-group/nagios
-   acct-user/nagios
-   virtual/mailx
-   dev-lang/perl:="
-
-# In addition to the things that the ./configure script checks for,
-# we also need to be able to unzip stuff on the build host.
-#
-# We need the apache/lighttpd groups in src_install() for the things
-# installed as the --with-command-group argument, so they go here too.
-# The groups are also needed at runtime, but that is ensured by apache
-# and lighttpd themselves being in RDEPEND.
-BDEPEND="${CONFIGURE_DEPEND}
-   apache2? ( acct-group/apache )
-   lighttpd? ( acct-group/lighttpd )
-   web? ( app-arch/unzip )"
-
-# This is linked into /usr/bin/nagios{,tats}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 1b7f931c3eaa0b6f0f3c2e08f30b8bd9bff9dbdf
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Dec  7 18:04:36 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Dec  7 18:22:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b7f931c

net-analyzer/nagios-core: add 4.4.9

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest |   1 +
 net-analyzer/nagios-core/nagios-core-4.4.9.ebuild | 266 ++
 2 files changed, 267 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index b60d98dfdb81..55ab91ada6a4 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,4 @@
 DIST nagios-4.4.7.tar.gz 11340759 BLAKE2B 
4316e6cfc7f576d0fe5ba075aba2931dc850c97fe84b124eceeefaa6c01563c0639c8cecf751e086d5a6f9c0a1079f7e9bd013f961956d7d59536dea4516cf86
 SHA512 
92adc74e687bcbbd742075c8c7222d42c90795a4eb7582e3f1f492349db8200c61f390bf3c4cab4b023c5c111353a43f5dd687b0ee5ab6a8775444e06d42517b
 DIST nagios-4.4.8.tar.gz 11339420 BLAKE2B 
785705824a5a47d5f20ac0f3d756d51d6362e230514e486e1dc1fa10488a9f7ca724cc96635f2965aac1bb9dc76dee3cf2ab4e2c1be77b239540b87d1a139a21
 SHA512 
56448628e54b9467d14978b039fc7b37f48be624757a1bd9fe16810101f3ce4a5d740e1c9c367d2b3a8bc408a56bdf295955d8b73d5d74ee92f4750b908e88a7
+DIST nagios-4.4.9.tar.gz 11339450 BLAKE2B 
9f99c889ebd070130cbb8bfdbb91b6b0e340a66134b2f2f20d98df08319f713db5a51a9070199e4f842876e06b52b4b0cb65dd2c40fb26508a184db3a36a5650
 SHA512 
59279cd35f329394481e4b3d3f5c3e2418125adeef98f0a8551c2ccf62720459e54c18f8a914be72fb5c2300ab7a69e115f262bfe3aedcf7226380621b32cd8c
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.9.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.9.ebuild
new file mode 100644
index ..e0583cea138b
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.9.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+MY_P="${PN/-core}-${PV}"
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi (USE=apache2_modules_cgi)
+#   * mod_cgid (USE=apache2_modules_cgid)
+#   * mod_fcgid (www-apache/mod_fcgid)
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+
+# The dependencies checked by the configure script. All of these are
+# also runtime dependencies; that's why ./configure checks for them.
+CONFIGURE_DEPEND="acct-group/nagios
+   acct-user/nagios
+   virtual/mailx
+   dev-lang/perl:="
+
+# In addition to the things that the ./configure script checks for,
+# we also need to be able to unzip stuff on the build host.
+#
+# We need the apache/lighttpd groups in src_install() for the things
+# installed as the --with-command-group argument, so they go here too.
+# The groups are also needed at runtime, but that is ensured by apache
+# and lighttpd themselves being in RDEPEND.
+BDEPEND="${CONFIGURE_DEPEND}
+   apache2? ( acct-group/apache )
+   lighttpd? ( acct-group/lighttpd )
+   web? ( app-arch/unzip )"
+
+# This is linked into /usr/bin/nagios{,tats}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/

[Michael Orlitzky]

commit: 9b5f44ca83e451a48770f526097f201974db3c2c
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Nov  8 06:23:01 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Nov  8 13:19:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b5f44ca

net-analyzer/nagios-core: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/28189
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../files/nagios-core-4.4.7-upgrade-sslfix.patch   | 120 -
 1 file changed, 120 deletions(-)

diff --git 
a/net-analyzer/nagios-core/files/nagios-core-4.4.7-upgrade-sslfix.patch 
b/net-analyzer/nagios-core/files/nagios-core-4.4.7-upgrade-sslfix.patch
deleted file mode 100644
index c89f096caaa5..
--- a/net-analyzer/nagios-core/files/nagios-core-4.4.7-upgrade-sslfix.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 5fd2e1541a873e87f689de601beb3bc35910740d Mon Sep 17 00:00:00 2001
-From: Doug Nazar 
-Date: Wed, 22 Jun 2022 15:07:03 -0400
-Subject: [PATCH 1/2] Fix SSL handling during upgrade check
-
-Only update counters if we've received data, not on error (-1) since
-we can then overwrite the stack, causing fault.
-
-my_ssl_connect() can return before initializing ssl & ctx. Ensure NULL
-initialization so *_free() are no-ops.
-
-Cleanly shutdown the channel after receiving all data.
-
-Use the client version of the TLS method to match the other options.

- base/netutils.c | 22 --
- base/utils.c|  4 ++--
- 2 files changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/base/netutils.c b/base/netutils.c
-index 08ee40dd7..689b56f9b 100644
 a/base/netutils.c
-+++ b/base/netutils.c
-@@ -154,7 +154,7 @@ int my_ssl_connect(const char *host_name, int port, int 
*sd, SSL **ssl, SSL_CTX
- 
- #if OPENSSL_VERSION_NUMBER >= 0x1010
- 
--  method = TLS_method();
-+  method = TLS_client_method();
- 
- #else /* OPENSSL_VERSION_NUMBER >= 0x1010 */
- 
-@@ -268,11 +268,11 @@ int my_ssl_sendall(int s, SSL *ssl, const char *buf, int 
*len, int timeout) {
-   /* If we hit one of these two errors, we just 
want to select() the socket again */
-   break;
-   }
-+  } else {
-+  total_sent += n;
-+  bytes_left -= n;
-   }
- 
--  total_sent += n;
--  bytes_left -= n;
--
-   /* make sure we haven't overrun the timeout */
-   time(_time);
-   if(current_time - start_time > timeout) {
-@@ -337,17 +337,19 @@ int my_ssl_recvall(int s, SSL *ssl, char *buf, int *len, 
int timeout) {
-   n = SSL_read(ssl, buf + total_received, bytes_left);
-   if(n <= 0) {
-   int error = SSL_get_error(ssl, n);
-+  /* If we hit one of these two errors, we just want to 
select() the socket again */
-   if (error != SSL_ERROR_WANT_READ && error != 
SSL_ERROR_WANT_WRITE) {
--  /* An actual error happened */
--  /* If we hit one of these two errors, we just 
want to select() the socket again */
-+  /* EOF or an actual error happened */
-+  if (error == SSL_ERROR_ZERO_RETURN)
-+  SSL_shutdown(ssl);
-   break;
-   }
-+  } else {
-+  /* apply bytes we received */
-+  total_received += n;
-+  bytes_left -= n;
-   }
- 
--  /* apply bytes we received */
--  total_received += n;
--  bytes_left -= n;
--
-   /* make sure we haven't overrun the timeout */
-   time(_time);
-   if(current_time - start_time > timeout) {
-diff --git a/base/utils.c b/base/utils.c
-index 79c6efba6..e83f7176a 100644
 a/base/utils.c
-+++ b/base/utils.c
-@@ -3379,8 +3379,8 @@ int query_update_api(void) {
-   }
- 
- #ifdef HAVE_SSL
--  SSL *ssl;
--  SSL_CTX *ctx;
-+  SSL *ssl = NULL;
-+  SSL_CTX *ctx = NULL;
- 
-   int result = my_ssl_connect(api_server, 443, , , , 2);
-   if(sd > 0 && result != ERROR) {
-
-From a2c1415f14db6bbce9ba3d1d5a0c8218dd8c4fb8 Mon Sep 17 00:00:00 2001
-From: Doug Nazar 
-Date: Wed, 22 Jun 2022 15:14:34 -0400
-Subject: [PATCH 2/2] Silence warning about port_str not large enough for port.
-

- base/netutils.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/base/netutils.c b/base/netutils.c
-index 689b56f9b..1fb1ec6a9 100644
 a/base/netutils.c
-+++ b/base/netutils.c
-@@ -46,7 +46,7 @@ int my_ssl_connect(const char *host_name, int port, int *sd, 
SSL **ssl, SSL_CTX
-   hints.ai_socktype = SOCK_STREAM;

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 29aea15ad534c6493fc27fb921ca37a96eb6f0be
Author: Tomáš Mózes  gmail  com>
AuthorDate: Sun Nov  6 11:23:13 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Nov  6 11:52:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29aea15a

net-analyzer/nagios-core: add 4.4.8

Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest |   1 +
 net-analyzer/nagios-core/nagios-core-4.4.8.ebuild | 266 ++
 2 files changed, 267 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 1e1a39a1a09f..b60d98dfdb81 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,2 +1,3 @@
 DIST nagios-4.4.7.tar.gz 11340759 BLAKE2B 
4316e6cfc7f576d0fe5ba075aba2931dc850c97fe84b124eceeefaa6c01563c0639c8cecf751e086d5a6f9c0a1079f7e9bd013f961956d7d59536dea4516cf86
 SHA512 
92adc74e687bcbbd742075c8c7222d42c90795a4eb7582e3f1f492349db8200c61f390bf3c4cab4b023c5c111353a43f5dd687b0ee5ab6a8775444e06d42517b
+DIST nagios-4.4.8.tar.gz 11339420 BLAKE2B 
785705824a5a47d5f20ac0f3d756d51d6362e230514e486e1dc1fa10488a9f7ca724cc96635f2965aac1bb9dc76dee3cf2ab4e2c1be77b239540b87d1a139a21
 SHA512 
56448628e54b9467d14978b039fc7b37f48be624757a1bd9fe16810101f3ce4a5d740e1c9c367d2b3a8bc408a56bdf295955d8b73d5d74ee92f4750b908e88a7
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.8.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.8.ebuild
new file mode 100644
index ..e0583cea138b
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.8.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+MY_P="${PN/-core}-${PV}"
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi (USE=apache2_modules_cgi)
+#   * mod_cgid (USE=apache2_modules_cgid)
+#   * mod_fcgid (www-apache/mod_fcgid)
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+
+# The dependencies checked by the configure script. All of these are
+# also runtime dependencies; that's why ./configure checks for them.
+CONFIGURE_DEPEND="acct-group/nagios
+   acct-user/nagios
+   virtual/mailx
+   dev-lang/perl:="
+
+# In addition to the things that the ./configure script checks for,
+# we also need to be able to unzip stuff on the build host.
+#
+# We need the apache/lighttpd groups in src_install() for the things
+# installed as the --with-command-group argument, so they go here too.
+# The groups are also needed at runtime, but that is ensured by apache
+# and lighttpd themselves being in RDEPEND.
+BDEPEND="${CONFIGURE_DEPEND}
+   apache2? ( acct-group/apache )
+   lighttpd? ( acct-group/lighttpd )
+   web? ( app-arch/unzip )"
+
+# This is linked into /usr/bin/nagios{,tats}
+DEPEND="dev-libs/libltdl:0"
+
+RDEPEND="${CONFIGURE_DEPEND}
+   ${DEPEND}
+   web? (
+   media-libs/gd[jpeg,png]
+   lighttpd? ( www-servers/lighttpd[php] )
+   apache2? (
+   || (
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: d01494d8d4a2219426b3436fc4850ec5a12bb98f
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Nov  6 11:45:21 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Nov  6 11:52:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d01494d8

net-analyzer/nagios-core: drop 4.4.7-r1

Signed-off-by: Michael Orlitzky  gentoo.org>

 .../nagios-core/nagios-core-4.4.7-r1.ebuild| 268 -
 1 file changed, 268 deletions(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.7-r1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.7-r1.ebuild
deleted file mode 100644
index 86ae61814588..
--- a/net-analyzer/nagios-core/nagios-core-4.4.7-r1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-MY_P="${PN/-core}-${PV}"
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 classicui lighttpd +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi (USE=apache2_modules_cgi)
-#   * mod_cgid (USE=apache2_modules_cgid)
-#   * mod_fcgid (www-apache/mod_fcgid)
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-
-# The dependencies checked by the configure script. All of these are
-# also runtime dependencies; that's why ./configure checks for them.
-CONFIGURE_DEPEND="acct-group/nagios
-   acct-user/nagios
-   virtual/mailx
-   dev-lang/perl:="
-
-# In addition to the things that the ./configure script checks for,
-# we also need to be able to unzip stuff on the build host.
-#
-# We need the apache/lighttpd groups in src_install() for the things
-# installed as the --with-command-group argument, so they go here too.
-# The groups are also needed at runtime, but that is ensured by apache
-# and lighttpd themselves being in RDEPEND.
-BDEPEND="${CONFIGURE_DEPEND}
-   apache2? ( acct-group/apache )
-   lighttpd? ( acct-group/lighttpd )
-   web? ( app-arch/unzip )"
-
-# This is linked into /usr/bin/nagios{,tats}
-DEPEND="dev-libs/libltdl:0"
-
-RDEPEND="${CONFIGURE_DEPEND}
-   ${DEPEND}
-   web? (
-   media-libs/gd[jpeg,png]
-   lighttpd? ( www-servers/lighttpd[php] )
-   apache2? (
-   || (
-   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
-   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgid]
-   ( www-servers/apache[${MOD_ALIAS}] 
www-apache/mod_fcgid ) )
-   || (
-   dev-lang/php:*[apache2]
-   dev-lang/php:*[cgi]
-   dev-lang/php:*[fpm] )
-   )
-   )
-   vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-upgrade-sslfix.patch" )
-
-src_configure() {
-   local myconf
-
-   if use !apache2 && use !lighttpd ; then
-   myconf="${myconf} --with-command-group=nagios"
-   else
-   if use apache2 ; then
-   myconf="${myconf} --with-command-group=apache"
-   myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-   elif use lighttpd ; then
-   myconf="${myconf} --with-command-group=lighttpd"
-   fi
-   fi
-
-   # We pass "unknown" as the init type because we don't want it to
-   # guess. Later on, we'll manually install both OpenRC and systemd
-   # services.
-   econf 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/, net-analyzer/nagios-core/

[Michael Orlitzky]

commit: f8955fe8fef3c48bed495ea27ff238febbb8dccb
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Sep 20 12:05:58 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Sep 20 12:16:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8955fe8

net-analyzer/nagios-core: new revision fixing some SSL issues.

This patch has been accepted upstream already and looks like it might
have some security implications (in addition to fixing an ugly crash),
so better safe than sorry. Thanks to Sylvain CANOINE for pointing it
out.

Closes: https://bugs.gentoo.org/871939
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../files/nagios-core-4.4.7-upgrade-sslfix.patch   | 120 +
 .../nagios-core/nagios-core-4.4.7-r1.ebuild| 268 +
 2 files changed, 388 insertions(+)

diff --git 
a/net-analyzer/nagios-core/files/nagios-core-4.4.7-upgrade-sslfix.patch 
b/net-analyzer/nagios-core/files/nagios-core-4.4.7-upgrade-sslfix.patch
new file mode 100644
index ..c89f096caaa5
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios-core-4.4.7-upgrade-sslfix.patch
@@ -0,0 +1,120 @@
+From 5fd2e1541a873e87f689de601beb3bc35910740d Mon Sep 17 00:00:00 2001
+From: Doug Nazar 
+Date: Wed, 22 Jun 2022 15:07:03 -0400
+Subject: [PATCH 1/2] Fix SSL handling during upgrade check
+
+Only update counters if we've received data, not on error (-1) since
+we can then overwrite the stack, causing fault.
+
+my_ssl_connect() can return before initializing ssl & ctx. Ensure NULL
+initialization so *_free() are no-ops.
+
+Cleanly shutdown the channel after receiving all data.
+
+Use the client version of the TLS method to match the other options.
+---
+ base/netutils.c | 22 --
+ base/utils.c|  4 ++--
+ 2 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/base/netutils.c b/base/netutils.c
+index 08ee40dd7..689b56f9b 100644
+--- a/base/netutils.c
 b/base/netutils.c
+@@ -154,7 +154,7 @@ int my_ssl_connect(const char *host_name, int port, int 
*sd, SSL **ssl, SSL_CTX
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x1010
+ 
+-  method = TLS_method();
++  method = TLS_client_method();
+ 
+ #else /* OPENSSL_VERSION_NUMBER >= 0x1010 */
+ 
+@@ -268,11 +268,11 @@ int my_ssl_sendall(int s, SSL *ssl, const char *buf, int 
*len, int timeout) {
+   /* If we hit one of these two errors, we just 
want to select() the socket again */
+   break;
+   }
++  } else {
++  total_sent += n;
++  bytes_left -= n;
+   }
+ 
+-  total_sent += n;
+-  bytes_left -= n;
+-
+   /* make sure we haven't overrun the timeout */
+   time(_time);
+   if(current_time - start_time > timeout) {
+@@ -337,17 +337,19 @@ int my_ssl_recvall(int s, SSL *ssl, char *buf, int *len, 
int timeout) {
+   n = SSL_read(ssl, buf + total_received, bytes_left);
+   if(n <= 0) {
+   int error = SSL_get_error(ssl, n);
++  /* If we hit one of these two errors, we just want to 
select() the socket again */
+   if (error != SSL_ERROR_WANT_READ && error != 
SSL_ERROR_WANT_WRITE) {
+-  /* An actual error happened */
+-  /* If we hit one of these two errors, we just 
want to select() the socket again */
++  /* EOF or an actual error happened */
++  if (error == SSL_ERROR_ZERO_RETURN)
++  SSL_shutdown(ssl);
+   break;
+   }
++  } else {
++  /* apply bytes we received */
++  total_received += n;
++  bytes_left -= n;
+   }
+ 
+-  /* apply bytes we received */
+-  total_received += n;
+-  bytes_left -= n;
+-
+   /* make sure we haven't overrun the timeout */
+   time(_time);
+   if(current_time - start_time > timeout) {
+diff --git a/base/utils.c b/base/utils.c
+index 79c6efba6..e83f7176a 100644
+--- a/base/utils.c
 b/base/utils.c
+@@ -3379,8 +3379,8 @@ int query_update_api(void) {
+   }
+ 
+ #ifdef HAVE_SSL
+-  SSL *ssl;
+-  SSL_CTX *ctx;
++  SSL *ssl = NULL;
++  SSL_CTX *ctx = NULL;
+ 
+   int result = my_ssl_connect(api_server, 443, , , , 2);
+   if(sd > 0 && result != ERROR) {
+
+From a2c1415f14db6bbce9ba3d1d5a0c8218dd8c4fb8 Mon Sep 17 00:00:00 2001
+From: Doug Nazar 
+Date: Wed, 22 Jun 2022 15:14:34 -0400
+Subject: [PATCH 2/2] Silence warning about port_str not large enough for port.
+
+---
+ base/netutils.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/base/netutils.c b/base/netutils.c

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 8faba1a22afd98961fb437ca7f627d39993b9ff4
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Aug 30 01:04:44 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Aug 30 01:04:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8faba1a2

net-analyzer/nagios-core: drop 4.4.6-r3

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest  |   1 -
 .../nagios-core/nagios-core-4.4.6-r3.ebuild| 266 -
 2 files changed, 267 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index a5805796b0b5..1e1a39a1a09f 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,2 @@
-DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B 
b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace
 SHA512 
6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550
 DIST nagios-4.4.7.tar.gz 11340759 BLAKE2B 
4316e6cfc7f576d0fe5ba075aba2931dc850c97fe84b124eceeefaa6c01563c0639c8cecf751e086d5a6f9c0a1079f7e9bd013f961956d7d59536dea4516cf86
 SHA512 
92adc74e687bcbbd742075c8c7222d42c90795a4eb7582e3f1f492349db8200c61f390bf3c4cab4b023c5c111353a43f5dd687b0ee5ab6a8775444e06d42517b
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
deleted file mode 100644
index 9483f0dda9d3..
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-MY_P="${PN/-core}-${PV}"
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi (USE=apache2_modules_cgi)
-#   * mod_cgid (USE=apache2_modules_cgid)
-#   * mod_fcgid (www-apache/mod_fcgid)
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-
-# The dependencies checked by the configure script. All of these are
-# also runtime dependencies; that's why ./configure checks for them.
-CONFIGURE_DEPEND="acct-group/nagios
-   acct-user/nagios
-   virtual/mailx
-   dev-lang/perl:="
-
-# In addition to the things that the ./configure script checks for,
-# we also need to be able to unzip stuff on the build host.
-#
-# We need the apache/lighttpd groups in src_install() for the things
-# installed as the --with-command-group argument, so they go here too.
-# The groups are also needed at runtime, but that is ensured by apache
-# and lighttpd themselves being in RDEPEND.
-BDEPEND="${CONFIGURE_DEPEND}
-   apache2? ( acct-group/apache )
-   lighttpd? ( acct-group/lighttpd )
-   web? ( app-arch/unzip )"
-
-# This is linked into /usr/bin/nagios{,tats}
-DEPEND="dev-libs/libltdl:0"
-
-RDEPEND="${CONFIGURE_DEPEND}
-   ${DEPEND}
-   web? (
-   media-libs/gd[jpeg,png]
-   lighttpd? ( www-servers/lighttpd[php] )
-   apache2? (
-   || (
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Jakov Smolić]

commit: 2b37159ff253be8231b979187508a1a27e166e42
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Aug 29 12:38:31 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Aug 29 12:38:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b37159f

net-analyzer/nagios-core: Stabilize 4.4.7 amd64, #862885

Signed-off-by: Jakov Smolić  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
index fc5ca77f76d3..9483f0dda9d3 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Sam James]

commit: c47ea33b3b8ab0c91f7ae29144b305cb49cc9f9f
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 12 14:26:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 12 14:26:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c47ea33b

net-analyzer/nagios-core: Stabilize 4.4.7 x86, #862885

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
index a41b65d95fc2..fc5ca77f76d3 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Arthur Zamarin]

commit: 6abb945812d6333aa8ea90c3b2d4acb61b369aa1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Aug  3 17:51:03 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Aug  3 17:51:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6abb9458

net-analyzer/nagios-core: Stabilize 4.4.7 sparc, #862885

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
index 33890a293014..a41b65d95fc2 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Arthur Zamarin]

commit: a32f3fbfbd455a3598b7bfcb5446933793bfa67c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Aug  3 16:12:18 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Aug  3 16:12:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a32f3fbf

net-analyzer/nagios-core: Stabilize 4.4.7 ppc64, #862885

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
index e0583cea138b..33890a293014 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: aeb56ba507284d9af7f4819cc50fd296e39c5109
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Jun  2 13:44:36 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Jun  2 17:06:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb56ba5

net-analyzer/nagios-core: new upstream v4.4.7.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest |   1 +
 net-analyzer/nagios-core/nagios-core-4.4.7.ebuild | 266 ++
 2 files changed, 267 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 8e5831ec7d2d..a5805796b0b5 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,2 +1,3 @@
 DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B 
b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace
 SHA512 
6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550
+DIST nagios-4.4.7.tar.gz 11340759 BLAKE2B 
4316e6cfc7f576d0fe5ba075aba2931dc850c97fe84b124eceeefaa6c01563c0639c8cecf751e086d5a6f9c0a1079f7e9bd013f961956d7d59536dea4516cf86
 SHA512 
92adc74e687bcbbd742075c8c7222d42c90795a4eb7582e3f1f492349db8200c61f390bf3c4cab4b023c5c111353a43f5dd687b0ee5ab6a8775444e06d42517b
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
new file mode 100644
index ..e0583cea138b
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+MY_P="${PN/-core}-${PV}"
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi (USE=apache2_modules_cgi)
+#   * mod_cgid (USE=apache2_modules_cgid)
+#   * mod_fcgid (www-apache/mod_fcgid)
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+
+# The dependencies checked by the configure script. All of these are
+# also runtime dependencies; that's why ./configure checks for them.
+CONFIGURE_DEPEND="acct-group/nagios
+   acct-user/nagios
+   virtual/mailx
+   dev-lang/perl:="
+
+# In addition to the things that the ./configure script checks for,
+# we also need to be able to unzip stuff on the build host.
+#
+# We need the apache/lighttpd groups in src_install() for the things
+# installed as the --with-command-group argument, so they go here too.
+# The groups are also needed at runtime, but that is ensured by apache
+# and lighttpd themselves being in RDEPEND.
+BDEPEND="${CONFIGURE_DEPEND}
+   apache2? ( acct-group/apache )
+   lighttpd? ( acct-group/lighttpd )
+   web? ( app-arch/unzip )"
+
+# This is linked into /usr/bin/nagios{,tats}
+DEPEND="dev-libs/libltdl:0"
+
+RDEPEND="${CONFIGURE_DEPEND}
+   ${DEPEND}
+   web? (
+   media-libs/gd[jpeg,png]
+   lighttpd? ( www-servers/lighttpd[php] )
+   apache2? (
+   || (
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: acf9105710f193abfdc1d98025bb6bf27e9f9eab
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Mar 28 12:08:55 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Mar 28 12:09:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf91057

net-analyzer/nagios-core: remove old EAPI=7 ebuild.

Closes: https://bugs.gentoo.org/836082
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../nagios-core/nagios-core-4.4.6-r2.ebuild| 270 -
 1 file changed, 270 deletions(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
deleted file mode 100644
index da7044dcdd6a..
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-MY_P="${PN/-core}-${PV}"
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi (USE=apache2_modules_cgi)
-#   * mod_cgid (USE=apache2_modules_cgid)
-#   * mod_fcgid (www-apache/mod_fcgid)
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-
-# The dependencies checked by the configure script. All of these are
-# also runtime dependencies; that's why ./configure checks for them.
-CONFIGURE_DEPEND="acct-group/nagios
-   acct-user/nagios
-   virtual/mailx
-   perl? ( dev-lang/perl:= )"
-
-# In addition to the things that the ./configure script checks for,
-# we also need to be able to unzip stuff on the build host.
-#
-# We need the apache/lighttpd groups in src_install() for the things
-# installed as the --with-command-group argument, so they go here too.
-# The groups are also needed at runtime, but that is ensured by apache
-# and lighttpd themselves being in RDEPEND.
-BDEPEND="${CONFIGURE_DEPEND}
-   apache2? ( acct-group/apache )
-   lighttpd? ( acct-group/lighttpd )
-   web? ( app-arch/unzip )"
-
-# This is linked into /usr/bin/nagios{,tats}
-DEPEND="dev-libs/libltdl:0"
-
-RDEPEND="${CONFIGURE_DEPEND}
-   ${DEPEND}
-   web? (
-   media-libs/gd[jpeg,png]
-   lighttpd? ( www-servers/lighttpd[php] )
-   apache2? (
-   || (
-   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
-   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgid]
-   ( www-servers/apache[${MOD_ALIAS}] 
www-apache/mod_fcgid ) )
-   || (
-   dev-lang/php:*[apache2]
-   dev-lang/php:*[cgi]
-   dev-lang/php:*[fpm] )
-   )
-   )
-   vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-   local myconf
-
-   if use perl; then
-   myconf="${myconf} --enable-embedded-perl --with-perlcache"
-   fi
-
-   if use !apache2 && use !lighttpd ; then
-   myconf="${myconf} --with-command-group=nagios"
-   else
-   if use apache2 ; then
-   myconf="${myconf} --with-command-group=apache"
-   myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-   elif use lighttpd ; then
-   myconf="${myconf} --with-command-group=lighttpd"
-   fi
-   fi
-
-   # We pass 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: 95dc56b1c85cde288ac27744fd4f038cabe48921
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar 28 06:53:36 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar 28 06:53:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95dc56b1

net-analyzer/nagios-core: x86 stable wrt bug #836162

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
index 8ce83cc229d0..9483f0dda9d3 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: 38b2e48947dace7581115703e044f44d4a8802b8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar 28 06:50:30 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar 28 06:50:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38b2e489

net-analyzer/nagios-core: amd64 stable wrt bug #836162

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
index a41b65d95fc2..8ce83cc229d0 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Sam James]

commit: 735c0f33d8cba36d293db6a75a28b7716bea6d46
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 26 19:43:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 26 19:43:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735c0f33

net-analyzer/nagios-core: Stabilize 4.4.6-r3 ppc64, #836162

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
index bd5d77bb0f4c..a41b65d95fc2 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Arthur Zamarin]

commit: e997f03ab5e14296b341cf2fc40316a3e44601b9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 26 17:09:53 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 26 17:09:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e997f03a

net-analyzer/nagios-core: Stabilize 4.4.6-r3 sparc, #836162

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
index e0583cea138b..bd5d77bb0f4c 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Sam James]

commit: 6857d6b6b42825eac213df2ee6a920f4f518
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 20 18:40:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 20 18:43:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6857d6b6

net-analyzer/nagios-core: [QA] fix tc-get* quoting

This can cause build problems for e.g. 32-bit (gcc -m32 ...)

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild | 4 ++--
 net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
index d868bf041bd4..da7044dcdd6a 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
@@ -136,11 +136,11 @@ src_configure() {
 }
 
 src_compile() {
-   emake CC=$(tc-getCC) nagios
+   emake CC="$(tc-getCC)" nagios
 
if use web; then
# Only compile the CGIs/HTML when USE=web is set.
-   emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
+   emake CC="$(tc-getCC)" DESTDIR="${D}" cgis html
fi
 }
 

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
index 2f3ebaec2193..e0583cea138b 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
@@ -132,11 +132,11 @@ src_configure() {
 }
 
 src_compile() {
-   emake CC=$(tc-getCC) nagios
+   emake CC="$(tc-getCC)" nagios
 
if use web; then
# Only compile the CGIs/HTML when USE=web is set.
-   emake CC=$(tc-getCC) cgis html
+   emake CC="$(tc-getCC)" cgis html
fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 1bf305c7021a5926f7b121c9ba9412bc7ce772be
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Jan 25 14:05:05 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jan 25 14:11:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf305c7

net-analyzer/nagios-core: new revision with unconditional perl dependency.

At some point, Nagios dropped its perl ./configure flags and started
checking for perl unconditionally. Here we synchronize the ebuild with
the upstream build system. I've also removed a DESTDIR="${D}" from
src_compile where it makes no sense (DESTDIR is used only at install).

Closes: https://bugs.gentoo.org/829234
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../nagios-core/nagios-core-4.4.6-r3.ebuild| 266 +
 1 file changed, 266 insertions(+)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
new file mode 100644
index ..2f3ebaec2193
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+MY_P="${PN/-core}-${PV}"
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi (USE=apache2_modules_cgi)
+#   * mod_cgid (USE=apache2_modules_cgid)
+#   * mod_fcgid (www-apache/mod_fcgid)
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+
+# The dependencies checked by the configure script. All of these are
+# also runtime dependencies; that's why ./configure checks for them.
+CONFIGURE_DEPEND="acct-group/nagios
+   acct-user/nagios
+   virtual/mailx
+   dev-lang/perl:="
+
+# In addition to the things that the ./configure script checks for,
+# we also need to be able to unzip stuff on the build host.
+#
+# We need the apache/lighttpd groups in src_install() for the things
+# installed as the --with-command-group argument, so they go here too.
+# The groups are also needed at runtime, but that is ensured by apache
+# and lighttpd themselves being in RDEPEND.
+BDEPEND="${CONFIGURE_DEPEND}
+   apache2? ( acct-group/apache )
+   lighttpd? ( acct-group/lighttpd )
+   web? ( app-arch/unzip )"
+
+# This is linked into /usr/bin/nagios{,tats}
+DEPEND="dev-libs/libltdl:0"
+
+RDEPEND="${CONFIGURE_DEPEND}
+   ${DEPEND}
+   web? (
+   media-libs/gd[jpeg,png]
+   lighttpd? ( www-servers/lighttpd[php] )
+   apache2? (
+   || (
+   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
+   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgid]
+   ( www-servers/apache[${MOD_ALIAS}] 
www-apache/mod_fcgid ) )
+   || (
+   dev-lang/php:*[apache2]
+   dev-lang/php:*[cgi]
+   dev-lang/php:*[fpm] )
+   )
+   )
+   vim-syntax? ( app-vim/nagios-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+   local myconf
+
+   if use !apache2 && use !lighttpd ; then
+   myconf="${myconf} --with-command-group=nagios"
+   else
+   if use apache2 ; then
+   myconf="${myconf} --with-command-group=apache"
+   myconf="${myconf} 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: ccf184341a42a7238db73c0309d908ad56ae0573
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Aug 19 01:34:56 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Aug 19 01:36:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf18434

net-analyzer/nagios-core: remove "unused" nagios-core-4.4.6.ebuild.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6.ebuild | 252 --
 1 file changed, 252 deletions(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
deleted file mode 100644
index e0fac4bf5eb..000
--- a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${PN/-core}-${PV}"
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi (USE=apache2_modules_cgi)
-#   * mod_cgid (USE=apache2_modules_cgid)
-#   * mod_fcgid (www-apache/mod_fcgid)
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-
-# The dependencies checked by the configure script. All of these are
-# also runtime dependencies; that's why ./configure checks for them.
-CONFIGURE_DEPEND="acct-group/nagios
-   acct-user/nagios
-   virtual/mailx
-   perl? ( dev-lang/perl:= )"
-
-# In addition to the things that the ./configure script checks for,
-# we also need to be able to unzip stuff on the build host.
-BDEPEND="${CONFIGURE_DEPEND} web? ( app-arch/unzip )"
-
-# This is linked into /usr/bin/nagios{,tats}
-DEPEND="dev-libs/libltdl:0"
-
-RDEPEND="${CONFIGURE_DEPEND}
-   ${DEPEND}
-   web? (
-   media-libs/gd[jpeg,png]
-   lighttpd? ( www-servers/lighttpd[php] )
-   apache2? (
-   || (
-   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
-   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgid]
-   ( www-servers/apache[${MOD_ALIAS}] 
www-apache/mod_fcgid ) )
-   || (
-   dev-lang/php:*[apache2]
-   dev-lang/php:*[cgi]
-   dev-lang/php:*[fpm] )
-   )
-   )
-   vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-   local myconf
-
-   if use perl; then
-   myconf="${myconf} --enable-embedded-perl --with-perlcache"
-   fi
-
-   if use !apache2 && use !lighttpd ; then
-   myconf="${myconf} --with-command-group=nagios"
-   else
-   if use apache2 ; then
-   myconf="${myconf} --with-command-group=apache"
-   myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-   elif use lighttpd ; then
-   myconf="${myconf} --with-command-group=lighttpd"
-   fi
-   fi
-
-   econf ${myconf} \
-   --prefix="${EPREFIX}/usr" \
-   --bindir="${EPREFIX}/usr/sbin" \
-   --localstatedir="${EPREFIX}/var/lib/nagios" \
-   --sysconfdir="${EPREFIX}/etc/nagios" \
-   --libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
-   --with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: 4773127336769d8cf961e520ea0005b77d08c705
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Aug 19 01:25:32 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Aug 19 01:25:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47731273

net-analyzer/nagios-core: amd64 stable wrt bug #808642

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
index 931542109b6..6cbbe87c684 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: 3dd697061589cb868afceec30d016d6294919f86
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug 18 12:58:20 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug 18 12:58:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dd69706

net-analyzer/nagios-core: x86 stable wrt bug #808642

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
index 0dfa7c80944..931542109b6 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: e2489a2832935d35c5c36b0131d7cc47b2863bcf
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 17 05:37:39 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 17 05:37:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2489a28

net-analyzer/nagios-core: sparc stable wrt bug #808642

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
index c087ed4f7fc..0dfa7c80944 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: 5f6affb88e27ed72b755aca67c8f8f27361a5393
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 17 05:37:08 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 17 05:37:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f6affb8

net-analyzer/nagios-core: ppc64 stable wrt bug #808642

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
index 712c11c8f40..c087ed4f7fc 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: 991f3b412850a16009a6b8835b564d208590e125
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 17 05:36:32 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 17 05:36:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=991f3b41

net-analyzer/nagios-core: ppc stable wrt bug #808642

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
index 90f596a5cc8..712c11c8f40 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: ea33afbdeaa8a6d2aa86bdfeddc8dbb45818e875
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Feb 24 00:32:38 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Feb 24 00:33:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea33afbd

net-analyzer/nagios-core: new revision to install systemd service.

Closes: https://bugs.gentoo.org/771774
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Michael Orlitzky  gentoo.org>

 ...-core-4.4.6-r1.ebuild => nagios-core-4.4.6-r2.ebuild} | 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
similarity index 93%
rename from net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
index b345507323e..90f596a5cc8 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit systemd toolchain-funcs
 
 MY_P="${PN/-core}-${PV}"
 DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
@@ -108,6 +108,9 @@ src_configure() {
fi
fi
 
+   # We pass "unknown" as the init type because we don't want it to
+   # guess. Later on, we'll manually install both OpenRC and systemd
+   # services.
econf ${myconf} \
--prefix="${EPREFIX}/usr" \
--bindir="${EPREFIX}/usr/sbin" \
@@ -115,7 +118,8 @@ src_configure() {
--sysconfdir="${EPREFIX}/etc/nagios" \
--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
--with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \
-   --with-webdir="${EPREFIX}/usr/share/nagios/htdocs"
+   --with-webdir="${EPREFIX}/usr/share/nagios/htdocs" \
+   --with-init-type="unknown"
 
# The paths in the web server configuration files need to match
# those passed to econf above.
@@ -198,7 +202,13 @@ src_install() {
doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
fi
 
+   # The ./configure script for nagios detects the init system on the
+   # build host, which is wrong for all sorts of reasons. We've gone
+   # to great lengths above to avoid running "install-init" -- even
+   # indirectly -- and so now we must install whatever service files
+   # we need by hand.
newinitd startup/openrc-init nagios
+   systemd_newunit startup/default-service nagios.service
 
if use web ; then
if use apache2 ; then

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 2af8886ca2faaabdc66c0e502319b3e94c4b98b2
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Sep 20 14:45:08 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Sep 20 14:45:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af8886c

net-analyzer/nagios-core: new revision with web groups in BDEPEND.

The apache/lighttpd groups are needed in src_install(), so they are
needed in BDEPEND as well as RDEPEND (where they appear transitively).

Closes: https://bugs.gentoo.org/743610
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../nagios-core/nagios-core-4.4.6-r1.ebuild| 260 +
 1 file changed, 260 insertions(+)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild
new file mode 100644
index 000..b345507323e
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${PN/-core}-${PV}"
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi (USE=apache2_modules_cgi)
+#   * mod_cgid (USE=apache2_modules_cgid)
+#   * mod_fcgid (www-apache/mod_fcgid)
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+
+# The dependencies checked by the configure script. All of these are
+# also runtime dependencies; that's why ./configure checks for them.
+CONFIGURE_DEPEND="acct-group/nagios
+   acct-user/nagios
+   virtual/mailx
+   perl? ( dev-lang/perl:= )"
+
+# In addition to the things that the ./configure script checks for,
+# we also need to be able to unzip stuff on the build host.
+#
+# We need the apache/lighttpd groups in src_install() for the things
+# installed as the --with-command-group argument, so they go here too.
+# The groups are also needed at runtime, but that is ensured by apache
+# and lighttpd themselves being in RDEPEND.
+BDEPEND="${CONFIGURE_DEPEND}
+   apache2? ( acct-group/apache )
+   lighttpd? ( acct-group/lighttpd )
+   web? ( app-arch/unzip )"
+
+# This is linked into /usr/bin/nagios{,tats}
+DEPEND="dev-libs/libltdl:0"
+
+RDEPEND="${CONFIGURE_DEPEND}
+   ${DEPEND}
+   web? (
+   media-libs/gd[jpeg,png]
+   lighttpd? ( www-servers/lighttpd[php] )
+   apache2? (
+   || (
+   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
+   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgid]
+   ( www-servers/apache[${MOD_ALIAS}] 
www-apache/mod_fcgid ) )
+   || (
+   dev-lang/php:*[apache2]
+   dev-lang/php:*[cgi]
+   dev-lang/php:*[fpm] )
+   )
+   )
+   vim-syntax? ( app-vim/nagios-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+   local myconf
+
+   if use perl; then
+   myconf="${myconf} --enable-embedded-perl --with-perlcache"
+   fi
+
+   if use !apache2 && use !lighttpd ; then
+   myconf="${myconf} --with-command-group=nagios"
+   else
+   if use apache2 ; then
+   myconf="${myconf} --with-command-group=apache"
+   myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+   elif 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 40f9c50e93d99e5afbddadfa6373e5637ff5a6e3
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Jun 11 12:29:42 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Jun 11 12:31:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f9c50e

net-analyzer/nagios-core: remove old version subject to CVE-2020-13977.

Bug: https://bugs.gentoo.org/727662
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest  |   1 -
 .../nagios-core/nagios-core-4.4.5-r6.ebuild| 242 -
 2 files changed, 243 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 98f6770b493..8e5831ec7d2 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,2 @@
-DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B 
e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675
 SHA512 
14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30
 DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B 
b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace
 SHA512 
6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
deleted file mode 100644
index b8bec80a3e0..000
--- a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="acct-group/nagios
-   acct-user/nagios
-   dev-libs/libltdl:0
-   virtual/mailx
-   perl? ( dev-lang/perl:= )
-   web? (
-   app-arch/unzip
-   media-libs/gd[jpeg,png]
-   lighttpd? ( www-servers/lighttpd[php] )
-   apache2? (
-   || (
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
-   || (
-   dev-lang/php:*[apache2]
-   dev-lang/php:*[cgi]
-   dev-lang/php:*[fpm] )
-   )
-   )"
-RDEPEND="${DEPEND}
-   vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-   local myconf
-
-   if use perl; then
-   myconf="${myconf} --enable-embedded-perl --with-perlcache"
-   fi
-
-   if use !apache2 && use !lighttpd ; 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: 50eb3db5422b0ffa1de978097510a2fa3ec8104e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun 11 08:34:18 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun 11 08:34:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50eb3db5

net-analyzer/nagios-core: x86 stable wrt bug #727662

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
index b46a4b2b0a3..e0fac4bf5eb 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: 8ba6427746ec43e2c08a43810dc264ff3fff5796
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun 11 08:31:40 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun 11 08:31:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba64277

net-analyzer/nagios-core: ppc64 stable wrt bug #727662

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
index 6d73ddf3281..b46a4b2b0a3 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: f17dc1f943fdae8cc558400e253a26e77d375a2b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun 11 08:29:25 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun 11 08:29:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17dc1f9

net-analyzer/nagios-core: ppc stable wrt bug #727662

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
index 0eb3d886ee2..6d73ddf3281 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: 3a39fb0552b0a4d17653dbbed510b58d6474ef2b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun 11 08:25:35 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun 11 08:25:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a39fb05

net-analyzer/nagios-core: amd64 stable wrt bug #727662

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
index ee74f2b599d..0eb3d886ee2 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: b789da01456ed85e04cf14a800122807bb49b23c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 10 13:01:35 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 10 13:01:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b789da01

net-analyzer/nagios-core: sparc stable wrt bug #727662

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
index e6228fde403..ee74f2b599d 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/

[Michael Orlitzky]

commit: abbb570371d5e4d3ef38daee46aff329cd863920
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Jun  9 18:28:37 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jun  9 19:22:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abbb5703

net-analyzer/nagios-core: remove unused files

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/16147

 net-analyzer/nagios-core/files/99_nagios4.conf   | 16 
 net-analyzer/nagios-core/files/lighttpd_nagios4.conf | 15 ---
 2 files changed, 31 deletions(-)

diff --git a/net-analyzer/nagios-core/files/99_nagios4.conf 
b/net-analyzer/nagios-core/files/99_nagios4.conf
deleted file mode 100644
index b04c2980eba..000
--- a/net-analyzer/nagios-core/files/99_nagios4.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-  ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
-  
-AllowOverride AuthConfig
-Options ExecCGI
-Require all granted
-  
-
-  Alias /nagios /usr/share/nagios/htdocs
-  
-AllowOverride AuthConfig
-Require all granted
-  
-
-

diff --git a/net-analyzer/nagios-core/files/lighttpd_nagios4.conf 
b/net-analyzer/nagios-core/files/lighttpd_nagios4.conf
deleted file mode 100644
index a073f177f23..000
--- a/net-analyzer/nagios-core/files/lighttpd_nagios4.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-server.modules += ("mod_cgi")
-server.modules += ("mod_alias")
-
-$HTTP["url"] =~ "^/nagios/cgi-bin/" {
-  dir-listing.activate = "disable"
-  cgi.assign = (
-".pl"  => "/usr/bin/perl",
-".cgi" => ""
-  )
-}
-
-alias.url += (
-  "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin",
-  "/nagios" => "/usr/share/nagios/htdocs"
-)

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 0e6eece7f3c5e2e1bc1f6d2b55287bd995ce1e12
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat May  9 22:59:12 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun May 10 11:25:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e6eece7

net-analyzer/nagios-core: new EAPI=7 version 4.4.6 with gcc-10.x fix.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest |   1 +
 net-analyzer/nagios-core/nagios-core-4.4.6.ebuild | 252 ++
 2 files changed, 253 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index ee90e3714d7..98f6770b493 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,2 +1,3 @@
 DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B 
e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675
 SHA512 
14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30
+DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B 
b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace
 SHA512 
6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
new file mode 100644
index 000..e6228fde403
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${PN/-core}-${PV}"
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi (USE=apache2_modules_cgi)
+#   * mod_cgid (USE=apache2_modules_cgid)
+#   * mod_fcgid (www-apache/mod_fcgid)
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+
+# The dependencies checked by the configure script. All of these are
+# also runtime dependencies; that's why ./configure checks for them.
+CONFIGURE_DEPEND="acct-group/nagios
+   acct-user/nagios
+   virtual/mailx
+   perl? ( dev-lang/perl:= )"
+
+# In addition to the things that the ./configure script checks for,
+# we also need to be able to unzip stuff on the build host.
+BDEPEND="${CONFIGURE_DEPEND} web? ( app-arch/unzip )"
+
+# This is linked into /usr/bin/nagios{,tats}
+DEPEND="dev-libs/libltdl:0"
+
+RDEPEND="${CONFIGURE_DEPEND}
+   ${DEPEND}
+   web? (
+   media-libs/gd[jpeg,png]
+   lighttpd? ( www-servers/lighttpd[php] )
+   apache2? (
+   || (
+   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
+   
www-servers/apache[${MOD_ALIAS},apache2_modules_cgid]
+   ( www-servers/apache[${MOD_ALIAS}] 
www-apache/mod_fcgid ) )
+   || (
+   dev-lang/php:*[apache2]
+  

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: dea660a107f90a55141e3984adf05b4098f46f69
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Apr 13 09:56:52 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Apr 13 09:56:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea660a1

net-analyzer/nagios-core: sparc stable wrt bug #715940

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
index 4fd452fbe90..b8bec80a3e0 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 0e8851a12d17e00f0362752afb3df5dbd964764e
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Apr  4 14:10:32 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Apr  4 14:10:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8851a1

net-analyzer/nagios-core: remove old versions.

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest  |   1 -
 net-analyzer/nagios-core/nagios-core-4.3.4.ebuild  | 214 ---
 .../nagios-core/nagios-core-4.4.5-r3.ebuild| 232 -
 3 files changed, 447 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index c1cd0864f89..ee90e3714d7 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,2 @@
-DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B 
e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675
 SHA512 
14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
deleted file mode 100644
index 53142ce9540..000
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-# sys-devel/libtool dependency is bug #401237.
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="sys-devel/libtool
-   virtual/mailx
-   perl? ( dev-lang/perl:= )
-   web? (
-   app-arch/unzip
-   media-libs/gd[jpeg,png]
-   lighttpd? ( www-servers/lighttpd[php] )
-   apache2? (
-   || (
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
-   || (
-   dev-lang/php:*[apache2]
-   dev-lang/php:*[cgi]
-   dev-lang/php:*[fpm] )
-   )
-   )"
-RDEPEND="${DEPEND}
-   vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-   enewgroup nagios
-   enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_configure() {
-   local myconf
-
-   if use perl; then
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: bd2a1a62ca5a35f9678ae6e25e4dc68e4f329030
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr  4 13:26:54 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr  4 13:26:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2a1a62

net-analyzer/nagios-core: amd64 stable wrt bug #715940

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
index 54fbb316d46..4fd452fbe90 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: 9f9fd19cf7c98b9ff5d3818c63a37d507fa743a0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Apr  3 16:14:37 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Apr  3 16:14:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9fd19c

net-analyzer/nagios-core: x86 stable wrt bug #715940

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
index f16906433c2..54fbb316d46 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: b26e2afd9d49031ece5928d93bf3b36fc52585e9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Apr  3 16:13:26 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Apr  3 16:13:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26e2afd

net-analyzer/nagios-core: ppc stable wrt bug #715940

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
index 6ec6bb7044f..62e51bf7977 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: 3ec0faa4ba05f25e50cea96ee95a946062b8a6c9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Apr  3 16:14:01 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Apr  3 16:14:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ec0faa4

net-analyzer/nagios-core: ppc64 stable wrt bug #715940

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
index 62e51bf7977..f16906433c2 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 614b395ef8d78e43fda8c1410a7319794594932f
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Jan 15 15:54:39 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Jan 17 17:01:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=614b395e

net-analyzer/nagios-core: new revision using a GLEP81 user/group.

Closes: https://bugs.gentoo.org/701224
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Michael Orlitzky  gentoo.org>

 ...ios-core-4.4.5-r5.ebuild => nagios-core-4.4.5-r6.ebuild} | 13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
similarity index 98%
rename from net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
index a1922298fa0..6ec6bb7044f 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit toolchain-funcs user
+inherit toolchain-funcs
 
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
@@ -47,7 +47,9 @@ REQUIRED_USE="apache2? ( !lighttpd )"
 # extract a snapshot of AngularJS, but that's only needed when USE=web.
 #
 MOD_ALIAS=apache2_modules_alias
-DEPEND="dev-libs/libltdl:0
+DEPEND="acct-group/nagios
+   acct-user/nagios
+   dev-libs/libltdl:0
virtual/mailx
perl? ( dev-lang/perl:= )
web? (
@@ -70,11 +72,6 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-   enewgroup nagios
-   enewuser nagios -1 -1 -1 nagios
-}
-
 src_configure() {
local myconf
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/, net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 9211c22e7c5016ba72d98d115c2a8071e4a89534
Author: Tomas Mozes  gmail  com>
AuthorDate: Thu Nov 14 06:56:40 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Nov 14 12:52:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9211c22e

net-analyzer/nagios-core: fix cgi-bin path for apache

Bug: https://bugs.gentoo.org/699002
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/files/99_nagios4-r1.conf   | 2 +-
 .../{nagios-core-4.4.5-r4.ebuild => nagios-core-4.4.5-r5.ebuild}| 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nagios-core/files/99_nagios4-r1.conf 
b/net-analyzer/nagios-core/files/99_nagios4-r1.conf
index 54531ed6275..8d080d5c17b 100644
--- a/net-analyzer/nagios-core/files/99_nagios4-r1.conf
+++ b/net-analyzer/nagios-core/files/99_nagios4-r1.conf
@@ -1,6 +1,6 @@
 
 
-  ScriptAlias /nagios/cgi-bin/ @CGIBINDIR@
+  ScriptAlias /nagios/cgi-bin @CGIBINDIR@
   
 AllowOverride AuthConfig
 Options ExecCGI

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild
similarity index 97%
rename from net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild
index 4a5ffee95d4..a1922298fa0 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild
@@ -105,8 +105,8 @@ src_configure() {
# The paths in the web server configuration files need to match
# those passed to econf above.
cp "${FILESDIR}/99_nagios4-r1.conf" \
-  "${FILESDIR}/lighttpd_nagios4-r1.conf" \
-  "${T}/" || die "failed to create copies of web server conf files"
+   "${FILESDIR}/lighttpd_nagios4-r1.conf" \
+   "${T}/" || die "failed to create copies of web server conf 
files"
 
sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \
-e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \
@@ -189,7 +189,7 @@ src_install() {
if use apache2 ; then
# Install the Nagios configuration file for Apache.
insinto "/etc/apache2/modules.d"
-   doins "${T}/99_nagios4-r1.conf"
+   newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf"
elif use lighttpd ; then
# Install the Nagios configuration file for Lighttpd.
insinto /etc/lighttpd

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/, net-analyzer/nagios-core/files/

[Michael Orlitzky]

commit: 1d689dbb5a8783f717d85f10344bf24991e557e1
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Nov  3 00:26:57 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Nov  5 17:43:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d689dbb

net-analyzer/nagios-core: synchronize econf and web server paths.

The nagios ./configure script takes two custom "cgibindir" and
"webdir" paths that tell it where to put its CGI files and public
document root. The web server configuration files that we ship also
need to know these paths, which normally wouldn't be a problem, except
that they involve a call to $(get_libdir).

There doesn't seem to be an elegant place to upstream these conf files
(which are Gentoo-specific), so we adopt the next-best solution: use
@CGIBINDIR@ and @WEBDIR@ as placeholders, and then replace them with
sed in src_configure().

For consistency with the PMS definition of econf, these paths (and all
others) now have EPREFIX prepended.

Closes: https://bugs.gentoo.org/699002
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/files/99_nagios4-r1.conf  |  16 ++
 .../nagios-core/files/lighttpd_nagios4-r1.conf |  15 ++
 .../nagios-core/nagios-core-4.4.5-r4.ebuild| 245 +
 3 files changed, 276 insertions(+)

diff --git a/net-analyzer/nagios-core/files/99_nagios4-r1.conf 
b/net-analyzer/nagios-core/files/99_nagios4-r1.conf
new file mode 100644
index 000..54531ed6275
--- /dev/null
+++ b/net-analyzer/nagios-core/files/99_nagios4-r1.conf
@@ -0,0 +1,16 @@
+
+
+  ScriptAlias /nagios/cgi-bin/ @CGIBINDIR@
+  
+AllowOverride AuthConfig
+Options ExecCGI
+Require all granted
+  
+
+  Alias /nagios @WEBDIR@
+  
+AllowOverride AuthConfig
+Require all granted
+  
+
+

diff --git a/net-analyzer/nagios-core/files/lighttpd_nagios4-r1.conf 
b/net-analyzer/nagios-core/files/lighttpd_nagios4-r1.conf
new file mode 100644
index 000..2653922ddc9
--- /dev/null
+++ b/net-analyzer/nagios-core/files/lighttpd_nagios4-r1.conf
@@ -0,0 +1,15 @@
+server.modules += ("mod_cgi")
+server.modules += ("mod_alias")
+
+$HTTP["url"] =~ "^/nagios/cgi-bin/" {
+  dir-listing.activate = "disable"
+  cgi.assign = (
+".pl"  => "/usr/bin/perl",
+".cgi" => ""
+  )
+}
+
+alias.url += (
+  "/nagios/cgi-bin" => "@CGIBINDIR@",
+  "/nagios" => "@WEBDIR@"
+)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild
new file mode 100644
index 000..4a5ffee95d4
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="dev-libs/libltdl:0
+   virtual/mailx
+   perl? ( dev-lang/perl:= )
+   web? (
+   app-arch/unzip
+   media-libs/gd[jpeg,png]
+   lighttpd? ( www-servers/lighttpd[php] )
+   apache2? (
+   || (
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: e0435bea90ce3a5163bd01991e58f616208bff54
Author: Tomas Mozes  gmail  com>
AuthorDate: Fri Aug 30 07:15:44 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Aug 31 21:34:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0435bea

net-analyzer/nagios-core: bump to 4.4.5

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest |   1 +
 net-analyzer/nagios-core/nagios-core-4.4.5.ebuild | 213 ++
 2 files changed, 214 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 2595d9143c6..87e9dd98c4f 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,4 @@
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 DIST nagios-4.4.4.tar.gz 11303598 BLAKE2B 
e4015ca5c0383b0540f2eaf3d608343df850c6045a4539c1f1ab8c19dc95e9223816efe71034b37f6995cb623dc6b83c92e22a677fe687a34d2215b1a2758c90
 SHA512 
c8f2b83bad744d67be4ba8356d9eea0be3efbf42d9a215d64815cdf7d944eba798348ce0faea6cebe64f1c99e0edbf12540d83ca42f8b4b563cbcc60139afdb0
+DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B 
e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675
 SHA512 
14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.5.ebuild
new file mode 100644
index 000..74ddb853c43
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="dev-libs/libltdl:0
+   virtual/mailx
+   perl? ( dev-lang/perl:= )
+   web? (
+   app-arch/unzip
+   media-libs/gd[jpeg,png]
+   lighttpd? ( www-servers/lighttpd[php] )
+   apache2? (
+   || (
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
+   || (
+   dev-lang/php:*[apache2]
+   dev-lang/php:*[cgi]
+   dev-lang/php:*[fpm] )
+   )
+   )"
+RDEPEND="${DEPEND}
+   vim-syntax? ( app-vim/nagios-syntax )"
+

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: e12eae4881db013c5569f4e4dafd70081cf3e485
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Aug 31 19:58:35 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Aug 31 21:34:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12eae48

net-analyzer/nagios-core: use default homedir/shell for "nagios" user.

With GLEP81 approved, we're finally going to be able to (properly)
share the "nagios" user between the packages that require it. As part
of the migration process, I'd like to clean up its home directory and
shell usage: I'm fairly sure that the default (/dev/null and
/sbin/nologin) will work, at least for nagios-core. Whether or not
this will affect any other packages is harder to discern.

I'm using this new ~arch version of nagios-core to test things out. In
this and later versions, we'll use the default "enewuser" arguments.
If this causes a problem, it should appear only in new installs
(enewuser is a no-op on upgrades), and with any luck someone will file
a bug to say it doesn't work.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../{nagios-core-4.4.5.ebuild => nagios-core-4.4.5-r1.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.5-r1.ebuild
similarity index 99%
rename from net-analyzer/nagios-core/nagios-core-4.4.5.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.4.5-r1.ebuild
index 74ddb853c43..fdfccca6aab 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.5.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r1.ebuild
@@ -72,7 +72,7 @@ S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
enewgroup nagios
-   enewuser nagios -1 /bin/bash /var/nagios/home nagios
+   enewuser nagios -1 -1 -1 nagios
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/, net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 390a02aa9cab0a7bdf5a86b0abc48f842d5b5ed3
Author: Tomas Mozes  gmail  com>
AuthorDate: Fri Aug 30 07:19:45 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Aug 31 21:34:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=390a02aa

net-analyzer/nagios-core: drop old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest  |   1 -
 .../nagios-core-4.4.4-no-zombie-processes.patch| 158 ---
 .../nagios-core/nagios-core-4.4.4-r1.ebuild| 215 -
 3 files changed, 374 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 87e9dd98c4f..c1cd0864f89 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,3 @@
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
-DIST nagios-4.4.4.tar.gz 11303598 BLAKE2B 
e4015ca5c0383b0540f2eaf3d608343df850c6045a4539c1f1ab8c19dc95e9223816efe71034b37f6995cb623dc6b83c92e22a677fe687a34d2215b1a2758c90
 SHA512 
c8f2b83bad744d67be4ba8356d9eea0be3efbf42d9a215d64815cdf7d944eba798348ce0faea6cebe64f1c99e0edbf12540d83ca42f8b4b563cbcc60139afdb0
 DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B 
e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675
 SHA512 
14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git 
a/net-analyzer/nagios-core/files/nagios-core-4.4.4-no-zombie-processes.patch 
b/net-analyzer/nagios-core/files/nagios-core-4.4.4-no-zombie-processes.patch
deleted file mode 100644
index 4592b1d27f4..000
--- a/net-analyzer/nagios-core/files/nagios-core-4.4.4-no-zombie-processes.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-This was an upstream bug that has been reverted for nagios-core-4.4.5:
-
-  https://github.com/NagiosEnterprises/nagioscore/issues/683
-
-Thanks to Tomáš Mózes (hydrapolic) for noticing and reporting the fix.
-
-diff --git a/base/events.c b/base/events.c
-index d601e970f..bb27b3240 100644
 a/base/events.c
-+++ b/base/events.c
-@@ -351,13 +351,12 @@ void init_timing_loop(void) {
-*/
-   check_delay =
-   mult_factor * 
scheduling_info.service_inter_check_delay;
--  time_t check_window = 
reschedule_within_timeperiod(next_valid_time, temp_service->check_period_ptr, 
check_window(temp_service)) - current_time;
--  if(check_delay > check_window) {
-+  if(check_delay > check_window(temp_service)) {
-   log_debug_info(DEBUGL_EVENTS, 0,
-   "  Fixing check time %lu secs 
too far away\n",
--  check_delay - check_window);
-+  check_delay - 
check_window(temp_service));
-   fixed_services++;
--  check_delay = check_window;
-+  check_delay = check_window(temp_service);
-   log_debug_info(DEBUGL_EVENTS, 0, "  New check 
offset: %d\n",
-   check_delay);
-   }
-@@ -370,7 +369,8 @@ void init_timing_loop(void) {
-   if(is_valid_time == ERROR) {
-   log_debug_info(DEBUGL_EVENTS, 2, "Preferred 
Time is Invalid In Timeperiod '%s': %lu --> %s\n", 
temp_service->check_period_ptr->name, (unsigned long)temp_service->next_check, 
ctime(_service->next_check));
-   get_next_valid_time(temp_service->next_check, 
_valid_time, temp_service->check_period_ptr);
--  temp_service->next_check = 
reschedule_within_timeperiod(next_valid_time, temp_service->check_period_ptr, 
check_window(temp_service));
-+  temp_service->next_check = 
-+  (time_t)(next_valid_time + check_delay);
-   }
- 
-   log_debug_info(DEBUGL_EVENTS, 2, "Actual Check Time: 
%lu --> %s\n", (unsigned 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 43693c5bb6b94d25f07debba38ae861139f49737
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Aug 31 20:39:16 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Aug 31 21:34:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43693c5b

net-analyzer/nagios-core: add keepdirs to fix QA warnings.

You will never convince me that warning about the correct behavior and
forcing developers to manually affirm that it's correct is wise.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../{nagios-core-4.4.5-r2.ebuild => nagios-core-4.4.5-r3.ebuild}| 6 ++
 1 file changed, 6 insertions(+)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild
similarity index 95%
rename from net-analyzer/nagios-core/nagios-core-4.4.5-r2.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild
index 2fab4595e65..b6994129cef 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.5-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild
@@ -141,6 +141,12 @@ src_install() {
# No INSTALL_OPTS used in install-commandmode, thankfully.
emake DESTDIR="${D}" install-commandmode
 
+   # The build system installs these directories, but portage assumes
+   # that the build system doesn't know what it's doing so we have to
+   # keepdir them, too. I guess you'll have to manually re-check the
+   # upstream build system forever to see if this is still necessary.
+   keepdir /var/lib/nagios{,/archives,/rw,/spool,/spool/checkresults}
+
if use web; then
# There is no way to install the CGIs unstripped from the
# top-level makefile, so descend into cgi/ here. The empty

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 7e81910df1947a9b7968fffe52655438b1adbdc4
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Aug 31 20:23:00 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Aug 31 21:34:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e81910d

net-analyzer/nagios-core: move localstatedir to /var/lib/nagios.

For whatever reason, the local state directory for nagios was
historically set to /var/nagios. The FHS (v3) states that local
application state should live under /var/lib instead, so this revision
sets it to /var/lib/nagios.

This could potentially be annoying to upgraders but is probably non-
fatal. The state directory holds logs and service status information
that can be regenerated if necessary. Doing so could lead to "extra"
service notifications, though. To mitigate this, a warning is emitted
telling upgraders how to migrate the state information if they choose
to do so.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Orlitzky  gentoo.org>

 ...s-core-4.4.5-r1.ebuild => nagios-core-4.4.5-r2.ebuild} | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.5-r2.ebuild
similarity index 91%
rename from net-analyzer/nagios-core/nagios-core-4.4.5-r1.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.4.5-r2.ebuild
index fdfccca6aab..2fab4595e65 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.5-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r2.ebuild
@@ -96,7 +96,7 @@ src_configure() {
econf ${myconf} \
--prefix=/usr \
--bindir=/usr/sbin \
-   --localstatedir=/var/nagios \
+   --localstatedir=/var/lib/nagios \
--sysconfdir=/etc/nagios \
--libexecdir=/usr/$(get_libdir)/nagios/plugins \
--with-cgibindir=/usr/$(get_libdir)/nagios/cgi-bin \
@@ -210,4 +210,17 @@ pkg_postinst() {
elog "filesystem. You can fix this by adding nagios into"
elog "the group wheel, but this is not recomended."
elog
+
+   if [ -n "${REPLACING_VERSIONS}" ]; then
+   ewarn "The local state directory for nagios has changed in 
v4.4.5,"
+   ewarn "from ${EROOT}var/nagios to ${EROOT}var/lib/nagios. If 
you"
+   ewarn "wish to migrate your state to the new location, first 
stop"
+   ewarn "nagios and then run"
+   ewarn ""
+   ewarn "  diff --recursive --brief ${EROOT}var/nagios 
${EROOT}var/lib/nagios"
+   ewarn ""
+   ewarn "to identify any files that should be moved to the new"
+   ewarn "location. They can simply be moved with \"mv\" before"
+   ewarn "restarting nagios."
+   fi
 }

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/, net-analyzer/nagios-core/

[Michael Orlitzky]

commit: c4f4d3abf675460b53e5ebb9a0550a4c9a539771
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Aug 19 23:30:32 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Aug 19 23:30:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f4d3ab

net-analyzer/nagios-core: new revision fixing zombie process bug.

Bug: https://bugs.gentoo.org/692092
Reported-by: Tomáš Mózes  gmail.com>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../nagios-core-4.4.4-no-zombie-processes.patch| 158 +
 ...re-4.4.4.ebuild => nagios-core-4.4.4-r1.ebuild} |   2 +
 2 files changed, 160 insertions(+)

diff --git 
a/net-analyzer/nagios-core/files/nagios-core-4.4.4-no-zombie-processes.patch 
b/net-analyzer/nagios-core/files/nagios-core-4.4.4-no-zombie-processes.patch
new file mode 100644
index 000..4592b1d27f4
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios-core-4.4.4-no-zombie-processes.patch
@@ -0,0 +1,158 @@
+This was an upstream bug that has been reverted for nagios-core-4.4.5:
+
+  https://github.com/NagiosEnterprises/nagioscore/issues/683
+
+Thanks to Tomáš Mózes (hydrapolic) for noticing and reporting the fix.
+
+diff --git a/base/events.c b/base/events.c
+index d601e970f..bb27b3240 100644
+--- a/base/events.c
 b/base/events.c
+@@ -351,13 +351,12 @@ void init_timing_loop(void) {
+*/
+   check_delay =
+   mult_factor * 
scheduling_info.service_inter_check_delay;
+-  time_t check_window = 
reschedule_within_timeperiod(next_valid_time, temp_service->check_period_ptr, 
check_window(temp_service)) - current_time;
+-  if(check_delay > check_window) {
++  if(check_delay > check_window(temp_service)) {
+   log_debug_info(DEBUGL_EVENTS, 0,
+   "  Fixing check time %lu secs 
too far away\n",
+-  check_delay - check_window);
++  check_delay - 
check_window(temp_service));
+   fixed_services++;
+-  check_delay = check_window;
++  check_delay = check_window(temp_service);
+   log_debug_info(DEBUGL_EVENTS, 0, "  New check 
offset: %d\n",
+   check_delay);
+   }
+@@ -370,7 +369,8 @@ void init_timing_loop(void) {
+   if(is_valid_time == ERROR) {
+   log_debug_info(DEBUGL_EVENTS, 2, "Preferred 
Time is Invalid In Timeperiod '%s': %lu --> %s\n", 
temp_service->check_period_ptr->name, (unsigned long)temp_service->next_check, 
ctime(_service->next_check));
+   get_next_valid_time(temp_service->next_check, 
_valid_time, temp_service->check_period_ptr);
+-  temp_service->next_check = 
reschedule_within_timeperiod(next_valid_time, temp_service->check_period_ptr, 
check_window(temp_service));
++  temp_service->next_check = 
++  (time_t)(next_valid_time + check_delay);
+   }
+ 
+   log_debug_info(DEBUGL_EVENTS, 2, "Actual Check Time: 
%lu --> %s\n", (unsigned long)temp_service->next_check, 
ctime(_service->next_check));
+@@ -508,7 +508,7 @@ void init_timing_loop(void) {
+   log_debug_info(DEBUGL_EVENTS, 1, "Fixing check time 
(off by %lu)\n",
+   check_delay - check_window(temp_host));
+   fixed_hosts++;
+-  check_delay = 
reschedule_within_timeperiod(next_valid_time, temp_host->check_period_ptr, 
check_window(temp_host));
++  check_delay = ranged_urand(0, check_window(temp_host));
+   }
+   temp_host->next_check = (time_t)(current_time + check_delay);
+ 
+diff --git a/cgi/status.c b/cgi/status.c
+index ae723c683..2f6a60fde 100644
+--- a/cgi/status.c
 b/cgi/status.c
+@@ -221,8 +221,26 @@ int main(void) {
+   document_header(TRUE);
+ 
+   /* if a navbar search was performed, find the host by name, address or 
partial name */
+-  if(navbar_search == TRUE) {
+-  if(host_name != NULL && NULL != strstr(host_name, "*")) {
++  if(navbar_search == TRUE && host_name != NULL) {
++
++  /* Remove trailing spaces from host_name */
++  len = strlen(host_name);
++  for (i = len - 1; i >= 0; i--) {
++  if (!isspace(host_name[i])) {
++  host_name[i+1] = '\0';
++  break;
++  }
++  }
++
++  /* Remove leading 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: dbf719f69c5f0885e9362daeb25216ac13fd2f66
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Aug 14 23:45:56 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Aug 15 00:04:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbf719f6

net-analyzer/nagios-core: new version 4.4.4.

Bug: https://bugs.gentoo.org/692092
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest |   1 +
 net-analyzer/nagios-core/nagios-core-4.4.4.ebuild | 213 ++
 2 files changed, 214 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 0b685560927..a794553e346 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,4 @@
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 DIST nagios-4.4.3.tar.gz 11302228 BLAKE2B 
d22ab64268832897dfa67d805a5d74656f7aa96ce1427c7326b632060d8c1ea0fbd07564f3c7a978bb5e2c0cba0c06290e7b0d579017fe73b900eb290c7853ae
 SHA512 
07c91a796d634ffda73305edb54e01e46cb4fc9dc996c937e657c18f8067d7e2d31421b058a04b7395ef739962445ea149c486caaac94b7d422b4032bdaa07d4
+DIST nagios-4.4.4.tar.gz 11303598 BLAKE2B 
e4015ca5c0383b0540f2eaf3d608343df850c6045a4539c1f1ab8c19dc95e9223816efe71034b37f6995cb623dc6b83c92e22a677fe687a34d2215b1a2758c90
 SHA512 
c8f2b83bad744d67be4ba8356d9eea0be3efbf42d9a215d64815cdf7d944eba798348ce0faea6cebe64f1c99e0edbf12540d83ca42f8b4b563cbcc60139afdb0
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.4.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.4.ebuild
new file mode 100644
index 000..74ddb853c43
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.4.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="dev-libs/libltdl:0
+   virtual/mailx
+   perl? ( dev-lang/perl:= )
+   web? (
+   app-arch/unzip
+   media-libs/gd[jpeg,png]
+   lighttpd? ( www-servers/lighttpd[php] )
+   apache2? (
+   || (
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
+   || (
+   dev-lang/php:*[apache2]
+   dev-lang/php:*[cgi]
+   dev-lang/php:*[fpm] )
+   )
+   )"
+RDEPEND="${DEPEND}
+   vim-syntax? ( app-vim/nagios-syntax )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: cb519cc1df86a3a369778cc4d73adf5da6a593a8
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Aug 14 23:49:21 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Aug 15 00:04:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb519cc1

net-analyzer/nagios-core: remove old nagios-core-4.4.3-r1.ebuild.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest  |   1 -
 .../nagios-core/nagios-core-4.4.3-r1.ebuild| 213 -
 2 files changed, 214 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index a794553e346..2595d9143c6 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,3 @@
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
-DIST nagios-4.4.3.tar.gz 11302228 BLAKE2B 
d22ab64268832897dfa67d805a5d74656f7aa96ce1427c7326b632060d8c1ea0fbd07564f3c7a978bb5e2c0cba0c06290e7b0d579017fe73b900eb290c7853ae
 SHA512 
07c91a796d634ffda73305edb54e01e46cb4fc9dc996c937e657c18f8067d7e2d31421b058a04b7395ef739962445ea149c486caaac94b7d422b4032bdaa07d4
 DIST nagios-4.4.4.tar.gz 11303598 BLAKE2B 
e4015ca5c0383b0540f2eaf3d608343df850c6045a4539c1f1ab8c19dc95e9223816efe71034b37f6995cb623dc6b83c92e22a677fe687a34d2215b1a2758c90
 SHA512 
c8f2b83bad744d67be4ba8356d9eea0be3efbf42d9a215d64815cdf7d944eba798348ce0faea6cebe64f1c99e0edbf12540d83ca42f8b4b563cbcc60139afdb0
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.3-r1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.3-r1.ebuild
deleted file mode 100644
index 74ddb853c43..000
--- a/net-analyzer/nagios-core/nagios-core-4.4.3-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="dev-libs/libltdl:0
-   virtual/mailx
-   perl? ( dev-lang/perl:= )
-   web? (
-   app-arch/unzip
-   media-libs/gd[jpeg,png]
-   lighttpd? ( www-servers/lighttpd[php] )
-   apache2? (
-   || (
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
-   || (
-   dev-lang/php:*[apache2]
-   dev-lang/php:*[cgi]
-   dev-lang/php:*[fpm] )
-   )
-   )"
-RDEPEND="${DEPEND}
-   vim-syntax? ( app-vim/nagios-syntax )"
-

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 68c7b2e3af337c3e2d2db0b09b08c89c5d291614
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Mar  2 04:28:43 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Mar  2 04:28:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c7b2e3

net-analyzer/nagios-core: remove "unused" nagios-core-4.4.2.ebuild.

Signed-off-by: Michael Orlitzky  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-analyzer/nagios-core/Manifest |   1 -
 net-analyzer/nagios-core/nagios-core-4.4.2.ebuild | 218 --
 2 files changed, 219 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 7e5e635dd9f..0b685560927 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,3 @@
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
-DIST nagios-4.4.2.tar.gz 11301454 BLAKE2B 
1b5ffa775bbf147e96d07edd36a387db271802d58cc1a1d1eb867645955aec0044e757785578a60c12549bd4e66e4c95ef06dd0f3f8be3599187d0ef0bcc8a4b
 SHA512 
a6ddb2d8ca1c523d02659a2af0b9c67a3802893c946279bb15be53645dc64c997cd5562b77eab9dae03e756ec6622a9a641f7bd68269aba4ddd56ee21f50959e
 DIST nagios-4.4.3.tar.gz 11302228 BLAKE2B 
d22ab64268832897dfa67d805a5d74656f7aa96ce1427c7326b632060d8c1ea0fbd07564f3c7a978bb5e2c0cba0c06290e7b0d579017fe73b900eb290c7853ae
 SHA512 
07c91a796d634ffda73305edb54e01e46cb4fc9dc996c937e657c18f8067d7e2d31421b058a04b7395ef739962445ea149c486caaac94b7d422b4032bdaa07d4
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
deleted file mode 100644
index bfd8898d488..000
--- a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-# sys-devel/libtool dependency is bug #401237.
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="sys-devel/libtool
-   virtual/mailx
-   perl? ( dev-lang/perl:= )
-   web? (
-   app-arch/unzip
-   media-libs/gd[jpeg,png]
-   lighttpd? ( www-servers/lighttpd[php] )
-   apache2? (
-   || (
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
-   || (
-   dev-lang/php:*[apache2]
-   dev-lang/php:*[cgi]
-   dev-lang/php:*[fpm] )
-   )
-   )"
-RDEPEND="${DEPEND}
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/

[Michael Orlitzky]

commit: 1f117f5e3fa59fa3bf1589ad23227e7c82d741b5
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Mar  2 04:32:10 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Mar  2 04:32:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f117f5e

net-analyzer/nagios-core: remove a now-unused patch.

Signed-off-by: Michael Orlitzky  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../nagios-core/files/nagios-4.4.3-pre.patch   | 42 --
 1 file changed, 42 deletions(-)

diff --git a/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch 
b/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch
deleted file mode 100644
index 3c5eb030547..000
--- a/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/Changelog b/Changelog
-index c695bd54..4c348894 100644
 a/Changelog
-+++ b/Changelog
-@@ -2,6 +2,11 @@
- Nagios Core 4 Change Log
- 
- 
-+4.4.3 - 2018-XX-XX
-+--
-+FIXES
-+* Fixed services sending recovery emails when they recover if host in down 
state (#572) (Scott Wilkerson)
-+
- 4.4.2 - 2018-08-16
- --
- FIXES
-diff --git a/base/notifications.c b/base/notifications.c
-index d4574c41..58ad140f 100644
 a/base/notifications.c
-+++ b/base/notifications.c
-@@ -591,10 +591,6 @@ int check_service_notification_viability(service *svc, 
int type, int options) {
-   return ERROR;
-   }
- 
--  /* RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT */
--  if(svc->current_state == STATE_OK)
--  return OK;
--
-   /* don't notify contacts about this service problem again if the 
notification interval is set to 0 */
-   if(svc->no_more_notifications == TRUE) {
-   log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify 
contacts about this service problem.\n");
-@@ -1501,10 +1497,6 @@ int check_host_notification_viability(host *hst, int 
type, int options) {
-   return ERROR;
-   }
- 
--  /* RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT */
--  if(hst->current_state == HOST_UP)
--  return OK;
--
-   /* check if we shouldn't renotify contacts about the host problem */
-   if(hst->no_more_notifications == TRUE) {
-   log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify 
contacts about this host problem.\n");

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/

[Michael Orlitzky]

commit: deb9136abe10a0f6155720db4f4aabb5d1384e5b
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Mar  1 17:55:59 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Mar  2 04:29:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deb9136a

net-analyzer/nagios-core: remove unused patch

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../nagios-core/files/nagios-4.4.2-pre.patch   | 209 -
 1 file changed, 209 deletions(-)

diff --git a/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch 
b/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch
deleted file mode 100644
index 6483b9df9f2..000
--- a/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-diff --git a/Changelog b/Changelog
-index 1e1bd9e2..8dd26fec 100644
 a/Changelog
-+++ b/Changelog
-@@ -2,6 +2,18 @@
- Nagios Core 4 Change Log
- 
- 
-+4.4.2 - ??
-+--
-+FIXES
-+* Fix comment data being duplicated after a `service nagios reload` or 
similar (Bryan Heden)
-+* Fix check_interval and retry_interval not changing at the appropriate times 
(Scott Wilkerson)
-+* Fixed passive checks sending recovery email when host was previously UP 
(Scott Wilkerson)
-+* Fixed flapping comments duplication on nagios reload (Christian Jung)
-+* Fix for CVE-2018-13441, CVE-2018-13458, CVE-2018-13457 null pointer 
dereference (Trevor McDonald)
-+* Fixed syntax error in file: default-init.in (#558) (Christian Zettel)
-+* Reset current notification number and state flags when the host recovers, 
reset all service variables when they recover fixes (#557) (Scott Wilkerson)
-+* Fixed wrong counting of service status totals when showing servicegroup 
details (#548) (Christian Zettel, Bryan Heden)
-+
- 4.4.1 - 2018-06-25
- --
- FIXES
-diff --git a/base/checks.c b/base/checks.c
-index 725dec9d..d45b6ac4 100644
 a/base/checks.c
-+++ b/base/checks.c
-@@ -911,6 +911,11 @@ static inline void 
service_state_or_hard_state_type_change(service * svc, int st
- 
-   if (state_or_type_change) {
- 
-+  /* check if service should go into downtime from flexible 
downtime */
-+  if (svc->pending_flex_downtime > 0) {
-+  check_pending_flex_service_downtime(svc);
-+  }
-+
-   /* reset notification times and suppression option */
-   svc->last_notification = (time_t)0;
-   svc->next_notification = (time_t)0;
-@@ -941,7 +946,10 @@ static inline void 
host_state_or_hard_state_type_change(host * hst, int state_ch
- 
-   log_debug_info(DEBUGL_CHECKS, 2, "Check type passive and 
passive host checks aren't false\n");
-   
--  hst->current_attempt = 1;
-+  if (state_change == TRUE) {
-+hst->current_attempt = 1;
-+}
-+
-   hard_state_change = TRUE;
-   }
- 
-@@ -989,6 +997,9 @@ static inline void 
host_state_or_hard_state_type_change(host * hst, int state_ch
- 
-   if (state_or_type_change) {
- 
-+  /* check if host should go into downtime from flexible downtime 
*/
-+  check_pending_flex_host_downtime(hst);
-+
-   /* reset notification times and suppression option */
-   hst->last_notification = (time_t)0;
-   hst->next_notification = (time_t)0;
-@@ -1228,7 +1239,7 @@ int handle_async_service_check_result(service *svc, 
check_result *cr)
-   next_check = (time_t)(svc->last_check + (svc->check_interval * 
interval_length));
- 
-   /***/
--  /** SCHEDULE HOST CHECK LOGIC **/
-+  /** SCHEDULE SERVICE CHECK LOGIC **/
-   /***/
-   if (svc->current_state == STATE_OK) {
- 
-@@ -1269,6 +1280,7 @@ int handle_async_service_check_result(service *svc, 
check_result *cr)
- 
-   svc->host_problem_at_last_check = TRUE;
-   }
-+
-   }
-   else {
- 
-@@ -1368,6 +1380,9 @@ int handle_async_service_check_result(service *svc, 
check_result *cr)
-   else {
- 
-   log_debug_info(DEBUGL_CHECKS, 1, "Service is a non-OK 
state (%s)!", service_state_name(svc->current_state));
-+
-+svc->state_type = SOFT_STATE;
-+  svc->current_attempt = 1;
- 
-   handle_event = TRUE;
-   }
-@@ -1395,6 +1410,21 @@ int handle_async_service_check_result(service *svc, 
check_result *cr)
- 
-   log_debug_info(DEBUGL_CHECKS, 1, "Service 
experienced a SOFT recovery.\n"); 
-   }
-+
-+
-+/* reset all service variables because its okay now... */
-+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: cd61e5bb9a7561bec1725ad24a45279d1ac75f02
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Jan 19 20:40:07 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Jan 19 21:06:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd61e5bb

net-analyzer/nagios-core: new revision to fix CGI install path.

Upstream commit 37da6f39c8 fixes an old bug in the build system, where
CGIDIR was set to @sbindir@ (rather than to @cgibindir@), and HTMLDIR
was set to @datarootdir@ (rather than to @webdir@). Now that the bug
is fixed, the ebuild has been revisioned to use the right configure flags:
we pass --with-cgibindir the old argument of --sbindir, and --with-webdir
the old argument of --datadir.

Thanks to Tomáš Mózes for the report and the fix.

Closes: https://bugs.gentoo.org/675872
Signed-off-by: Michael Orlitzky  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../{nagios-core-4.4.3.ebuild => nagios-core-4.4.3-r1.ebuild}   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.3-r1.ebuild
similarity index 97%
rename from net-analyzer/nagios-core/nagios-core-4.4.3.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.4.3-r1.ebuild
index d568d350d58..74ddb853c43 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.3-r1.ebuild
@@ -96,11 +96,11 @@ src_configure() {
econf ${myconf} \
--prefix=/usr \
--bindir=/usr/sbin \
-   --sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
-   --datadir=/usr/share/nagios/htdocs \
--localstatedir=/var/nagios \
--sysconfdir=/etc/nagios \
-   --libexecdir=/usr/$(get_libdir)/nagios/plugins
+   --libexecdir=/usr/$(get_libdir)/nagios/plugins \
+   --with-cgibindir=/usr/$(get_libdir)/nagios/cgi-bin \
+   --with-webdir=/usr/share/nagios/htdocs
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: f56ca9245195c4370eb715639a9e412e272d1d39
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Jan 18 23:39:42 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Jan 18 23:52:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56ca924

net-analyzer/nagios-core: new version 4.4.3.

This is a standard version bump, but also fixes a dependency on
sys-devel/libtool that should have been dev-libs/libltdl all
along. Since "--enable-event-broker" is enabled by default, the
configure script looks for and links against libltdl. Thanks are due
to Sławomir Nizio for noticing the bug.

Closes: https://bugs.gentoo.org/675226
Signed-off-by: Michael Orlitzky  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-analyzer/nagios-core/Manifest |   1 +
 net-analyzer/nagios-core/nagios-core-4.4.3.ebuild | 213 ++
 2 files changed, 214 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 1aee223909c..7e5e635dd9f 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,4 @@
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 DIST nagios-4.4.2.tar.gz 11301454 BLAKE2B 
1b5ffa775bbf147e96d07edd36a387db271802d58cc1a1d1eb867645955aec0044e757785578a60c12549bd4e66e4c95ef06dd0f3f8be3599187d0ef0bcc8a4b
 SHA512 
a6ddb2d8ca1c523d02659a2af0b9c67a3802893c946279bb15be53645dc64c997cd5562b77eab9dae03e756ec6622a9a641f7bd68269aba4ddd56ee21f50959e
+DIST nagios-4.4.3.tar.gz 11302228 BLAKE2B 
d22ab64268832897dfa67d805a5d74656f7aa96ce1427c7326b632060d8c1ea0fbd07564f3c7a978bb5e2c0cba0c06290e7b0d579017fe73b900eb290c7853ae
 SHA512 
07c91a796d634ffda73305edb54e01e46cb4fc9dc996c937e657c18f8067d7e2d31421b058a04b7395ef739962445ea149c486caaac94b7d422b4032bdaa07d4
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.3.ebuild
new file mode 100644
index 000..d568d350d58
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.3.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="dev-libs/libltdl:0
+   virtual/mailx
+   perl? ( dev-lang/perl:= )
+   web? (
+   app-arch/unzip
+   media-libs/gd[jpeg,png]
+   lighttpd? ( www-servers/lighttpd[php] )
+   apache2? (
+   || (
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 148ccec5856bf101bcfc7789947c2d070e8c6107
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Dec  2 15:59:26 2018 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Dec  2 16:01:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=148ccec5

net-analyzer/nagios-core: remove "unused" nagios-core-4.4.{0,1} ebuilds.

Signed-off-by: Michael Orlitzky  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-analyzer/nagios-core/Manifest |   2 -
 net-analyzer/nagios-core/nagios-core-4.4.0.ebuild | 214 -
 net-analyzer/nagios-core/nagios-core-4.4.1.ebuild | 218 --
 3 files changed, 434 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index bb184319683..073ae5bd3c8 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,6 +1,4 @@
 DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 
537d49ecf28b457fbc1e24eaaa9c5d9e8c4db59ed69c91a573c0cacb6cfb6fd2d52c31e87c0cef34b81a69247bb5b9513983d95e7eae3ea7f861742da485d2d4
 SHA512 
588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
-DIST nagios-4.4.0.tar.gz 11295727 BLAKE2B 
f89e7934b13814ec8c0ae7a19f14eed8842c7b0044fb2812f1399f27a82e5a639b63cc53f04b58ae99aa87bf595b2e25642ad3eb134a041e39f744919bd46d2f
 SHA512 
8c136463133cf26c756ccd39b158ed417297e30f8a0b12d063a4dba6a43f126b27bb5f7ea962c8cde9fb9c1fd8d3439d7cfeaab833045315a9800c993fa0676f
-DIST nagios-4.4.1.tar.gz 11296403 BLAKE2B 
fdbaec5f913d18d5591f44cd1e0622b9741d7415b591f24f1521f2897b8a1bdbff00e9378ef6b3a6a99ab8d639960abd3d734fd66b665ea88ea1de169b552ace
 SHA512 
d84f22a8fd21a573b4162f232c3a6bb2ba0b7d3a470e5fd80183a1862d2ae666956cfc2dd4c7fe6319ee7ccedb9f8a6920ba39a6b499ed9ff5b8be60a9779fa9
 DIST nagios-4.4.2.tar.gz 11301454 BLAKE2B 
1b5ffa775bbf147e96d07edd36a387db271802d58cc1a1d1eb867645955aec0044e757785578a60c12549bd4e66e4c95ef06dd0f3f8be3599187d0ef0bcc8a4b
 SHA512 
a6ddb2d8ca1c523d02659a2af0b9c67a3802893c946279bb15be53645dc64c997cd5562b77eab9dae03e756ec6622a9a641f7bd68269aba4ddd56ee21f50959e
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
deleted file mode 100644
index 4f2dbf117c3..000
--- a/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-# sys-devel/libtool dependency is bug #401237.
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="sys-devel/libtool
-   virtual/mailx
-   perl? ( dev-lang/perl:= )
-   web? (
-

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 8588e32c1c4dd67e878bee70d1777b8fdb9c2662
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Dec  2 16:00:24 2018 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Dec  2 16:01:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8588e32c

net-analyzer/nagios-core: remove nagios-core-4.3.3 to fix CVE-2017-14312.

Bug: https://bugs.gentoo.org/629380
Signed-off-by: Michael Orlitzky  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-analyzer/nagios-core/Manifest |   1 -
 net-analyzer/nagios-core/nagios-core-4.3.3.ebuild | 246 --
 2 files changed, 247 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 073ae5bd3c8..1aee223909c 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,3 @@
-DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 
537d49ecf28b457fbc1e24eaaa9c5d9e8c4db59ed69c91a573c0cacb6cfb6fd2d52c31e87c0cef34b81a69247bb5b9513983d95e7eae3ea7f861742da485d2d4
 SHA512 
588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 DIST nagios-4.4.2.tar.gz 11301454 BLAKE2B 
1b5ffa775bbf147e96d07edd36a387db271802d58cc1a1d1eb867645955aec0044e757785578a60c12549bd4e66e4c95ef06dd0f3f8be3599187d0ef0bcc8a4b
 SHA512 
a6ddb2d8ca1c523d02659a2af0b9c67a3802893c946279bb15be53645dc64c997cd5562b77eab9dae03e756ec6622a9a641f7bd68269aba4ddd56ee21f50959e
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
deleted file mode 100644
index 11e40c1b8e0..000
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-# sys-devel/libtool dependency is bug #401237.
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="sys-devel/libtool
-   virtual/mailx
-   perl? ( dev-lang/perl:= )
-   web? (
-   app-arch/unzip
-   media-libs/gd[jpeg,png]
-   lighttpd? ( www-servers/lighttpd[php] )
-   apache2? (
-   || (
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
-   || (
-   dev-lang/php:*[apache2]
-   dev-lang/php:*[cgi]
-   dev-lang/php:*[fpm] )
-   )
- 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Mikle Kolyada]

commit: 609be42e457c83f488f43c250df51bf0d918d909
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Oct 12 12:45:50 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Oct 12 12:46:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=609be42e

net-analyzer/nagios-core: Drop hppa keyword

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 net-analyzer/nagios-core/nagios-core-4.3.3.ebuild | 4 ++--
 net-analyzer/nagios-core/nagios-core-4.3.4.ebuild | 4 ++--
 net-analyzer/nagios-core/nagios-core-4.4.0.ebuild | 4 ++--
 net-analyzer/nagios-core/nagios-core-4.4.1.ebuild | 4 ++--
 net-analyzer/nagios-core/nagios-core-4.4.2.ebuild | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index 5773285f59b..11e40c1b8e0 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index 9ee27cd6da9..1df849693e9 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
index ec0577881b0..4f2dbf117c3 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild
index bfc0aac4a73..b29021b26ea 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
index cb47956dba4..bfd8898d488 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/, net-analyzer/nagios-core/files/

[Michael Orlitzky]

commit: 56e365a929aedd2af9efe846365dfbf721b4c6c5
Author: Tomas Mozes  gmail  com>
AuthorDate: Mon Sep  3 05:33:55 2018 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Sep  3 14:19:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56e365a9

net-analyzer/nagios-core: bump to 4.4.2

Package-Manager: Portage-2.3.48, Repoman-2.3.10
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest  |   1 +
 .../nagios-core/files/nagios-4.4.3-pre.patch   |  42 
 net-analyzer/nagios-core/nagios-core-4.4.2.ebuild  | 218 +
 3 files changed, 261 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 11a8055082a..bb184319683 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -2,4 +2,5 @@ DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 
537d49ecf28b457fbc1e24eaaa9c5d9e8c4db5
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 DIST nagios-4.4.0.tar.gz 11295727 BLAKE2B 
f89e7934b13814ec8c0ae7a19f14eed8842c7b0044fb2812f1399f27a82e5a639b63cc53f04b58ae99aa87bf595b2e25642ad3eb134a041e39f744919bd46d2f
 SHA512 
8c136463133cf26c756ccd39b158ed417297e30f8a0b12d063a4dba6a43f126b27bb5f7ea962c8cde9fb9c1fd8d3439d7cfeaab833045315a9800c993fa0676f
 DIST nagios-4.4.1.tar.gz 11296403 BLAKE2B 
fdbaec5f913d18d5591f44cd1e0622b9741d7415b591f24f1521f2897b8a1bdbff00e9378ef6b3a6a99ab8d639960abd3d734fd66b665ea88ea1de169b552ace
 SHA512 
d84f22a8fd21a573b4162f232c3a6bb2ba0b7d3a470e5fd80183a1862d2ae666956cfc2dd4c7fe6319ee7ccedb9f8a6920ba39a6b499ed9ff5b8be60a9779fa9
+DIST nagios-4.4.2.tar.gz 11301454 BLAKE2B 
1b5ffa775bbf147e96d07edd36a387db271802d58cc1a1d1eb867645955aec0044e757785578a60c12549bd4e66e4c95ef06dd0f3f8be3599187d0ef0bcc8a4b
 SHA512 
a6ddb2d8ca1c523d02659a2af0b9c67a3802893c946279bb15be53645dc64c997cd5562b77eab9dae03e756ec6622a9a641f7bd68269aba4ddd56ee21f50959e
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch 
b/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch
new file mode 100644
index 000..3c5eb030547
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch
@@ -0,0 +1,42 @@
+diff --git a/Changelog b/Changelog
+index c695bd54..4c348894 100644
+--- a/Changelog
 b/Changelog
+@@ -2,6 +2,11 @@
+ Nagios Core 4 Change Log
+ 
+ 
++4.4.3 - 2018-XX-XX
++--
++FIXES
++* Fixed services sending recovery emails when they recover if host in down 
state (#572) (Scott Wilkerson)
++
+ 4.4.2 - 2018-08-16
+ --
+ FIXES
+diff --git a/base/notifications.c b/base/notifications.c
+index d4574c41..58ad140f 100644
+--- a/base/notifications.c
 b/base/notifications.c
+@@ -591,10 +591,6 @@ int check_service_notification_viability(service *svc, 
int type, int options) {
+   return ERROR;
+   }
+ 
+-  /* RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT */
+-  if(svc->current_state == STATE_OK)
+-  return OK;
+-
+   /* don't notify contacts about this service problem again if the 
notification interval is set to 0 */
+   if(svc->no_more_notifications == TRUE) {
+   log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify 
contacts about this service problem.\n");
+@@ -1501,10 +1497,6 @@ int check_host_notification_viability(host *hst, int 
type, int options) {
+   return ERROR;
+   }
+ 
+-  /* RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT */
+-  if(hst->current_state == HOST_UP)
+-  return OK;
+-
+   /* check if we shouldn't renotify contacts about the host problem */
+   if(hst->no_more_notifications == TRUE) {
+   log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify 
contacts about this host problem.\n");

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
new file mode 100644
index 000..cb47956dba4
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/, net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 7a67d7c03c3a81ce80c3f5aaf4e931402a12
Author: Tomas Mozes  gmail  com>
AuthorDate: Wed Aug  8 06:21:04 2018 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Aug  8 21:08:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a67d7c0

net-analyzer/nagios-core: bump to 4.4.1

Closes: https://bugs.gentoo.org/662194
Package-Manager: Portage-2.3.44, Repoman-2.3.10
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest  |   1 +
 .../nagios-core/files/nagios-4.4.2-pre.patch   | 209 
 net-analyzer/nagios-core/nagios-core-4.4.1.ebuild  | 218 +
 3 files changed, 428 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index f051a22305c..11a8055082a 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,5 @@
 DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 
537d49ecf28b457fbc1e24eaaa9c5d9e8c4db59ed69c91a573c0cacb6cfb6fd2d52c31e87c0cef34b81a69247bb5b9513983d95e7eae3ea7f861742da485d2d4
 SHA512 
588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 DIST nagios-4.4.0.tar.gz 11295727 BLAKE2B 
f89e7934b13814ec8c0ae7a19f14eed8842c7b0044fb2812f1399f27a82e5a639b63cc53f04b58ae99aa87bf595b2e25642ad3eb134a041e39f744919bd46d2f
 SHA512 
8c136463133cf26c756ccd39b158ed417297e30f8a0b12d063a4dba6a43f126b27bb5f7ea962c8cde9fb9c1fd8d3439d7cfeaab833045315a9800c993fa0676f
+DIST nagios-4.4.1.tar.gz 11296403 BLAKE2B 
fdbaec5f913d18d5591f44cd1e0622b9741d7415b591f24f1521f2897b8a1bdbff00e9378ef6b3a6a99ab8d639960abd3d734fd66b665ea88ea1de169b552ace
 SHA512 
d84f22a8fd21a573b4162f232c3a6bb2ba0b7d3a470e5fd80183a1862d2ae666956cfc2dd4c7fe6319ee7ccedb9f8a6920ba39a6b499ed9ff5b8be60a9779fa9
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch 
b/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch
new file mode 100644
index 000..6483b9df9f2
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch
@@ -0,0 +1,209 @@
+diff --git a/Changelog b/Changelog
+index 1e1bd9e2..8dd26fec 100644
+--- a/Changelog
 b/Changelog
+@@ -2,6 +2,18 @@
+ Nagios Core 4 Change Log
+ 
+ 
++4.4.2 - ??
++--
++FIXES
++* Fix comment data being duplicated after a `service nagios reload` or 
similar (Bryan Heden)
++* Fix check_interval and retry_interval not changing at the appropriate times 
(Scott Wilkerson)
++* Fixed passive checks sending recovery email when host was previously UP 
(Scott Wilkerson)
++* Fixed flapping comments duplication on nagios reload (Christian Jung)
++* Fix for CVE-2018-13441, CVE-2018-13458, CVE-2018-13457 null pointer 
dereference (Trevor McDonald)
++* Fixed syntax error in file: default-init.in (#558) (Christian Zettel)
++* Reset current notification number and state flags when the host recovers, 
reset all service variables when they recover fixes (#557) (Scott Wilkerson)
++* Fixed wrong counting of service status totals when showing servicegroup 
details (#548) (Christian Zettel, Bryan Heden)
++
+ 4.4.1 - 2018-06-25
+ --
+ FIXES
+diff --git a/base/checks.c b/base/checks.c
+index 725dec9d..d45b6ac4 100644
+--- a/base/checks.c
 b/base/checks.c
+@@ -911,6 +911,11 @@ static inline void 
service_state_or_hard_state_type_change(service * svc, int st
+ 
+   if (state_or_type_change) {
+ 
++  /* check if service should go into downtime from flexible 
downtime */
++  if (svc->pending_flex_downtime > 0) {
++  check_pending_flex_service_downtime(svc);
++  }
++
+   /* reset notification times and suppression option */
+   svc->last_notification = (time_t)0;
+   svc->next_notification = (time_t)0;
+@@ -941,7 +946,10 @@ static inline void 
host_state_or_hard_state_type_change(host * hst, int state_ch
+ 
+   log_debug_info(DEBUGL_CHECKS, 2, "Check type passive and 
passive host checks aren't false\n");
+   
+-  hst->current_attempt = 1;
++  if (state_change == TRUE) {
++hst->current_attempt = 1;
++}
++
+   hard_state_change = TRUE;
+   }
+ 
+@@ 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Mikle Kolyada]

commit: aefc712eb53f13952aea3202d98c222f6e2de6c0
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Jul 11 23:59:55 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Jul 11 23:59:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aefc712e

net-analyzer/nagios-core: ppc stable wrt bug #629380

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-analyzer/nagios-core/nagios-core-4.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index ee472ba7a10..9ee27cd6da9 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 933b3ec9a32a5274541452d845656d67f5bf7f8d
Author: Tomas Mozes  gmail  com>
AuthorDate: Fri Jun 22 12:29:54 2018 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Jun 23 11:39:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=933b3ec9

net-analyzer/nagios-core: bump to 4.4.0

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-analyzer/nagios-core/Manifest |   1 +
 net-analyzer/nagios-core/nagios-core-4.4.0.ebuild | 214 ++
 2 files changed, 215 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 6bd1ee96f5a..f051a22305c 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,4 @@
 DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 
537d49ecf28b457fbc1e24eaaa9c5d9e8c4db59ed69c91a573c0cacb6cfb6fd2d52c31e87c0cef34b81a69247bb5b9513983d95e7eae3ea7f861742da485d2d4
 SHA512 
588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
+DIST nagios-4.4.0.tar.gz 11295727 BLAKE2B 
f89e7934b13814ec8c0ae7a19f14eed8842c7b0044fb2812f1399f27a82e5a639b63cc53f04b58ae99aa87bf595b2e25642ad3eb134a041e39f744919bd46d2f
 SHA512 
8c136463133cf26c756ccd39b158ed417297e30f8a0b12d063a4dba6a43f126b27bb5f7ea962c8cde9fb9c1fd8d3439d7cfeaab833045315a9800c993fa0676f
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
new file mode 100644
index 000..ec0577881b0
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+# sys-devel/libtool dependency is bug #401237.
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="sys-devel/libtool
+   virtual/mailx
+   perl? ( dev-lang/perl:= )
+   web? (
+   app-arch/unzip
+   media-libs/gd[jpeg,png]
+   lighttpd? ( www-servers/lighttpd[php] )
+   apache2? (
+   || (
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
+   || (
+   dev-lang/php:*[apache2]
+   dev-lang/php:*[cgi]
+   dev-lang/php:*[fpm] )
+   )
+   )"
+RDEPEND="${DEPEND}
+   vim-syntax? ( app-vim/nagios-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/

[Michael Orlitzky]

commit: d8c9e8160e7575722e0226c045be15ac9d1f3523
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Jun 19 22:35:55 2018 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jun 19 22:41:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c9e816

net-analyzer/nagios-core: clean up unused files.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-analyzer/nagios-core/files/99_nagios3.conf |  15 --
 net-analyzer/nagios-core/files/conf.d  |   9 --
 .../nagios-core/files/lighttpd_nagios3-r1.conf |  24 ---
 .../files/nagios-core-3.5.1-process_cgivars.patch  | 175 -
 .../nagios-core-4.3.1-fix-upstream-issue-337.patch |  21 ---
 net-analyzer/nagios-core/files/nagios3 |  52 --
 net-analyzer/nagios-core/files/nagios4-r1  |  45 --
 7 files changed, 341 deletions(-)

diff --git a/net-analyzer/nagios-core/files/99_nagios3.conf 
b/net-analyzer/nagios-core/files/99_nagios3.conf
deleted file mode 100644
index 074f9ce5e4a..000
--- a/net-analyzer/nagios-core/files/99_nagios3.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-
-   ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
-   
-   AllowOverride AuthConfig
-   Options ExecCGI
-   Order allow,deny
-   Allow from all
-   
-   Alias /nagios /usr/share/nagios/htdocs
-   
-   AllowOverride AuthConfig
-   Order allow,deny
-   Allow from all
-   
-

diff --git a/net-analyzer/nagios-core/files/conf.d 
b/net-analyzer/nagios-core/files/conf.d
deleted file mode 100644
index 68c7370c887..000
--- a/net-analyzer/nagios-core/files/conf.d
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2 
-
-# Distributed monitoring users will want to configure here the ip/hostname of 
the central server.
-# It will be used by submit_check_result_via_nsca.
-NAGIOS_NSCA_HOST="localhost"
-
-
-

diff --git a/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf 
b/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf
deleted file mode 100644
index 6e2577029ac..000
--- a/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-server.modules += ("mod_cgi")
-server.modules += ("mod_auth")
-server.modules += ("mod_alias")
-
-auth.require += ( "/nagios" =>
-  (
-"method"  => "digest",
-"realm"   => "nagios",
-"require" => "valid-user"
-  )
-)
-
-$HTTP["url"] =~ "^/nagios/cgi-bin/" {
-  dir-listing.activate = "disable"
-  cgi.assign = (
-".pl"  => "/usr/bin/perl",
-".cgi" => ""
-  )
-}
-
-alias.url += (
-  "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin",
-  "/nagios" => "/usr/share/nagios/htdocs"
-)

diff --git 
a/net-analyzer/nagios-core/files/nagios-core-3.5.1-process_cgivars.patch 
b/net-analyzer/nagios-core/files/nagios-core-3.5.1-process_cgivars.patch
deleted file mode 100644
index 9d953674779..000
--- a/net-analyzer/nagios-core/files/nagios-core-3.5.1-process_cgivars.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-commit d97e03f32741a7d851826b03ed73ff4c9612a866
-Author: Eric Stanley 
-Date:   Fri Dec 20 13:14:30 2013 -0600
-
-CGIs: Fixed minor vulnerability where a custom query could crash the CGI.
-
-Most CGIs previously incremented the input variable counter twice when
-it encountered a long key value. This could cause the CGI to read past
-the end of the list of CGI variables. This commit removes the second
-increment, removing the possibility of reading past the end of the list
-of CGI variables.
-
-diff --git a/cgi/avail.c b/cgi/avail.c
-index 76afd86..64eaadc 100644
 a/cgi/avail.c
-+++ b/cgi/avail.c
-@@ -1096,7 +1096,6 @@ int process_cgivars(void) {
- 
-   /* do some basic length checking on the variable identifier to 
prevent buffer overflows */
-   if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
--  x++;
-   continue;
-   }
- 
-diff --git a/cgi/cmd.c b/cgi/cmd.c
-index fa6cf5a..50504eb 100644
 a/cgi/cmd.c
-+++ b/cgi/cmd.c
-@@ -311,7 +311,6 @@ int process_cgivars(void) {
- 
-   /* do some basic length checking on the variable identifier to 
prevent buffer overflows */
-   if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
--  x++;
-   continue;
-   }
- 
-diff --git a/cgi/config.c b/cgi/config.c
-index f061b0f..3360e70 100644
 a/cgi/config.c
-+++ b/cgi/config.c
-@@ -344,7 +344,6 @@ int process_cgivars(void) {
- 
-   /* do some basic length checking on the variable identifier to 
prevent buffer overflows */
-   if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
--  x++;
-   continue;
-   }
- 
-diff --git 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 8912285b30dc5dcf76d10a7810444ef69ae8e760
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Jun 19 22:32:18 2018 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jun 19 22:41:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8912285b

net-analyzer/nagios-core: finally drop nagios-3.x from the tree.

A bunch of security bugs (and my own personal happiness) were blocked
on this because nagios-3.x was sometimes required by an old version of
net-analyzer/pnp4nagios. Now that a version of pnp4nagios has been
stabilized with more reasonable dependencies, we can finally get rid
of nagios-3.x.

This leaves a bunch of unused files in FILESDIR that I'll clean up in
another commit.

Bug: https://bugs.gentoo.org/636234
Bug: https://bugs.gentoo.org/628086
Bug: https://bugs.gentoo.org/629380
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-analyzer/nagios-core/Manifest |   1 -
 net-analyzer/nagios-core/nagios-core-3.5.1.ebuild | 216 --
 2 files changed, 217 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index ffaa042a970..6bd1ee96f5a 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,3 @@
-DIST nagios-3.5.1.tar.gz 1763584 BLAKE2B 
e0391c906e11aec18a07bc8627ed47892f69415f5f777ab6ecf2f08f7486b1b71efc3687547665b5cf62eb9f477084d7fc58344e7e5754d1bea32be3a916779e
 SHA512 
48e2ecb91002b08203937b12a438c87c62cd3c5c401a0ed9e861cd6d79074c7017ed373e9379f013d87dea1fd7cb8e3d85112d55c87ac91aed96b256868c112d
 DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 
537d49ecf28b457fbc1e24eaaa9c5d9e8c4db59ed69c91a573c0cacb6cfb6fd2d52c31e87c0cef34b81a69247bb5b9513983d95e7eae3ea7f861742da485d2d4
 SHA512 
588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild 
b/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
deleted file mode 100644
index 06ad6320317..000
--- a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit depend.apache eutils multilib toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
-HOMEPAGE="https://www.nagios.org/;
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
-IUSE="debug lighttpd perl +web vim-syntax"
-DEPEND="virtual/mailx
-   web? (
-   >=media-libs/gd-1.8.3-r5[jpeg,png]
-   lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] )
-   apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) )
-   )
-   perl? ( >=dev-lang/perl-5.6.1-r7:= )"
-RDEPEND="${DEPEND}
-   !net-analyzer/nagios-imagepack
-   vim-syntax? ( app-vim/nagios-syntax )"
-
-want_apache2
-
-S="${WORKDIR}/${PN/-core}"
-
-pkg_setup() {
-   depend.apache_pkg_setup
-
-   enewgroup nagios
-   enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_prepare() {
-   epatch "${FILESDIR}/${PN}-3.5.1-process_cgivars.patch"
-   local strip="$(echo '$(MAKE) strip-post-install')"
-   sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in 
Makefile.in"
-}
-
-src_configure() {
-   local myconf
-
-   if use perl ; then
-   myconf="${myconf} --enable-embedded-perl --with-perlcache"
-   fi
-
-   if use debug; then
-   myconf="${myconf} --enable-DEBUG0"
-   myconf="${myconf} --enable-DEBUG1"
-   myconf="${myconf} --enable-DEBUG2"
-   myconf="${myconf} --enable-DEBUG3"
-   myconf="${myconf} --enable-DEBUG4"
-   myconf="${myconf} --enable-DEBUG5"
-   fi
-
-   if use !apache2 && use !lighttpd ; then
-   myconf="${myconf} --with-command-group=nagios"
-   else
-   if use apache2 ; then
-   myconf="${myconf} --with-command-group=apache"
-   myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-   elif use lighttpd ; then
- 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 98d10472277b5b05c21d45bc97ad7cb17eeb58e4
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Jun 19 11:44:33 2018 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jun 19 11:44:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d10472

net-analyzer/nagios-core: remove "unused" nagios-core-4.3.1-r1.ebuild.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-analyzer/nagios-core/Manifest  |   1 -
 .../nagios-core/nagios-core-4.3.1-r1.ebuild| 249 -
 2 files changed, 250 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index fe75ac32370..ffaa042a970 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,5 +1,4 @@
 DIST nagios-3.5.1.tar.gz 1763584 BLAKE2B 
e0391c906e11aec18a07bc8627ed47892f69415f5f777ab6ecf2f08f7486b1b71efc3687547665b5cf62eb9f477084d7fc58344e7e5754d1bea32be3a916779e
 SHA512 
48e2ecb91002b08203937b12a438c87c62cd3c5c401a0ed9e861cd6d79074c7017ed373e9379f013d87dea1fd7cb8e3d85112d55c87ac91aed96b256868c112d
-DIST nagios-4.3.1.tar.gz 11095797 BLAKE2B 
46c7ca25b7277dc1b114b08fba6eece6d841ea8bd2a499428f1b8637ae547a4990a66b4ab7feb7137d9bc4249a9fb73238f37145da76d98be7591abe0d87b4eb
 SHA512 
d5f1919e2b32b0b2f4c5766367f0992fcf9b1f6766f4d3386e15e318cc1f57cdae6bc07f09464fd8212bef1713948fcb25d233eab588438036f996b6c479c97e
 DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 
537d49ecf28b457fbc1e24eaaa9c5d9e8c4db59ed69c91a573c0cacb6cfb6fd2d52c31e87c0cef34b81a69247bb5b9513983d95e7eae3ea7f861742da485d2d4
 SHA512 
588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 
6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820
 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 
31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09
 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
deleted file mode 100644
index 7e952737c4d..000
--- a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-# sys-devel/libtool dependency is bug #401237.
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="sys-devel/libtool
-   virtual/mailx
-   perl? ( dev-lang/perl:= )
-   web? (
-   app-arch/unzip
-   media-libs/gd[jpeg,png]
-   lighttpd? ( www-servers/lighttpd[php] )
-   apache2? (
-   || (
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Aaron Bauman]

commit: d12092475736cfa760ade0bf907b0d7c308e56c3
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jun 10 09:17:34 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jun 11 16:26:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1209247

net-analyzer/nagios-core: use HTTPs

 net-analyzer/nagios-core/nagios-core-3.5.1.ebuild| 4 ++--
 net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild | 4 ++--
 net-analyzer/nagios-core/nagios-core-4.3.3.ebuild| 4 ++--
 net-analyzer/nagios-core/nagios-core-4.3.4.ebuild| 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild 
b/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
index 515322c7481..06ad6320317 100644
--- a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-3.5.1.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=5
@@ -7,7 +7,7 @@ inherit depend.apache eutils multilib toolchain-funcs user
 
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
-HOMEPAGE="http://www.nagios.org/;
+HOMEPAGE="https://www.nagios.org/;
 SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
index 7acee4a50aa..7e952737c4d 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.1-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
@@ -7,7 +7,7 @@ inherit toolchain-funcs user
 
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="http://www.nagios.org/;
+HOMEPAGE="https://www.nagios.org/;
 
 # The name of the directory into which our Gentoo icons will be
 # extracted, and also the basename of the archive containing it.

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index 553186b6064..5773285f59b 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.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
@@ -7,7 +7,7 @@ inherit toolchain-funcs user
 
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="http://www.nagios.org/;
+HOMEPAGE="https://www.nagios.org/;
 
 # The name of the directory into which our Gentoo icons will be
 # extracted, and also the basename of the archive containing it.

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index 122423ab105..5bd7da55c5f 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs user
 
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="http://www.nagios.org/;
+HOMEPAGE="https://www.nagios.org/;
 
 # The name of the directory into which our Gentoo icons will be
 # extracted, and also the basename of the archive containing it.

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Tobias Klausmann]

commit: 54f1e8726ab3dda51c6d1b7ee33573407d328145
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Mon May 14 11:49:06 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Mon May 14 11:49:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f1e872

net-analyzer/nagios-core-4.3.4-r0: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/629380

 net-analyzer/nagios-core/nagios-core-4.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index fdfbefc4943..122423ab105 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Sergei Trofimovich]

commit: 4f9eeaadf74de22ee6365ffe433816aca7bc45f3
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue May  8 18:13:16 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue May  8 18:42:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f9eeaad

net-analyzer/nagios-core: stable 4.3.4 for sparc

Bug: https://bugs.gentoo.org/629380
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 net-analyzer/nagios-core/nagios-core-4.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index e2924762ece..fdfbefc4943 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Thomas Deutschmann]

commit: 394bca60df4191b554ec0a57c7ab9fbfdfa623a0
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Apr 24 23:39:12 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Apr 24 23:39:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=394bca60

net-analyzer/nagios-core: x86 stable (bug #629380)

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-analyzer/nagios-core/nagios-core-4.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index a8a5b480f77..e2924762ece 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Aaron Bauman]

commit: f1050603f504e8b20e0729c893ac6860ffb85605
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Apr 23 03:16:31 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Apr 23 03:16:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1050603

net-analyzer/nagios-core: amd64 stable wrt bug #629380

Bug: https://bugs.gentoo.org/629380
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-analyzer/nagios-core/nagios-core-4.3.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index 6de6b181b22..a8a5b480f77 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.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
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Aaron Bauman]

commit: fb56777ae9661803e5b3ed6d012925660ccbf283
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Oct 13 22:58:27 2017 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Oct 13 22:59:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb56777a

net-analyzer/nagios-core: amd64 stable wrt bug #628086

 net-analyzer/nagios-core/nagios-core-4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index fd40037f208..553186b6064 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Sergei Trofimovich]

commit: a0d5650b1ed20b9accc10d53933766533af8bb86
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Oct 13 09:12:28 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Oct 13 09:50:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d5650b

net-analyzer/nagios-core: stable 4.3.3 for hppa, bug #628086

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="hppa"

 net-analyzer/nagios-core/nagios-core-4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index 0b26c87cad8..fd40037f208 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Thomas Deutschmann]

commit: 7d0c127473d1f0cc2a205409cbd91c35ed5a35c7
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Oct  3 00:38:26 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Oct  3 00:38:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d0c1274

net-analyzer/nagios-core: x86 stable (bug #628086)

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 net-analyzer/nagios-core/nagios-core-4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index ead61fe926e..0b26c87cad8 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Sergei Trofimovich]

commit: 292449b3db320c55471b8c7f8dc48fc3da940bf6
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep 24 19:46:18 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep 24 19:50:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=292449b3

net-analyzer/nagios-core: stable 4.3.3 for ppc, bug #628086

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc"

 net-analyzer/nagios-core/nagios-core-4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index 162a7328770..ead61fe926e 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Sergei Trofimovich]

commit: a62b5d16a6e94026e8d55f53a380b400aded028d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep 24 10:59:23 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep 24 11:00:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a62b5d16

net-analyzer/nagios-core: stable 4.3.3 for ppc64, bug #628086

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc64"

 net-analyzer/nagios-core/nagios-core-4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index a26b912a6f4..162a7328770 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Sergei Trofimovich]

commit: 27c93de9b6edc824c20a2a418e2abaea5bd5fd3b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Sep  7 20:57:16 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Sep  7 20:57:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c93de9

net-analyzer/nagios-core: stable 4.3.3 for sparc, bug #628086 (thanks to Dakon)

Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="sparc"

 net-analyzer/nagios-core/nagios-core-4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index e0ec2a2f0ff..a26b912a6f4 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Matt Turner]

commit: 5632a6bc990b72e436eaf8b9c97b789c40d6cb89
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Aug 31 15:17:26 2017 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Aug 31 15:17:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5632a6bc

net-analyzer/nagios-core-4.3.3: alpha stable, bug 628086

 net-analyzer/nagios-core/nagios-core-4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index 650b8786d5d..e0ec2a2f0ff 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 2402641769a87447a44869d97b79343725a48ec1
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Aug 30 13:55:01 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Aug 30 14:09:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24026417

net-analyzer/nagios-core: new version 4.3.4 for testing.

This new version comes with few upstream changes, but I took a flaming
sword to the ebuild. Upstream defaults to installing everything as
nagios:nagios, and this creates a few easy-to-exploit scenarios. The
ebuild will now install everything as root:root where I think we can
get away with it, but this is all an experiment. I'll mask this
version and ask for help testing.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-analyzer/nagios-core/Manifest |   1 +
 net-analyzer/nagios-core/nagios-core-4.3.4.ebuild | 214 ++
 2 files changed, 215 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index f1029f0cbd7..ffabb32a4f4 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,5 @@
 DIST nagios-3.5.1.tar.gz 1763584 SHA256 
ca9dd68234fa090b3c35ecc8767b2c9eb743977eaf32612fa9b8341cc00a0f99 SHA512 
48e2ecb91002b08203937b12a438c87c62cd3c5c401a0ed9e861cd6d79074c7017ed373e9379f013d87dea1fd7cb8e3d85112d55c87ac91aed96b256868c112d
 WHIRLPOOL 
2c02584702c64dbb0e353e34b758fab079eee0dc7a401e7b5947a21733758d3596401e5519e2dd7f05c89ee4835c21965d2718157fd9d6d3d20af9c853d688ca
 DIST nagios-4.3.1.tar.gz 11095797 SHA256 
dfc2f5f146eb508b2a28d28af7c338ef9eb604327efdc50142642026f7e79f82 SHA512 
d5f1919e2b32b0b2f4c5766367f0992fcf9b1f6766f4d3386e15e318cc1f57cdae6bc07f09464fd8212bef1713948fcb25d233eab588438036f996b6c479c97e
 WHIRLPOOL 
72032e93802fd28db71bb5a10bba703a9508c587de69ff24ce302ad4fbbd93996b4800ceb7dd4f5648e2717377409cd7a66591f177e775da1c69444d528be1a2
 DIST nagios-4.3.3.tar.gz 11101531 SHA256 
1fc4c72f76c720884dd3b538dc423b44f3bdde24e014f4212e58046a1fc114b6 SHA512 
588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
 WHIRLPOOL 
1452256a79190eae90076a9b50fdac3876557a6382d15d38a0c7930ec6d286c58e44220fee3243c9bcb1ae0ef337ddadd19e3552f02049959e69eaffd9fcd4a8
+DIST nagios-4.3.4.tar.gz 11101966 SHA256 
c90b7812d9e343db12be19a572e15c415c5d6353a91c5e226e432c2d4aaa44f1 SHA512 
f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 WHIRLPOOL 
dae991fe44f2d8c5457cffec6647d2b8a7ace60450e0ec2409838aaf1a6f35af1f6c56d260a36cceeede21cfd4521e695146a8c18b38d4e6689d0801d3471157
 DIST nagios-core-gentoo-icons-20141125.tar 40960 SHA256 
68b715f636eb291343cab3259862bbed8b6b898520b58df522438524de3d8761 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 WHIRLPOOL 
7ec3a944b2a659b456d3168818ca5b1af3a427436e6af2f3e5d6cba6fc7b1c7bad6f552301f064df31988865b3b32fd117d9e6f61c630d6d817a51cbbbcb331d

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
new file mode 100644
index 000..6de6b181b22
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="http://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+# sys-devel/libtool dependency is bug #401237.
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: ca327875ba40a5d741c2dd1cf3e8e4d42d1102d5
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Aug 16 11:31:32 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Aug 16 11:33:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca327875

net-analyzer/nagios-core: new version 4.3.3 using upstream's init script.

This new upstream version includes an OpenRC init script that makes
use of the build system for the nagios user and runtime paths. As a
result, we are able to drop the init/conf files that we've been using
in FILESDIR. The new version also writes its PID file before dropping
privileges, and combined with the new init script, that constitutes
a fix for CVE-2017-12847.

Gentoo-Bug: 621114

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-analyzer/nagios-core/Manifest| 2 +-
 .../{nagios-core-4.3.2.ebuild => nagios-core-4.3.3.ebuild}   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 5e689a5128c..f1029f0cbd7 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,4 @@
 DIST nagios-3.5.1.tar.gz 1763584 SHA256 
ca9dd68234fa090b3c35ecc8767b2c9eb743977eaf32612fa9b8341cc00a0f99 SHA512 
48e2ecb91002b08203937b12a438c87c62cd3c5c401a0ed9e861cd6d79074c7017ed373e9379f013d87dea1fd7cb8e3d85112d55c87ac91aed96b256868c112d
 WHIRLPOOL 
2c02584702c64dbb0e353e34b758fab079eee0dc7a401e7b5947a21733758d3596401e5519e2dd7f05c89ee4835c21965d2718157fd9d6d3d20af9c853d688ca
 DIST nagios-4.3.1.tar.gz 11095797 SHA256 
dfc2f5f146eb508b2a28d28af7c338ef9eb604327efdc50142642026f7e79f82 SHA512 
d5f1919e2b32b0b2f4c5766367f0992fcf9b1f6766f4d3386e15e318cc1f57cdae6bc07f09464fd8212bef1713948fcb25d233eab588438036f996b6c479c97e
 WHIRLPOOL 
72032e93802fd28db71bb5a10bba703a9508c587de69ff24ce302ad4fbbd93996b4800ceb7dd4f5648e2717377409cd7a66591f177e775da1c69444d528be1a2
-DIST nagios-4.3.2.tar.gz 11096863 SHA256 
687814b40b03b40361377aeace057dddb23459ffb8c00434bc1a95b21ccdf796 SHA512 
679e76f7a232b9b0dbbc2697f51b58d09ae3d3833e0e6922bb39d90768c81f2eb09b9ab36b7fdaeca893cebd93fc1edc1232f245498d4420980ba4659df60a31
 WHIRLPOOL 
27c1d479c6b8293e1a614721e891d7358f154d15f18c70ce9591ce1e16f459812fd37df65caf96d99aeaa19bb08cafe5b753f4754ec790795041030d3ff1e4d6
+DIST nagios-4.3.3.tar.gz 11101531 SHA256 
1fc4c72f76c720884dd3b538dc423b44f3bdde24e014f4212e58046a1fc114b6 SHA512 
588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
 WHIRLPOOL 
1452256a79190eae90076a9b50fdac3876557a6382d15d38a0c7930ec6d286c58e44220fee3243c9bcb1ae0ef337ddadd19e3552f02049959e69eaffd9fcd4a8
 DIST nagios-core-gentoo-icons-20141125.tar 40960 SHA256 
68b715f636eb291343cab3259862bbed8b6b898520b58df522438524de3d8761 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 WHIRLPOOL 
7ec3a944b2a659b456d3168818ca5b1af3a427436e6af2f3e5d6cba6fc7b1c7bad6f552301f064df31988865b3b32fd117d9e6f61c630d6d817a51cbbbcb331d

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
similarity index 98%
rename from net-analyzer/nagios-core/nagios-core-4.3.2.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index efcd6c2484c..650b8786d5d 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -114,7 +114,7 @@ src_compile() {
 }
 
 src_install() {
-   dodoc Changelog INSTALLING LEGAL README.asciidoc UPGRADING
+   dodoc Changelog CONTRIBUTING.md README.asciidoc THANKS UPGRADING
 
emake DESTDIR="${D}" install-base
emake DESTDIR="${D}" install-basic
@@ -141,8 +141,7 @@ src_install() {
insopts --mode=0644 # Back to the default...
fi
 
-   newinitd "${FILESDIR}"/nagios4-r1 nagios
-   newconfd "${FILESDIR}"/conf.d nagios
+   newinitd openrc-init nagios
 
if use web ; then
if use apache2 ; then

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 17b295bb6e7d48f11de21a248703896c6d70c653
Author: Tomas Mozes  gmail  com>
AuthorDate: Mon Aug  7 10:30:47 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Aug  8 23:07:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17b295bb

net-analyzer/nagios-core: update apache define for current eselect-php

Package-Manager: Portage-2.3.6, Repoman-2.3.2

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild | 2 +-
 net-analyzer/nagios-core/nagios-core-4.3.2.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
index b34de2caad8..7acee4a50aa 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
@@ -220,7 +220,7 @@ pkg_postinst() {
|| die "failed to change group of 
${ROOT}etc/nagios"
 
elog "To enable the Nagios web front-end, 
please edit"
-   elog "${ROOT}etc/conf.d/apache2 and add \"-D 
NAGIOS -D PHP5\""
+   elog "${ROOT}etc/conf.d/apache2 and add \"-D 
NAGIOS -D PHP\""
elog "to APACHE2_OPTS. Then Nagios will be 
available at,"
elog
elif use lighttpd; then

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.2.ebuild
index 2b0afdbba17..efcd6c2484c 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.2.ebuild
@@ -218,7 +218,7 @@ pkg_postinst() {
|| die "failed to change group of 
${ROOT}etc/nagios"
 
elog "To enable the Nagios web front-end, 
please edit"
-   elog "${ROOT}etc/conf.d/apache2 and add \"-D 
NAGIOS -D PHP5\""
+   elog "${ROOT}etc/conf.d/apache2 and add \"-D 
NAGIOS -D PHP\""
elog "to APACHE2_OPTS. Then Nagios will be 
available at,"
elog
elif use lighttpd; then

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: 4d819bd1b24e0111287873835306fb3785c3e64b
Author: Tomas Mozes  gmail  com>
AuthorDate: Fri Jun  2 05:47:49 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Jun  7 12:40:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d819bd1

net-analyzer/nagios-core: bump to 4.3.2

Package-Manager: Portage-2.3.6, Repoman-2.3.2

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-core/Manifest |   1 +
 net-analyzer/nagios-core/nagios-core-4.3.2.ebuild | 247 ++
 2 files changed, 248 insertions(+)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index 0a6a1130860..5e689a5128c 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,4 @@
 DIST nagios-3.5.1.tar.gz 1763584 SHA256 
ca9dd68234fa090b3c35ecc8767b2c9eb743977eaf32612fa9b8341cc00a0f99 SHA512 
48e2ecb91002b08203937b12a438c87c62cd3c5c401a0ed9e861cd6d79074c7017ed373e9379f013d87dea1fd7cb8e3d85112d55c87ac91aed96b256868c112d
 WHIRLPOOL 
2c02584702c64dbb0e353e34b758fab079eee0dc7a401e7b5947a21733758d3596401e5519e2dd7f05c89ee4835c21965d2718157fd9d6d3d20af9c853d688ca
 DIST nagios-4.3.1.tar.gz 11095797 SHA256 
dfc2f5f146eb508b2a28d28af7c338ef9eb604327efdc50142642026f7e79f82 SHA512 
d5f1919e2b32b0b2f4c5766367f0992fcf9b1f6766f4d3386e15e318cc1f57cdae6bc07f09464fd8212bef1713948fcb25d233eab588438036f996b6c479c97e
 WHIRLPOOL 
72032e93802fd28db71bb5a10bba703a9508c587de69ff24ce302ad4fbbd93996b4800ceb7dd4f5648e2717377409cd7a66591f177e775da1c69444d528be1a2
+DIST nagios-4.3.2.tar.gz 11096863 SHA256 
687814b40b03b40361377aeace057dddb23459ffb8c00434bc1a95b21ccdf796 SHA512 
679e76f7a232b9b0dbbc2697f51b58d09ae3d3833e0e6922bb39d90768c81f2eb09b9ab36b7fdaeca893cebd93fc1edc1232f245498d4420980ba4659df60a31
 WHIRLPOOL 
27c1d479c6b8293e1a614721e891d7358f154d15f18c70ce9591ce1e16f459812fd37df65caf96d99aeaa19bb08cafe5b753f4754ec790795041030d3ff1e4d6
 DIST nagios-core-gentoo-icons-20141125.tar 40960 SHA256 
68b715f636eb291343cab3259862bbed8b6b898520b58df522438524de3d8761 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 WHIRLPOOL 
7ec3a944b2a659b456d3168818ca5b1af3a427436e6af2f3e5d6cba6fc7b1c7bad6f552301f064df31988865b3b32fd117d9e6f61c630d6d817a51cbbbcb331d

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.2.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.2.ebuild
new file mode 100644
index 000..2b0afdbba17
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.3.2.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="http://www.nagios.org/;
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+# sys-devel/libtool dependency is bug #401237.
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="sys-devel/libtool
+   virtual/mailx
+   perl? ( dev-lang/perl:= )
+   web? (
+   app-arch/unzip
+   media-libs/gd[jpeg,png]
+   lighttpd? ( www-servers/lighttpd[php] )
+   apache2? (
+   || (
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Michael Orlitzky]

commit: a207f2677392c478a03369e6148aeab803b684e4
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Mar  8 12:25:07 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Mar  8 12:48:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a207f267

net-analyzer/nagios-core: remove vulnerable 4.x versions.

Gentoo-Bug: 585914

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/nagios-core/Manifest |   1 -
 net-analyzer/nagios-core/nagios-core-4.2.4.ebuild | 247 --
 2 files changed, 248 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest 
b/net-analyzer/nagios-core/Manifest
index d5f0efb170d..0a6a1130860 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,3 @@
 DIST nagios-3.5.1.tar.gz 1763584 SHA256 
ca9dd68234fa090b3c35ecc8767b2c9eb743977eaf32612fa9b8341cc00a0f99 SHA512 
48e2ecb91002b08203937b12a438c87c62cd3c5c401a0ed9e861cd6d79074c7017ed373e9379f013d87dea1fd7cb8e3d85112d55c87ac91aed96b256868c112d
 WHIRLPOOL 
2c02584702c64dbb0e353e34b758fab079eee0dc7a401e7b5947a21733758d3596401e5519e2dd7f05c89ee4835c21965d2718157fd9d6d3d20af9c853d688ca
-DIST nagios-4.2.4.tar.gz 11088206 SHA256 
b0055c475683ce50d77b1536ff0cec9abf89139adecf771601fa021ef9a20b70 SHA512 
1f060f3139db6f77f7ca218bb4befb631c08b0ccb1b2b85e4c06cfc94328b5d09cef9b547eb54617089334a1e36b881347dfbb98bcc88b9b38e878214f97883a
 WHIRLPOOL 
a3d5454c72ab38388e8071dca8a319c717bb22915cfd06243727eb33f7b8a93cc323531be1535d14e283335b9964762a2729f4605f76d9a01ff78bbe924053a7
 DIST nagios-4.3.1.tar.gz 11095797 SHA256 
dfc2f5f146eb508b2a28d28af7c338ef9eb604327efdc50142642026f7e79f82 SHA512 
d5f1919e2b32b0b2f4c5766367f0992fcf9b1f6766f4d3386e15e318cc1f57cdae6bc07f09464fd8212bef1713948fcb25d233eab588438036f996b6c479c97e
 WHIRLPOOL 
72032e93802fd28db71bb5a10bba703a9508c587de69ff24ce302ad4fbbd93996b4800ceb7dd4f5648e2717377409cd7a66591f177e775da1c69444d528be1a2
 DIST nagios-core-gentoo-icons-20141125.tar 40960 SHA256 
68b715f636eb291343cab3259862bbed8b6b898520b58df522438524de3d8761 SHA512 
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 WHIRLPOOL 
7ec3a944b2a659b456d3168818ca5b1af3a427436e6af2f3e5d6cba6fc7b1c7bad6f552301f064df31988865b3b32fd117d9e6f61c630d6d817a51cbbbcb331d

diff --git a/net-analyzer/nagios-core/nagios-core-4.2.4.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.2.4.ebuild
deleted file mode 100644
index 70479fba17f..000
--- a/net-analyzer/nagios-core/nagios-core-4.2.4.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="http://www.nagios.org/;
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-   web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-# sys-devel/libtool dependency is bug #401237.
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="sys-devel/libtool
-   virtual/mailx
-   perl? ( dev-lang/perl:= )
-   web? (
-   app-arch/unzip
-   media-libs/gd[jpeg,png]
-   lighttpd? ( www-servers/lighttpd[php] )
-   apache2? (
-   || (
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-   
>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Jeroen Roovers]

commit: 954aa884b9be2c39eecb47154a3fb8ebecbf200d
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Mar  8 05:15:58 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Mar  8 05:15:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=954aa884

net-analyzer/nagios-core: Stable for HPPA (bug #585914).

Package-Manager: Portage-2.3.4, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
index d5a2cd6d2d4..b34de2caad8 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/, net-analyzer/nagios-core/files/

[Thomas Deutschmann]

commit: 85bf8d68cd0ec5fe93d7064c760dad5faebb5670
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Mar  2 19:31:12 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Mar  2 19:35:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85bf8d68

net-analyzer/nagios-core: Rev bump to fix upstream issue #337

Ebuild changes:
===
- Cherry picked commit e03e4fd470 to stop nagios-core from flooding
  syslog every 15 seconds due to debug leftovers [Upstream Issue #337].

Upstream Issue #337: https://github.com/NagiosEnterprises/nagioscore/issues/337

Acked-by: Michael Orlitzky  gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../nagios-core-4.3.1-fix-upstream-issue-337.patch  | 21 +
 ...ore-4.3.1.ebuild => nagios-core-4.3.1-r1.ebuild} |  2 ++
 2 files changed, 23 insertions(+)

diff --git 
a/net-analyzer/nagios-core/files/nagios-core-4.3.1-fix-upstream-issue-337.patch 
b/net-analyzer/nagios-core/files/nagios-core-4.3.1-fix-upstream-issue-337.patch
new file mode 100644
index 000..d5344a6442c
--- /dev/null
+++ 
b/net-analyzer/nagios-core/files/nagios-core-4.3.1-fix-upstream-issue-337.patch
@@ -0,0 +1,21 @@
+From e03e4fd470fbc8d4304d860d7b3b523c5d78373d Mon Sep 17 00:00:00 2001
+From: "John C. Frickson" 
+Date: Thu, 2 Mar 2017 10:24:24 -0600
+Subject: [PATCH] every 15sec /var/log/messages is flooded with "nagios:
+ set_environment_var"
+
+Fix for https://github.com/NagiosEnterprises/nagioscore/issues/337
+diff --git a/base/utils.c b/base/utils.c
+index 733fdef..19e20c7 100644
+--- a/base/utils.c
 b/base/utils.c
+@@ -872,9 +872,6 @@ int set_environment_var(char *name, char *value, int set) {
+ 
+   /* set the environment variable */
+   if(set == TRUE) {
+-  log_debug_info(DEBUGL_EVENTS, 0, "set_environment_var 
'%s'='%s'\n", name, value);
+-  syslog(LOG_DAEMON|LOG_INFO, "set_environment_var '%s'='%s'\n", 
name, value);
+-
+ #ifdef HAVE_SETENV
+   setenv(name, (value == NULL) ? "" : value, 1);
+ #else

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
similarity index 99%
rename from net-analyzer/nagios-core/nagios-core-4.3.1.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
index fa4f4225999..c86bbcf9dfc 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
@@ -71,6 +71,8 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${PN}-4.3.1-fix-upstream-issue-337.patch )
+
 pkg_setup() {
enewgroup nagios
enewuser nagios -1 /bin/bash /var/nagios/home nagios

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/

[Agostino Sarubbo]

commit: 09a02c1736d22eb120fde29179174d606aeed337
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar  2 10:44:31 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar  2 10:44:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a02c17

net-analyzer/nagios-core: x86 stable wrt bug #585914

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nagios-core/nagios-core-4.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nagios-core/nagios-core-4.3.1.ebuild 
b/net-analyzer/nagios-core/nagios-core-4.3.1.ebuild
index 1e82cb64fbe..fa4f4225999 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration