Fri Dec 18 00:55:17 2015 UTC ()
Upstream set the maximum queue length of the socket to INT_MAX. Increase
this value to 1024 to accommodate larger deployments until we get a proper
tunable.


(rodent)
diff -r1.26 -r1.27 pkgsrc/net/nagios-base/distinfo
diff -r1.1 -r1.2 pkgsrc/net/nagios-base/patches/patch-lib_nsock.c
cvs diff -r1.26 -r1.27 pkgsrc/net/nagios-base/distinfo (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/distinfo 2015/11/04 00:35:13 1.26
+++ pkgsrc/net/nagios-base/distinfo 2015/12/18 00:55:17 1.27
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: distinfo,v 1.26 2015/11/04 00:35:13 agc Exp $ 1$NetBSD: distinfo,v 1.27 2015/12/18 00:55:17 rodent Exp $
2 2
3SHA1 (nagios-4.0.8.tar.gz) = d49586db6905a8e58a082251d8f89ef5c2cab872 3SHA1 (nagios-4.0.8.tar.gz) = d49586db6905a8e58a082251d8f89ef5c2cab872
4RMD160 (nagios-4.0.8.tar.gz) = b53631755e0a23aba918a99f58b7bea237fdd799 4RMD160 (nagios-4.0.8.tar.gz) = b53631755e0a23aba918a99f58b7bea237fdd799
5SHA512 (nagios-4.0.8.tar.gz) = d72fdbcc0beb2de72e5aa788b4ccc83aa30c7f4a4460edaa831f012db04647e4836b876bb7dc235e2a1b525827e9a2a0f4d348919f69fbfbfdaa4d13e968e18c 5SHA512 (nagios-4.0.8.tar.gz) = d72fdbcc0beb2de72e5aa788b4ccc83aa30c7f4a4460edaa831f012db04647e4836b876bb7dc235e2a1b525827e9a2a0f4d348919f69fbfbfdaa4d13e968e18c
6Size (nagios-4.0.8.tar.gz) = 1805059 bytes 6Size (nagios-4.0.8.tar.gz) = 1805059 bytes
7SHA1 (nagios-netbsd40-icons.tar.gz) = 62919c22c5d5dc3f603c3320578431e93dfdd9fe 7SHA1 (nagios-netbsd40-icons.tar.gz) = 62919c22c5d5dc3f603c3320578431e93dfdd9fe
8RMD160 (nagios-netbsd40-icons.tar.gz) = 96ad67a107dad095213ddbf58debcfd5b46d6dee 8RMD160 (nagios-netbsd40-icons.tar.gz) = 96ad67a107dad095213ddbf58debcfd5b46d6dee
9SHA512 (nagios-netbsd40-icons.tar.gz) = 27cd564ef6dbe076b43dc2207f8f4f49bfb575f216e90d03a157208e57e23930c1e5915353406f09bd762ad11e6306625544292bd919f8524a2239aac758afb1 9SHA512 (nagios-netbsd40-icons.tar.gz) = 27cd564ef6dbe076b43dc2207f8f4f49bfb575f216e90d03a157208e57e23930c1e5915353406f09bd762ad11e6306625544292bd919f8524a2239aac758afb1
10Size (nagios-netbsd40-icons.tar.gz) = 5659 bytes 10Size (nagios-netbsd40-icons.tar.gz) = 5659 bytes
11SHA1 (patch-Makefile.in) = 953eea6b276beba75ab5c64c14d10cdcf1ca2188 11SHA1 (patch-Makefile.in) = 953eea6b276beba75ab5c64c14d10cdcf1ca2188
12SHA1 (patch-base_Makefile.in) = 2b0162bb4d395b1d529f5fc1fdf9eab3ddaeb161 12SHA1 (patch-base_Makefile.in) = 2b0162bb4d395b1d529f5fc1fdf9eab3ddaeb161
13SHA1 (patch-cgi_Makefile.in) = 25c22914986c0b781f5dd665a7a53778e1031a63 13SHA1 (patch-cgi_Makefile.in) = 25c22914986c0b781f5dd665a7a53778e1031a63
14SHA1 (patch-cgi_cmd.c) = 90dfbfc78b08c5d72f168003d6c9fb56d67a8743 14SHA1 (patch-cgi_cmd.c) = 90dfbfc78b08c5d72f168003d6c9fb56d67a8743
15SHA1 (patch-cgi_extinfo.c) = 8cad0787fbe0a782edb93ca299462a5718a34a4b 15SHA1 (patch-cgi_extinfo.c) = 8cad0787fbe0a782edb93ca299462a5718a34a4b
16SHA1 (patch-cgi_getcgi.c) = 3af474de4f4281f18a306f7d618ff532d0a9ca9e 16SHA1 (patch-cgi_getcgi.c) = 3af474de4f4281f18a306f7d618ff532d0a9ca9e
17SHA1 (patch-cgi_statusjson.c) = 13967c18ee3eaaaf75edb8b3ee028bece73272ae 17SHA1 (patch-cgi_statusjson.c) = 13967c18ee3eaaaf75edb8b3ee028bece73272ae
18SHA1 (patch-common_Makefile.in) = 7fa093a6109dfa03f9b97e4312d3a09e3235f00f 18SHA1 (patch-common_Makefile.in) = 7fa093a6109dfa03f9b97e4312d3a09e3235f00f
19SHA1 (patch-common_comments.c) = 7739c9c74333c45e86242383073dfa78785445ec 19SHA1 (patch-common_comments.c) = 7739c9c74333c45e86242383073dfa78785445ec
20SHA1 (patch-configure) = f57db3a43c1abc1aa0d6fe007308089c620624a4 20SHA1 (patch-configure) = f57db3a43c1abc1aa0d6fe007308089c620624a4
21SHA1 (patch-daemon-init.in) = 1e50bb84fde9780d5b13edb4e232c0e3a90ac3f4 21SHA1 (patch-daemon-init.in) = 1e50bb84fde9780d5b13edb4e232c0e3a90ac3f4
22SHA1 (patch-html_Makefile.in) = 33ca19b5cf37839be6fbd851a5dcf29d4d701c8b 22SHA1 (patch-html_Makefile.in) = 33ca19b5cf37839be6fbd851a5dcf29d4d701c8b
23SHA1 (patch-include_comments.h) = c86328a4f1437ee1dc2b6f97be61693414dd4fce 23SHA1 (patch-include_comments.h) = c86328a4f1437ee1dc2b6f97be61693414dd4fce
24SHA1 (patch-include_locations.h.in) = 0ee376f6737b24f0d4ea8b37781aca70147c5e70 24SHA1 (patch-include_locations.h.in) = 0ee376f6737b24f0d4ea8b37781aca70147c5e70
25SHA1 (patch-include_statusjson.h) = c5a84b9ef3114f2e2480d719bbb4a24c8965e052 25SHA1 (patch-include_statusjson.h) = c5a84b9ef3114f2e2480d719bbb4a24c8965e052
26SHA1 (patch-lib_nsock.c) = e50b9c5ed572fea309eb1c06fea2e0ee8f4d34d3 26SHA1 (patch-lib_nsock.c) = bd8801e4aff13ebac26e512b44764c2da1e2e5a5
27SHA1 (patch-lib_runcmd.c) = fb34fe5cdc39aca973c1a6e125b125867e6ed262 27SHA1 (patch-lib_runcmd.c) = fb34fe5cdc39aca973c1a6e125b125867e6ed262
28SHA1 (patch-sample-config_nagios.cfg.in) = 4ad00840ad66d2e01b19c6db76c810fc3fb80795 28SHA1 (patch-sample-config_nagios.cfg.in) = 4ad00840ad66d2e01b19c6db76c810fc3fb80795
29SHA1 (patch-t-tap_test__xsddefault.c) = db7166fae411a461d8b4a4a31f55af693aeb03b0 29SHA1 (patch-t-tap_test__xsddefault.c) = db7166fae411a461d8b4a4a31f55af693aeb03b0
30SHA1 (patch-xdata_xcddefault.c) = ba14af868cd773d07e029a2773a44614eedc3e46 30SHA1 (patch-xdata_xcddefault.c) = ba14af868cd773d07e029a2773a44614eedc3e46
31SHA1 (patch-xdata_xrddefault.c) = 0883a8ea4bac21523b0aa6ef77272ba5ae0c8b42 31SHA1 (patch-xdata_xrddefault.c) = 0883a8ea4bac21523b0aa6ef77272ba5ae0c8b42
32SHA1 (patch-xdata_xsddefault.c) = 6255158bfe90a390678f2b834935e809b21d560c 32SHA1 (patch-xdata_xsddefault.c) = 6255158bfe90a390678f2b834935e809b21d560c
cvs diff -r1.1 -r1.2 pkgsrc/net/nagios-base/patches/Attic/patch-lib_nsock.c (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/patches/Attic/patch-lib_nsock.c 2015/06/15 01:29:40 1.1
+++ pkgsrc/net/nagios-base/patches/Attic/patch-lib_nsock.c 2015/12/18 00:55:17 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-lib_nsock.c,v 1.1 2015/06/15 01:29:40 rodent Exp $ 1$NetBSD: patch-lib_nsock.c,v 1.2 2015/12/18 00:55:17 rodent Exp $
 2
 3Increase maximum queue length for socket to avoid disaster on large deployments.
2 4
3--- lib/nsock.c.orig 2014-08-12 15:00:01.000000000 +0000 5--- lib/nsock.c.orig 2014-08-12 15:00:01.000000000 +0000
4+++ lib/nsock.c 6+++ lib/nsock.c
5@@ -81,7 +81,7 @@ int nsock_unix(const char *path, unsigne 7@@ -81,7 +81,7 @@ int nsock_unix(const char *path, unsigne
6 if(flags & NSOCK_UDP) 8 if(flags & NSOCK_UDP)
7 return sock; 9 return sock;
8  10
9- if(listen(sock, 3) < 0) { 11- if(listen(sock, 3) < 0) {
10+ if(listen(sock, 128) < 0) { 12+ if(listen(sock, 1024) < 0) {
11 close(sock); 13 close(sock);
12 return NSOCK_ELISTEN; 14 return NSOCK_ELISTEN;
13 } 15 }