public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/
@ 2017-01-14 21:05 Michael Orlitzky
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2017-01-14 21:05 UTC (permalink / raw
  To: gentoo-commits

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 <estanley@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 <michael@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 <michael@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
-


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/
@ 2017-01-14 21:05 Michael Orlitzky
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2017-01-14 21:05 UTC (permalink / raw
  To: gentoo-commits

commit:     85d8b5b7b78412408d6e77d6083b8790cb4d7e5f
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jan 14 09:35:23 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=85d8b5b7

net-analyzer/nagios-core: remove unused patches

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 .../files/nagios-3.3.1-htmlmakefile.patch          | 14 -----
 .../nagios-core/files/statuswml-bug275288.patch    | 51 -----------------
 .../files/use-INSTALL-to-install-themes-r1.patch   | 65 ----------------------
 3 files changed, 130 deletions(-)

diff --git a/net-analyzer/nagios-core/files/nagios-3.3.1-htmlmakefile.patch b/net-analyzer/nagios-core/files/nagios-3.3.1-htmlmakefile.patch
deleted file mode 100644
index c033c98..00000000
--- a/net-analyzer/nagios-core/files/nagios-3.3.1-htmlmakefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- html/Makefile.in.orig	2011-07-27 16:06:58.000000000 +0200
-+++ html/Makefile.in	2011-07-27 16:07:10.000000000 +0200
-@@ -75,9 +75,9 @@
- 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
- 	for file in includes/*.*; \
- 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
--	for file in includes/rss/*; \
-+	for file in includes/rss/*.*; \
- 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
--	for file in includes/rss/extlib/*; \
-+	for file in includes/rss/extlib/*.*; \
- 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
- 
- install-unstripped:

diff --git a/net-analyzer/nagios-core/files/statuswml-bug275288.patch b/net-analyzer/nagios-core/files/statuswml-bug275288.patch
deleted file mode 100644
index 8b9a020..00000000
--- a/net-analyzer/nagios-core/files/statuswml-bug275288.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- cgi/statuswml.c	2008/11/30 18:13:11	1.27
-+++ cgi/statuswml.c	2009/06/19 04:30:26	1.28
-@@ -67,6 +67,8 @@
- void document_header(void);
- void document_footer(void);
- int process_cgivars(void);
-+int validate_arguments(void);
-+int is_valid_hostip(char *hostip);
- 
- int display_type=DISPLAY_INDEX;
- int hostgroup_style=DISPLAY_HOSTGROUP_SUMMARY;
-@@ -108,6 +110,13 @@
- 
- 	document_header();
- 
-+	/* validate arguments in URL */
-+	result=validate_arguments();
-+	if(result==ERROR){
-+		document_footer();
-+		return ERROR;
-+	        }
-+	
- 	/* read the CGI configuration file */
- 	result=read_cgi_config_file(get_cgi_config_location());
- 	if(result==ERROR){
-@@ -334,7 +343,25 @@
- 	return error;
-         }
- 
-+int validate_arguments(void){
-+	int result=OK;
-+	if((strcmp(ping_address,"")) && !is_valid_hostip(ping_address)) {
-+		printf("<p>Invalid host name/ip</p>\n");
-+		result=ERROR;
-+		}
-+	if(strcmp(traceroute_address,"") && !is_valid_hostip(traceroute_address)){
-+		printf("<p>Invalid host name/ip</p>\n");
-+		result=ERROR;
-+		}
-+	return result;
-+	}
- 
-+int is_valid_hostip(char *hostip) {
-+	char *valid_domain_chars="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-";
-+	if(strcmp(hostip,"") && strlen(hostip)==strspn(hostip,valid_domain_chars) && hostip[0] != '-' && hostip[strlen(hostip)-1] != '-')
-+		return TRUE;
-+	return FALSE;
-+	}
- 
- /* main intro screen */
- void display_index(void){

diff --git a/net-analyzer/nagios-core/files/use-INSTALL-to-install-themes-r1.patch b/net-analyzer/nagios-core/files/use-INSTALL-to-install-themes-r1.patch
deleted file mode 100644
index a14f5a3..00000000
--- a/net-analyzer/nagios-core/files/use-INSTALL-to-install-themes-r1.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From b6552e3b0b006fa28014150d199813de12d89ef4 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Mon, 25 Apr 2016 20:06:18 -0400
-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 | 20 ++++++++++++++++----
- 1 file changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 5b97513..0ec50b7 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -300,8 +300,14 @@ 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
-+
-+	for file in contrib/exfoliation/images/logos/*.*; \
-+	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
- 
- 	@echo ""
- 	@echo "*** Exfoliation theme installed ***"
-@@ -309,8 +315,14 @@ 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
-+
-+	for file in html/images/logos/*.*; \
-+	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
- 
- 	@echo ""
- 	@echo "*** Classic theme installed ***"
--- 
-2.7.3
-


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/
@ 2018-06-19 22:44 Michael Orlitzky
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2018-06-19 22:44 UTC (permalink / raw
  To: gentoo-commits

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 <estanley@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/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" <jfrickson@nagios.com>
-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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/
@ 2019-03-02  4:38 Michael Orlitzky
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2019-03-02  4:38 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/nagios-core: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> 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..00000000000
--- 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... */
-+            svc->host_problem_at_last_check = FALSE;
-+            svc->current_attempt = 1;
-+            svc->state_type = HARD_STATE;
-+            svc->last_hard_state = STATE_OK;
-+            svc->last_notification = (time_t)0;
-+            svc->next_notification = (time_t)0;
-+            svc->current_notification_number = 0;
-+            svc->problem_has_been_acknowledged = FALSE;
-+            svc->acknowledgement_type = ACKNOWLEDGEMENT_NONE;
-+            svc->notified_on = 0;
-+            
-+            hard_state_change = TRUE;
- 		}
- 
- 		/***** SERVICE IS STILL IN PROBLEM STATE *****/
-@@ -1418,6 +1448,14 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 			}
- 		}
- 	}
-+    
-+    /* soft states should be using retry_interval */
-+    if (svc->state_type == SOFT_STATE) {
-+        
-+            log_debug_info(DEBUGL_CHECKS, 2, "Service state type is soft, using retry_interval\n");
-+            
-+            next_check = (unsigned long) (current_time + svc->retry_interval * interval_length);
-+    }
- 
- 	/* check for a state change */
- 	if (svc->current_state != svc->last_state || (svc->current_state == STATE_OK && svc->state_type == SOFT_STATE)) {
-@@ -1454,6 +1492,8 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 	if (svc->current_attempt >= svc->max_attempts && svc->current_state != svc->last_hard_state) {
- 
- 		log_debug_info(DEBUGL_CHECKS, 2, "Service had a HARD STATE CHANGE!!\n");
-+        
-+        next_check = (unsigned long)(current_time + (svc->check_interval * interval_length));
- 
- 		hard_state_change = TRUE;
- 
-@@ -2197,6 +2237,9 @@ int handle_async_host_check_result(host *hst, check_result *cr)
- 		else {
- 
- 			log_debug_info(DEBUGL_CHECKS, 1, "Host is no longer UP (%s)!\n", host_state_name(hst->current_state));
-+            
-+            hst->state_type = SOFT_STATE;
-+            hst->current_attempt = 1;
- 
- 			/* propagate checks to immediate parents if they are UP */
- 			host_propagate_checks_to_immediate_parents(hst, FALSE, current_time);
-@@ -2276,7 +2319,9 @@ int handle_async_host_check_result(host *hst, check_result *cr)
- 	if (hst->current_state != HOST_UP && (hst->check_type == CHECK_TYPE_ACTIVE || translate_passive_host_checks == TRUE)) {
- 
- 		hst->current_state = determine_host_reachability(hst);
--		next_check = (unsigned long)(current_time + (hst->retry_interval * interval_length));
-+		if (hst->state_type == SOFT_STATE)
-+            next_check = (unsigned long)(current_time + (hst->retry_interval * interval_length));
-+        
- 	}
- 
- 	/* check for state change */
-@@ -2310,7 +2355,9 @@ int handle_async_host_check_result(host *hst, check_result *cr)
- 
- 		log_debug_info(DEBUGL_CHECKS, 2, "Host had a HARD STATE CHANGE!!\n");
- 
--		hard_state_change = TRUE;
-+		next_check = (unsigned long)(current_time + (hst->check_interval * interval_length));
-+        
-+        hard_state_change = TRUE;
- 		send_notification = TRUE;
- 	}
- 
-@@ -2372,6 +2419,12 @@ int handle_async_host_check_result(host *hst, check_result *cr)
- 		}
- 	}
- 
-+    /* the host recovered, so reset the current notification number and state flags (after the recovery notification has gone out) */
-+    if(hst->current_state == HOST_UP && hst->state_type == HARD_STATE && hard_state_change == TRUE) {
-+        hst->current_notification_number = 0;
-+        hst->notified_on = 0;
-+        }
-+        
- 	if (obsess_over_hosts == TRUE) {
- 		obsessive_compulsive_host_check_processor(hst);
- 	}
-diff --git a/base/nagios.c b/base/nagios.c
-index 520ba71e..24719647 100644
---- a/base/nagios.c
-+++ b/base/nagios.c
-@@ -878,6 +878,9 @@ int main(int argc, char **argv) {
- 			/* clean up the scheduled downtime data */
- 			cleanup_downtime_data();
- 
-+			/* clean up comment data */
-+			free_comment_data();
-+
- 			/* clean up the status data if we are not restarting */
- 			if(sigrestart == FALSE) {
- 				cleanup_status_data(TRUE);
-diff --git a/cgi/status.c b/cgi/status.c
-index 20c4ed48..8b1c8b31 100644
---- a/cgi/status.c
-+++ b/cgi/status.c
-@@ -873,6 +873,11 @@ void show_service_status_totals(void) {
- 				count_service = 1;
- 			}
- 		else if(display_type == DISPLAY_SERVICEGROUPS) {
-+
-+			if (is_service_member_of_servicegroup(find_servicegroup(servicegroup_name), temp_service) == FALSE) {
-+				continue;
-+			}
-+
- 			if(show_all_servicegroups == TRUE) {
- 				count_service = 1;
- 				}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/
@ 2019-03-02  4:38 Michael Orlitzky
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2019-03-02  4:38 UTC (permalink / raw
  To: gentoo-commits

commit:     1f117f5e3fa59fa3bf1589ad23227e7c82d741b5
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 04:32:10 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 04:32:10 2019 +0000
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 <mjo <AT> 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..00000000000
--- 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");


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/
@ 2020-06-09 19:32 Michael Orlitzky
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2020-06-09 19:32 UTC (permalink / raw
  To: gentoo-commits

commit:     abbb570371d5e4d3ef38daee46aff329cd863920
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jun  9 18:28:37 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 19:22:59 2020 +0000
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 <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> 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..00000000000
--- a/net-analyzer/nagios-core/files/99_nagios4.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<IfDefine NAGIOS>
-
-  ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
-  <Directory "/usr/lib/nagios/cgi-bin/">
-    AllowOverride AuthConfig
-    Options ExecCGI
-    Require all granted
-  </Directory>
-
-  Alias /nagios /usr/share/nagios/htdocs
-  <Directory "/usr/share/nagios/htdocs">
-    AllowOverride AuthConfig
-    Require all granted
-  </Directory>
-
-</IfDefine>

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..00000000000
--- 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"
-)


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/
@ 2022-11-08 13:22 Michael Orlitzky
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2022-11-08 13:22 UTC (permalink / raw
  To: gentoo-commits

commit:     9b5f44ca83e451a48770f526097f201974db3c2c
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Nov  8 06:23:01 2022 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Nov  8 13:19:47 2022 +0000
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 <mmk <AT> levelnine.at>
Signed-off-by: Michael Orlitzky <mjo <AT> 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..000000000000
--- 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 <nazard@nazar.ca>
-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 >= 0x10100000
- 
--	method = TLS_method();
-+	method = TLS_client_method();
- 
- #else		/* OPENSSL_VERSION_NUMBER >= 0x10100000 */
- 
-@@ -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(&current_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(&current_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, &sd, &ssl, &ctx, 2);
- 	if(sd > 0 && result != ERROR) {
-
-From a2c1415f14db6bbce9ba3d1d5a0c8218dd8c4fb8 Mon Sep 17 00:00:00 2001
-From: Doug Nazar <nazard@nazar.ca>
-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;
- 
- 	/* make sure our static port_str is long enough */
--	if(port > 65535)
-+	if(port < 0 || port > 65535)
- 		return ERROR;
- 
- 	snprintf(port_str, sizeof(port_str), "%d", port);
-@@ -385,7 +385,7 @@ int my_tcp_connect(const char *host_name, int port, int *sd, int timeout) {
- 	hints.ai_socktype = SOCK_STREAM;
- 
- 	/* make sure our static port_str is long enough */
--	if(port > 65535)
-+	if(port < 0 || port > 65535)
- 		return ERROR;
- 
- 	snprintf(port_str, sizeof(port_str), "%d", port);


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-11-08 13:22 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-14 21:05 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/ Michael Orlitzky
  -- strict thread matches above, loose matches on Subject: below --
2017-01-14 21:05 Michael Orlitzky
2018-06-19 22:44 Michael Orlitzky
2019-03-02  4:38 Michael Orlitzky
2019-03-02  4:38 Michael Orlitzky
2020-06-09 19:32 Michael Orlitzky
2022-11-08 13:22 Michael Orlitzky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox