kiwi/klara-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Verisign stuff

Browse Source
This commit is contained in:
Xavier Beaudouin
2024-12-16 09:43:03 +01:00
parent 2b0788e34d
commit 17b695b587
59 changed files with 1428 additions and 3112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
net-mgmt/nagios/files/nagios.in Normal file
View File

@ -0,0 +1,100 @@
#!/bin/sh
# PROVIDE: nagios
# REQUIRE: LOGIN
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf to enable nagios:
# nagios_enable (bool): Set to "NO" by default.
# Set it to "YES" to enable nagios.
# nagios_precache (bool): Set to "NO" by default.
# Set it to "YES" to enable pre-caching.
# nagios_flags (str): Set to "" by default.
# nagios_configfile (str): Set to "%%PREFIX%%/etc/nagios/nagios.cfg" by default.
#
. /etc/rc.subr
name="nagios"
rcvar=nagios_enable
command="%%PREFIX%%/bin/nagios"
command_args="-d"
extra_commands="reload configtest"
pidfile="%%NAGIOSDIR%%/nagios.lock"
nagios_user="%%NAGIOSUSER%%"
start_precmd="start_precmd"
stop_postcmd="stop_postcmd"
restart_precmd="nagios_checkconfig"
reload_precmd="reload_precmd"
configtest_cmd="nagios_checkconfig"
sig_reload=HUP
load_rc_config "${name}"
[ -z "${nagios_enable}" ] && nagios_enable="NO"
[ -z "${nagios_configfile}" ] && nagios_configfile="%%PREFIX%%/etc/nagios/nagios.cfg"
[ -z "${nagios_precache}" ] && nagios_precache="NO"
required_files="${nagios_configfile}"
command_args="${command_args} ${nagios_configfile}"
nagios_cacheconfig() {
if ! checkyesno nagios_precache; then
return 0
fi
echo -n "Pre-Caching nagios configuration: "
${command} -pv ${nagios_configfile} 2>&1 >/dev/null
if [ $? != 0 ]; then
echo "FAILED"
${command} -v ${nagios_configfile}
return 1
else
command_args="-u -x ${command_args}"
echo "OK"
fi
}
nagios_checkconfig() {
echo -n "Performing sanity check of nagios configuration: "
${command} -v ${nagios_configfile} 2>&1 >/dev/null
if [ $? != 0 ]; then
echo "FAILED"
${command} -v ${nagios_configfile}
return 1
else
echo "OK"
fi
}
reload_precmd() {
if ! nagios_checkconfig; then
return 1
fi
if ! nagios_cacheconfig; then
return 1
fi
}
start_precmd() {
if ! nagios_checkconfig; then
return 1
fi
if ! nagios_cacheconfig; then
return 1
fi
su -m "${nagios_user}" -c "touch \"%%NAGIOSDIR%%/nagios.log\" \"%%NAGIOSDIR%%/status.sav\""
rm -f "%%NAGIOSDIR%%/rw/nagios.cmd"
}
stop_postcmd() {
rm -f "%%NAGIOSDIR%%/nagios.tmp" "%%NAGIOSDIR%%/rw/nagios.cmd"
}
run_rc_command "$1"

32
net-mgmt/nagios/files/patch-0007-fix_downtime_struct Normal file
View File

@ -0,0 +1,32 @@
--- ./include/downtime.h.orig 2013-08-30 19:46:14.000000000 +0200
+++ ./include/downtime.h 2014-04-18 10:49:26.000000000 +0200
@@ -39,24 +39,26 @@
char *service_description;
time_t entry_time;
time_t start_time;
- time_t flex_downtime_start; /* Time the flexible downtime started */
time_t end_time;
int fixed;
unsigned long triggered_by;
unsigned long duration;
unsigned long downtime_id;
- int is_in_effect;
- int start_notification_sent;
char *author;
char *comment;
#ifdef NSCORE
unsigned long comment_id;
+#endif
+ int is_in_effect;
+#ifdef NSCORE
int start_flex_downtime;
int incremented_pending_downtime;
// int start_event;
// int stop_event;
#endif
struct scheduled_downtime_struct *next;
+ time_t flex_downtime_start; /* Time the flexible downtime started */
+ int start_notification_sent;
} scheduled_downtime;

66
net-mgmt/nagios/files/patch-Makefile.in Normal file
View File

@ -0,0 +1,66 @@
--- ./Makefile.in.orig 2013-08-30 19:46:14.000000000 +0200
+++ ./Makefile.in 2014-01-14 13:57:06.000000000 +0100
@@ -30,8 +30,6 @@
LIBEXECDIR=@libexecdir@
HTMLDIR=@datadir@
INSTALL=@INSTALL@
-INSTALL_OPTS=@INSTALL_OPTS@
-COMMAND_OPTS=@COMMAND_OPTS@
HTTPD_CONF=@HTTPD_CONF@
INIT_DIR=@init_dir@
INIT_OPTS=-o root -g root
@@ -234,12 +232,12 @@
$(MAKE) install-basic
install-basic:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
if [ $(INSTALLPERLSTUFF) = yes ]; then \
- $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
+ $(INSTALL) -m 644 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
fi;
@echo ""
@@ -261,19 +259,18 @@
install-config:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
- $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg-sample
@echo ""
@echo "*** Config files installed ***"
@@ -321,7 +318,6 @@
install-commandmode:
$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
- chmod g+s $(DESTDIR)$(LOGDIR)/rw
@echo ""
@echo "*** External command directory configured ***"

24
net-mgmt/nagios/files/patch-base__Makefile.in Normal file
View File

@ -0,0 +1,24 @@
--- ./base/Makefile.in.orig 2013-08-30 19:46:14.000000000 +0200
+++ ./base/Makefile.in 2014-01-14 13:57:06.000000000 +0100
@@ -39,8 +39,6 @@
CGIDIR=@sbindir@
HTMLDIR=@datarootdir@
INSTALL=@INSTALL@
-INSTALL_OPTS=@INSTALL_OPTS@
-COMMAND_OPTS=@COMMAND_OPTS@
STRIP=@STRIP@
CGIURL=@cgiurl@
@@ -204,9 +202,9 @@
$(MAKE) install-basic
install-basic:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
strip-post-install:
$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@

23
net-mgmt/nagios/files/patch-cgi__Makefile.in Normal file
View File

@ -0,0 +1,23 @@
--- ./cgi/Makefile.in.orig 2013-08-30 19:46:14.000000000 +0200
+++ ./cgi/Makefile.in 2014-01-14 13:57:06.000000000 +0100
@@ -18,8 +18,6 @@
CGIDIR=@sbindir@
HTMLDIR=@datarootdir@
INSTALL=@INSTALL@
-INSTALL_OPTS=@INSTALL_OPTS@
-COMMAND_OPTS=@COMMAND_OPTS@
STRIP=@STRIP@
CGIEXTRAS=@CGIEXTRAS@
@@ -201,9 +199,9 @@
$(MAKE) install-basic
install-basic:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
for file in *.cgi; do \
- $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
+ $(INSTALL) -m 755 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
done
strip-post-install:

25
net-mgmt/nagios/files/patch-contrib__Makefile.in Normal file
View File

@ -0,0 +1,25 @@
--- ./contrib/Makefile.in.orig 2013-08-30 19:46:14.000000000 +0200
+++ ./contrib/Makefile.in 2014-01-14 13:57:06.000000000 +0100
@@ -16,7 +16,6 @@
# Generated automatically from configure script
SNPRINTF_O=@SNPRINTF_O@
INSTALL=@INSTALL@
-INSTALL_OPTS=@INSTALL_OPTS@
prefix=@prefix@
@@ -51,10 +50,10 @@
devclean: distclean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- for f in $(CGIS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
- for f in $(UTILS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+ for f in $(CGIS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
+ for f in $(UTILS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
##############################################################################
# rules and dependencies for actual target programs

175
net-mgmt/nagios/files/patch-d97e03f32741a7d851826b03ed73ff4c9612a866 Normal file
View File

@ -0,0 +1,175 @@
commit d97e03f32741a7d851826b03ed73ff4c9612a866
Author: Eric Stanley <estanley@nagios.com>
Date: 2013-12-20 13:14:30 -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 ./cgi/avail.c ./cgi/avail.c
index 76afd86..64eaadc 100644
--- ./cgi/avail.c
+++ ./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 ./cgi/cmd.c ./cgi/cmd.c
index fa6cf5a..50504eb 100644
--- ./cgi/cmd.c
+++ ./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 ./cgi/config.c ./cgi/config.c
index f061b0f..3360e70 100644
--- ./cgi/config.c
+++ ./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 ./cgi/extinfo.c ./cgi/extinfo.c
index 62a1b18..5113df4 100644
--- ./cgi/extinfo.c
+++ ./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 ./cgi/histogram.c ./cgi/histogram.c
index 4616541..f6934d0 100644
--- ./cgi/histogram.c
+++ ./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 ./cgi/notifications.c ./cgi/notifications.c
index 8ba11c1..461ae84 100644
--- ./cgi/notifications.c
+++ ./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 ./cgi/outages.c ./cgi/outages.c
index 426ede6..cb58dee 100644
--- ./cgi/outages.c
+++ ./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 ./cgi/status.c ./cgi/status.c
index 3253340..4ec1c92 100644
--- ./cgi/status.c
+++ ./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 ./cgi/statusmap.c ./cgi/statusmap.c
index ea48368..2580ae5 100644
--- ./cgi/statusmap.c
+++ ./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 ./cgi/statuswml.c ./cgi/statuswml.c
index bd8cea2..d25abef 100644
--- ./cgi/statuswml.c
+++ ./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 ./cgi/summary.c ./cgi/summary.c
index 126ce5e..749a02c 100644
--- ./cgi/summary.c
+++ ./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 ./cgi/trends.c ./cgi/trends.c
index b35c18e..895db01 100644
--- ./cgi/trends.c
+++ ./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 ./contrib/daemonchk.c ./contrib/daemonchk.c
index 78716e5..9bb6c4b 100644
--- ./contrib/daemonchk.c
+++ ./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;
}
}

97
net-mgmt/nagios/files/patch-html__Makefile.in Normal file
View File

@ -0,0 +1,97 @@
--- html/Makefile.in.orig 2013-08-30 17:46:14 UTC
+++ html/Makefile.in
@@ -10,8 +10,6 @@ BINDIR=@bindir@
CGIDIR=@sbindir@
HTMLDIR=@datadir@
INSTALL=@INSTALL@
-INSTALL_OPTS=@INSTALL_OPTS@
-COMMAND_OPTS=@COMMAND_OPTS@
CP=@CP@
@@ -34,55 +32,55 @@ distclean: clean
devclean: distclean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
-# $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
+# $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
+# $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
+# $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
+ $(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
+# $(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
# Remove old HTML files (PHP files are used now)
rm -f $(DESTDIR)$(HTMLDIR)/index.html
rm -f $(DESTDIR)$(HTMLDIR)/main.html
rm -f $(DESTDIR)$(HTMLDIR)/side.html
for file in *.php; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
# for file in media/*.wav; \
-# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
+# do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
for file in stylesheets/*.css; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
for file in contexthelp/*.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
for file in js/*.js; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
# for file in docs/*.html; \
-# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
+# do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
# for file in docs/images/*.*; \
-# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
+# do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
for file in images/*.gif; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/*.jpg; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/*.png; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/*.ico; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/logos/*.*; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
for file in includes/*.*; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
for file in includes/rss/*.*; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
for file in includes/rss/extlib/*.*; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
install-unstripped:
$(MAKE) install

13
net-mgmt/nagios/files/patch-html__index.php Normal file
View File

@ -0,0 +1,13 @@
--- ./html/index.php.orig 2013-08-30 19:46:14.000000000 +0200
+++ ./html/index.php 2014-01-14 13:57:06.000000000 +0100
@@ -8,8 +8,9 @@
</head>
<?php
+include_once(dirname(__FILE__).'/includes/utils.inc.php');
// allow specifying main window URL for permalinks, etc.
-$corewindow="main.php";
+$corewindow=$cfg["cgi_base_url"]."/tac.cgi";
if(isset($_GET['corewindow'])){
// default window url may have been overridden with a permalink...

39
net-mgmt/nagios/files/patch-html__main.php Normal file
View File

@ -0,0 +1,39 @@
--- ./html/main.php.orig 2013-08-30 19:46:14.000000000 +0200
+++ ./html/main.php 2014-01-14 13:57:06.000000000 +0100
@@ -40,36 +40,10 @@
<div class="product">Nagios<sup><span style="font-size: small;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</span></sup></div>
<div class="version">Version 3.5.1</div>
<div class="releasedate">August 30, 2013</div>
-<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=3.5.1&product=nagioscore" target="_blank">Check for updates</a></div>
<!--<div class="whatsnew"><a href="http://go.nagios.com/nagioscore/whatsnew">Read what's new in Nagios Core 3</a></div>-->
</div>
-<div id="updateversioninfo">
-<?php
- $updateinfo=get_update_information();
- //print_r($updateinfo);
- //$updateinfo['update_checks_enabled']=false;
- //$updateinfo['update_available']=true;
- if($updateinfo['update_checks_enabled']==false){
-?>
- <div class="updatechecksdisabled">
- <div class="warningmessage">Warning: Automatic Update Checks are Disabled!</div>
- <div class="submessage">Disabling update checks presents a possible security risk. Visit <a href="http://www.nagios.org/" target="_blank">nagios.org</a> to check for updates manually or enable update checks in your Nagios config file.</a></div>
- </div>
-<?php
- }
- else if($updateinfo['update_available']==true && $this_version!=$updateinfo['update_version']){
-?>
- <div class="updateavailable">
- <div class="updatemessage">A new version of Nagios Core is available!</div>
- <div class="submessage">Visit <a href="http://www.nagios.org/download/" target="_blank">nagios.org</a> to download Nagios <?php echo $updateinfo['update_version'];?>.</div>
- </div>
-<?php
- }
-?>
-</div>
-
<div id="splashboxes">

11
net-mgmt/nagios/files/patch-html_includes_rss_parse.inc Normal file
View File

@ -0,0 +1,11 @@
--- html/includes/rss/rss_parse.inc.orig 2017-12-21 16:55:41.032397000 +0100
+++ html/includes/rss/rss_parse.inc 2017-12-21 16:57:40.079068000 +0100
@@ -150,7 +150,7 @@
// check for a namespace, and split if found
$ns = false;
if ( strpos( $element, ':' ) ) {
- list($ns, $el) = split( ':', $element, 2);
+ list($ns, $el) = explode( ':', $element, 2);
}
if ( $ns and $ns != 'rdf' ) {
$this->current_namespace = $ns;

11
net-mgmt/nagios/files/patch-include__locations.h.in Normal file
View File

@ -0,0 +1,11 @@
--- ./include/locations.h.in.orig 2013-08-30 19:46:14.000000000 +0200
+++ ./include/locations.h.in 2014-01-14 13:57:06.000000000 +0100
@@ -20,7 +20,7 @@
#define DEFAULT_TEMP_FILE "@localstatedir@/tempfile"
#define DEFAULT_TEMP_PATH "/tmp"
-#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/spool/checkresults"
+#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/checkresults"
#define DEFAULT_STATUS_FILE "@localstatedir@/status.dat"
#define DEFAULT_LOG_FILE "@localstatedir@/nagios.log"
#define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/archives/"

11
net-mgmt/nagios/files/patch-sample-config__cgi.cfg.in Normal file
View File

@ -0,0 +1,11 @@
--- ./sample-config/cgi.cfg.in.orig 2013-08-30 19:46:14.000000000 +0200
+++ ./sample-config/cgi.cfg.in 2014-01-14 13:57:06.000000000 +0100
@@ -264,7 +264,7 @@
# OS and distribution, so you may have to tweak this to
# work on your system.
-ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$
+ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$

11
net-mgmt/nagios/files/patch-sample-config__nagios.cfg.in Normal file
View File

@ -0,0 +1,11 @@
--- ./sample-config/nagios.cfg.in.orig 2013-08-30 19:46:14.000000000 +0200
+++ ./sample-config/nagios.cfg.in 2014-01-14 13:57:06.000000000 +0100
@@ -32,7 +32,7 @@
cfg_file=@sysconfdir@/objects/timeperiods.cfg
cfg_file=@sysconfdir@/objects/templates.cfg
-# Definitions for monitoring the local (Linux) host
+# Definitions for monitoring the local (FreeBSD) host
cfg_file=@sysconfdir@/objects/localhost.cfg
# Definitions for monitoring a Windows machine

40
net-mgmt/nagios/files/patch-sample-config__template-object__localhost.cfg.in Normal file
View File

@ -0,0 +1,40 @@
--- ./sample-config/template-object/localhost.cfg.in.orig 2013-08-30 19:46:14.000000000 +0200
+++ ./sample-config/template-object/localhost.cfg.in 2014-01-14 13:57:06.000000000 +0100
@@ -5,7 +5,7 @@
#
# NOTE: This config file is intended to serve as an *extremely* simple
# example of how you can create configuration entries to monitor
-# the local (Linux) machine.
+# the local (FreeBSD) machine.
#
###############################################################################
@@ -23,9 +23,9 @@
# Define a host for the local machine
define host{
- use linux-server ; Name of host template to use
+ use freebsd-server ; Name of host template to use
; This host definition will inherit all variables that are defined
- ; in (or inherited by) the linux-server host template definition.
+ ; in (or inherited by) the freebsd-server host template definition.
host_name localhost
alias localhost
address 127.0.0.1
@@ -41,12 +41,12 @@
###############################################################################
###############################################################################
-# Define an optional hostgroup for Linux machines
+# Define an optional hostgroup for FreeBSD machines
define hostgroup{
- hostgroup_name linux-servers ; The name of the hostgroup
- alias Linux Servers ; Long name of the group
- members localhost ; Comma separated list of hosts that belong to this group
+ hostgroup_name freebsd-servers ; The name of the hostgroup
+ alias FreeBSD Servers ; Long name of the group
+ members localhost ; Comma separated list of hosts that belong to this group
}

26
net-mgmt/nagios/files/patch-sample-config__template-object__templates.cfg.in Normal file
View File

@ -0,0 +1,26 @@
--- ./sample-config/template-object/templates.cfg.in.orig 2013-08-30 19:46:14.000000000 +0200
+++ ./sample-config/template-object/templates.cfg.in 2014-01-14 13:57:06.000000000 +0100
@@ -63,17 +63,17 @@
}
-# Linux host definition template - This is NOT a real host, just a template!
+# FreeBSD host definition template - This is NOT a real host, just a template!
define host{
- name linux-server ; The name of this host template
+ name freebsd-server ; The name of this host template
use generic-host ; This template inherits other values from the generic-host template
- check_period 24x7 ; By default, Linux hosts are checked round the clock
+ check_period 24x7 ; By default, FreeBSD hosts are checked round the clock
check_interval 5 ; Actively check the host every 5 minutes
retry_interval 1 ; Schedule host check retries at 1 minute intervals
- max_check_attempts 10 ; Check each Linux host 10 times (max)
- check_command check-host-alive ; Default command to check Linux hosts
- notification_period workhours ; Linux admins hate to be woken up, so we only notify during the day
+ max_check_attempts 10 ; Check each FreeBSD host 10 times (max)
+ check_command check-host-alive ; Default command to check FreeBSD hosts
+ notification_period workhours ; FreeBSD admins hate to be woken up, so we only notify during the day
; Note that the notification_period variable is being overridden from
; the value that is inherited from the generic-host template!
notification_interval 120 ; Resend notifications every 2 hours

34
net-mgmt/nagios/files/pkg-message.in Normal file
View File

@ -0,0 +1,34 @@
[
{
message: <<EOT
Enable Nagios in /etc/rc.conf with the following line:
nagios_enable="YES"
Configuration templates are available in %%PREFIX%%/etc/nagios as
*.cfg-sample files. Copy them to *.cfg files where required and
edit to suit your needs.
If you don't already have a web server running, you will need to
install and configure one to finish off your Nagios installation.
When used with Apache, the following should be sufficient to publish
the web component of Nagios (modify the allow list to suit):
<Directory %%PREFIX%%/%%NAGIOSWWWDIR%%>
Order deny,allow
Deny from all
Allow from 127.0.0.1
php_flag engine on
php_admin_value open_basedir %%PREFIX%%/%%NAGIOSWWWDIR%%/:%%NAGIOSDIR%%/
</Directory>
<Directory %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin>
Options ExecCGI
</Directory>
ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/
Alias %%NAGIOSHTMURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/
EOT
type: install
}
]