From crees@zeus.bayofrum.net  Thu Apr 14 09:32:07 2011
Return-Path: <crees@zeus.bayofrum.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E891C1065670
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 14 Apr 2011 09:32:06 +0000 (UTC)
	(envelope-from crees@zeus.bayofrum.net)
Received: from mail.skyusermail.com (mail.skyusermail.com [77.240.11.49])
	by mx1.freebsd.org (Postfix) with ESMTP id 76D778FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 14 Apr 2011 09:32:06 +0000 (UTC)
Received: from Spooler by mail.skyusermail.com (Mercury/32 v4.52) ID MO024076;
    14 Apr 2011 10:32:04 +0100
Received: from spooler by mail.skyusermail.com (Mercury/32 v4.52); 14 Apr 2011 10:01:48 +0100
Received: from zeus.bayofrum.net (90.221.7.88) by mail.skyusermail.com (Mercury/32 v4.52) with ESMTP
  ID MG024075 (Using SSL/TLS, 3DES, CBC mode, keysize 192 bits) ; 14 Apr 2011 10:01:45 +0100
Received: from zeus.bayofrum.net (crees@localhost [127.0.0.1])
	by zeus.bayofrum.net (8.14.4/8.14.4) with ESMTP id p3E91IKk078307
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 14 Apr 2011 10:01:19 +0100 (BST)
	(envelope-from crees@zeus.bayofrum.net)
Received: (from crees@localhost)
	by zeus.bayofrum.net (8.14.4/8.14.4/Submit) id p3E91ID8078306;
	Thu, 14 Apr 2011 10:01:18 +0100 (BST)
	(envelope-from crees)
Message-Id: <201104140901.p3E91ID8078306@zeus.bayofrum.net>
Date: Thu, 14 Apr 2011 10:01:18 +0100 (BST)
From: Chris Rees <utisoft@gmail.com>
Reply-To: Chris Rees <utisoft@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER UPDATE] sysutils/monitorix Update to 2.1.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         156395
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] sysutils/monitorix Update to 2.1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 14 09:40:01 UTC 2011
>Closed-Date:    Mon Apr 18 17:46:13 UTC 2011
>Last-Modified:  Mon Apr 18 17:50:09 UTC 2011
>Originator:     Chris Rees
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD zeus.bayofrum.net 8.2-RELEASE FreeBSD 8.2-RELEASE #1: Sun Feb 27 22:19:51 UTC 2011 root@zeus.bayofrum.net:/usr/obj/usr/src/sys/ZEUS i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

	- Update to 2.1.1

	Submitted by: Chris Rees <utisoft_at_gmail.com> (maintainer)

--- monitorix-2.1.1.diff begins here ---
Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/sysutils/monitorix/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	29 Mar 2011 02:40:12 -0000	1.4
+++ Makefile	14 Apr 2011 08:58:51 -0000
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	monitorix
-PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTVERSION=	2.1.1
+PORTREVISION?=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.monitorix.org/ \
 		http://www.bayofrum.net/dist/${PORTNAME}/
@@ -76,17 +76,23 @@
 	@${ECHO_MSG} ""
 
 post-patch:
-# Set FreeBSD path for perl in shebang
+# Set FreeBSD path for perl in shebang and absolute sysctl so as not to break
+# in cgi-bin
 .for f in monitorix.cgi monitorix.conf monitorix reports/send_reports
-	@${REINPLACE_CMD} -e "1s|^\(#!\).*|\1${PERL}|" ${WRKSRC}/${f}
+	@${REINPLACE_CMD} -e "1s|^\(#!\).*|\1${PERL}|" \
+		-e 's|"\(sysctl\)|"/sbin/\1|' \
+		${WRKSRC}/${f}
 .endfor
 # eth0 doesn't exist in FreeBSD! Also let's set our own paths.
+# No iptables, so we'll disable PORT_GRAPH
 	@${REINPLACE_CMD} \
 		-e 's|\($$BASE_DIR = "\)[^"]*|\1${WWWDIR}/|' \
 		-e 's|\($$BASE_LIB = "\)[^"]*|\1${DATADIR}/|' \
 		-e 's|\($$BASE_CGI = "\)[^"]*|\1${CGIPATH}/|' \
+		-e 's|\($$SECURE_LOG= "\)[^"]*|\1/var/log/auth.log|' \
 		-e "s|/var/lib/milter-greylist/db/|/var/milter-greylist/|" \
 		-e "s|eth0|lo0|g" \
+		-e 's|\("port"[^Y]*\)Y|\1N|' \
 			${WRKSRC}/monitorix.conf
 
 do-install:
Index: distinfo
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/sysutils/monitorix/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	28 Mar 2011 02:45:01 -0000	1.3
+++ distinfo	14 Apr 2011 08:58:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (monitorix-2.1.0.tar.gz) = 647b36ac80f15a805eecb68fc507334ebcbb0cb1fe7efd381eed6a7cf3bc0210
-SIZE (monitorix-2.1.0.tar.gz) = 85689
+SHA256 (monitorix-2.1.1.tar.gz) = 2419593ae00d2a083e7f5258bfab840b48c87be799e8186a599c0a28f4508e33
+SIZE (monitorix-2.1.1.tar.gz) = 86289
--- monitorix-2.1.1.diff ends here ---



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: beech 
Responsible-Changed-When: Fri Apr 15 21:30:43 UTC 2011 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156395 
State-Changed-From-To: open->closed 
State-Changed-By: beech 
State-Changed-When: Mon Apr 18 17:45:59 UTC 2011 
State-Changed-Why:  
Committed, Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/156395: commit references a PR
Date: Mon, 18 Apr 2011 17:44:11 +0000 (UTC)

 beech       2011-04-18 17:44:03 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/monitorix   Makefile distinfo 
   Log:
   Update to 2.1.1
   
   PR:             ports/156395
   Submitted by:   Chris Rees (utisoft@gmail.com)(maintainer)
   
   Revision  Changes    Path
   1.5       +10 -4     ports/sysutils/monitorix/Makefile
   1.4       +2 -2      ports/sysutils/monitorix/distinfo
 _______________________________________________
 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:
