From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 8 11:30:16 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A484716A4DD for ; Tue, 8 Aug 2006 11:30:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0230B43D45 for ; Tue, 8 Aug 2006 11:30:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k78BUFVY063191 for ; Tue, 8 Aug 2006 11:30:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k78BUFWo063190; Tue, 8 Aug 2006 11:30:15 GMT (envelope-from gnats) Resent-Date: Tue, 8 Aug 2006 11:30:15 GMT Resent-Message-Id: <200608081130.k78BUFWo063190@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Xavier Beaudouin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2AA1F16A4DF for ; Tue, 8 Aug 2006 11:30:03 +0000 (UTC) (envelope-from kiwi@kiwi.oav.net) Received: from mail.oav.net (mail.oav.net [193.218.105.18]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D76F43D45 for ; Tue, 8 Aug 2006 11:30:02 +0000 (GMT) (envelope-from kiwi@kiwi.oav.net) Received: from localhost (mail.oav.net [193.218.105.18]) by mail02.oav.net (Postfix) with ESMTP id 7A2A33F42C for ; Tue, 8 Aug 2006 13:30:01 +0200 (CEST) (envelope-from kiwi@kiwi.oav.net) Received: from mail01.oav.net ([193.218.105.18]) by localhost (mail01.oav.net [172.31.1.1]) (amavisd-new, port 10026) with LMTP id vc0AvKD3tm4v for ; Tue, 8 Aug 2006 13:30:01 +0200 (CEST) Received: from kiwi.oav.net (kiwi.oav.net [82.225.248.92]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail01.oav.net (Postfix) with ESMTP id DAAD93F421 for ; Tue, 8 Aug 2006 13:30:00 +0200 (CEST) (envelope-from kiwi@kiwi.oav.net) Received: by kiwi.oav.net (Postfix, from userid 1000) id D7BAF2E04F; Tue, 8 Aug 2006 13:31:31 +0200 (CEST) Message-Id: <20060808113131.D7BAF2E04F@kiwi.oav.net> Date: Tue, 8 Aug 2006 13:31:31 +0200 (CEST) From: Xavier Beaudouin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/101650: [MAINTAINER] mail/couriergraph: update to 20060202 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Aug 2006 11:30:16 -0000 >Number: 101650 >Category: ports >Synopsis: [MAINTAINER] mail/couriergraph: update to 20060202 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Aug 08 11:30:14 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Xavier Beaudouin >Release: FreeBSD 5.4-RELEASE-p16 i386 >Organization: Association KAZAR / The Caudium Group >Environment: System: FreeBSD proxy.home.oav.net 5.4-RELEASE-p16 FreeBSD 5.4-RELEASE-p16 #0: Thu Jul 20 12:51:42 CEST 2006 >Description: - Update to 20060202 Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- couriergraph-20060202.patch begins here --- diff -ruN --exclude=CVS /usr/ports/mail/couriergraph.old/Makefile /usr/ports/mail/couriergraph/Makefile --- /usr/ports/mail/couriergraph.old/Makefile Thu May 11 00:36:48 2006 +++ /usr/ports/mail/couriergraph/Makefile Tue Aug 8 12:43:23 2006 @@ -6,11 +6,11 @@ # PORTNAME= couriergraph -PORTVERSION= 20041207 +PORTVERSION= 20060202 CATEGORIES= mail -MASTER_SITES= http://www.stahl.bau.tu-bs.de/~hildeb/postfix/couriergraph/ -DISTNAME= ${PORTNAME} -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} +MASTER_SITES= ftp://ftp.oav.net/couriergraph/ +DISTNAME= ${PORTNAME}-${PORTVERSION} +DIST_SUBDIR= ${PORTNAME} MAINTAINER= kiwi@oav.net COMMENT= A RRDtool frontend for Courier statistics @@ -19,14 +19,14 @@ ${SITE_PERL}/File/Tail.pm:${PORTSDIR}/devel/p5-File-Tail NO_BUILD= yes +WRKSRC= ${WRKDIR}/${PORTNAME} DATADIR?= /var/db/couriergraph COURIERGRAPH_USER?= ${WWWOWN} COURIERGRAPH_GROUP?= ${WWWGRP} -USE_RC_SUBR= yes -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} DATADIR=${DATADIR} \ - COURIERGRAPH_USER=${COURIERGRAPH_USER} COURIERGRAPH_GROUP=${COURIERGRAPH_GROUP} +USE_RC_SUBR= ${PORTNAME}.sh +SUB_LIST+= COURIERGRAPH_USER=${COURIERGRAPH_USER} COURIERGRAPH_GROUP=${COURIERGRAPH_GROUP} STARTUP_FILE= ${PREFIX}/etc/rc.d/couriergraph.sh @@ -53,9 +53,6 @@ @${CHOWN} -R ${COURIERGRAPH_USER}:${COURIERGRAPH_GROUP} ${DATADIR} @${INSTALL_SCRIPT} ${WRKSRC}/couriergraph.pl ${PREFIX}/sbin @${INSTALL_SCRIPT} ${WRKSRC}/couriergraph.cgi ${PREFIX}/www/cgi-bin - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/couriergraph.sh.in > ${STARTUP_FILE} - @${CHMOD} 755 ${STARTUP_FILE} post-install: @${ECHO} diff -ruN --exclude=CVS /usr/ports/mail/couriergraph.old/distinfo /usr/ports/mail/couriergraph/distinfo --- /usr/ports/mail/couriergraph.old/distinfo Wed Dec 28 21:51:50 2005 +++ /usr/ports/mail/couriergraph/distinfo Tue Aug 8 12:32:04 2006 @@ -1,3 +1,3 @@ -MD5 (couriergraph-20041207/couriergraph.tar.gz) = 19d63b9740c63aaf29b24141b37984df -SHA256 (couriergraph-20041207/couriergraph.tar.gz) = b888361ae69db62da61e47c117f5910e430584473ac2f7bd968e3bc69daa7ba7 -SIZE (couriergraph-20041207/couriergraph.tar.gz) = 7657 +MD5 (couriergraph/couriergraph-20060202.tar.gz) = 0c9fcbc1223fd7e7b594d4bcfae5f70b +SHA256 (couriergraph/couriergraph-20060202.tar.gz) = 3159948a122d808e90567a12ad7db4031b5e47e9ec6c7e90f6fc3283eb0cdc7f +SIZE (couriergraph/couriergraph-20060202.tar.gz) = 7559 diff -ruN --exclude=CVS /usr/ports/mail/couriergraph.old/files/couriergraph.sh.in /usr/ports/mail/couriergraph/files/couriergraph.sh.in --- /usr/ports/mail/couriergraph.old/files/couriergraph.sh.in Mon Feb 20 21:47:08 2006 +++ /usr/ports/mail/couriergraph/files/couriergraph.sh.in Tue Aug 8 11:53:51 2006 @@ -4,6 +4,7 @@ # # PROVIDE: couriergraph # REQUIRE: DAEMON +# BEFORE: mail # # Add the following line to /etc/rc.conf to enable mailgraph: # diff -ruN --exclude=CVS /usr/ports/mail/couriergraph.old/files/patch-couriergraph.cgi /usr/ports/mail/couriergraph/files/patch-couriergraph.cgi --- /usr/ports/mail/couriergraph.old/files/patch-couriergraph.cgi Wed Dec 28 21:51:51 2005 +++ /usr/ports/mail/couriergraph/files/patch-couriergraph.cgi Tue Aug 8 12:06:14 2006 @@ -1,15 +1,11 @@ ---- couriergraph.cgi.orig Thu Dec 29 07:42:00 2005 -+++ couriergraph.cgi Thu Dec 29 07:44:42 2005 -@@ -18,9 +18,10 @@ +--- couriergraph.cgi.orig Tue Aug 8 11:56:47 2006 ++++ couriergraph.cgi Tue Aug 8 11:57:09 2006 +@@ -18,7 +18,7 @@ my $points_per_sample = 3; my $ypoints = 160; my $ypoints_err = 96; -my $rrd = '/etc/postfix/couriergraph.rrd'; # path to where the RRD database is --my $rrd_virus = '/etc/postfix/mailgraph_virus.rrd'; # path to where the Virus RRD database is -+my $rrd = '%%DATADIR%%/etc/postfix/couriergraph.rrd'; # path to where the RRD database is -+my $rrd_virus = '%%DATADIR%%/etc/postfix/mailgraph_virus.rrd'; # path to where the Virus RRD database is ++my $rrd = '%%DATADIR%%/couriergraph.rrd'; # path to where the RRD database is my $tmp_dir = '/tmp/couriergraph'; # temporary directory where to store the images -+my $rrdtool_1_0 = ($RRDs::VERSION < 1.199908); my @graphs = ( - { title => 'Day Graphs', seconds => 3600*24, }, diff -ruN --exclude=CVS /usr/ports/mail/couriergraph.old/files/patch-couriergraph.pl /usr/ports/mail/couriergraph/files/patch-couriergraph.pl --- /usr/ports/mail/couriergraph.old/files/patch-couriergraph.pl Wed Dec 28 21:51:51 2005 +++ /usr/ports/mail/couriergraph/files/patch-couriergraph.pl Tue Aug 8 12:03:07 2006 @@ -1,5 +1,5 @@ ---- couriergraph.pl.orig Thu Dec 29 07:47:47 2005 -+++ couriergraph.pl Thu Dec 29 07:48:36 2005 +--- couriergraph.pl.orig Tue Jun 20 11:11:39 2006 ++++ couriergraph.pl Tue Aug 8 12:02:45 2006 @@ -314,11 +314,11 @@ my $daemon_logfile = '/var/log/couriergraph.log'; @@ -23,7 +23,7 @@ print " --daemon-log=FILE write verbose-log to FILE instead of /var/log/mailgraph.log\n"; print " --rrd-name=NAME use NAME.rrd for the rrd files\n"; -@@ -473,12 +473,12 @@ +@@ -473,7 +473,7 @@ my $prog = $sl->[2]; my $text = $sl->[4]; @@ -31,10 +31,4 @@ + if ($prog eq 'pop3d') { if($text =~ /LOGIN,/) { event($time, 'pop3d_login'); - } - } -- elsif ($prog eq 'imaplogin') { -+ elsif ($prog eq 'imap') { - if($text =~ /LOGIN,/) { - event($time, 'imapd_login'); } diff -ruN --exclude=CVS /usr/ports/mail/couriergraph.old/pkg-plist /usr/ports/mail/couriergraph/pkg-plist --- /usr/ports/mail/couriergraph.old/pkg-plist Sun Jan 22 03:19:47 2006 +++ /usr/ports/mail/couriergraph/pkg-plist Tue Aug 8 12:39:29 2006 @@ -1,4 +1,3 @@ -etc/rc.d/couriergraph.sh www/cgi-bin/couriergraph.cgi sbin/couriergraph.pl @dirrmtry www/cgi-bin --- couriergraph-20060202.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: