summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2016-02-13 16:25:40 +0000
committerbsiegert <bsiegert@pkgsrc.org>2016-02-13 16:25:40 +0000
commit482d538e1ba127796fc9df27bbaa550636ed6ab4 (patch)
tree6af5e976e657d5f30f1d92cb4cfdc2c2a90a8cbb
parentbf99d7f479a9c2298bef75a8a27679fea7114804 (diff)
downloadpkgsrc-482d538e1ba127796fc9df27bbaa550636ed6ab4.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
-rw-r--r--net/nagios-base/Makefile12
-rw-r--r--net/nagios-base/distinfo6
-rw-r--r--net/nagios-base/patches/patch-html_Makefile.in20
-rw-r--r--net/nagios-base/patches/patch-lib_worker.c14
-rw-r--r--net/nagios-plugins/Makefile4
-rw-r--r--net/nagios-plugins/distinfo3
-rw-r--r--net/nagios-plugins/patches/patch-plugins-root_Makefile.in30
7 files changed, 68 insertions, 21 deletions
diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index 23fbe05246c..e78103f36fc 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.61.2.1 2016/02/08 10:12:10 bsiegert Exp $
+# $NetBSD: Makefile,v 1.61.2.2 2016/02/13 16:25:40 bsiegert Exp $
#
DISTNAME= nagios-4.0.8
PKGNAME= ${DISTNAME:S/-/-base-/}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= net sysutils
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
@@ -15,7 +15,7 @@ HOMEPAGE= http://www.nagios.org/
COMMENT= Network monitor
LICENSE= gnu-gpl-v2
-PKG_DESTDIR_SUPPORT= destdir
+PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
.include "../../net/nagios-base/Makefile.common"
@@ -52,8 +52,6 @@ BUILD_DEFS+= NAGIOSDIR
PKG_GROUPS+= ${NAGIOS_GROUP}
PKG_GROUPS+= ${NAGIOSCMD_GROUP}
-USERGROUP_PHASE+= pre-install
-
PKG_USERS+= ${NAGIOS_USER}:${NAGIOS_GROUP}
PKG_GECOS.${NAGIOS_USER}= Nagios Runtime User
@@ -80,6 +78,10 @@ OWN_DIRS_PERMS+=${NAGIOSDIR}/archives ${NAGIOS_USER} ${NAGIOS_GROUP} 0775
OWN_DIRS_PERMS+=${NAGIOSDIR}/rw ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775
OWN_DIRS_PERMS+=${NAGIOSDIR}/checkresults ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775
+SPECIAL_PERMS+= ${DESTDIR}/${PREFIX}/share/nagios/jsonquery.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644
+SPECIAL_PERMS+= ${DESTDIR}/${PREFIX}/share/nagios/rss-corefeed.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644
+SPECIAL_PERMS+= ${DESTDIR}/${PREFIX}/share/nagios/rss-newsfeed.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644
+
SUBST_CLASSES+= files
SUBST_STAGE.files= post-build
SUBST_FILES.files= nagios.conf.dist
diff --git a/net/nagios-base/distinfo b/net/nagios-base/distinfo
index 1b5019d9b4a..eb411b6bf85 100644
--- a/net/nagios-base/distinfo
+++ b/net/nagios-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27.2.1 2016/02/08 10:12:10 bsiegert Exp $
+$NetBSD: distinfo,v 1.27.2.2 2016/02/13 16:25:40 bsiegert Exp $
SHA1 (nagios-4.0.8.tar.gz) = d49586db6905a8e58a082251d8f89ef5c2cab872
RMD160 (nagios-4.0.8.tar.gz) = b53631755e0a23aba918a99f58b7bea237fdd799
@@ -27,14 +27,14 @@ SHA1 (patch-common_comments.c) = 7739c9c74333c45e86242383073dfa78785445ec
SHA1 (patch-common_downtime.c) = 000f1e33ab1ca1c433c3fd0de3d5bf750df6f57f
SHA1 (patch-configure) = f57db3a43c1abc1aa0d6fe007308089c620624a4
SHA1 (patch-daemon-init.in) = 1e50bb84fde9780d5b13edb4e232c0e3a90ac3f4
-SHA1 (patch-html_Makefile.in) = 33ca19b5cf37839be6fbd851a5dcf29d4d701c8b
+SHA1 (patch-html_Makefile.in) = cef5febcedfaaa38cdf73283e2bda43b4c114379
SHA1 (patch-include_comments.h) = c86328a4f1437ee1dc2b6f97be61693414dd4fce
SHA1 (patch-include_locations.h.in) = 0ee376f6737b24f0d4ea8b37781aca70147c5e70
SHA1 (patch-include_statusjson.h) = c5a84b9ef3114f2e2480d719bbb4a24c8965e052
SHA1 (patch-lib_nsock.c) = bd8801e4aff13ebac26e512b44764c2da1e2e5a5
SHA1 (patch-lib_runcmd.c) = fb34fe5cdc39aca973c1a6e125b125867e6ed262
SHA1 (patch-lib_test-squeue.c) = 1bc197da815a069f0f37525f1acbf5fb4110d399
-SHA1 (patch-lib_worker.c) = c70fd4cec230cefc94cd82a20a20c7ecef3cae2a
+SHA1 (patch-lib_worker.c) = fe1b6d00429556caaefe43afe7bb1c6d9f6fcb0b
SHA1 (patch-sample-config_nagios.cfg.in) = 4ad00840ad66d2e01b19c6db76c810fc3fb80795
SHA1 (patch-t-tap_test__xsddefault.c) = db7166fae411a461d8b4a4a31f55af693aeb03b0
SHA1 (patch-xdata_xcddefault.c) = ba14af868cd773d07e029a2773a44614eedc3e46
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)
diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile
index 8c6c90b2b69..3225378647e 100644
--- a/net/nagios-plugins/Makefile
+++ b/net/nagios-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2015/06/12 10:50:43 wiz Exp $
+# $NetBSD: Makefile,v 1.40.6.1 2016/02/13 16:25:41 bsiegert Exp $
#
PKGREVISION= 1
@@ -9,7 +9,7 @@ HOMEPAGE= http://sourceforge.net/projects/nagiosplug/
COMMENT= Nagios plugins
LICENSE= gnu-gpl-v2
-PKG_DESTDIR_SUPPORT= destdir
+PKG_DESTDIR_SUPPORT= user-destdir
.include "../../net/nagios-plugins/Makefile.common"
diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo
index b727ac263fa..c7c58f08b4b 100644
--- a/net/nagios-plugins/distinfo
+++ b/net/nagios-plugins/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2015/11/04 00:35:14 agc Exp $
+$NetBSD: distinfo,v 1.18.2.1 2016/02/13 16:25:41 bsiegert Exp $
SHA1 (nagios-plugins-2.0.3.tar.gz) = 29b6183ab9d796299dc17c395eef493415d1e9d6
RMD160 (nagios-plugins-2.0.3.tar.gz) = b682b126c78df51f64d9cb8599d2f9dfd411d5f4
@@ -11,4 +11,5 @@ SHA1 (patch-ai) = 645ebd4ac16a71bd5944fe3850c809cb45bf6a4c
SHA1 (patch-ak) = 093638669dd5b524d8a9b31d452f1ba737e684b3
SHA1 (patch-an) = 6ba8dec0eb62cd0097809daf8075248afd448695
SHA1 (patch-configure) = 8a06bbd0fa0649625ffb1c8e2f4b667714a40fe4
+SHA1 (patch-plugins-root_Makefile.in) = e4352f38bd0085f5c0acd9d058f1aa5d76676fff
SHA1 (patch-plugins__check_swap.c) = 4a32398b3e8e596b9f67b3ea95a3acce37287b0b
diff --git a/net/nagios-plugins/patches/patch-plugins-root_Makefile.in b/net/nagios-plugins/patches/patch-plugins-root_Makefile.in
new file mode 100644
index 00000000000..6302ddcdd2b
--- /dev/null
+++ b/net/nagios-plugins/patches/patch-plugins-root_Makefile.in
@@ -0,0 +1,30 @@
+$NetBSD: patch-plugins-root_Makefile.in,v 1.1.2.2 2016/02/13 16:25:41 bsiegert Exp $
+user-destdir install fixes.
+
+--- plugins-root/Makefile.in.orig 2016-02-08 13:26:51.000000000 +0100
++++ plugins-root/Makefile.in 2016-02-08 13:27:43.000000000 +0100
+@@ -1312,10 +1312,6 @@
+ p=$$f; \
+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
+- echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \
+- chown root $(DESTDIR)$(libexecdir)/$$p; \
+- echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
+- chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
+ done
+
+
+@@ -1748,12 +1744,7 @@
+ && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
+ && can_create_suid_root_executable=yes; \
+ rm -f $$TMPFILE; \
+- if test $$can_create_suid_root_executable = yes; then \
+- $(INSTALL_SUID); \
+- else \
+- echo "WARNING: insufficient access; not installing setuid plugins"; \
+- echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \
+- fi
++ $(INSTALL_SUID); \
+
+ clean-local:
+ rm -f NP-VERSION-FILE