From jarrod@wallace.netleader.com.au  Thu Nov  1 09:28:30 2007
Return-Path: <jarrod@wallace.netleader.com.au>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 92CA016A418
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Nov 2007 09:28:30 +0000 (UTC)
	(envelope-from jarrod@wallace.netleader.com.au)
Received: from wallace.netleader.com.au (wallace.netleader.com.au [203.122.246.247])
	by mx1.freebsd.org (Postfix) with ESMTP id A062B13C4A7
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Nov 2007 09:28:29 +0000 (UTC)
	(envelope-from jarrod@wallace.netleader.com.au)
Received: from wallace.netleader.com.au (localhost [127.0.0.1])
	by wallace.netleader.com.au (8.13.8/8.13.8) with ESMTP id lA19GrDN022296
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 1 Nov 2007 19:46:56 +1030 (CST)
	(envelope-from jarrod@wallace.netleader.com.au)
Received: (from jarrod@localhost)
	by wallace.netleader.com.au (8.13.8/8.13.8/Submit) id lA19Grcq022295;
	Thu, 1 Nov 2007 19:46:53 +1030 (CST)
	(envelope-from jarrod)
Message-Id: <200711010916.lA19Grcq022295@wallace.netleader.com.au>
Date: Thu, 1 Nov 2007 19:46:53 +1030 (CST)
From: Jarrod Sayers <jarrod@netleader.com.au>
Reply-To: Jarrod Sayers <jarrod@netleader.com.au>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer-update] net-mgmt/nagios-devel: Update to 3.0.b6
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         117737
>Category:       ports
>Synopsis:       [maintainer-update] net-mgmt/nagios-devel: Update to 3.0.b6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 01 09:30:01 UTC 2007
>Closed-Date:    Wed Dec 12 13:57:54 UTC 2007
>Last-Modified:  Wed Dec 12 14:00:06 UTC 2007
>Originator:     Jarrod Sayers
>Release:        FreeBSD 6.2-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD wallace.netleader.com.au 6.2-RELEASE-p8 FreeBSD 6.2-RELEASE-p8 #99: Sat Oct 6 22:54:56 CST 2007 root@wallace.netleader.com.au:/usr/obj/usr/src/sys/WALLACE i386
>Description:
Update to 3.0.b6:
- Logging API revamp, cleanup
- Misc internal performance improvements
- Bug fix with attempting to access an uninitalized mutex if external commands
  are disabled
- Updates to .cvsignore files
- Fix for embedded Perl interpreter to recache scripts when they're modified
- Fix for canceling inheritance with 'null' in various object directives
- Additional functionality of additive inheritance feature
- Fixed bug where missing host/servicegroups in object definitions didn't always
  generate errors
- Increased max plugin output length cap from 4kb to 8kb
- Caching of Perl scripts now enabled by default if embedded Perl interpreter
  is compiled in
- Fix for segfault when contact definitions had no notification timeperiods
  defined
- Retention of host/service check scheduling options
- Fix for race condition when freshening host and service check results
- Added null -b option to install-sh for Solaris so install scripts don't break
- Added .gitignore files for git users
- Added new external commands to change notification period for host, services,
  and contact on-the-fly
- Added new external commands to change modified object attributes (affecting
  data retention logic)
- Added $ISVALIDTIME:$ and $NEXTVALIDTIME:$ on-demand macros
- Added enable_environment_macros option to determine whether or not macros are
  set as environment vars
- Major overhaul (read: complete rewrite) of macro code, so macros are now only
  computed when found
- Summary macros are now available as regular (non-environment) macros if
  requested when large installation tweaks are enabled
- Bug fix for scheduling hostgroup host downtime through web interface
- Better error logging when failing to rename/move files
- Added $LASTHOSTSTATE$, $LASTHOSTSTATEID$, $LASTSERVICESTATE$, and
  $LASTSERVICESTATEID$ macros
- Addition of object pointers to event broker module data structures (may
  require event broker module rebuilds)
- Spec file changes to better support RPM builds on 64-bit systems
- Possible fix for Unicode html encoding errors in CGIs
>How-To-Repeat:
>Fix:
Downloadable diff from:
http://www.netleader.com.au/~jarrod/FreeBSD/net-mgmt-nagios-devel-3.0.b6.diff

--- net-mgmt-nagios-devel-3.0.b6.diff begins here ---
diff -ruN ports/net-mgmt/nagios-devel.orig/Makefile ports/net-mgmt/nagios-devel/Makefile
--- ports/net-mgmt/nagios-devel.orig/Makefile	Sun Oct 14 12:04:59 2007
+++ ports/net-mgmt/nagios-devel/Makefile	Thu Nov  1 19:29:34 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nagios
-DISTVERSION=	3.0b5
+DISTVERSION=	3.0b6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
diff -ruN ports/net-mgmt/nagios-devel.orig/distinfo ports/net-mgmt/nagios-devel/distinfo
--- ports/net-mgmt/nagios-devel.orig/distinfo	Sun Oct 14 12:04:59 2007
+++ ports/net-mgmt/nagios-devel/distinfo	Thu Nov  1 19:30:43 2007
@@ -1,3 +1,3 @@
-MD5 (nagios-3.0b5.tar.gz) = e4952e943f4f7b6f472d22e3ee209b39
-SHA256 (nagios-3.0b5.tar.gz) = 8c48abb2f8eb6aaec37826ebd344154456d6805b9a97192ad2a3258652bd03eb
-SIZE (nagios-3.0b5.tar.gz) = 2726148
+MD5 (nagios-3.0b6.tar.gz) = 6b1bdf467250c9961c025db5f1c5e382
+SHA256 (nagios-3.0b6.tar.gz) = 4335e4bf8713394f8772dc2d8921faa47fc81196616021e5d2b8bd2da3f1cce0
+SIZE (nagios-3.0b6.tar.gz) = 2732880
diff -ruN ports/net-mgmt/nagios-devel.orig/files/patch-configure.in ports/net-mgmt/nagios-devel/files/patch-configure.in
--- ports/net-mgmt/nagios-devel.orig/files/patch-configure.in	Fri Aug 31 00:24:59 2007
+++ ports/net-mgmt/nagios-devel/files/patch-configure.in	Thu Nov  1 19:34:06 2007
@@ -1,13 +1,13 @@
---- configure.in.orig	Wed Jun 20 08:41:34 2007
-+++ configure.in	Fri Jul 20 14:20:13 2007
+--- configure.in.orig	Thu Nov  1 04:05:38 2007
++++ configure.in	Thu Nov  1 19:33:42 2007
 @@ -6,7 +6,6 @@
  
  AC_INIT(base/nagios.c)
- AC_CONFIG_HEADER(include/config.h include/snprintf.h include/nagios.h include/cgiutils.h)
+ AC_CONFIG_HEADER(include/config.h include/snprintf.h include/cgiutils.h)
 -AC_PREFIX_DEFAULT(/usr/local/nagios)
  
  PKG_NAME=nagios
- PKG_VERSION="3.0a5"
+ PKG_VERSION="3.0b6"
 @@ -196,7 +195,7 @@
  AC_SUBST(nagios_grp)
  AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
--- net-mgmt-nagios-devel-3.0.b6.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Jarrod Sayers <jarrod@netleader.com.au>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117737: [maintainer-update] net-mgmt/nagios-devel: Update to 3.0.b6
Date: Thu, 1 Nov 2007 22:17:34 +1030

 The attached patch did not include a fix for the ports pkg-plist file  
 which fails to remove several directories under /var/spool/nagios (aka
 NAGIOSDIR) even if they are empty.  The use of @dirrmtry to remove  
 these fails as when the packing list is created, a %D/ is prefixed to  
 the directory name.  Directories outside of %D require the use of the  
 @dirrmtry's expanded form.  The patch mentioned in the URL now  
 reflects the addition modification to pkg-plist and should be used in  
 preference to the file attached to this PR.
 
 <thought>
 I'm not sure of the implications in fixing the @dirrmtry tags ability  
 to remove directories outside of %D, i.e., fully qualified paths, but  
 ports/Mk/bsd.port.mk could be modified to do so:
 PLIST_REINPLACE+=	dirrmtryfq dirrmtry stopdaemon
 PLIST_REINPLACE_DIRRMTRYFQ=s!^@dirrmtry \(/.*\)!@unexec rmdir \1 2>/ 
 dev/null || true!
 PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/ 
 dev/null || true!
 PLIST_REINPLACE_STOPDAEMON=s!^@stopdaemon \(.*\)!@unexec %D/etc/rc.d/ 
 \1${RC_SUBR_SUFFIX} forcestop 2>/dev/null || true!
 </thought>
 
 Jarrod.
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Wed Nov 7 12:55:38 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117737 

From: Jarrod Sayers <jarrod@netleader.com.au>
To: miwi@FreeBSD.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/117737: [maintainer-update] net-mgmt/nagios-devel: Update to 3.0.b6
Date: Sat, 1 Dec 2007 21:40:38 +1030

 --Apple-Mail-6--843093664
 Content-Type: text/plain;
 	charset=US-ASCII;
 	format=flowed;
 	delsp=yes
 Content-Transfer-Encoding: 7bit
 
 Martin,
 
 Nagios 3.0.b7 has been released during the current ports freeze.   
 Attached is an updated diff to bump the port to the current  
 development version.
 
 Downloadable version from:
 http://www.netleader.com.au/~jarrod/FreeBSD/net-mgmt-nagios-devel-3.0.b7.diff
 
 Jarrod.
 
 
 --Apple-Mail-6--843093664
 Content-Disposition: attachment;
 	filename=net-mgmt-nagios-devel-3.0.b7.diff
 Content-Type: application/octet-stream;
 	x-unix-mode=0444;
 	name="net-mgmt-nagios-devel-3.0.b7.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -ruN ports/net-mgmt/nagios-devel.orig/Makefile ports/net-mgmt/nagios-devel/Makefile
 --- ports/net-mgmt/nagios-devel.orig/Makefile	2007-10-14 12:04:59.000000000 +0930
 +++ ports/net-mgmt/nagios-devel/Makefile	2007-12-01 21:24:28.000000000 +1030
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	nagios
 -DISTVERSION=	3.0b5
 +DISTVERSION=	3.0b7
  CATEGORIES=	net-mgmt
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	nagios
 diff -ruN ports/net-mgmt/nagios-devel.orig/distinfo ports/net-mgmt/nagios-devel/distinfo
 --- ports/net-mgmt/nagios-devel.orig/distinfo	2007-10-14 12:04:59.000000000 +0930
 +++ ports/net-mgmt/nagios-devel/distinfo	2007-12-01 21:25:00.000000000 +1030
 @@ -1,3 +1,3 @@
 -MD5 (nagios-3.0b5.tar.gz) = e4952e943f4f7b6f472d22e3ee209b39
 -SHA256 (nagios-3.0b5.tar.gz) = 8c48abb2f8eb6aaec37826ebd344154456d6805b9a97192ad2a3258652bd03eb
 -SIZE (nagios-3.0b5.tar.gz) = 2726148
 +MD5 (nagios-3.0b7.tar.gz) = 3c3aaeddff040ba57c3c43553524b13f
 +SHA256 (nagios-3.0b7.tar.gz) = 18a2ba6094fc182daf49294b869331c5cd9c99f25e9873866598d34862977ccc
 +SIZE (nagios-3.0b7.tar.gz) = 2735347
 diff -ruN ports/net-mgmt/nagios-devel.orig/files/patch-configure.in ports/net-mgmt/nagios-devel/files/patch-configure.in
 --- ports/net-mgmt/nagios-devel.orig/files/patch-configure.in	2007-08-31 00:24:59.000000000 +0930
 +++ ports/net-mgmt/nagios-devel/files/patch-configure.in	2007-12-01 21:33:21.000000000 +1030
 @@ -1,13 +1,13 @@
 ---- configure.in.orig	Wed Jun 20 08:41:34 2007
 -+++ configure.in	Fri Jul 20 14:20:13 2007
 +--- configure.in.orig	Thu Nov  1 04:05:38 2007
 ++++ configure.in	Thu Nov  1 19:33:42 2007
  @@ -6,7 +6,6 @@
   
   AC_INIT(base/nagios.c)
 - AC_CONFIG_HEADER(include/config.h include/snprintf.h include/nagios.h include/cgiutils.h)
 + AC_CONFIG_HEADER(include/config.h include/snprintf.h include/cgiutils.h)
  -AC_PREFIX_DEFAULT(/usr/local/nagios)
   
   PKG_NAME=nagios
 - PKG_VERSION="3.0a5"
 + PKG_VERSION="3.0b7"
  @@ -196,7 +195,7 @@
   AC_SUBST(nagios_grp)
   AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
 diff -ruN ports/net-mgmt/nagios-devel.orig/pkg-plist ports/net-mgmt/nagios-devel/pkg-plist
 --- ports/net-mgmt/nagios-devel.orig/pkg-plist	2007-08-31 00:24:59.000000000 +0930
 +++ ports/net-mgmt/nagios-devel/pkg-plist	2007-12-01 21:24:03.000000000 +1030
 @@ -377,7 +377,7 @@
  @dirrm %%NAGIOSWWWDIR%%/ssi
  @dirrm %%NAGIOSWWWDIR%%/stylesheets
  @dirrmtry %%NAGIOSWWWDIR%%
 -@dirrmtry %%NAGIOSDIR%%/archives
 -@dirrmtry %%NAGIOSDIR%%/checkresults
 -@dirrmtry %%NAGIOSDIR%%/rw
 -@dirrmtry %%NAGIOSDIR%%
 +@unexec rmdir %%NAGIOSDIR%%/archives 2>/dev/null || true
 +@unexec rmdir %%NAGIOSDIR%%/checkresults 2>/dev/null || true
 +@unexec rmdir %%NAGIOSDIR%%/rw 2>/dev/null || true
 +@unexec rmdir %%NAGIOSDIR%% 2>/dev/null || true
 
 --Apple-Mail-6--843093664
 Content-Type: text/plain;
 	charset=US-ASCII;
 	format=flowed
 Content-Transfer-Encoding: 7bit
 
 
 
 --Apple-Mail-6--843093664--
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Wed Dec 12 13:57:53 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117737 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117737: commit references a PR
Date: Wed, 12 Dec 2007 13:58:02 +0000 (UTC)

 miwi        2007-12-12 13:57:56 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/nagios-devel Makefile distinfo 
     net-mgmt/nagios-devel/files patch-configure.in 
   Log:
   - Update to 3.0.b7
   
   PR:             117737
   Submitted by:   Jarrod Sayers <jarrod@netleader.com.au> (maintainer)
   
   Revision  Changes    Path
   1.6       +1 -1      ports/net-mgmt/nagios-devel/Makefile
   1.5       +3 -3      ports/net-mgmt/nagios-devel/distinfo
   1.2       +4 -4      ports/net-mgmt/nagios-devel/files/patch-configure.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
