commit: d8c9e8160e7575722e0226c045be15ac9d1f3523
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 19 22:35:55 2018 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jun 19 22:41:56 2018 +0000
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..00000000000
--- a/net-analyzer/nagios-core/files/99_nagios3.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-<IfDefine NAGIOS>
- ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
- <Directory "/usr/lib/nagios/cgi-bin/">
- AllowOverride AuthConfig
- Options ExecCGI
- Order allow,deny
- Allow from all
- </Directory>
- Alias /nagios /usr/share/nagios/htdocs
- <Directory "/usr/share/nagios/htdocs">
- AllowOverride AuthConfig
- Order allow,deny
- Allow from all
- </Directory>
-</IfDefine>
diff --git a/net-analyzer/nagios-core/files/conf.d
b/net-analyzer/nagios-core/files/conf.d
deleted file mode 100644
index 68c7370c887..00000000000
--- 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..00000000000
--- 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..00000000000
--- 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 <[email protected]>
-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 a/cgi/extinfo.c b/cgi/extinfo.c
-index 62a1b18..5113df4 100644
---- a/cgi/extinfo.c
-+++ b/cgi/extinfo.c
-@@ -591,7 +591,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/histogram.c b/cgi/histogram.c
-index 4616541..f6934d0 100644
---- a/cgi/histogram.c
-+++ b/cgi/histogram.c
-@@ -1060,7 +1060,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/notifications.c b/cgi/notifications.c
-index 8ba11c1..461ae84 100644
---- a/cgi/notifications.c
-+++ b/cgi/notifications.c
-@@ -327,7 +327,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/outages.c b/cgi/outages.c
-index 426ede6..cb58dee 100644
---- a/cgi/outages.c
-+++ b/cgi/outages.c
-@@ -225,7 +225,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/status.c b/cgi/status.c
-index 3253340..4ec1c92 100644
---- a/cgi/status.c
-+++ b/cgi/status.c
-@@ -567,7 +567,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/statusmap.c b/cgi/statusmap.c
-index ea48368..2580ae5 100644
---- a/cgi/statusmap.c
-+++ b/cgi/statusmap.c
-@@ -400,7 +400,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/statuswml.c b/cgi/statuswml.c
-index bd8cea2..d25abef 100644
---- a/cgi/statuswml.c
-+++ b/cgi/statuswml.c
-@@ -226,8 +226,13 @@ int process_cgivars(void) {
-
- for(x = 0; variables[x] != NULL; x++) {
-
-+ /* do some basic length checking on the variable identifier to
prevent buffer overflows */
-+ if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
-+ continue;
-+ }
-+
- /* we found the hostgroup argument */
-- if(!strcmp(variables[x], "hostgroup")) {
-+ else if(!strcmp(variables[x], "hostgroup")) {
- display_type = DISPLAY_HOSTGROUP;
- x++;
- if(variables[x] == NULL) {
-diff --git a/cgi/summary.c b/cgi/summary.c
-index 126ce5e..749a02c 100644
---- a/cgi/summary.c
-+++ b/cgi/summary.c
-@@ -725,7 +725,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/trends.c b/cgi/trends.c
-index b35c18e..895db01 100644
---- a/cgi/trends.c
-+++ b/cgi/trends.c
-@@ -1263,7 +1263,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/contrib/daemonchk.c b/contrib/daemonchk.c
-index 78716e5..9bb6c4b 100644
---- a/contrib/daemonchk.c
-+++ b/contrib/daemonchk.c
-@@ -174,7 +174,6 @@ static 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/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
deleted file mode 100644
index d5344a6442c..00000000000
---
a/net-analyzer/nagios-core/files/nagios-core-4.3.1-fix-upstream-issue-337.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From e03e4fd470fbc8d4304d860d7b3b523c5d78373d Mon Sep 17 00:00:00 2001
-From: "John C. Frickson" <[email protected]>
-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/files/nagios3
b/net-analyzer/nagios-core/files/nagios3
deleted file mode 100644
index 9b904936227..00000000000
--- a/net-analyzer/nagios-core/files/nagios3
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-nagios_config="/etc/nagios/nagios.cfg"
-nagios_cmdfile="/var/nagios/rw/nagios.cmd"
-
-command="/usr/sbin/nagios"
-command_args="-d ${nagios_config}"
-pidfile="/var/nagios/nagios.lock"
-start_stop_daemon_args="-e HOME=/var/nagios/home"
-
-depend() {
- need net
- use dns logger firewall
- after mysql postgresql
-}
-
-reload()
-{
- checkconfig || return 1
- ebegin "Reloading configuration"
- start-stop-daemon --signal HUP --pidfile ${pidfile}
- eend $?
-}
-
-checkconfig() {
- ebegin "Verifying config files"
-
- # Silent Check
- /usr/sbin/nagios -v ${nagios_config} &>/dev/null && return 0
-
- # Now we know there's problem - run again and display errors
- /usr/sbin/nagios -v ${nagios_config}
- eend $? "Configuration Error. Please fix your configfile"
-}
-
-start_pre() {
- checkconfig || return 1
-
- touch /var/nagios/nagios.log /var/nagios/status.sav
- chown nagios:nagios /var/nagios/nagios.log /var/nagios/status.sav
- rm -f ${nagios_cmdfile}
-}
-
-stop_post() {
- rm -f /var/nagios/status.log /var/nagios/nagios.tmp ${pidfile} \
- ${nagios_cmdfile}
-}
diff --git a/net-analyzer/nagios-core/files/nagios4-r1
b/net-analyzer/nagios-core/files/nagios4-r1
deleted file mode 100644
index 6309fcf0670..00000000000
--- a/net-analyzer/nagios-core/files/nagios4-r1
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-nagios_config="/etc/nagios/nagios.cfg"
-
-command="/usr/sbin/nagios"
-command_args="-d ${nagios_config}"
-pidfile="/var/nagios/nagios.lock"
-start_stop_daemon_args="-e HOME=/var/nagios/home"
-
-depend(){
- need net
- use dns logger firewall
- after mysql postgresql
-}
-
-reload(){
- checkconfig || return 1
- ebegin "Reloading configuration"
- start-stop-daemon --signal HUP --pidfile ${pidfile}
- eend $?
-}
-
-checkconfig(){
- ebegin "Verifying config files"
-
- # Silent Check
- ${command} -v ${nagios_config} > /dev/null 2>&1 && return 0
-
- # Now we know there's a problem. Run the check again and
- # this time, display the errors.
- ${command} -v ${nagios_config}
- eend $? "Configuration Error. Please fix your config file."
-}
-
-start_pre() {
- # Without this, the "start" action will appear to succeed even
- # when the config file contains errors and the daemon failed to
- # start.
- checkconfig || return 1
-}
