diff options
Diffstat (limited to 'net/nagios-base/patches')
| -rw-r--r-- | net/nagios-base/patches/patch-html_Makefile.in | 20 | ||||
| -rw-r--r-- | net/nagios-base/patches/patch-lib_worker.c | 14 |
2 files changed, 24 insertions, 10 deletions
diff --git a/net/nagios-base/patches/patch-html_Makefile.in b/net/nagios-base/patches/patch-html_Makefile.in index abd35797ea5..b48346089e9 100644 --- a/net/nagios-base/patches/patch-html_Makefile.in +++ b/net/nagios-base/patches/patch-html_Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-html_Makefile.in,v 1.3 2015/04/08 23:25:25 rodent Exp $ +$NetBSD: patch-html_Makefile.in,v 1.3.6.1 2016/02/13 16:25:40 bsiegert Exp $ Adjustments to build procedure. ---- html/Makefile.in.orig 2014-08-12 15:00:01.000000000 +0000 -+++ html/Makefile.in -@@ -7,7 +7,7 @@ exec_prefix=@exec_prefix@ +--- html/Makefile.in.orig 2014-08-12 17:00:01.000000000 +0200 ++++ html/Makefile.in 2016-02-08 13:16:12.000000000 +0100 +@@ -7,7 +7,7 @@ LOGDIR=@localstatedir@ CFGDIR=@sysconfdir@ BINDIR=@bindir@ @@ -13,7 +13,7 @@ Adjustments to build procedure. HTMLDIR=@datadir@ datarootdir=@datarootdir@ INSTALL=@INSTALL@ -@@ -35,21 +35,21 @@ distclean: clean +@@ -35,58 +35,58 @@ devclean: distclean install: @@ -50,9 +50,13 @@ Adjustments to build procedure. # Remove old HTML files (PHP files are used now) rm -f $(DESTDIR)$(HTMLDIR)/index.html rm -f $(DESTDIR)$(HTMLDIR)/main.html -@@ -58,35 +58,35 @@ install: - $(INSTALL) -m 664 $(INSTALL_OPTS) rss-corefeed.html $(DESTDIR)$(HTMLDIR) - $(INSTALL) -m 664 $(INSTALL_OPTS) rss-newsfeed.html $(DESTDIR)$(HTMLDIR) + rm -f $(DESTDIR)$(HTMLDIR)/side.html +- $(INSTALL) -m 664 $(INSTALL_OPTS) jsonquery.html $(DESTDIR)$(HTMLDIR) +- $(INSTALL) -m 664 $(INSTALL_OPTS) rss-corefeed.html $(DESTDIR)$(HTMLDIR) +- $(INSTALL) -m 664 $(INSTALL_OPTS) rss-newsfeed.html $(DESTDIR)$(HTMLDIR) ++ $(BSD_INSTALL_DATA) jsonquery.html $(DESTDIR)$(HTMLDIR) ++ $(BSD_INSTALL_DATA) rss-corefeed.html $(DESTDIR)$(HTMLDIR) ++ $(BSD_INSTALL_DATA) rss-newsfeed.html $(DESTDIR)$(HTMLDIR) for file in *.php; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done + do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR); done 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) |