Add a couple of patches to fix the number of workers and CPU load.

While there, regen patches, and update pkg-message to apache 2.4.

PR:		197204
Submitted by:	Rudolf Čejka
Sponsored by:	Absolight

15 files changed, 58 insertions, 20 deletions

diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile
index f43b8a394e13..a54f52adfa53 100644
--- a/net-mgmt/nagios4/Makefile
+++ b/net-mgmt/nagios4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	4.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	4
@@ -89,9 +89,6 @@ NANOSLEEP_CONFIGURE_ENABLE=	nanosleep
 #	 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
 UNHANDLED_HACK_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-html__side.php
 
-post-patch:
-	@${REINPLACE_CMD} '/^INSTALL_OPTS=/d;/COMMAND_OPTS=/d' ${WRKSRC}/configure
-
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php.sample
 
diff --git a/net-mgmt/nagios4/files/extra-patch-html__side.php b/net-mgmt/nagios4/files/extra-patch-html__side.php
index 7c944c067bae..b9d05c3f344d 100644
--- a/net-mgmt/nagios4/files/extra-patch-html__side.php
+++ b/net-mgmt/nagios4/files/extra-patch-html__side.php
@@ -1,6 +1,6 @@
 --- html/side.php.orig	2014-08-12 15:00:01 UTC
 +++ html/side.php
-@@ -56,8 +56,8 @@
+@@ -56,8 +56,8 @@ $link_target = 'main';
  			<li>
  				<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?host=all&amp;servicestatustypes=28" target="<?php echo $link_target;?>">Problems</a>
  				<ul>
diff --git a/net-mgmt/nagios4/files/patch-Makefile.in b/net-mgmt/nagios4/files/patch-Makefile.in
index e746fa4bf0b4..b9396fecb6f0 100644
--- a/net-mgmt/nagios4/files/patch-Makefile.in
+++ b/net-mgmt/nagios4/files/patch-Makefile.in
@@ -1,6 +1,6 @@
 --- Makefile.in.orig	2014-08-12 15:00:01 UTC
 +++ Makefile.in
-@@ -245,11 +245,10 @@
+@@ -245,11 +245,10 @@ install-unstripped:
  	$(MAKE) install-basic
  
  install-basic:
@@ -13,7 +13,7 @@
  
  	@echo ""
  	@echo "*** Main program, CGIs and HTML files installed ***"
-@@ -270,19 +269,18 @@
+@@ -270,19 +269,18 @@ install-basic:
  
  
  install-config:
@@ -45,7 +45,7 @@
  
  	@echo ""
  	@echo "*** Config files installed ***"
-@@ -330,7 +328,6 @@
+@@ -330,7 +328,6 @@ install-daemoninit:
  
  install-commandmode:
  	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
diff --git a/net-mgmt/nagios4/files/patch-base__Makefile.in b/net-mgmt/nagios4/files/patch-base__Makefile.in
index d2dff18a6698..2db9772aa3ca 100644
--- a/net-mgmt/nagios4/files/patch-base__Makefile.in
+++ b/net-mgmt/nagios4/files/patch-base__Makefile.in
@@ -1,6 +1,6 @@
 --- base/Makefile.in.orig	2014-08-12 15:00:01 UTC
 +++ base/Makefile.in
-@@ -180,9 +180,9 @@
+@@ -180,9 +180,9 @@ install-unstripped:
  	$(MAKE) install-basic
  
  install-basic:
diff --git a/net-mgmt/nagios4/files/patch-cgi__Makefile.in b/net-mgmt/nagios4/files/patch-cgi__Makefile.in
index 1905480d38a0..dae4c5e97b8e 100644
--- a/net-mgmt/nagios4/files/patch-cgi__Makefile.in
+++ b/net-mgmt/nagios4/files/patch-cgi__Makefile.in
@@ -1,6 +1,6 @@
 --- cgi/Makefile.in.orig	2014-08-12 15:00:01 UTC
 +++ cgi/Makefile.in
-@@ -201,9 +201,9 @@
+@@ -201,9 +201,9 @@ install-unstripped:
  	$(MAKE) install-basic
  
  install-basic:
diff --git a/net-mgmt/nagios4/files/patch-configure b/net-mgmt/nagios4/files/patch-configure
index ca02e39998eb..fc2493eff76e 100644
--- a/net-mgmt/nagios4/files/patch-configure
+++ b/net-mgmt/nagios4/files/patch-configure
@@ -1,6 +1,22 @@
 --- configure.orig	2014-08-12 15:00:01 UTC
 +++ configure
-@@ -7766,7 +7766,7 @@ $as_echo_n "checking for linker flags fo
+@@ -6014,7 +6014,6 @@ cat >>confdefs.h <<_ACEOF
+ #define DEFAULT_NAGIOS_GROUP "$nagios_grp"
+ _ACEOF
+ 
+-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
+ 
+ 
+ 
+@@ -6035,7 +6034,6 @@ fi
+ 
+ 
+ 
+-COMMAND_OPTS="-o $command_user -g $command_grp"
+ 
+ 
+ MAIL_PROG=no
+@@ -7766,7 +7764,7 @@ $as_echo_n "checking for linker flags fo
  			MOD_LDFLAGS="-shared"
  			MOD_CFLAGS="-fPIC"
  		;;
diff --git a/net-mgmt/nagios4/files/patch-contrib__Makefile.in b/net-mgmt/nagios4/files/patch-contrib__Makefile.in
index a5def5589a06..04161a9d1e13 100644
--- a/net-mgmt/nagios4/files/patch-contrib__Makefile.in
+++ b/net-mgmt/nagios4/files/patch-contrib__Makefile.in
@@ -1,6 +1,6 @@
 --- contrib/Makefile.in.orig	2014-08-12 15:00:01 UTC
 +++ contrib/Makefile.in
-@@ -52,10 +52,10 @@
+@@ -52,10 +52,10 @@ distclean: clean
  devclean: distclean
  
  install:
diff --git a/net-mgmt/nagios4/files/patch-html__main.php b/net-mgmt/nagios4/files/patch-html__main.php
index dbaea3c412e7..5f9475c4d339 100644
--- a/net-mgmt/nagios4/files/patch-html__main.php
+++ b/net-mgmt/nagios4/files/patch-html__main.php
@@ -1,6 +1,6 @@
 --- html/main.php.orig	2014-08-12 15:00:01 UTC
 +++ html/main.php
-@@ -130,31 +130,6 @@
+@@ -130,31 +130,6 @@ $this_year = '2014';
  	<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 <?php echo $this_version; ?></div>
  	<div class="releasedate">August 12, 2014</div>
diff --git a/net-mgmt/nagios4/files/patch-lib_iobroker.c b/net-mgmt/nagios4/files/patch-lib_iobroker.c
new file mode 100644
index 000000000000..9c63a5050062
--- /dev/null
+++ b/net-mgmt/nagios4/files/patch-lib_iobroker.c
@@ -0,0 +1,16 @@
+--- lib/iobroker.c.orig	2014-08-12 15:00:01 UTC
++++ lib/iobroker.c
+@@ -415,11 +415,11 @@ int iobroker_poll(iobroker_set *iobs, in
+ 			iobs->pfd[p].events = POLLIN;
+ 			p++;
+ 		}
+-		nfds = poll(iobs->pfd, iobs->num_fds, timeout);
++		nfds = poll(iobs->pfd, p, timeout);
+ 		if (nfds < 0) {
+ 			return IOBROKER_ELIB;
+ 		}
+-		for (i = 0; i < iobs->num_fds; i++) {
++		for (i = 0; i < p; i++) {
+ 			iobroker_fd *s;
+ 			if ((iobs->pfd[i].revents & POLLIN) != POLLIN) {
+ 				continue;
diff --git a/net-mgmt/nagios4/files/patch-lib_nsock.c b/net-mgmt/nagios4/files/patch-lib_nsock.c
new file mode 100644
index 000000000000..24d0532373c7
--- /dev/null
+++ b/net-mgmt/nagios4/files/patch-lib_nsock.c
@@ -0,0 +1,11 @@
+--- lib/nsock.c.orig	2014-08-12 15:00:01 UTC
++++ lib/nsock.c
+@@ -81,7 +81,7 @@ int nsock_unix(const char *path, unsigne
+ 	if(flags & NSOCK_UDP)
+ 		return sock;
+ 
+-	if(listen(sock, 3) < 0) {
++	if(listen(sock, 48) < 0) {
+ 		close(sock);
+ 		return NSOCK_ELISTEN;
+ 	}
diff --git a/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in b/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in
index d49b2b6c0409..03a6dc83d6a9 100644
--- a/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in
+++ b/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in
@@ -1,6 +1,6 @@
 --- sample-config/cgi.cfg.in.orig	2014-08-12 15:00:01 UTC
 +++ sample-config/cgi.cfg.in
-@@ -263,7 +263,7 @@
+@@ -263,7 +263,7 @@ default_statuswrl_layout=4
  # OS and distribution, so you may have to tweak this to
  # work on your system.
  
diff --git a/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in b/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in
index 038d766d8949..368a8cf19d40 100644
--- a/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in
+++ b/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in
@@ -1,6 +1,6 @@
 --- sample-config/nagios.cfg.in.orig	2014-08-12 15:00:01 UTC
 +++ sample-config/nagios.cfg.in
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ cfg_file=@sysconfdir@/objects/contacts.c
  cfg_file=@sysconfdir@/objects/timeperiods.cfg
  cfg_file=@sysconfdir@/objects/templates.cfg
  
diff --git a/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in b/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in
index d7944cceedbd..9fc52359ee4b 100644
--- a/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in
+++ b/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in
@@ -21,7 +21,7 @@
          host_name               localhost
          alias                   localhost
          address                 127.0.0.1
-@@ -40,12 +40,12 @@
+@@ -40,12 +40,12 @@ define host{
  ###############################################################################
  ###############################################################################
  
diff --git a/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in b/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in
index 4f6564ec8db4..99ec2be29418 100644
--- a/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in
+++ b/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in
@@ -1,6 +1,6 @@
 --- sample-config/template-object/templates.cfg.in.orig	2014-08-12 15:00:01 UTC
 +++ sample-config/template-object/templates.cfg.in
-@@ -61,17 +61,17 @@
+@@ -61,17 +61,17 @@ define host{
          }
  
  
diff --git a/net-mgmt/nagios4/files/pkg-message.in b/net-mgmt/nagios4/files/pkg-message.in
index 3f38f9e457e1..5072529e92d1 100644
--- a/net-mgmt/nagios4/files/pkg-message.in
+++ b/net-mgmt/nagios4/files/pkg-message.in
@@ -15,9 +15,7 @@
  the web component of Nagios (modify the allow list to suit):
 
    <Directory %%NAGIOSWWWDIR%%>
-     Order deny,allow
-     Deny from all
-     Allow from 127.0.0.1
+     Require ip 127.0.0.1
      php_flag engine on
      php_admin_value open_basedir %%NAGIOSWWWDIR%%/:%%NAGIOSDIR%%/
    </Directory>