commit: 3fe7eef56ef63155a5c79346bd3f8aa55fb4f179 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Sat Jan 14 20:48:12 2017 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Sat Jan 14 21:04:16 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fe7eef5
net-analyzer/nagios-core: remove the rest of the unused files. With nagios-3.x (and older 4.x versions) removed from the tree, we now have a bunch of unused files sitting in $FILESDIR. Get rid of them. Gentoo-Bug: 602216 Package-Manager: portage-2.3.0 net-analyzer/nagios-core/files/99_nagios3.conf | 15 -- .../files/fix-bogus-perf-data-warnings.patch | 32 ---- .../nagios-core/files/lighttpd_nagios3-r1.conf | 24 --- net-analyzer/nagios-core/files/nagios | 57 ------- .../files/nagios-core-3.5.1-process_cgivars.patch | 175 --------------------- net-analyzer/nagios-core/files/nagios3 | 53 ------- net-analyzer/nagios-core/files/nagios4 | 52 ------ .../files/use-INSTALL-to-install-themes.patch | 59 ------- .../files/use-MAKE-instead-of-bare-make.patch | 37 ----- 9 files changed, 504 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 074f9ce..00000000 --- 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/fix-bogus-perf-data-warnings.patch b/net-analyzer/nagios-core/files/fix-bogus-perf-data-warnings.patch deleted file mode 100644 index 8f589e8..00000000 --- a/net-analyzer/nagios-core/files/fix-bogus-perf-data-warnings.patch +++ /dev/null @@ -1,32 +0,0 @@ -Patch submitted upstream at, - - http://tracker.nagios.org/view.php?id=534 - -by user ovidiu_stanila. Confirmed to work by at least one other user, -travissidelinger. Applied to fix Gentoo bug #530640. - -diff --git a/base/workers.c b/base/workers.c -index 881e434..d1e1f8d 100644 ---- a/base/workers.c -+++ b/base/workers.c -@@ -285,6 +285,8 @@ static void destroy_job(struct wproc_job *job) - case WPJOB_SVC_EVTHANDLER: - case WPJOB_GLOBAL_HOST_EVTHANDLER: - case WPJOB_HOST_EVTHANDLER: -+ case WPJOB_HOST_PERFDATA: -+ case WPJOB_SVC_PERFDATA: - /* these require nothing special */ - break; - case WPJOB_CALLBACK: -@@ -763,6 +765,11 @@ static int handle_worker_result(int sd, int events, void *arg) - run_job_callback(job, &wpres, 0); - break; - -+ case WPJOB_HOST_PERFDATA: -+ case WPJOB_SVC_PERFDATA: -+ /* these require nothing special */ -+ break; -+ - default: - logit(NSLOG_RUNTIME_WARNING, TRUE, "Worker %d: Unknown jobtype: %d\n", wp->pid, job->type); - break; 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 6e25770..00000000 --- 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 b/net-analyzer/nagios-core/files/nagios deleted file mode 100644 index b8a642f..00000000 --- a/net-analyzer/nagios-core/files/nagios +++ /dev/null @@ -1,57 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -opts="${opts} reload checkconfig" - -depend() { - need net - use dns logger firewall - after mysql postgresql -} - -reload() -{ - checkconfig || return 1 - ebegin "Reloading configuration" - killall -HUP nagios &>/dev/null - eend $? -} - -checkconfig() { - # Silent Check - /usr/nagios/bin/nagios -v /etc/nagios/nagios.cfg &>/dev/null && return 0 - - # Now we know there's problem - run again and display errors - /usr/nagios/bin/nagios -v /etc/nagios/nagios.cfg - eend $? "Configuration Error. Please fix your configfile" -} - -start() { - checkconfig || return 1 - ebegin "Starting nagios" - touch /var/nagios/nagios.log /var/nagios/status.sav - chown nagios:nagios /var/nagios/nagios.log /var/nagios/status.sav - rm -f /var/nagios/rw/nagios.cmd - start-stop-daemon --quiet --start --startas /usr/nagios/bin/nagios \ - -e HOME="/var/nagios/home" --pidfile /var/nagios/nagios.lock \ - -- -d /etc/nagios/nagios.cfg - eend $? -} - -stop() { - ebegin "Stopping nagios" - start-stop-daemon --quiet --stop --pidfile /var/nagios/nagios.lock - rm -f /var/nagios/status.log /var/nagios/nagios.tmp /var/nagios/nagios.lock /var/nagios/rw/nagios.cmd - eend $? -} - -svc_restart() { - checkconfig || return 1 - ebegin "Restarting nagios" - svc_stop - svc_start - eend $? -} - 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 9d95367..00000000 --- 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 <estan...@nagios.com> -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/nagios3 b/net-analyzer/nagios-core/files/nagios3 deleted file mode 100644 index a43ece4..00000000 --- a/net-analyzer/nagios-core/files/nagios3 +++ /dev/null @@ -1,53 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 b/net-analyzer/nagios-core/files/nagios4 deleted file mode 100644 index f434752..00000000 --- a/net-analyzer/nagios-core/files/nagios4 +++ /dev/null @@ -1,52 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 2>&1 && 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 config file." -} - -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/use-INSTALL-to-install-themes.patch b/net-analyzer/nagios-core/files/use-INSTALL-to-install-themes.patch deleted file mode 100644 index a852430..00000000 --- a/net-analyzer/nagios-core/files/use-INSTALL-to-install-themes.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 26bef86bad804836babd9d99accfc247eb744132 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -Date: Wed, 12 Nov 2014 08:35:28 -0500 -Subject: [PATCH 1/1] Use $(INSTALL) to install themes. - -Most of the images installed under the htdocs folder are installed -mode 644 with owner:group nagios:nagios. This is due to the use of -$(INSTALL) in html/Makefile. However, the theme images and stylesheets -are currently installed with a simple "cp -r", which leads to -inconsistencies like the following: - - $ cd /usr/share/nagios/htdocs/images - $ ls action*.gif - -rw-rw-r-- 1 nagios nagios 1.3K 2014-11-12 08:22 action.gif - -rw-r--r-- 1 root root 1.3K 2014-11-12 08:22 action-graph.gif - -rw-r--r-- 1 root root 171 2014-11-12 08:22 action-nagios.gif - -rw-r--r-- 1 root root 162 2014-11-12 08:22 action-orig.gif - -By using $(INSTALL) in the install-exfoliation and install-classicui -targets, we enforce some consistency. ---- - Makefile.in | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 1341160..67e1502 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -300,8 +300,11 @@ install-webconf: - @echo "" - - install-exfoliation: -- cp -rf contrib/exfoliation/stylesheets/* $(DESTDIR)$(HTMLDIR)/stylesheets -- cp -rf contrib/exfoliation/images/* $(DESTDIR)$(HTMLDIR)/images -+ for file in contrib/exfoliation/stylesheets/*.*; \ -+ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done -+ -+ for file in contrib/exfoliation/images/*.*; \ -+ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done - - @echo "" - @echo "*** Exfoliation theme installed ***" -@@ -309,8 +312,11 @@ install-exfoliation: - @echo "" - - install-classicui: -- cp -rf html/stylesheets/* $(DESTDIR)$(HTMLDIR)/stylesheets -- cp -rf html/images/* $(DESTDIR)$(HTMLDIR)/images -+ for file in html/stylesheets/*.*; \ -+ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done -+ -+ for file in html/images/*.*; \ -+ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done - - @echo "" - @echo "*** Classic theme installed ***" --- -2.0.4 - diff --git a/net-analyzer/nagios-core/files/use-MAKE-instead-of-bare-make.patch b/net-analyzer/nagios-core/files/use-MAKE-instead-of-bare-make.patch deleted file mode 100644 index e53ba78..00000000 --- a/net-analyzer/nagios-core/files/use-MAKE-instead-of-bare-make.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e043015081c9dc6869b282da76ae0de5ac9840a2 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -Date: Wed, 5 Nov 2014 13:46:04 -0500 -Subject: [PATCH 1/1] Use $(MAKE) instead of bare "make" in subtarget of - install-html. - -When running make as a subprocess of itself, it's best to invoke it as -$(MAKE). The rest of Makefile.in does this correctly, but there was -one instance where it was forgotten. For posterity, this can lead to -warnings like, - - make[1]: warning: jobserver unavailable: using -j1. - Add '+' to parent make rule. - -More info is available at, - - https://www.gnu.org/software/make/manual/html_node/Error-Messages.html ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index f487c47..1341160 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -222,7 +222,7 @@ test-perl: cgis - - install-html: - cd $(SRC_HTM) && $(MAKE) install -- make install-exfoliation -+ $(MAKE) install-exfoliation - - install-base: - cd $(SRC_BASE) && $(MAKE) install --- -2.0.4 -
