\n");
if(display_type == DISPLAY_HOST_TRENDS) {
@@ -17,7 +16,7 @@ $NetBSD: patch-cgi_trends.c,v 1.5 2017/0
#endif
printf("View Status Detail For This Host \n", STATUS_CGI, url_encode(host_name));
printf("View Alert History For This Host \n", HISTORY_CGI, url_encode(host_name));
- printf("View Notifications For This Host \n", NOTIFICATIONS_CGI, url_encode(host_name));
+@@ -458,14 +458,14 @@
}
else {
#ifdef LEGACY_GRAPHICAL_CGIS
@@ -36,4 +35,3 @@ $NetBSD: patch-cgi_trends.c,v 1.5 2017/0
printf("View Alert History For This Service \n", url_encode(svc_description));
printf("View Notifications For This Service \n", url_encode(svc_description));
Index: pkgsrc/net/nagios-base/patches/patch-html_Makefile.in
diff -u pkgsrc/net/nagios-base/patches/patch-html_Makefile.in:1.5 pkgsrc/net/nagios-base/patches/patch-html_Makefile.in:1.6
--- pkgsrc/net/nagios-base/patches/patch-html_Makefile.in:1.5 Wed May 24 07:42:39 2017
+++ pkgsrc/net/nagios-base/patches/patch-html_Makefile.in Sun Jan 8 23:33:59 2023
@@ -1,22 +1,10 @@
-$NetBSD: patch-html_Makefile.in,v 1.5 2017/05/24 07:42:39 manu Exp $
+$NetBSD: patch-html_Makefile.in,v 1.6 2023/01/08 23:33:59 sekiya Exp $
Adjustments to build procedure.
---- html/Makefile.in.orig 2017-05-09 19:03:31.000000000 +0200
-+++ html/Makefile.in 2017-05-22 09:20:24.000000000 +0200
-@@ -6,9 +6,9 @@
- exec_prefix=@exec_prefix@
- LOGDIR=@localstatedir@
- CFGDIR=@sysconfdir@
- BINDIR=@bindir@
--CGIDIR=@sbindir@
-+CGIDIR=@libexecdir@
- HTMLDIR=@datadir@
- datarootdir=@datarootdir@
- INSTALL=@INSTALL@
- INSTALL_OPTS=@INSTALL_OPTS@
-@@ -43,92 +43,92 @@
-
+--- html/Makefile.in.orig 2022-11-17 05:52:51.000000000 +0900
++++ html/Makefile.in 2023-01-09 07:15:39.443389605 +0900
+@@ -44,28 +44,28 @@
devclean: distclean
install:
@@ -45,16 +33,16 @@ Adjustments to build procedure.
# Directories for new CGI pages
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/angularjs
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.1
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.3
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7/css
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/d3
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/spin
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/angularjs
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
-+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.1
-+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0
-+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css
++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.3
++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7
++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7/css
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/d3
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/spin
# End of directories for new CGI pages
@@ -65,7 +53,7 @@ Adjustments to build procedure.
# Remove old files
rm -f $(DESTDIR)$(HTMLDIR)/index.html
rm -f $(DESTDIR)$(HTMLDIR)/main.html
- rm -f $(DESTDIR)$(HTMLDIR)/side.html
+@@ -73,61 +73,61 @@
rm -f $(DESTDIR)$(HTMLDIR)/map.html
rm -f $(DESTDIR)$(HTMLDIR)/rss-*
rm -rf $(DESTDIR)$(HTMLDIR)/include/rss
@@ -149,21 +137,20 @@ Adjustments to build procedure.
# Support files for new graphical CGIs
- $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/angular-1.3.9/angular.min.js $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
- $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/angular-1.3.9/angular.min.js.map $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
-- $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/ui-bootstrap-tpls-0.12.0.min.js $(DESTDIR)$(HTMLDIR)/angularjs
-- $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/ui-utils-0.2.1/ui-utils.js $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.1
-- $(INSTALL) -m 664 $(INSTALL_OPTS) bootstrap-3.3.0/css/bootstrap.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css
-- $(INSTALL) -m 664 $(INSTALL_OPTS) bootstrap-3.3.0/css/bootstrap-theme.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css
+- $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/ui-bootstrap-tpls-0.14.3.min.js $(DESTDIR)$(HTMLDIR)/angularjs
+- $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/ui-utils-0.2.3/ui-utils.js $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.3
+- $(INSTALL) -m 664 $(INSTALL_OPTS) bootstrap-3.3.7/css/bootstrap.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7/css
+- $(INSTALL) -m 664 $(INSTALL_OPTS) bootstrap-3.3.7/css/bootstrap-theme.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7/css
- $(INSTALL) -m 664 $(INSTALL_OPTS) d3/d3.min.js $(DESTDIR)$(HTMLDIR)/d3
- $(INSTALL) -m 664 $(INSTALL_OPTS) spin/spin.min.js $(DESTDIR)$(HTMLDIR)/spin
+ $(BSD_INSTALL_DATA) angularjs/angular-1.3.9/angular.min.js $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
+ $(BSD_INSTALL_DATA) angularjs/angular-1.3.9/angular.min.js.map $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
-+ $(BSD_INSTALL_DATA) angularjs/ui-bootstrap-tpls-0.12.0.min.js $(DESTDIR)$(HTMLDIR)/angularjs
-+ $(BSD_INSTALL_DATA) angularjs/ui-utils-0.2.1/ui-utils.js $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.1
-+ $(BSD_INSTALL_DATA) bootstrap-3.3.0/css/bootstrap.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css
-+ $(BSD_INSTALL_DATA) bootstrap-3.3.0/css/bootstrap-theme.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css
++ $(BSD_INSTALL_DATA) angularjs/ui-bootstrap-tpls-0.14.3.min.js $(DESTDIR)$(HTMLDIR)/angularjs
++ $(BSD_INSTALL_DATA) angularjs/ui-utils-0.2.3/ui-utils.js $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.3
++ $(BSD_INSTALL_DATA) bootstrap-3.3.7/css/bootstrap.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7/css
++ $(BSD_INSTALL_DATA) bootstrap-3.3.7/css/bootstrap-theme.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7/css
+ $(BSD_INSTALL_DATA) d3/d3.min.js $(DESTDIR)$(HTMLDIR)/d3
+ $(BSD_INSTALL_DATA) spin/spin.min.js $(DESTDIR)$(HTMLDIR)/spin
# End of support files for new graphical CGIs
install-unstripped:
- $(MAKE) install
Index: pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c
diff -u pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c:1.6 pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c:1.7
--- pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c:1.6 Wed May 24 07:42:39 2017
+++ pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c Sun Jan 8 23:33:59 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-cgi_cmd.c,v 1.6 2017/05/24 07:42:39 manu Exp $
+$NetBSD: patch-cgi_cmd.c,v 1.7 2023/01/08 23:33:59 sekiya Exp $
Fix build in SunOS.
-64bit time_t workaround.
+64-bit time_t workaround.
---- cgi/cmd.c.orig 2014-08-12 17:00:01.000000000 +0200
-+++ cgi/cmd.c 2016-02-07 22:41:29.000000000 +0100
-@@ -1906,7 +1906,7 @@
+--- cgi/cmd.c.orig 2022-11-17 05:52:51.000000000 +0900
++++ cgi/cmd.c 2023-01-09 07:06:23.042829273 +0900
+@@ -1937,7 +1937,7 @@
if(!command_name || (strlen(command_name) > 6 && !memcmp("CHANGE", command_name, 6)))
return ERROR;
@@ -14,7 +14,7 @@ Fix build in SunOS.
if(len < 0 || len >= sizeof(cmd))
return ERROR;
-@@ -2032,25 +2032,25 @@
+@@ -2072,25 +2072,25 @@
break;
case CMD_DELAY_HOST_NOTIFICATION:
@@ -44,7 +44,7 @@ Fix build in SunOS.
break;
case CMD_ENABLE_HOST_SVC_CHECKS:
-@@ -2065,7 +2065,7 @@
+@@ -2105,7 +2105,7 @@
case CMD_SCHEDULE_HOST_SVC_CHECKS:
if(force_check == TRUE)
cmd = CMD_SCHEDULE_FORCED_HOST_SVC_CHECKS;
@@ -53,26 +53,26 @@ Fix build in SunOS.
break;
case CMD_ENABLE_HOST_NOTIFICATIONS:
-@@ -2106,15 +2106,15 @@
+@@ -2146,15 +2146,15 @@
else if(child_options == 2)
cmd = CMD_SCHEDULE_AND_PROPAGATE_HOST_DOWNTIME;
-- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu;%s;%s", host_name, start_time, end_time, fixed, triggered_by, duration, comment_author, comment_data);
-+ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu;%s;%s", host_name, (unsigned long)start_time, (unsigned long)end_time, fixed, triggered_by, duration, comment_author, comment_data);
+- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu", host_name, start_time, end_time, fixed, triggered_by, duration);
++ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu", host_name, (unsigned long)start_time, (unsigned long)end_time, fixed, triggered_by, duration);
break;
case CMD_SCHEDULE_HOST_SVC_DOWNTIME:
-- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu;%s;%s", host_name, start_time, end_time, fixed, triggered_by, duration, comment_author, comment_data);
-+ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu;%s;%s", host_name, (unsigned long)start_time, (unsigned long)end_time, fixed, triggered_by, duration, comment_author, comment_data);
+- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu", host_name, start_time, end_time, fixed, triggered_by, duration);
++ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu", host_name, (unsigned long)start_time, (unsigned long)end_time, fixed, triggered_by, duration);
break;
case CMD_SCHEDULE_SVC_DOWNTIME:
-- result = cmd_submitf(cmd, "%s;%s;%lu;%lu;%d;%lu;%lu;%s;%s", host_name, service_desc, start_time, end_time, fixed, triggered_by, duration, comment_author, comment_data);
-+ result = cmd_submitf(cmd, "%s;%s;%lu;%lu;%d;%lu;%lu;%s;%s", host_name, service_desc, (unsigned long)start_time, (unsigned long)end_time, fixed, triggered_by, duration, comment_author, comment_data);
+- result = cmd_submitf(cmd, "%s;%s;%lu;%lu;%d;%lu;%lu", host_name, service_desc, start_time, end_time, fixed, triggered_by, duration);
++ result = cmd_submitf(cmd, "%s;%s;%lu;%lu;%d;%lu;%lu", host_name, service_desc, (unsigned long)start_time, (unsigned long)end_time, fixed, triggered_by, duration);
break;
case CMD_DEL_HOST_DOWNTIME:
-@@ -2125,7 +2125,7 @@
+@@ -2165,7 +2165,7 @@
case CMD_SCHEDULE_HOST_CHECK:
if(force_check == TRUE)
cmd = CMD_SCHEDULE_FORCED_HOST_CHECK;
@@ -81,37 +81,34 @@ Fix build in SunOS.
break;
case CMD_SEND_CUSTOM_HOST_NOTIFICATION:
-@@ -2163,13 +2163,13 @@
+@@ -2203,11 +2203,11 @@
break;
case CMD_SCHEDULE_HOSTGROUP_HOST_DOWNTIME:
-- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", hostgroup_name, start_time, end_time, fixed, duration, comment_author, comment_data);
-+ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", hostgroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration, comment_author, comment_data);
+- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", hostgroup_name, start_time, end_time, fixed, duration);
++ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", hostgroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration);
break;
case CMD_SCHEDULE_HOSTGROUP_SVC_DOWNTIME:
-- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", hostgroup_name, start_time, end_time, fixed, duration, comment_author, comment_data);
-+ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", hostgroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration, comment_author, comment_data);
+- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", hostgroup_name, start_time, end_time, fixed, duration);
++ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", hostgroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration);
if(affect_host_and_services == TRUE)
-- result |= cmd_submitf(CMD_SCHEDULE_HOSTGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu;%s;%s", hostgroup_name, start_time, end_time, fixed, duration, comment_author, comment_data);
-+ result |= cmd_submitf(CMD_SCHEDULE_HOSTGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu;%s;%s", hostgroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration, comment_author, comment_data);
+ result |= cmd_submitf(CMD_SCHEDULE_HOSTGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu", hostgroup_name, start_time, end_time, fixed, duration);
break;
-
-
-@@ -2199,13 +2199,13 @@
+@@ -2239,13 +2239,13 @@
break;
case CMD_SCHEDULE_SERVICEGROUP_HOST_DOWNTIME:
-- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", servicegroup_name, start_time, end_time, fixed, duration, comment_author, comment_data);
-+ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", servicegroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration, comment_author, comment_data);
+- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", servicegroup_name, start_time, end_time, fixed, duration);
++ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", servicegroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration);
break;
case CMD_SCHEDULE_SERVICEGROUP_SVC_DOWNTIME:
-- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", servicegroup_name, start_time, end_time, fixed, duration, comment_author, comment_data);
-+ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", servicegroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration, comment_author, comment_data);
+- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", servicegroup_name, start_time, end_time, fixed, duration);
++ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", servicegroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration);
if(affect_host_and_services == TRUE)
-- result |= cmd_submitf(CMD_SCHEDULE_SERVICEGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu;%s;%s", servicegroup_name, start_time, end_time, fixed, duration, comment_author, comment_data);
-+ result |= cmd_submitf(CMD_SCHEDULE_SERVICEGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu;%s;%s", servicegroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration, comment_author, comment_data);
+- result |= cmd_submitf(CMD_SCHEDULE_SERVICEGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu", servicegroup_name, start_time, end_time, fixed, duration);
++ result |= cmd_submitf(CMD_SCHEDULE_SERVICEGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu", servicegroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration);
break;
default:
Index: pkgsrc/net/nagios-base/patches/patch-lib_runcmd.c
diff -u pkgsrc/net/nagios-base/patches/patch-lib_runcmd.c:1.1 pkgsrc/net/nagios-base/patches/patch-lib_runcmd.c:1.2
--- pkgsrc/net/nagios-base/patches/patch-lib_runcmd.c:1.1 Fri Apr 3 17:06:08 2015
+++ pkgsrc/net/nagios-base/patches/patch-lib_runcmd.c Sun Jan 8 23:33:59 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_runcmd.c,v 1.1 2015/04/03 17:06:08 rodent Exp $
+$NetBSD: patch-lib_runcmd.c,v 1.2 2023/01/08 23:33:59 sekiya Exp $
Include config.h generated during configure.
setenv(3) was tested there. No need to check for it here.
Can't assign a value to a constant. Ensure we don't do that.
---- lib/runcmd.c.orig 2014-08-12 15:00:01.000000000 +0000
-+++ lib/runcmd.c
+--- lib/runcmd.c.orig 2022-11-17 05:52:51.000000000 +0900
++++ lib/runcmd.c 2023-01-09 07:15:54.323753241 +0900
@@ -15,6 +15,7 @@
#define NAGIOSPLUG_API_C 1
@@ -26,7 +26,7 @@ Can't assign a value to a constant. Ensu
/*
* This variable must be global, since there's no way the caller
* can forcibly slay a dead or ungainly running program otherwise.
-@@ -304,13 +300,13 @@ int runcmd_cmd2strv(const char *str, int
+@@ -304,13 +300,13 @@
* through this API and thus achieve async-safeness throughout the API. */
void runcmd_init(void)
{
Added files:
Index: pkgsrc/net/nagios-base/patches/patch-startup_default-init.in
diff -u /dev/null pkgsrc/net/nagios-base/patches/patch-startup_default-init.in:1.1
--- /dev/null Sun Jan 8 23:33:59 2023
+++ pkgsrc/net/nagios-base/patches/patch-startup_default-init.in Sun Jan 8 23:33:59 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-startup_default-init.in,v 1.1 2023/01/08 23:33:59 sekiya Exp $
+
+Fix portability failure.
+
+--- startup/default-init.in.orig 2022-11-16 20:52:51.000000000 +0000
++++ startup/default-init.in
+@@ -61,7 +61,7 @@ fi
+ USE_RAMDISK=${USE_RAMDISK:-0}
+ if test "$USE_RAMDISK" -ne 0 && test "$RAMDISK_SIZE"X != "X"; then
+ ramdisk=`mount |grep "${RAMDISK_DIR} type tmpfs"`
+- if [ "$ramdisk"X == "X" ]; then
++ if [ "$ramdisk"X = "X" ]; then
+ if [ ! -d ${RAMDISK_DIR} ]; then
+ mkdir -p -m 0755 ${RAMDISK_DIR}
+ if [ -d ${RAMDISK_DIR} ]; then
--_----------=_1673220839155390--
|