summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Scherbaum <dertobi123@gentoo.org>2007-12-29 12:03:59 +0000
committerTobias Scherbaum <dertobi123@gentoo.org>2007-12-29 12:03:59 +0000
commitd1dc7f20934642b6812d49d57ba9bef59381d60c (patch)
treed9a36dc0265526d186fce1a022dc99efacf56549 /net-mail
parentVersion Bump (diff)
downloadgentoo-2-d1dc7f20934642b6812d49d57ba9bef59381d60c.tar.gz
gentoo-2-d1dc7f20934642b6812d49d57ba9bef59381d60c.tar.bz2
gentoo-2-d1dc7f20934642b6812d49d57ba9bef59381d60c.zip
Cleanup
(Portage version: 2.1.3.19)
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/mailgraph/ChangeLog6
-rw-r--r--net-mail/mailgraph/files/digest-mailgraph-1.133
-rw-r--r--net-mail/mailgraph/files/mailgraph.confd11
-rw-r--r--net-mail/mailgraph/files/mailgraph.initd23
-rw-r--r--net-mail/mailgraph/mailgraph-1.13.ebuild146
5 files changed, 5 insertions, 184 deletions
diff --git a/net-mail/mailgraph/ChangeLog b/net-mail/mailgraph/ChangeLog
index 4736350e43a0..a31e6f09bc70 100644
--- a/net-mail/mailgraph/ChangeLog
+++ b/net-mail/mailgraph/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-mail/mailgraph
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.31 2007/12/27 23:50:58 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.32 2007/12/29 12:03:58 dertobi123 Exp $
+
+ 29 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+ -files/mailgraph.confd, -files/mailgraph.initd, -mailgraph-1.13.ebuild:
+ Cleanup
27 Dec 2007; Richard Freeman <rich0@gentoo.org> mailgraph-1.14.ebuild:
amd64 stable - bug 203171
diff --git a/net-mail/mailgraph/files/digest-mailgraph-1.13 b/net-mail/mailgraph/files/digest-mailgraph-1.13
deleted file mode 100644
index 5031f30f5a2c..000000000000
--- a/net-mail/mailgraph/files/digest-mailgraph-1.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b59cc2375662f6c113c6be2ab5bfa179 mailgraph-1.13.tar.gz 21322
-RMD160 8c4e393e548b99a49da4f35c8b8a104d5bf14339 mailgraph-1.13.tar.gz 21322
-SHA256 f08476371b59b1e2313b388e962e6ff968432d4b66520c11e8b05ff7e968c6c8 mailgraph-1.13.tar.gz 21322
diff --git a/net-mail/mailgraph/files/mailgraph.confd b/net-mail/mailgraph/files/mailgraph.confd
deleted file mode 100644
index 041a41f53168..000000000000
--- a/net-mail/mailgraph/files/mailgraph.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/files/mailgraph.confd,v 1.2 2005/06/25 20:33:40 halcy0n Exp $
-
-# Location of logfile that postfix logs to.
-# mailgraph defaults to /var/log/syslog if unspecified
-#MG_POSTFIX_LOG="/var/log/mail.log"
-
-# Specify any extra options here.
-# If MG_POSTFIX_LOG is in metalog format, add "-t metalog" to MG_OPTS
-#MG_OPTS=""
diff --git a/net-mail/mailgraph/files/mailgraph.initd b/net-mail/mailgraph/files/mailgraph.initd
deleted file mode 100644
index 6c6a06f958cd..000000000000
--- a/net-mail/mailgraph/files/mailgraph.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/files/mailgraph.initd,v 1.2 2005/07/23 20:18:56 halcy0n Exp $
-
-start() {
- ebegin "Starting mailgraph"
-
- # read postfix log messages somewhere other than /var/log/syslog?
- [[ -n "${MG_POSTFIX_LOG}" ]] && MG_OPTS="${MG_OPTS} -l ${MG_POSTFIX_LOG}"
-
- start-stop-daemon --start --quiet \
- --exec /usr/bin/mailgraph -- -v --daemon \
- --daemon-rrd=/var/lib/mailgraph ${MG_OPTS}
-
- eend $?
-}
-
-stop() {
- ebegin "Shutting down mailgraph"
- start-stop-daemon --stop --quiet --pidfile /var/run/mailgraph.pid
- eend $?
-}
diff --git a/net-mail/mailgraph/mailgraph-1.13.ebuild b/net-mail/mailgraph/mailgraph-1.13.ebuild
deleted file mode 100644
index 92b0e33d3f5f..000000000000
--- a/net-mail/mailgraph/mailgraph-1.13.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.13.ebuild,v 1.6 2007/11/14 19:29:51 ticho Exp $
-
-inherit eutils webapp
-
-DESCRIPTION="A mail statistics RRDtool frontend for Postfix"
-HOMEPAGE="http://mailgraph.schweikert.ch/"
-SRC_URI="http://mailgraph.schweikert.ch//pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
- dev-perl/File-Tail
- >=net-analyzer/rrdtool-1.2.2"
-DEPEND=">=sys-apps/sed-4"
-
-user_group_setup() {
- # add user and group for mailgraph daemon
- # also add mgraph to the group adm so it's able to
- # read syslog logfile /var/log/messages (should be owned by
- # root:adm with permission 0640)
- enewgroup mgraph
- enewuser mgraph -1 -1 /var/empty mgraph,adm
-}
-
-pkg_setup() {
- webapp_pkg_setup
- built_with_use net-analyzer/rrdtool perl \
- || die "net-analyzer/rrdtool must be built with USE=perl"
- user_group_setup
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- sed -i \
- -e "s|\(my \$rrd = '\).*'|\1/var/lib/mailgraph/mailgraph.rrd'|" \
- -e "s|\(my \$rrd_virus = '\).*'|\1/var/lib/mailgraph/mailgraph_virus.rrd'|" \
- mailgraph.cgi || die "sed mailgraph.cgi failed"
-}
-
-pkg_preinst() {
- user_group_setup
-}
-
-src_install() {
- webapp_src_preinst
- # be sure to run webapp_src_install *before* doing the directories below
- # because it cripples all other permissions :-(
- webapp_src_install
-
- # for the RRDs
- dodir /var/lib
- diropts -omgraph -gmgraph -m0750
- dodir /var/lib/mailgraph
- keepdir /var/lib/mailgraph
-
- # log and pid file
- diropts ""
- dodir /var/log
- dodir /var/run
- diropts -omgraph -gadm -m0750
- dodir /var/log/mailgraph
- keepdir /var/log/mailgraph
- dodir /var/run/mailgraph
- keepdir /var/run/mailgraph
-
- # logrotate config for mailgraph log
- diropts ""
- dodir /etc/logrotate.d
- insopts -m0644
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/mailgraph.logrotate-new mailgraph
-
- # mailgraph daemon
- newbin mailgraph.pl mailgraph
-
- # mailgraph CGI script
- exeinto "${MY_CGIBINDIR}"
- doexe mailgraph.cgi
-
- # init/conf files for mailgraph daemon
- newinitd "${FILESDIR}"/mailgraph.initd-new mailgraph
- newconfd "${FILESDIR}"/mailgraph.confd-new mailgraph
-
- # docs
- dodoc README CHANGES
-}
-
-pkg_postinst() {
- # Fix ownerships - previous versions installed these with
- # root as owner
- if [[ has_version <=net-mail/mailgraph-1.12 ]] ; then
- if [[ -d /var/lib/mailgraph ]] ; then
- chown mgraph:mgraph /var/lib/mailgraph
- fi
- if [[ -d /var/log/mailgraph ]] ; then
- chown mgraph:adm /var/log/mailgraph
- fi
- if [[ -d /var/run/mailgraph ]] ; then
- chown mgraph:adm /var/run/mailgraph
- fi
- fi
- elog
- elog "Mailgraph will run as user mgraph with group adm by default."
- elog "This can be changed in /etc/conf.d/mailgraph if it doesn't fit."
- elog "Remember to adjust MG_DAEMON_LOG, MG_DAEMON_PID and MG_DAEMON_RRD"
- elog "as well!"
- elog
- elog
- ewarn
- ewarn "Please make sure the MG_LOGFILE (default: /var/log/messages) is readable"
- ewarn "by group adm or change MG_DAEMON_GID in /etc/conf.d/mailgraph accordingly!"
- ewarn
- ewarn "Please make sure *all* mail related logs (MTA, spamfilter, virus scanner)"
- ewarn "go to the file /var/log/messages or change MG_LOGFILE in"
- ewarn "/etc/conf.d/mailgraph accordingly! Otherwise mailgraph won't get to know"
- ewarn "the corresponding events (virus/spam mail found etc.)."
- ewarn
- ewarn
- elog
- elog "Checking for user apache"
- if egetent passwd apache >&/dev/null; then
- elog
- elog "Adding user apache to group mgraph so the included"
- elog "CGI script is able to read the mailgraph RRD files"
- elog
- if ! gpasswd -a apache mgraph >&/dev/null; then
- eerror "Failed to add user apache to group mgraph!"
- eerror "Please check manually."
- fi
- else
- elog
- elog "User apache not found, maybe we will be running a"
- elog "webserver with a different UID?"
- elog "If that's the case, please add that user to the"
- elog "group mgraph manually to enable the included"
- elog "CGI script to read the mailgraph RRD files:"
- elog
- elog "\tgpasswd -a <user> mgraph"
- elog
- fi
-}