diff options
| author | bsiegert <bsiegert> | 2016-02-13 16:25:40 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2016-02-13 16:25:40 +0000 |
| commit | fca257b0755679aa476f167d5857cc91e45c038e (patch) | |
| tree | 6af5e976e657d5f30f1d92cb4cfdc2c2a90a8cbb /net/nagios-base/patches/patch-lib_worker.c | |
| parent | 1333ed08527a9ff8e64dbfdbf266c36ebdc75176 (diff) | |
| download | pkgsrc-fca257b0755679aa476f167d5857cc91e45c038e.tar.gz | |
Pullup ticket #4920 - requested by bouyer
net/nagios-base: bugfix
net/nagios-plugins: fix packaging issue
Revisions pulled up:
- net/nagios-base/Makefile 1.63
- net/nagios-base/distinfo 1.30
- net/nagios-base/patches/patch-base_checks.c 1.2
- net/nagios-base/patches/patch-base_events.c 1.2
- net/nagios-base/patches/patch-base_logging.c 1.3
- net/nagios-base/patches/patch-base_nerd.c 1.2
- net/nagios-base/patches/patch-cgi_avail.c 1.4
- net/nagios-base/patches/patch-cgi_histogram.c 1.4
- net/nagios-base/patches/patch-cgi_trends.c 1.4
- net/nagios-base/patches/patch-common_downtime.c 1.2
- net/nagios-base/patches/patch-html_Makefile.in 1.4
- net/nagios-base/patches/patch-lib_test-squeue.c 1.2
- net/nagios-base/patches/patch-lib_worker.c 1.2
- net/nagios-plugins/Makefile 1.41
- net/nagios-plugins/distinfo 1.19
- net/nagios-plugins/patches/patch-plugins-root_Makefile.in 1.1
---
Module Name: pkgsrc
Committed By: bouyer
Date: Tue Feb 9 10:12:53 UTC 2016
Modified Files:
pkgsrc/net/nagios-base: Makefile distinfo
pkgsrc/net/nagios-base/patches: patch-base_checks.c patch-base_events.c
patch-base_logging.c patch-base_nerd.c patch-cgi_avail.c
patch-cgi_histogram.c patch-cgi_trends.c patch-common_downtime.c
patch-html_Makefile.in patch-lib_test-squeue.c patch-lib_worker.c
Log Message:
Bug fix for workers busy-waiting for child completion: when read()ing a
non-bloking descriptor after a poll(), don't loop forever on EAGAIN
as poll() may return POLLIN for a descriptor which doesn't have data
to be read. Bump PKGREVISION.
While there add user-destdir support.
---
Module Name: pkgsrc
Committed By: bouyer
Date: Tue Feb 9 10:13:17 UTC 2016
Modified Files:
pkgsrc/net/nagios-plugins: Makefile distinfo
Added Files:
pkgsrc/net/nagios-plugins/patches: patch-plugins-root_Makefile.in
Log Message:
Add user-destdir support
Diffstat (limited to 'net/nagios-base/patches/patch-lib_worker.c')
| -rw-r--r-- | net/nagios-base/patches/patch-lib_worker.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/net/nagios-base/patches/patch-lib_worker.c b/net/nagios-base/patches/patch-lib_worker.c index 416b4777cbe..15d7042adc1 100644 --- a/net/nagios-base/patches/patch-lib_worker.c +++ b/net/nagios-base/patches/patch-lib_worker.c @@ -1,9 +1,10 @@ -$NetBSD: patch-lib_worker.c,v 1.1.2.2 2016/02/08 10:12:10 bsiegert Exp $ +$NetBSD: patch-lib_worker.c,v 1.1.2.3 2016/02/13 16:25:40 bsiegert Exp $ 64bit time_t workaround +Workaround for poll(2) returning spurious POLLIN --- lib/worker.c.orig 2014-08-12 17:00:01.000000000 +0200 -+++ lib/worker.c 2016-02-07 22:08:53.000000000 +0100 ++++ lib/worker.c 2016-02-08 12:31:57.000000000 +0100 @@ -194,7 +194,7 @@ #define kvvec_add_tv(kvv, key, value) \ @@ -13,3 +14,12 @@ $NetBSD: patch-lib_worker.c,v 1.1.2.2 2016/02/08 10:12:10 bsiegert Exp $ kvvec_addkv_wlen(kvv, key, sizeof(key) - 1, buf, strlen(buf)); \ } while (0) +@@ -439,6 +439,8 @@ + + rd = read(io->fd, buf, sizeof(buf)); + if (rd < 0) { ++ if (!final && errno == EAGAIN) ++ return; + if (errno == EINTR || errno == EAGAIN) + continue; + if (!final && errno != EAGAIN) |