Fri Apr 8 22:37:25 2011 UTC ()
Update nagios-base to 3.2.3. While there, add DESTDIR support and set LICENSE.
ChangeLog:
* Fixes problem where disabling all active hosts/services was not taking effect
* Fixes for compiler warnings (code cleanup by Stephen Gran)
* Fixes for format errors in event handler logging (Guillaume Rousse)
* Fixed incorrect info in sample nagios.cfg file for state_retention_file (Michael Friedrich)
* Fixed broker_event_handler() to return ERR if data is NULL (Michael Friedrich)
* Patch to new_mini_epn to allow any command line length without breaking on extra trailing or leading whitespace (Ray Bengen)
* Patch to mini_epn to allow any command line length (Thomas Guyot-Sionnest)
* Patch to speed up loading of state retention data (Matthieu Kermagoret)
* Custom notifications are now suppressed during scheduled downtime (Sven Nierlein)
* Added code to warn user about exit code of 126 meaning plugin is not executable (bug #153)
* Scheduled downtime can now start on SOFT error states (bug #47)
* Main window frame URL can now be specify with a "corewindow=" parameter
* Improved config CGI shows commands, command args in an easier to use manner (Jochen Bern)
* Added ability for NEB modules to override execution of event handlers (Sven Nierlein)
* Custom macros are no longer cleaned/stripped as they are user-defined and should be trusted (Peter Morch)
* Fix for choosing next valid time on day of DST change when clocks go one hour backwards
* Fix for nagios now erroring when "Error: Could not find any contactgroup matching..." displayed
* Fix tap tests for Sol0 and newer versions of Test::Harness
* Fix for notifications not being sent out when scheduled downtime is canceluzzner)
* Fix for first notification delay being calculated incorrectly, and notifications potentially going out early (Plachowski)
* Fix for text of scheduling downtime of all services on a host (Holger Weiss)
* Fix for services inheriting notification period from hosts if not defined (Gordon Messmer)
* Fix for incorrect service states on host failures (bug #130 Pet)
* Fix for incorrect service state attributes being set on host failures (bug #128 Petya Kohts)
* Fix for non-scheduled hostsnd services not being updated in NDOUtils
* Fix for typos in TAC, CMD CGIs (bugs #150, #144, #148)
* Fix for types in documentation (bugs #145, #105, #106)
* Fix for incorrect host state counts in status CGI when viewing servicegroups (bug #72)
* Fix few Splunk integration query parameters (bug #136)
* Fix for extra field header in availability CSV export (bug #113)
* Fix foracro processing code modifying input string (Jochen Bern)
* Fix for update check API
* Fix for CGI speedup when persistent=0 f comments
* Fix for event execution loop re-scheduling host checks instead of executing them if service checks are disabled (b #152)
* Fix for segfaults on Solaris (Torsten Huebler)
* Fix for incorrect comment expiration times being passed to event bror (Mattieu Kermagot)
* Doc updates related to cleaning of custom macros (Peter Valdemar Morch)
* Fix to sample notify-service--email command (bug #62)
* Fix for retaining host display name and alias, as well as service display name (Folkert van Heusden* Link to allow scheduling downtime for all services on a host (Hendrik Baecker)
* Speedup to CGIs when lots of comments or dotimes in status.dat file (Jonathan Kamens)
* Patch for new_mini_epn to allow for any command line length without breaking extra trailing or leading whitespace (Ray Bengen)
* Fix for incorrect scheduling when time has gone back an hour (partial fix for 24x7)
* Fix for compile on Fedora Core 3 (bug #0000082)
* Fix for compile on Solaris
* Fix for logging test, which was not timezone aware (bug #0000077 - Allan Clark)
* Trivial cleanups for autoconf (Allan Clark)
* Fix for CSS validation of padding: X
* Fix for documentation re: case-insensitive nature of custom variables (Marc Powell)
* Fix for template configurations which use negated wildcards (Tim Wilde)
* Fix for read-only permissions bug in CGIs that caused problems viewing comments (bug #0000029)
* Fix for incorrect CGI reports (availability, trends, etc.) when reporting period spans Daylight Savings Time (bug #0000046)
* Fix for detection of truecolor support in GD library (Lars Hecking)
* Reverted to use --datadir configure script option instead of the more recently introduced --datarootdir option
* Status and retention files are now flushed/synced to disk to prevent incomplete information being displayed in CGIs
* Fix for incorrect next service check time calculation when Nagios is reloaded with different timeperiod ranges
* Updated Fedora quistart guide to indicate PHP requirements
* Known issue: Service checks that are defined with timeperiods that contain "exclude" directives are incorrectly re-scheduled.  Don't use these for now - we'll get this
 fixed for 3.4


(morr)
diff -r1.30 -r1.31 pkgsrc/net/nagios-base/Makefile
diff -r1.10 -r1.11 pkgsrc/net/nagios-base/Makefile.common
diff -r1.8 -r1.9 pkgsrc/net/nagios-base/PLIST
diff -r1.11 -r1.12 pkgsrc/net/nagios-base/distinfo
diff -r1.7 -r1.8 pkgsrc/net/nagios-base/patches/patch-aa
diff -r1.5 -r1.6 pkgsrc/net/nagios-base/patches/patch-ab
diff -r1.6 -r1.7 pkgsrc/net/nagios-base/patches/patch-ac
diff -r1.6 -r1.7 pkgsrc/net/nagios-base/patches/patch-ad
diff -r1.6 -r1.7 pkgsrc/net/nagios-base/patches/patch-ag
diff -r1.3 -r1.4 pkgsrc/net/nagios-base/patches/patch-ae
diff -r1.3 -r1.4 pkgsrc/net/nagios-base/patches/patch-af
diff -r1.3 -r1.4 pkgsrc/net/nagios-base/patches/patch-ai
diff -r1.1 -r1.2 pkgsrc/net/nagios-base/patches/patch-ah
cvs diff -r1.30 -r1.31 pkgsrc/net/nagios-base/Makefile (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/Makefile 2011/01/13 13:39:06 1.30
+++ pkgsrc/net/nagios-base/Makefile 2011/04/08 22:37:24 1.31
@@ -1,52 +1,49 @@ @@ -1,52 +1,49 @@
1# $NetBSD: Makefile,v 1.30 2011/01/13 13:39:06 wiz Exp $ 1# $NetBSD: Makefile,v 1.31 2011/04/08 22:37:24 morr Exp $
2# 2#
3 3
4DISTNAME= nagios-3.1.2 4DISTNAME= nagios-3.2.3
5PKGNAME= ${DISTNAME:S/-/-base-/} 5PKGNAME= ${DISTNAME:S/-/-base-/}
6PKGREVISION= 4 
7CATEGORIES= net sysutils 6CATEGORIES= net sysutils
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.nagios.org/ 10HOMEPAGE= http://www.nagios.org/
12COMMENT= Network monitor 11COMMENT= Network monitor
 12LICENSE= gnu-gpl-v2
 13
 14PKG_DESTDIR_SUPPORT= user-destdir
13 15
14.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
15.include "../../net/nagios-base/Makefile.common" 17.include "../../net/nagios-base/Makefile.common"
16.include "options.mk" 18.include "options.mk"
17 19
18CONFIGURE_ARGS+= --with-gd-lib=${PREFIX}/lib 20CONFIGURE_ARGS+= --with-gd-lib=${PREFIX}/lib
19CONFIGURE_ARGS+= --with-gd-inc=${PREFIX}/include 21CONFIGURE_ARGS+= --with-gd-inc=${PREFIX}/include
20CONFIGURE_ARGS+= --enable-embedded-perl 22CONFIGURE_ARGS+= --enable-embedded-perl
21CONFIGURE_ARGS+= --with-perlcache 23CONFIGURE_ARGS+= --with-perlcache
22 24
23CONFIGURE_ARGS+= --with-nagios-user=${NAGIOS_USER} 25CONFIGURE_ARGS+= --with-nagios-user=${NAGIOS_USER}
24CONFIGURE_ARGS+= --with-nagios-group=${NAGIOS_GROUP} 26CONFIGURE_ARGS+= --with-nagios-group=${NAGIOS_GROUP}
25CONFIGURE_ARGS+= --with-command-user=${NAGIOS_USER} 27CONFIGURE_ARGS+= --with-command-user=${NAGIOS_USER}
26CONFIGURE_ARGS+= --with-command-group=${NAGIOSCMD_GROUP} 28CONFIGURE_ARGS+= --with-command-group=${NAGIOSCMD_GROUP}
27CONFIGURE_ARGS+= --with-init-dir=${PREFIX}/share/examples/rc.d 29CONFIGURE_ARGS+= --with-init-dir=${PREFIX}/share/examples/rc.d
28CONFIGURE_ARGS+= --with-lockfile=/var/run/nagios.lock 30CONFIGURE_ARGS+= --with-lockfile=/var/run/nagios/nagios.lock
29 31
30USE_TOOLS+= mail:run perl 32USE_TOOLS+= mail:run perl
31CONFIGURE_ARGS+= --with-mail=${TOOLS_PLATFORM.mail:Q} 33CONFIGURE_ARGS+= --with-mail=${TOOLS_PLATFORM.mail:Q}
32 34
33RCD_SCRIPTS+= nagios 35RCD_SCRIPTS+= nagios
34FILES_SUBST+= NAGIOS_USER=${NAGIOS_USER} 36FILES_SUBST+= NAGIOS_USER=${NAGIOS_USER}
35# XXX Merge this into the package proper. 
36# Nagios drops permissions before creating the log file, so the 
37# default location doesn't work. In the config file, change 
38# lock_file=/var/run/nagios.lock to 
39# lock_file=/var/run/nagios/nagios.lock 
40 37
41INSTALL_TARGET= install install-config 38INSTALL_TARGET= install install-config
42 39
43BUILD_DEFS+= VARBASE NAGIOS_USER NAGIOS_GROUP NAGIOSCMD_GROUP 40BUILD_DEFS+= VARBASE NAGIOS_USER NAGIOS_GROUP NAGIOSCMD_GROUP
44BUILD_DEFS+= NAGIOSDIR 41BUILD_DEFS+= NAGIOSDIR
45 42
46PKG_GROUPS+= ${NAGIOS_GROUP} 43PKG_GROUPS+= ${NAGIOS_GROUP}
47PKG_GROUPS+= ${NAGIOSCMD_GROUP} 44PKG_GROUPS+= ${NAGIOSCMD_GROUP}
48 45
49PKG_USERS+= ${NAGIOS_USER}:${NAGIOS_GROUP} 46PKG_USERS+= ${NAGIOS_USER}:${NAGIOS_GROUP}
50 47
51PKG_GECOS.${NAGIOS_USER}= Nagios Runtime User 48PKG_GECOS.${NAGIOS_USER}= Nagios Runtime User
52 49
@@ -60,31 +57,32 @@ EGFILES+= objects/contacts.cfg objects/ @@ -60,31 +57,32 @@ EGFILES+= objects/contacts.cfg objects/
60EGFILES+= objects/localhost.cfg objects/windows.cfg 57EGFILES+= objects/localhost.cfg objects/windows.cfg
61EGFILES+= objects/printer.cfg objects/switch.cfg 58EGFILES+= objects/printer.cfg objects/switch.cfg
62 59
63INSTALLATION_DIRS+= ${PKG_SYSCONFDIR}/objects 60INSTALLATION_DIRS+= ${PKG_SYSCONFDIR}/objects
64 61
65.for files in ${EGFILES} 62.for files in ${EGFILES}
66CONF_FILES+= ${EGDIR}/${files}-sample ${PKG_SYSCONFDIR}/${files} 63CONF_FILES+= ${EGDIR}/${files}-sample ${PKG_SYSCONFDIR}/${files}
67.endfor 64.endfor
68CONF_FILES+= ${EGDIR}/nagios.conf ${PKG_SYSCONFDIR}/nagios.conf 65CONF_FILES+= ${EGDIR}/nagios.conf ${PKG_SYSCONFDIR}/nagios.conf
69 66
70OWN_DIRS_PERMS+=${NAGIOSDIR} ${NAGIOS_USER} ${NAGIOS_GROUP} 0775 67OWN_DIRS_PERMS+=${NAGIOSDIR} ${NAGIOS_USER} ${NAGIOS_GROUP} 0775
71OWN_DIRS_PERMS+=${NAGIOSDIR}/archives ${NAGIOS_USER} ${NAGIOS_GROUP} 0775 68OWN_DIRS_PERMS+=${NAGIOSDIR}/archives ${NAGIOS_USER} ${NAGIOS_GROUP} 0775
72OWN_DIRS_PERMS+=${NAGIOSDIR}/rw ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775 69OWN_DIRS_PERMS+=${NAGIOSDIR}/rw ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775
 70OWN_DIRS_PERMS+=${NAGIOSDIR}/checkresults ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775
73 71
74SUBST_CLASSES+= files 72SUBST_CLASSES+= files
75SUBST_STAGE.files= post-build 73SUBST_STAGE.files= post-build
76SUBST_FILES.files= nagios.conf.dist 74SUBST_FILES.files= nagios.conf.dist
77SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" 75SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g"
78SUBST_MESSAGE.files= Fixing configuration files. 76SUBST_MESSAGE.files= Fixing configuration files.
79 77
80pre-build: 78pre-build:
81 ${CP} ${FILESDIR}/nagios.conf.dist ${WRKSRC}/nagios.conf.dist 79 ${CP} ${FILESDIR}/nagios.conf.dist ${WRKSRC}/nagios.conf.dist
82 80
83post-install: 81post-install:
84 ${INSTALL_DATA} ${WRKSRC}/nagios.conf.dist ${EGDIR}/nagios.conf 82 ${INSTALL_DATA} ${WRKSRC}/nagios.conf.dist ${DESTDIR}/${EGDIR}/nagios.conf
85 83
86.include "../../graphics/gd/buildlink3.mk" 84.include "../../graphics/gd/buildlink3.mk"
87.include "../../lang/php/phpversion.mk" 85.include "../../lang/php/phpversion.mk"
88.include "${PHPPKGSRCDIR}/buildlink3.mk" 86.include "${PHPPKGSRCDIR}/buildlink3.mk"
89.include "../../lang/perl5/buildlink3.mk" 87.include "../../lang/perl5/buildlink3.mk"
90.include "../../mk/bsd.pkg.mk" 88.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/net/nagios-base/Makefile.common (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/Makefile.common 2010/04/07 17:57:41 1.10
+++ pkgsrc/net/nagios-base/Makefile.common 2011/04/08 22:37:24 1.11
@@ -1,16 +1,19 @@ @@ -1,16 +1,19 @@
1# $NetBSD: Makefile.common,v 1.10 2010/04/07 17:57:41 joerg Exp $ 1# $NetBSD: Makefile.common,v 1.11 2011/04/08 22:37:24 morr Exp $
2# 2#
3# used by net/nagios-base/Makefile 3# used by net/nagios-base/Makefile
 4# used by net/nagios-nsca/Makefile
 5# used by net/nagios-plugins/Makefile.common
 6# used by net/nagios-plugin-ldap/Makefile
4 7
5.include "../../mk/bsd.prefs.mk" 8.include "../../mk/bsd.prefs.mk"
6 9
7PKG_GROUPS_VARS+= NAGIOS_GROUP NAGIOSCMD_GROUP 10PKG_GROUPS_VARS+= NAGIOS_GROUP NAGIOSCMD_GROUP
8PKG_USERS_VARS+= NAGIOS_USER 11PKG_USERS_VARS+= NAGIOS_USER
9 12
10GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
11USE_TOOLS+= gmake 14USE_TOOLS+= gmake
12 15
13PKG_SYSCONFSUBDIR= nagios 16PKG_SYSCONFSUBDIR= nagios
14 17
15PERL5_REQD= 5.6 18PERL5_REQD= 5.6
16 19
cvs diff -r1.8 -r1.9 pkgsrc/net/nagios-base/PLIST (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/PLIST 2009/12/15 18:56:01 1.8
+++ pkgsrc/net/nagios-base/PLIST 2011/04/08 22:37:24 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.8 2009/12/15 18:56:01 bouyer Exp $ 1@comment $NetBSD: PLIST,v 1.9 2011/04/08 22:37:24 morr Exp $
2bin/nagios 2bin/nagios
3bin/nagiostats 3bin/nagiostats
4bin/p1.pl 4bin/p1.pl
5libexec/nagios/cgi-bin/avail.cgi 5libexec/nagios/cgi-bin/avail.cgi
6libexec/nagios/cgi-bin/cmd.cgi 6libexec/nagios/cgi-bin/cmd.cgi
7libexec/nagios/cgi-bin/config.cgi 7libexec/nagios/cgi-bin/config.cgi
8libexec/nagios/cgi-bin/extinfo.cgi 8libexec/nagios/cgi-bin/extinfo.cgi
9libexec/nagios/cgi-bin/histogram.cgi 9libexec/nagios/cgi-bin/histogram.cgi
10libexec/nagios/cgi-bin/history.cgi 10libexec/nagios/cgi-bin/history.cgi
11libexec/nagios/cgi-bin/notifications.cgi 11libexec/nagios/cgi-bin/notifications.cgi
12libexec/nagios/cgi-bin/outages.cgi 12libexec/nagios/cgi-bin/outages.cgi
13libexec/nagios/cgi-bin/showlog.cgi 13libexec/nagios/cgi-bin/showlog.cgi
14libexec/nagios/cgi-bin/status.cgi 14libexec/nagios/cgi-bin/status.cgi
@@ -225,26 +225,27 @@ share/nagios/docs/images/seealso.gif @@ -225,26 +225,27 @@ share/nagios/docs/images/seealso.gif
225share/nagios/docs/images/service-dependencies.png 225share/nagios/docs/images/service-dependencies.png
226share/nagios/docs/images/statetransitions.png 226share/nagios/docs/images/statetransitions.png
227share/nagios/docs/images/statetransitions2.png 227share/nagios/docs/images/statetransitions2.png
228share/nagios/docs/images/stoprestart.png 228share/nagios/docs/images/stoprestart.png
229share/nagios/docs/images/switch.png 229share/nagios/docs/images/switch.png
230share/nagios/docs/images/tcpwrappers.png 230share/nagios/docs/images/tcpwrappers.png
231share/nagios/docs/images/tip.gif 231share/nagios/docs/images/tip.gif
232share/nagios/docs/images/tuning.png 232share/nagios/docs/images/tuning.png
233share/nagios/docs/images/upto.gif 233share/nagios/docs/images/upto.gif
234share/nagios/docs/index.html 234share/nagios/docs/index.html
235share/nagios/docs/int-snmptrap.html 235share/nagios/docs/int-snmptrap.html
236share/nagios/docs/int-tcpwrappers.html 236share/nagios/docs/int-tcpwrappers.html
237share/nagios/docs/integration.html 237share/nagios/docs/integration.html
 238share/nagios/docs/knownissues.html
238share/nagios/docs/largeinstalltweaks.html 239share/nagios/docs/largeinstalltweaks.html
239share/nagios/docs/macrolist.html 240share/nagios/docs/macrolist.html
240share/nagios/docs/macros.html 241share/nagios/docs/macros.html
241share/nagios/docs/monitoring-linux.html 242share/nagios/docs/monitoring-linux.html
242share/nagios/docs/monitoring-netware.html 243share/nagios/docs/monitoring-netware.html
243share/nagios/docs/monitoring-printers.html 244share/nagios/docs/monitoring-printers.html
244share/nagios/docs/monitoring-publicservices.html 245share/nagios/docs/monitoring-publicservices.html
245share/nagios/docs/monitoring-routers.html 246share/nagios/docs/monitoring-routers.html
246share/nagios/docs/monitoring-windows.html 247share/nagios/docs/monitoring-windows.html
247share/nagios/docs/mrtggraphs.html 248share/nagios/docs/mrtggraphs.html
248share/nagios/docs/nagiostats.html 249share/nagios/docs/nagiostats.html
249share/nagios/docs/networkreachability.html 250share/nagios/docs/networkreachability.html
250share/nagios/docs/notifications.html 251share/nagios/docs/notifications.html
@@ -311,26 +312,27 @@ share/nagios/images/logrotate.png @@ -311,26 +312,27 @@ share/nagios/images/logrotate.png
311share/nagios/images/ndisabled.gif 312share/nagios/images/ndisabled.gif
312share/nagios/images/noack.gif 313share/nagios/images/noack.gif
313share/nagios/images/notes.gif 314share/nagios/images/notes.gif
314share/nagios/images/notify.gif 315share/nagios/images/notify.gif
315share/nagios/images/orangedot.gif 316share/nagios/images/orangedot.gif
316share/nagios/images/passiveonly.gif 317share/nagios/images/passiveonly.gif
317share/nagios/images/recovery.png 318share/nagios/images/recovery.png
318share/nagios/images/redudancy.png 319share/nagios/images/redudancy.png
319share/nagios/images/redundancy.png 320share/nagios/images/redundancy.png
320share/nagios/images/restart.gif 321share/nagios/images/restart.gif
321share/nagios/images/right.gif 322share/nagios/images/right.gif
322share/nagios/images/sblogo.png 323share/nagios/images/sblogo.png
323share/nagios/images/serviceevent.gif 324share/nagios/images/serviceevent.gif
 325share/nagios/images/sflogo.png
324share/nagios/images/splunk1.gif 326share/nagios/images/splunk1.gif
325share/nagios/images/splunk2.gif 327share/nagios/images/splunk2.gif
326share/nagios/images/start.gif 328share/nagios/images/start.gif
327share/nagios/images/status.gif 329share/nagios/images/status.gif
328share/nagios/images/status2.gif 330share/nagios/images/status2.gif
329share/nagios/images/status3.gif 331share/nagios/images/status3.gif
330share/nagios/images/status4.gif 332share/nagios/images/status4.gif
331share/nagios/images/stop.gif 333share/nagios/images/stop.gif
332share/nagios/images/tacdisabled.jpg 334share/nagios/images/tacdisabled.jpg
333share/nagios/images/tacdisabled.png 335share/nagios/images/tacdisabled.png
334share/nagios/images/tacenabled.jpg 336share/nagios/images/tacenabled.jpg
335share/nagios/images/tacenabled.png 337share/nagios/images/tacenabled.png
336share/nagios/images/thermcrit.png 338share/nagios/images/thermcrit.png
@@ -358,13 +360,14 @@ share/nagios/stylesheets/config.css @@ -358,13 +360,14 @@ share/nagios/stylesheets/config.css
358share/nagios/stylesheets/extinfo.css 360share/nagios/stylesheets/extinfo.css
359share/nagios/stylesheets/histogram.css 361share/nagios/stylesheets/histogram.css
360share/nagios/stylesheets/history.css 362share/nagios/stylesheets/history.css
361share/nagios/stylesheets/ministatus.css 363share/nagios/stylesheets/ministatus.css
362share/nagios/stylesheets/notifications.css 364share/nagios/stylesheets/notifications.css
363share/nagios/stylesheets/outages.css 365share/nagios/stylesheets/outages.css
364share/nagios/stylesheets/showlog.css 366share/nagios/stylesheets/showlog.css
365share/nagios/stylesheets/status.css 367share/nagios/stylesheets/status.css
366share/nagios/stylesheets/statusmap.css 368share/nagios/stylesheets/statusmap.css
367share/nagios/stylesheets/summary.css 369share/nagios/stylesheets/summary.css
368share/nagios/stylesheets/tac.css 370share/nagios/stylesheets/tac.css
369share/nagios/stylesheets/trends.css 371share/nagios/stylesheets/trends.css
370@pkgdir share/nagios/ssi 372@pkgdir share/nagios/ssi
 373@pkgdir etc/nagios/objects
cvs diff -r1.11 -r1.12 pkgsrc/net/nagios-base/distinfo (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/distinfo 2009/12/15 18:56:01 1.11
+++ pkgsrc/net/nagios-base/distinfo 2011/04/08 22:37:24 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.11 2009/12/15 18:56:01 bouyer Exp $ 1$NetBSD: distinfo,v 1.12 2011/04/08 22:37:24 morr Exp $
2 2
3SHA1 (nagios-3.1.2.tar.gz) = 91d6e0dc19b4f09d1c0c7d4220bc69df8af07b1b 3SHA1 (nagios-3.2.3.tar.gz) = fcb2c016c1b803bac71442d0ee8375b737906421
4RMD160 (nagios-3.1.2.tar.gz) = cb633f316cc6108a9b4fe387b3e8097a2e8546a9 4RMD160 (nagios-3.2.3.tar.gz) = 3c09034069416c5f4dd5071e34516b1154c276b2
5Size (nagios-3.1.2.tar.gz) = 3172982 bytes 5Size (nagios-3.2.3.tar.gz) = 3249447 bytes
6SHA1 (patch-aa) = 1079c24f0d42b69522ca04ab91e77cf53065e63d 6SHA1 (patch-aa) = d56ae45ad54b43fe28e1d83fe916f04e8f8741a7
7SHA1 (patch-ab) = 0f5b7ab0d13be9eca22ffed921ee8e22e3f8fa1b 7SHA1 (patch-ab) = 37beee7195879806a2cd44cde2f376e07fc13470
8SHA1 (patch-ac) = ac60819f5c4f9b385637a6c8d0b5dd62622c2622 8SHA1 (patch-ac) = cb2c6a28fc4d46eb41c942998251171ddd946bf2
9SHA1 (patch-ad) = 72565abe365a4488d519169822bfcad7a6cc2eba 9SHA1 (patch-ad) = 22d2a083f485e0da323403a2e27d6ee83e8cea27
10SHA1 (patch-ae) = e1f80e7b0496d19545321f9d05306cfcd0f9af31 10SHA1 (patch-ae) = 35418dbe26f2e7c14d6a98951e62247344ae80b0
11SHA1 (patch-af) = 8041ca50021a41bdd7897363f6ea68afdddaab28 11SHA1 (patch-af) = a91ab37f16e8adda3146a2dde7273ebf841ef9af
12SHA1 (patch-ag) = 9904acb53998a9efeecf37efe722e61a3edf2053 12SHA1 (patch-ag) = ae2811e97fc91e937ef240fc671c069181c97861
13SHA1 (patch-ah) = 88122296f9d74648c3dadbd7f6e12e7ef1f32081 13SHA1 (patch-ah) = 3e73f1256f2364855598a94092744968b88c78e6
14SHA1 (patch-ai) = 738039e46af95a035bf0220eaa5c621938b651fd 14SHA1 (patch-ai) = 9212106c141be6faaf65e4e4909fcf92907c0e58
cvs diff -r1.7 -r1.8 pkgsrc/net/nagios-base/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/patches/Attic/patch-aa 2009/12/15 18:56:02 1.7
+++ pkgsrc/net/nagios-base/patches/Attic/patch-aa 2011/04/08 22:37:25 1.8
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1$NetBSD: patch-aa,v 1.7 2009/12/15 18:56:02 bouyer Exp $ 1$NetBSD: patch-aa,v 1.8 2011/04/08 22:37:25 morr Exp $
2 2
3--- Makefile.in.orig 2009-06-17 05:57:21.000000000 +0200 3--- Makefile.in.orig 2009-12-31 10:12:08.000000000 +0000
4+++ Makefile.in 2009-12-15 16:53:59.000000000 +0100 4+++ Makefile.in
5@@ -24,17 +24,16 @@ 5@@ -24,17 +24,16 @@ prefix=@prefix@
6 exec_prefix=@exec_prefix@ 6 exec_prefix=@exec_prefix@
7 LOGDIR=@localstatedir@ 7 LOGDIR=@localstatedir@
8 CHECKRESULTDIR=@CHECKRESULTDIR@ 8 CHECKRESULTDIR=@CHECKRESULTDIR@
9-CFGDIR=@sysconfdir@ 9-CFGDIR=@sysconfdir@
10+SAMPDIR=@prefix@/share/examples/nagios 10+SAMPDIR=@prefix@/share/examples/nagios
11 BINDIR=@bindir@ 11 BINDIR=@bindir@
12-CGIDIR=@sbindir@ 12-CGIDIR=@sbindir@
13+CGIDIR=@libexecdir@ 13+CGIDIR=@libexecdir@
14 LIBEXECDIR=@libexecdir@ 14 LIBEXECDIR=@libexecdir@
15 HTMLDIR=@datarootdir@ 15 HTMLDIR=@datarootdir@
16 INSTALL=@INSTALL@ 16 INSTALL=@INSTALL@
17 INSTALL_OPTS=@INSTALL_OPTS@ 17 INSTALL_OPTS=@INSTALL_OPTS@
18 COMMAND_OPTS=@COMMAND_OPTS@ 18 COMMAND_OPTS=@COMMAND_OPTS@
19-HTTPD_CONF=@HTTPD_CONF@ 19-HTTPD_CONF=@HTTPD_CONF@
20 INIT_DIR=@init_dir@ 20 INIT_DIR=@init_dir@
21-INIT_OPTS=-o root -g root 21-INIT_OPTS=-o root -g root
22+INIT_OPTS=-o root -g wheel 22+INIT_OPTS=-o root -g wheel
23 CGICFGDIR=$(CGIDIR) 23 CGICFGDIR=$(CGIDIR)
24 PERLDIR=@PERLDIR@ 24 PERLDIR=@PERLDIR@
25  25
26@@ -64,66 +63,6 @@ 26@@ -64,66 +63,6 @@ all:
27 cd $(SRC_BASE) && $(MAKE) 27 cd $(SRC_BASE) && $(MAKE)
28 cd $(SRC_CGI) && $(MAKE) 28 cd $(SRC_CGI) && $(MAKE)
29 cd $(SRC_HTM) && $(MAKE) 29 cd $(SRC_HTM) && $(MAKE)
30- if [ x$(USE_EVENTBROKER) = xyes ]; then \ 30- if [ x$(USE_EVENTBROKER) = xyes ]; then \
31- cd $(SRC_MODULE) && $(MAKE); \ 31- cd $(SRC_MODULE) && $(MAKE); \
32- fi 32- fi
33- 33-
34- @echo "" 34- @echo ""
35- @echo "*** Compile finished ***" 35- @echo "*** Compile finished ***"
36- @echo "" 36- @echo ""
37- @echo "If the main program and CGIs compiled without any errors, you" 37- @echo "If the main program and CGIs compiled without any errors, you"
38- @echo "can continue with installing Nagios as follows (type 'make'" 38- @echo "can continue with installing Nagios as follows (type 'make'"
39- @echo "without any arguments for a list of all possible options):" 39- @echo "without any arguments for a list of all possible options):"
@@ -80,77 +80,77 @@ $NetBSD: patch-aa,v 1.7 2009/12/15 18:56 @@ -80,77 +80,77 @@ $NetBSD: patch-aa,v 1.7 2009/12/15 18:56
80- @echo " - Relevant error messages from the Nagios log file" 80- @echo " - Relevant error messages from the Nagios log file"
81- @echo "" 81- @echo ""
82- @echo "For more information on obtaining support for Nagios, visit:" 82- @echo "For more information on obtaining support for Nagios, visit:"
83- @echo "" 83- @echo ""
84- @echo " http://www.nagios.org/support/" 84- @echo " http://www.nagios.org/support/"
85- @echo "" 85- @echo ""
86- @echo "*************************************************************" 86- @echo "*************************************************************"
87- @echo "" 87- @echo ""
88- @echo "Enjoy." 88- @echo "Enjoy."
89- @echo "" 89- @echo ""
90  90
91 nagios: 91 nagios:
92 cd $(SRC_BASE) && $(MAKE) 92 cd $(SRC_BASE) && $(MAKE)
93@@ -214,14 +153,10 @@ 93@@ -214,14 +153,10 @@ install-unstripped:
94 $(MAKE) install-basic 94 $(MAKE) install-basic
95  95
96 install-basic: 96 install-basic:
97- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) 97- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
98- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) 98- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
99- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives 99- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
100- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) 100- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
101 if [ $(INSTALLPERLSTUFF) = yes ]; then \ 101 if [ $(INSTALLPERLSTUFF) = yes ]; then \
102- $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \ 102- $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
103+ $(BSD_INSTALL_SCRIPT) p1.pl $(DESTDIR)$(BINDIR); \ 103+ $(BSD_INSTALL_SCRIPT) p1.pl $(DESTDIR)$(BINDIR); \
104 fi; 104 fi;
105- 105-
106+  106+
107 @echo "" 107 @echo ""
108 @echo "*** Main program, CGIs and HTML files installed ***" 108 @echo "*** Main program, CGIs and HTML files installed ***"
109 @echo "" 109 @echo ""
110@@ -241,20 +176,20 @@ 110@@ -241,20 +176,20 @@ install-basic:
111  111
112  112
113 install-config: 113 install-config:
114- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) 114- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
115- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects 115- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
116- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg 116- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg
117- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg 117- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
118- $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg 118- $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
119- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg 119- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
120- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg 120- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
121- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg 121- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
122- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg 122- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
123- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg 123- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
124- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg 124- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
125- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg 125- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg
126- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg 126- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
127- 127-
128+ [ -d $(DESTDIR)$(SAMPDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR) 128+ [ -d $(DESTDIR)$(SAMPDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)
129+ [ -d $(DESTDIR)$(SAMPDIR)/objects ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)/objects 129+ [ -d $(DESTDIR)$(SAMPDIR)/objects ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)/objects
130+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(SAMPDIR)/nagios.cfg-sample 130+ ${BSD_INSTALL_DATA} -m 644 sample-config/nagios.cfg $(DESTDIR)$(SAMPDIR)/nagios.cfg-sample
131+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(SAMPDIR)/cgi.cfg-sample 131+ ${BSD_INSTALL_DATA} -m 644 sample-config/cgi.cfg $(DESTDIR)$(SAMPDIR)/cgi.cfg-sample
132+ $(INSTALL) -m 640 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(SAMPDIR)/resource.cfg-sample 132+ ${BSD_INSTALL_DATA} -m 640 sample-config/resource.cfg $(DESTDIR)$(SAMPDIR)/resource.cfg-sample
133+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(SAMPDIR)/objects/templates.cfg-sample 133+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/templates.cfg $(DESTDIR)$(SAMPDIR)/objects/templates.cfg-sample
134+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(SAMPDIR)/objects/commands.cfg-sample 134+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/commands.cfg $(DESTDIR)$(SAMPDIR)/objects/commands.cfg-sample
135+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(SAMPDIR)/objects/contacts.cfg-sample 135+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/contacts.cfg $(DESTDIR)$(SAMPDIR)/objects/contacts.cfg-sample
136+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(SAMPDIR)/objects/timeperiods.cfg-sample 136+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/timeperiods.cfg $(DESTDIR)$(SAMPDIR)/objects/timeperiods.cfg-sample
137+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(SAMPDIR)/objects/localhost.cfg-sample 137+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/localhost.cfg $(DESTDIR)$(SAMPDIR)/objects/localhost.cfg-sample
138+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(SAMPDIR)/objects/windows.cfg-sample 138+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/windows.cfg $(DESTDIR)$(SAMPDIR)/objects/windows.cfg-sample
139+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(SAMPDIR)/objects/printer.cfg-sample 139+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/printer.cfg $(DESTDIR)$(SAMPDIR)/objects/printer.cfg-sample
140+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(SAMPDIR)/objects/switch.cfg-sample 140+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/switch.cfg $(DESTDIR)$(SAMPDIR)/objects/switch.cfg-sample
141+  141+
142 @echo "" 142 @echo ""
143 @echo "*** Config files installed ***" 143 @echo "*** Config files installed ***"
144 @echo "" 144 @echo ""
145@@ -282,7 +217,10 @@ 145@@ -282,7 +217,10 @@ install-daemoninit:
146  146
147  147
148 install-commandmode: 148 install-commandmode:
149- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw 149- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
150+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/archives 150+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/archives
151+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/rw 151+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/rw
152+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CHECKRESULTDIR) 152+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CHECKRESULTDIR)
153+ chmod g+s $(DESTDIR)$(LOGDIR)/archives 153+ chmod g+s $(DESTDIR)$(LOGDIR)/archives
154 chmod g+s $(DESTDIR)$(LOGDIR)/rw 154 chmod g+s $(DESTDIR)$(LOGDIR)/rw
155  155
156 @echo "" 156 @echo ""
cvs diff -r1.5 -r1.6 pkgsrc/net/nagios-base/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/patches/Attic/patch-ab 2009/12/15 18:56:02 1.5
+++ pkgsrc/net/nagios-base/patches/Attic/patch-ab 2011/04/08 22:37:25 1.6
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-ab,v 1.5 2009/12/15 18:56:02 bouyer Exp $ 1$NetBSD: patch-ab,v 1.6 2011/04/08 22:37:25 morr Exp $
2 2
3--- cgi/Makefile.in.orig 2009-06-17 05:57:21.000000000 +0200 3--- cgi/Makefile.in.orig 2010-08-28 13:01:25.000000000 +0000
4+++ cgi/Makefile.in 2009-12-15 16:54:45.000000000 +0100 4+++ cgi/Makefile.in
5@@ -15,7 +15,7 @@ 5@@ -15,7 +15,7 @@ exec_prefix=@exec_prefix@
6 LOGDIR=@localstatedir@ 6 LOGDIR=@localstatedir@
7 CFGDIR=@sysconfdir@ 7 CFGDIR=@sysconfdir@
8 BINDIR=@bindir@ 8 BINDIR=@bindir@
9-CGIDIR=@sbindir@ 9-CGIDIR=@sbindir@
10+CGIDIR=@libexecdir@/cgi-bin 10+CGIDIR=@libexecdir@/cgi-bin
11 HTMLDIR=@datarootdir@ 11 HTMLDIR=@datarootdir@
12 INSTALL=@INSTALL@ 12 INSTALL=@INSTALL@
13 INSTALL_OPTS=@INSTALL_OPTS@ 13 INSTALL_OPTS=@INSTALL_OPTS@
14@@ -196,9 +196,9 @@ 14@@ -199,9 +199,9 @@ install-unstripped:
15 $(MAKE) install-basic 15 $(MAKE) install-basic
16  16
17 install-basic: 17 install-basic:
18- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) 18- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
19+ [ -d $(DESTDIR)$(CGIDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CGIDIR) 19+ [ -d $(DESTDIR)$(CGIDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CGIDIR)
20 for file in *.cgi; do \ 20 for file in *.cgi; do \
21- $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \ 21- $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
22+ $(BSD_INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIDIR); \ 22+ $(BSD_INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIDIR); \
23 done 23 done
24  24
25 strip-post-install: 25 strip-post-install:
cvs diff -r1.6 -r1.7 pkgsrc/net/nagios-base/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/patches/Attic/patch-ac 2009/12/15 18:56:02 1.6
+++ pkgsrc/net/nagios-base/patches/Attic/patch-ac 2011/04/08 22:37:25 1.7
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1$NetBSD: patch-ac,v 1.6 2009/12/15 18:56:02 bouyer Exp $ 1$NetBSD: patch-ac,v 1.7 2011/04/08 22:37:25 morr Exp $
2 2
3--- base/Makefile.in.orig 2009-06-17 05:57:21.000000000 +0200 3--- base/Makefile.in.orig 2009-06-17 03:57:21.000000000 +0000
4+++ base/Makefile.in 2009-12-15 16:55:30.000000000 +0100 4+++ base/Makefile.in
5@@ -36,7 +36,7 @@ 5@@ -36,7 +36,7 @@ exec_prefix=@exec_prefix@
6 LOGDIR=@localstatedir@ 6 LOGDIR=@localstatedir@
7 CFGDIR=@sysconfdir@ 7 CFGDIR=@sysconfdir@
8 BINDIR=@bindir@ 8 BINDIR=@bindir@
9-CGIDIR=@sbindir@ 9-CGIDIR=@sbindir@
10+CGIDIR=@libexecdir@ 10+CGIDIR=@libexecdir@
11 HTMLDIR=@datarootdir@ 11 HTMLDIR=@datarootdir@
12 INSTALL=@INSTALL@ 12 INSTALL=@INSTALL@
13 INSTALL_OPTS=@INSTALL_OPTS@ 13 INSTALL_OPTS=@INSTALL_OPTS@
14@@ -202,9 +202,8 @@ 14@@ -202,9 +202,9 @@ install-unstripped:
15 $(MAKE) install-basic 15 $(MAKE) install-basic
16  16
17 install-basic: 17 install-basic:
18- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) 18- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
19- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR) 19- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
20- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) 20- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
 21+ ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(BINDIR)
21+ ${BSD_INSTALL_PROGRAM} @nagios_name@ $(DESTDIR)$(BINDIR) 22+ ${BSD_INSTALL_PROGRAM} @nagios_name@ $(DESTDIR)$(BINDIR)
22+ $(INSTALL) -m 550 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) 23+ ${BSD_INSTALL_PROGRAM} -m 550 @nagiostats_name@ $(DESTDIR)$(BINDIR)
23  24
24 strip-post-install: 25 strip-post-install:
25 $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@ 26 $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
cvs diff -r1.6 -r1.7 pkgsrc/net/nagios-base/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/patches/Attic/patch-ad 2009/12/15 18:56:02 1.6
+++ pkgsrc/net/nagios-base/patches/Attic/patch-ad 2011/04/08 22:37:25 1.7
@@ -1,27 +1,29 @@ @@ -1,27 +1,29 @@
1$NetBSD: patch-ad,v 1.6 2009/12/15 18:56:02 bouyer Exp $ 1$NetBSD: patch-ad,v 1.7 2011/04/08 22:37:25 morr Exp $
2 2
3--- html/Makefile.in.orig 2009-06-17 05:57:21.000000000 +0200 3--- html/Makefile.in.orig 2009-07-07 22:34:51.000000000 +0000
4+++ html/Makefile.in 2009-12-15 17:01:07.000000000 +0100 4+++ html/Makefile.in
5@@ -7,7 +7,7 @@ 5@@ -7,8 +7,8 @@ exec_prefix=@exec_prefix@
6 LOGDIR=@localstatedir@ 6 LOGDIR=@localstatedir@
7 CFGDIR=@sysconfdir@ 7 CFGDIR=@sysconfdir@
8 BINDIR=@bindir@ 8 BINDIR=@bindir@
9-CGIDIR=@sbindir@ 9-CGIDIR=@sbindir@
 10-HTMLDIR=@datadir@
10+CGIDIR=@libexecdir@ 11+CGIDIR=@libexecdir@
11 HTMLDIR=@datarootdir@ 12+HTMLDIR=@datarootdir@
12 INSTALL=@INSTALL@ 13 INSTALL=@INSTALL@
13 INSTALL_OPTS=@INSTALL_OPTS@ 14 INSTALL_OPTS=@INSTALL_OPTS@
14@@ -33,46 +33,45 @@ 15 COMMAND_OPTS=@COMMAND_OPTS@
 16@@ -33,46 +33,45 @@ distclean: clean
15 devclean: distclean 17 devclean: distclean
16  18
17 install: 19 install:
18- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) 20- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
19- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media 21- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
20- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets 22- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
21- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp 23- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
22- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs 24- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
23- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images 25- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
24- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images 26- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
25- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos 27- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
26- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes 28- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
27- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi 29- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
cvs diff -r1.6 -r1.7 pkgsrc/net/nagios-base/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/patches/Attic/patch-ag 2009/12/15 18:56:02 1.6
+++ pkgsrc/net/nagios-base/patches/Attic/patch-ag 2011/04/08 22:37:25 1.7
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ag,v 1.6 2009/12/15 18:56:02 bouyer Exp $ 1$NetBSD: patch-ag,v 1.7 2011/04/08 22:37:25 morr Exp $
2 2
3--- configure.orig 2009-06-23 19:40:46.000000000 +0200 3--- configure.orig 2010-10-04 03:56:55.000000000 +0000
4+++ configure 2009-12-15 17:03:08.000000000 +0100 4+++ configure
5@@ -6061,7 +6061,7 @@ 5@@ -6239,7 +6239,7 @@ else
6 fi 6 fi
7  7
8 if test x$CHECKRESULTDIR = xno; then 8 if test x$CHECKRESULTDIR = xno; then
9- CHECKRESULTDIR="$localstatedir/spool/checkresults" 9- CHECKRESULTDIR="$localstatedir/spool/checkresults"
10+ CHECKRESULTDIR="$localstatedir/checkresults" 10+ CHECKRESULTDIR="$localstatedir/checkresults"
11 fi 11 fi
12  12
13  13
cvs diff -r1.3 -r1.4 pkgsrc/net/nagios-base/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/patches/Attic/patch-ae 2009/12/15 18:56:02 1.3
+++ pkgsrc/net/nagios-base/patches/Attic/patch-ae 2011/04/08 22:37:25 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ae,v 1.3 2009/12/15 18:56:02 bouyer Exp $ 1$NetBSD: patch-ae,v 1.4 2011/04/08 22:37:25 morr Exp $
2 2
3--- common/Makefile.in.orig 2009-06-17 05:57:21.000000000 +0200 3--- common/Makefile.in.orig 2009-06-17 03:57:21.000000000 +0000
4+++ common/Makefile.in 2009-12-15 17:01:52.000000000 +0100 4+++ common/Makefile.in
5@@ -17,7 +17,7 @@ 5@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@
6 LOGDIR=@localstatedir@ 6 LOGDIR=@localstatedir@
7 CFGDIR=@sysconfdir@ 7 CFGDIR=@sysconfdir@
8 BINDIR=@bindir@ 8 BINDIR=@bindir@
9-CGIDIR=@sbindir@ 9-CGIDIR=@sbindir@
10+CGIDIR=@libexecdir@ 10+CGIDIR=@libexecdir@
11 HTMLDIR=@datarootdir@ 11 HTMLDIR=@datarootdir@
12 INSTALL=@INSTALL@ 12 INSTALL=@INSTALL@
13 INSTALL_OPTS=@INSTALL_OPTS@ 13 INSTALL_OPTS=@INSTALL_OPTS@
cvs diff -r1.3 -r1.4 pkgsrc/net/nagios-base/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/patches/Attic/patch-af 2009/12/15 18:56:02 1.3
+++ pkgsrc/net/nagios-base/patches/Attic/patch-af 2011/04/08 22:37:25 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-af,v 1.3 2009/12/15 18:56:02 bouyer Exp $ 1$NetBSD: patch-af,v 1.4 2011/04/08 22:37:25 morr Exp $
2 2
3--- sample-config/nagios.cfg.in.orig 2008-12-14 15:52:23.000000000 +0100 3--- sample-config/nagios.cfg.in.orig 2010-10-04 02:27:55.000000000 +0000
4+++ sample-config/nagios.cfg.in 2009-12-15 17:02:13.000000000 +0100 4+++ sample-config/nagios.cfg.in
5@@ -198,7 +198,7 @@ 5@@ -198,7 +198,7 @@ lock_file=@lockfile@
6 # is created, used, and deleted throughout the time that Nagios is 6 # is created, used, and deleted throughout the time that Nagios is
7 # running. 7 # running.
8  8
9-temp_file=@localstatedir@/nagios.tmp 9-temp_file=@localstatedir@/nagios.tmp
10+temp_file=/tmp/nagios.tmp 10+temp_file=/tmp/nagios.tmp
11  11
12  12
13  13
cvs diff -r1.3 -r1.4 pkgsrc/net/nagios-base/patches/Attic/patch-ai (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/patches/Attic/patch-ai 2008/07/21 00:36:11 1.3
+++ pkgsrc/net/nagios-base/patches/Attic/patch-ai 2011/04/08 22:37:25 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ai,v 1.3 2008/07/21 00:36:11 tonnerre Exp $ 1$NetBSD: patch-ai,v 1.4 2011/04/08 22:37:25 morr Exp $
2 2
3--- include/locations.h.in.orig 2007-05-01 00:45:57.000000000 +0200 3--- include/locations.h.in.orig 2008-11-30 17:22:59.000000000 +0000
4+++ include/locations.h.in 4+++ include/locations.h.in
5@@ -20,7 +20,7 @@ 5@@ -20,7 +20,7 @@
6  6
7 #define DEFAULT_TEMP_FILE "@localstatedir@/tempfile" 7 #define DEFAULT_TEMP_FILE "@localstatedir@/tempfile"
8 #define DEFAULT_TEMP_PATH "/tmp" 8 #define DEFAULT_TEMP_PATH "/tmp"
9-#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/spool/checkresults" 9-#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/spool/checkresults"
10+#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/checkresults" 10+#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/checkresults"
11 #define DEFAULT_STATUS_FILE "@localstatedir@/status.dat" 11 #define DEFAULT_STATUS_FILE "@localstatedir@/status.dat"
12 #define DEFAULT_LOG_FILE "@localstatedir@/nagios.log" 12 #define DEFAULT_LOG_FILE "@localstatedir@/nagios.log"
13 #define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/archives/" 13 #define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/archives/"
cvs diff -r1.1 -r1.2 pkgsrc/net/nagios-base/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/net/nagios-base/patches/Attic/patch-ah 2006/05/17 20:47:41 1.1
+++ pkgsrc/net/nagios-base/patches/Attic/patch-ah 2011/04/08 22:37:25 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-ah,v 1.1 2006/05/17 20:47:41 bouyer Exp $ 1$NetBSD: patch-ah,v 1.2 2011/04/08 22:37:25 morr Exp $
2 2
3--- cgi/getcgi.c.orig 2006-05-17 22:25:16.000000000 +0200 3--- cgi/getcgi.c.orig 2006-05-15 16:59:24.000000000 +0000
4+++ cgi/getcgi.c 2006-05-17 22:25:26.000000000 +0200 4+++ cgi/getcgi.c
5@@ -10,6 +10,7 @@ 5@@ -10,6 +10,7 @@
6 #include "../include/getcgi.h" 6 #include "../include/getcgi.h"
7 #include <stdio.h> 7 #include <stdio.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9+#include <limits.h> 9+#include <limits.h>
10  10
11  11
12 #undef PARANOID_CGI_INPUT 12 #undef PARANOID_CGI_INPUT