FreeBSD Bugzilla – Attachment 150798 Details for
Bug 196090
[patch] mail/mailgraph rc script bug and little enhancements
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
proposed changes + take maintainership
mailgraph_pr196090.diff (text/plain), 2.34 KB, created by
geoffroy desvernay
on 2014-12-20 09:44:28 UTC
(
hide
)
Description:
proposed changes + take maintainership
Filename:
MIME Type:
Creator:
geoffroy desvernay
Created:
2014-12-20 09:44:28 UTC
Size:
2.34 KB
patch
obsolete
>Index: mail/mailgraph/Makefile >=================================================================== >--- mail/mailgraph/Makefile (revision 374994) >+++ mail/mailgraph/Makefile (working copy) >@@ -3,12 +3,12 @@ > > PORTNAME= mailgraph > PORTVERSION= 1.14 >-PORTREVISION= 6 >+PORTREVISION= 7 > CATEGORIES= mail > MASTER_SITES= http://mailgraph.schweikert.ch/pub/ \ > http://mailgraph.schweikert.ch/pub/old/ > >-MAINTAINER= rafan@FreeBSD.org >+MAINTAINER= dgeo@centrale-marseille.fr > COMMENT= RRDtool frontend for Postfix statistics > > RUN_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool \ >@@ -25,7 +25,7 @@ > MAILGRAPH_GROUP?= ${WWWGRP} > > USE_RC_SUBR= ${PORTNAME} >-SUB_LIST+= MAILGRAPH_USER=${MAILGRAPH_USER} MAILGRAPH_GROUP=${MAILGRAPH_GROUP} >+SUB_LIST+= MAILGRAPH_USER=${MAILGRAPH_USER} MAILGRAPH_GROUP=${MAILGRAPH_GROUP} PERL=${PERL} > PLIST_SUB= CGIDIR=${CGIDIR:S,${PREFIX}/,,} WWWROOT=${WWWROOT:S,${PREFIX}/,,} > > OPTIONS_DEFINE= DOCS >Index: mail/mailgraph/files/mailgraph.in >=================================================================== >--- mail/mailgraph/files/mailgraph.in (revision 374994) >+++ mail/mailgraph/files/mailgraph.in (working copy) >@@ -17,14 +17,18 @@ > > command=%%PREFIX%%/sbin/${name}.pl > command_args='> /dev/null 2>&1' >-command_interpreter=/usr/bin/perl >+command_interpreter=%%PERL%% > start_precmd=start_precmd > stop_postcmd=stop_postcmd > > start_precmd() > { >- mkdir -p "%%DATADIR%%" >- chown "%%MAILGRAPH_USER%%" "%%DATADIR%%" >+ mkdir -p "$mailgraph_chdir" >+ chown "$mailgraph_user" "$mailgraph_chdir" >+ if ! su -m $mailgraph_user -c 'sh -c "[ -r '$mailgraph_maillog' ]"'; then >+ echo "MAILGRAPH CANNOT RUN: $mailgraph_maillog not readable by $mailgraph_user" >+ return 1 >+ fi > } > > stop_postcmd() >@@ -35,10 +39,11 @@ > load_rc_config $name > > : ${mailgraph_enable="NO"} >-: ${mailgraph_pidfile="%%DATADIR%%/mailgraph.pid"} >-: ${mailgraph_flags="--logfile /var/log/maillog --daemon-rrd=%%DATADIR%% --ignore-localhost --daemon --daemon-pid=${mailgraph_pidfile}"} >+: ${mailgraph_chdir="%%DATADIR%%"} >+: ${mailgraph_pidfile="$mailgraph_chdir/mailgraph.pid"} >+: ${mailgraph_maillog="/var/log/maillog"} >+: ${mailgraph_flags="--logfile $mailgraph_maillog --daemon-rrd=$mailgraph_chdir --ignore-localhost --daemon --daemon-pid=$mailgraph_pidfile"} > : ${mailgraph_user="%%MAILGRAPH_USER%%"} >-: ${mailgraph_chdir="%%DATADIR%%"} > > pidfile=${mailgraph_pidfile} >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
rafan
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 196090
:
150713
| 150798 |
150922