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 <[email protected]>
-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
-
