pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2011Q2]: pkgsrc/net Pullup ticket #3488 - requested by bouyer
details: https://anonhg.NetBSD.org/pkgsrc/rev/7dc958b5c84f
branches: pkgsrc-2011Q2
changeset: 590248:7dc958b5c84f
user: tron <tron%pkgsrc.org@localhost>
date: Wed Aug 03 17:51:52 2011 +0000
description:
Pullup ticket #3488 - requested by bouyer
net/nagios-base: security update
Revisions pulled up:
- net/nagios-base/Makefile 1.32
- net/nagios-base/Makefile.common 1.12
- net/nagios-base/PLIST 1.10
- net/nagios-base/distinfo 1.13
- net/nagios-base/patches/patch-aa 1.9
- net/nagios-base/patches/patch-ad 1.8
- net/nagios-base/patches/patch-ag 1.8
- net/nagios-base/patches/patch-ah 1.3
- net/nagios-plugins/Makefile.common 1.9
---
Module Name: pkgsrc
Committed By: bouyer
Date: Tue Aug 2 14:03:18 UTC 2011
Modified Files:
pkgsrc/net/nagios-base: Makefile Makefile.common PLIST distinfo
pkgsrc/net/nagios-base/patches: patch-aa patch-ad patch-ag patch-ah
pkgsrc/net/nagios-plugins: Makefile.common
Log Message:
Update nagios-base to 3.3.1, fixig CVE-2011-1523 and CVE-2011-2179.
Changes since 3.2.3:
ENHANCEMENTS
* Added support for same host service dependencies with servicegroups (Mathieu Gagn?)
* Empty hostgroups referenced from services now optionally generate a warning instead of an error.
* Documentation links now point to online resources
* Matt Wall's Exfoliation theme is now installed by default. You can reinstall the classic theme with "make install-classicui"
* Downtime delete commands made "distributable" by deleting by host group name, host name or start time/comment (Opsview team)
* Allow status.cgi to order by "host urgency" (Jochen Bern)
* Added news items and quick links to main splash page
* Added ability to authenticate to CGIs using contactgroup name (Stephen Gran)
FIXES
* Fixes status.cgi when called with no parameters, where host should be set to all if none specified (Michael Friedrich)
* Fixes possible validation error with empty hostgroups/servicegroups (Sven-G?ran Bergh)
* Performance-data handling and checking is now thread-safe so long as embedded perl is not used.
* Children should no longer hang on mutex locks held in parent for localtime() (and similar) calls.
* Debug logging is now properly serialized, using soft-locking with a timeout of 150 milliseconds to avoid multiple threads competing for the privilege to write debug info.
* Fixed extraneous alerts for services when host is down
* Fixed incorrect parsing of multi-line host check results (Jochen Bern)
* Fixed bug with passive host checks being incorrectly sent to event brokers as active checks
* Fixed bug where passive host check status updates were not being propagated to event brokers
* Reverted 'Fix for retaining host display name and alias, as well as service display name' as configuration information stored incorrectly over a reload
* Fixed compile warnings for size_t (Michael Friedrich)
* Fixed problem where acknowledgements were getting reset when a hard state change occurred
* Removed duplicated unlinks for check result files with multiple results
* Fixed race condition on flexible downtime commands when duration not set or zero (Michael Friedrich)
* Fixed flexible downtime on service hard state change doesn't get triggered/activated (Michael Friedrich)
* Fixed XSS vulnerability in config.cgi and statusmap.cgi (Stefan Schurtz)
* Fixed segfault when sending host notifications (Michael Friedrich)
* Fixed bug where unauthorized contacts could issue hostgroup and servicegroup commands (Sven Nierlein)
diffstat:
net/nagios-base/Makefile | 7 +-
net/nagios-base/Makefile.common | 7 +-
net/nagios-base/PLIST | 372 ++++++++++++++++++------------------
net/nagios-base/distinfo | 16 +-
net/nagios-base/patches/patch-aa | 50 +++-
net/nagios-base/patches/patch-ad | 58 +++--
net/nagios-base/patches/patch-ag | 12 +-
net/nagios-base/patches/patch-ah | 18 +-
net/nagios-plugins/Makefile.common | 3 +-
9 files changed, 295 insertions(+), 248 deletions(-)
diffs (truncated from 756 to 300 lines):
diff -r 3077e7d989f8 -r 7dc958b5c84f net/nagios-base/Makefile
--- a/net/nagios-base/Makefile Tue Aug 02 08:11:44 2011 +0000
+++ b/net/nagios-base/Makefile Wed Aug 03 17:51:52 2011 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2011/04/08 22:37:24 morr Exp $
+# $NetBSD: Makefile,v 1.31.2.1 2011/08/03 17:51:52 tron Exp $
#
-DISTNAME= nagios-3.2.3
+DISTNAME= nagios-3.3.1
PKGNAME= ${DISTNAME:S/-/-base-/}
CATEGORIES= net sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
@@ -75,6 +75,9 @@
SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g"
SUBST_MESSAGE.files= Fixing configuration files.
+post-extract:
+ ${MV} ${WRKDIR}/nagios ${WRKSRC}
+
pre-build:
${CP} ${FILESDIR}/nagios.conf.dist ${WRKSRC}/nagios.conf.dist
diff -r 3077e7d989f8 -r 7dc958b5c84f net/nagios-base/Makefile.common
--- a/net/nagios-base/Makefile.common Tue Aug 02 08:11:44 2011 +0000
+++ b/net/nagios-base/Makefile.common Wed Aug 03 17:51:52 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2011/04/08 22:37:24 morr Exp $
+# $NetBSD: Makefile.common,v 1.11.2.1 2011/08/03 17:51:52 tron Exp $
#
# used by net/nagios-base/Makefile
# used by net/nagios-nsca/Makefile
@@ -19,9 +19,10 @@
CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/nagios
.if ${PKGPATH} != "net/nagios-nsca"
-CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/nagios
+CONFIGURE_ARGS+= --datadir=${PREFIX}/share/nagios
+.else
+CONFIGURE_ARGS+= --datadir=${PREFIX}/share
.endif
-CONFIGURE_ARGS+= --datadir=${PREFIX}/share
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --localstatedir=${NAGIOSDIR}
diff -r 3077e7d989f8 -r 7dc958b5c84f net/nagios-base/PLIST
--- a/net/nagios-base/PLIST Tue Aug 02 08:11:44 2011 +0000
+++ b/net/nagios-base/PLIST Wed Aug 03 17:51:52 2011 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2011/04/08 22:37:24 morr Exp $
+@comment $NetBSD: PLIST,v 1.9.2.1 2011/08/03 17:51:52 tron Exp $
bin/nagios
bin/nagiostats
bin/p1.pl
@@ -95,190 +95,12 @@
share/nagios/contexthelp/N5.html
share/nagios/contexthelp/N6.html
share/nagios/contexthelp/N7.html
-share/nagios/docs/about.html
-share/nagios/docs/activechecks.html
-share/nagios/docs/adaptive.html
-share/nagios/docs/addons.html
-share/nagios/docs/beginners.html
-share/nagios/docs/cachedchecks.html
-share/nagios/docs/cgiauth.html
-share/nagios/docs/cgiincludes.html
-share/nagios/docs/cgis.html
-share/nagios/docs/cgisecurity.html
-share/nagios/docs/checkscheduling.html
-share/nagios/docs/clusters.html
-share/nagios/docs/config.html
-share/nagios/docs/configcgi.html
-share/nagios/docs/configmain.html
-share/nagios/docs/configobject.html
-share/nagios/docs/customobjectvars.html
-share/nagios/docs/dependencies.html
-share/nagios/docs/dependencychecks.html
-share/nagios/docs/distributed.html
-share/nagios/docs/downtime.html
-share/nagios/docs/embeddedperl.html
-share/nagios/docs/epnplugins.html
-share/nagios/docs/escalations.html
-share/nagios/docs/eventhandlers.html
-share/nagios/docs/extcommands.html
-share/nagios/docs/faststartup.html
-share/nagios/docs/flapping.html
-share/nagios/docs/freshness.html
-share/nagios/docs/funstuff.html
-share/nagios/docs/hostchecks.html
-share/nagios/docs/images/activechecks.png
-share/nagios/docs/images/cachedcheckgraphs.png
-share/nagios/docs/images/cachedchecks.png
-share/nagios/docs/images/cachedchecks1.png
-share/nagios/docs/images/cgi-avail-a.png
-share/nagios/docs/images/cgi-avail-b.png
-share/nagios/docs/images/cgi-cmd.png
-share/nagios/docs/images/cgi-config.png
-share/nagios/docs/images/cgi-extinfo-a.png
-share/nagios/docs/images/cgi-extinfo-b.png
-share/nagios/docs/images/cgi-extinfo-c.png
-share/nagios/docs/images/cgi-extinfo-d.png
-share/nagios/docs/images/cgi-histogram.png
-share/nagios/docs/images/cgi-history.png
-share/nagios/docs/images/cgi-notifications.png
-share/nagios/docs/images/cgi-outages.png
-share/nagios/docs/images/cgi-showlog.png
-share/nagios/docs/images/cgi-status-a.png
-share/nagios/docs/images/cgi-status-b.png
-share/nagios/docs/images/cgi-status-c.png
-share/nagios/docs/images/cgi-status-d.png
-share/nagios/docs/images/cgi-statusmap.png
-share/nagios/docs/images/cgi-statuswml.png
-share/nagios/docs/images/cgi-statuswrl.png
-share/nagios/docs/images/cgi-summary.png
-share/nagios/docs/images/cgi-tac.png
-share/nagios/docs/images/cgi-trends.png
-share/nagios/docs/images/checkmark.png
-share/nagios/docs/images/checktiming.png
-share/nagios/docs/images/configoverview.png
-share/nagios/docs/images/distributed.png
-share/nagios/docs/images/downtime.png
-share/nagios/docs/images/epn.png
-share/nagios/docs/images/eventhandlers.png
-share/nagios/docs/images/externalcommands.png
-share/nagios/docs/images/fast-startup.png
-share/nagios/docs/images/fast-startup1.png
-share/nagios/docs/images/fast-startup2.png
-share/nagios/docs/images/freshness.png
-share/nagios/docs/images/host-dependencies.png
-share/nagios/docs/images/important.gif
-share/nagios/docs/images/integrationoverview.png
-share/nagios/docs/images/interleaved1.png
-share/nagios/docs/images/interleaved2.png
-share/nagios/docs/images/interleaved3.png
-share/nagios/docs/images/logofullsize.png
-share/nagios/docs/images/monitoring-printers.png
-share/nagios/docs/images/monitoring-routers.png
-share/nagios/docs/images/monitoring-windows.png
-share/nagios/docs/images/mrtg-activehostchecks.png
-share/nagios/docs/images/mrtg-activelychecked.png
-share/nagios/docs/images/mrtg-activeservicechecks.png
-share/nagios/docs/images/mrtg-cachedchecks.png
-share/nagios/docs/images/mrtg-commandbuffers.png
-share/nagios/docs/images/mrtg-externalcommands.png
-share/nagios/docs/images/mrtg-hostperfstats.png
-share/nagios/docs/images/mrtg-hoststatechange.png
-share/nagios/docs/images/mrtg-passivechecks.png
-share/nagios/docs/images/mrtg-passivelychecked.png
-share/nagios/docs/images/mrtg-serviceperfstats.png
-share/nagios/docs/images/mrtg-servicestatechange.png
-share/nagios/docs/images/multiple-templates1.png
-share/nagios/docs/images/multiple-templates2.png
-share/nagios/docs/images/nagios.jpg
-share/nagios/docs/images/nagiosexchange.png
-share/nagios/docs/images/nagiossupport.png
-share/nagios/docs/images/ndoutils.png
-share/nagios/docs/images/network-outage1.png
-share/nagios/docs/images/network-outage2.png
-share/nagios/docs/images/noninterleaved1.png
-share/nagios/docs/images/noninterleaved2.png
-share/nagios/docs/images/note.gif
-share/nagios/docs/images/nrpe.png
-share/nagios/docs/images/nsca.png
-share/nagios/docs/images/nscpp.png
-share/nagios/docs/images/objects-commands.png
-share/nagios/docs/images/objects-contacts.png
-share/nagios/docs/images/objects-hosts.png
-share/nagios/docs/images/objects-services.png
-share/nagios/docs/images/objects-timeperiods.png
-share/nagios/docs/images/passivechecks.png
-share/nagios/docs/images/passivehosttranslation.png
-share/nagios/docs/images/plugins.png
-share/nagios/docs/images/predictive-dependency-checks.png
-share/nagios/docs/images/printer.png
-share/nagios/docs/images/reachability1.png
-share/nagios/docs/images/reachability2.png
-share/nagios/docs/images/reachability3.png
-share/nagios/docs/images/reachability4.png
-share/nagios/docs/images/redudancy.png
-share/nagios/docs/images/redundancy.png
-share/nagios/docs/images/security.png
-share/nagios/docs/images/security1.png
-share/nagios/docs/images/security2.png
-share/nagios/docs/images/security3.png
-share/nagios/docs/images/seealso.gif
-share/nagios/docs/images/service-dependencies.png
-share/nagios/docs/images/statetransitions.png
-share/nagios/docs/images/statetransitions2.png
-share/nagios/docs/images/stoprestart.png
-share/nagios/docs/images/switch.png
-share/nagios/docs/images/tcpwrappers.png
-share/nagios/docs/images/tip.gif
-share/nagios/docs/images/tuning.png
-share/nagios/docs/images/upto.gif
-share/nagios/docs/index.html
-share/nagios/docs/int-snmptrap.html
-share/nagios/docs/int-tcpwrappers.html
-share/nagios/docs/integration.html
-share/nagios/docs/knownissues.html
-share/nagios/docs/largeinstalltweaks.html
-share/nagios/docs/macrolist.html
-share/nagios/docs/macros.html
-share/nagios/docs/monitoring-linux.html
-share/nagios/docs/monitoring-netware.html
-share/nagios/docs/monitoring-printers.html
-share/nagios/docs/monitoring-publicservices.html
-share/nagios/docs/monitoring-routers.html
-share/nagios/docs/monitoring-windows.html
-share/nagios/docs/mrtggraphs.html
-share/nagios/docs/nagiostats.html
-share/nagios/docs/networkreachability.html
-share/nagios/docs/notifications.html
-share/nagios/docs/objectdefinitions.html
-share/nagios/docs/objectinheritance.html
-share/nagios/docs/objecttricks.html
-share/nagios/docs/oncallrotation.html
-share/nagios/docs/passivechecks.html
-share/nagios/docs/passivestatetranslation.html
-share/nagios/docs/perfdata.html
-share/nagios/docs/pluginapi.html
-share/nagios/docs/plugins.html
-share/nagios/docs/quickstart-fedora.html
-share/nagios/docs/quickstart-opensuse.html
-share/nagios/docs/quickstart-ubuntu.html
-share/nagios/docs/quickstart.html
-share/nagios/docs/redundancy.html
-share/nagios/docs/robots.txt
-share/nagios/docs/security.html
-share/nagios/docs/servicechecks.html
-share/nagios/docs/stalking.html
-share/nagios/docs/startstop.html
-share/nagios/docs/statetypes.html
-share/nagios/docs/timeperiods.html
-share/nagios/docs/toc.html
-share/nagios/docs/tuning.html
-share/nagios/docs/upgrading.html
-share/nagios/docs/verifyconfig.html
-share/nagios/docs/volatileservices.html
-share/nagios/docs/whatsnew.html
share/nagios/images/NagiosEnterprises-whitebg-112x46.png
share/nagios/images/ack.gif
share/nagios/images/action.gif
+share/nagios/images/action-graph.gif
+share/nagios/images/action-nagios.gif
+share/nagios/images/action-orig.gif
share/nagios/images/command.png
share/nagios/images/comment.gif
share/nagios/images/contexthelp1.gif
@@ -296,6 +118,7 @@
share/nagios/images/favicon.ico
share/nagios/images/flapping.gif
share/nagios/images/globe-support-150x150.png
+share/nagios/images/graph.gif
share/nagios/images/greendot.gif
share/nagios/images/histogram.png
share/nagios/images/history.gif
@@ -303,11 +126,183 @@
share/nagios/images/info.png
share/nagios/images/left.gif
share/nagios/images/logofullsize.png
+share/nagios/images/logos/aix.gd2
+share/nagios/images/logos/aix.gif
+share/nagios/images/logos/aix.jpg
+share/nagios/images/logos/aix.png
+share/nagios/images/logos/amiga.gd2
+share/nagios/images/logos/amiga.gif
+share/nagios/images/logos/amiga.jpg
+share/nagios/images/logos/amiga.png
+share/nagios/images/logos/apple.gd2
+share/nagios/images/logos/apple.gif
+share/nagios/images/logos/apple.jpg
+share/nagios/images/logos/apple.png
+share/nagios/images/logos/beos.gd2
+share/nagios/images/logos/beos.gif
+share/nagios/images/logos/beos.jpg
+share/nagios/images/logos/beos.png
+share/nagios/images/logos/bluetooth.png
+share/nagios/images/logos/caldera.gd2
+share/nagios/images/logos/caldera.gif
+share/nagios/images/logos/caldera.jpg
+share/nagios/images/logos/caldera.png
+share/nagios/images/logos/cat1900.gd2
+share/nagios/images/logos/cat2900.gd2
+share/nagios/images/logos/cat5000.gd2
+share/nagios/images/logos/database.gd2
+share/nagios/images/logos/database.gif
+share/nagios/images/logos/debian.gd2
+share/nagios/images/logos/debian.gif
+share/nagios/images/logos/debian.jpg
+share/nagios/images/logos/debian.png
+share/nagios/images/logos/desktop-server.gd2
+share/nagios/images/logos/desktop-server.gif
+share/nagios/images/logos/ethernet_card.png
+share/nagios/images/logos/fax.gd2
+share/nagios/images/logos/fax.gif
+share/nagios/images/logos/firewall.gd2
+share/nagios/images/logos/firewall.gif
+share/nagios/images/logos/freebsd40.gd2
+share/nagios/images/logos/freebsd40.gif
+share/nagios/images/logos/freebsd40.jpg
Home |
Main Index |
Thread Index |
Old Index