* [gentoo-commits] gentoo-x86 commit in net-mail/mailgraph: ChangeLog mailgraph-1.14-r1.ebuild
@ 2011-07-07 15:08 Eray Aslan (eras)
0 siblings, 0 replies; 3+ messages in thread
From: Eray Aslan (eras) @ 2011-07-07 15:08 UTC (permalink / raw
To: gentoo-commits
eras 11/07/07 15:08:14
Modified: ChangeLog
Added: mailgraph-1.14-r1.ebuild
Log:
Fix depreciation warning and crashed status in init script - bugs #366581 #374311. EAPI bump.
(Portage version: 2.1.10.4/cvs/Linux x86_64)
Revision Changes Path
1.36 net-mail/mailgraph/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/ChangeLog?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/ChangeLog?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/ChangeLog?r1=1.35&r2=1.36
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog 15 Jun 2008 10:19:03 -0000 1.35
+++ ChangeLog 7 Jul 2011 15:08:14 -0000 1.36
@@ -1,6 +1,13 @@
# ChangeLog for net-mail/mailgraph
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.35 2008/06/15 10:19:03 zmedico Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.36 2011/07/07 15:08:14 eras Exp $
+
+*mailgraph-1.14-r1 (07 Jul 2011)
+
+ 07 Jul 2011; Eray Aslan <eras@gentoo.org> +mailgraph-1.14-r1.ebuild,
+ files/mailgraph.initd-new:
+ Fix depreciation warning and crashed status in init script - bugs #366581
+ #374311. EAPI bump.
15 Jun 2008; Zac Medico <zmedico@gentoo.org> mailgraph-1.14.ebuild:
Bug #226505 - For compatibility with phase execution order in
1.1 net-mail/mailgraph/mailgraph-1.14-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/mailgraph-1.14-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/mailgraph-1.14-r1.ebuild?rev=1.1&content-type=text/plain
Index: mailgraph-1.14-r1.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.14-r1.ebuild,v 1.1 2011/07/07 15:08:14 eras Exp $
EAPI=4
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 ~sparc ~x86"
IUSE=""
RDEPEND="dev-lang/perl
dev-perl/File-Tail
>=net-analyzer/rrdtool-1.2.2[perl]"
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
user_group_setup
}
src_prepare() {
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"
}
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
# 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_preinst() {
has_version "<=${CATEGORY}/${PN}-1.12"
previous_less_or_equal_to_1_12=$?
}
pkg_postinst() {
# Fix ownerships - previous versions installed these with
# root as owner
if [[ $previous_less_or_equal_to_1_12 = 0 ]] ; 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
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-mail/mailgraph: ChangeLog mailgraph-1.14-r1.ebuild
@ 2011-08-19 18:54 Eray Aslan (eras)
0 siblings, 0 replies; 3+ messages in thread
From: Eray Aslan (eras) @ 2011-08-19 18:54 UTC (permalink / raw
To: gentoo-commits
eras 11/08/19 18:54:45
Modified: ChangeLog mailgraph-1.14-r1.ebuild
Log:
Drop webapps eclass - bug #379535
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Revision Changes Path
1.37 net-mail/mailgraph/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/ChangeLog?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/ChangeLog?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/ChangeLog?r1=1.36&r2=1.37
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog 7 Jul 2011 15:08:14 -0000 1.36
+++ ChangeLog 19 Aug 2011 18:54:44 -0000 1.37
@@ -1,6 +1,9 @@
# ChangeLog for net-mail/mailgraph
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.36 2011/07/07 15:08:14 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.37 2011/08/19 18:54:44 eras Exp $
+
+ 19 Aug 2011; Eray Aslan <eras@gentoo.org> mailgraph-1.14-r1.ebuild:
+ Drop webapps eclass - bug #379535
*mailgraph-1.14-r1 (07 Jul 2011)
1.2 net-mail/mailgraph/mailgraph-1.14-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/mailgraph-1.14-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/mailgraph-1.14-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/mailgraph-1.14-r1.ebuild?r1=1.1&r2=1.2
Index: mailgraph-1.14-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.14-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mailgraph-1.14-r1.ebuild 7 Jul 2011 15:08:14 -0000 1.1
+++ mailgraph-1.14-r1.ebuild 19 Aug 2011 18:54:44 -0000 1.2
@@ -1,15 +1,18 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.14-r1.ebuild,v 1.1 2011/07/07 15:08:14 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/mailgraph-1.14-r1.ebuild,v 1.2 2011/08/19 18:54:44 eras Exp $
EAPI=4
-inherit eutils webapp
+inherit eutils
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"
+# Change SLOT to 0 when appropriate
+# This is NOT ${PV}
+SLOT="1.14"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
@@ -18,7 +21,7 @@
>=net-analyzer/rrdtool-1.2.2[perl]"
DEPEND=">=sys-apps/sed-4"
-user_group_setup() {
+pkg_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
@@ -27,11 +30,6 @@
enewuser mgraph -1 -1 /var/empty mgraph,adm
}
-pkg_setup() {
- webapp_pkg_setup
- user_group_setup
-}
-
src_prepare() {
sed -i \
-e "s|\(my \$rrd = '\).*'|\1/var/lib/mailgraph/mailgraph.rrd'|" \
@@ -40,11 +38,6 @@
}
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
@@ -70,8 +63,10 @@
newbin mailgraph.pl mailgraph
# mailgraph CGI script
- exeinto ${MY_CGIBINDIR}
+ exeinto /usr/share/${PN}
doexe mailgraph.cgi
+ insinto /usr/share/${PN}
+ doins mailgraph.css
# init/conf files for mailgraph daemon
newinitd "${FILESDIR}"/mailgraph.initd-new mailgraph
@@ -81,15 +76,10 @@
dodoc README CHANGES
}
-pkg_preinst() {
- has_version "<=${CATEGORY}/${PN}-1.12"
- previous_less_or_equal_to_1_12=$?
-}
-
pkg_postinst() {
# Fix ownerships - previous versions installed these with
# root as owner
- if [[ $previous_less_or_equal_to_1_12 = 0 ]] ; then
+ if [[ ${REPLACING_VERSIONS} < 1.13 ]] ; then
if [[ -d /var/lib/mailgraph ]] ; then
chown mgraph:mgraph /var/lib/mailgraph
fi
@@ -100,14 +90,10 @@
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
@@ -115,15 +101,11 @@
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"
+ 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."
@@ -137,6 +119,8 @@
elog "CGI script to read the mailgraph RRD files:"
elog
elog "\tgpasswd -a <user> mgraph"
- elog
fi
+ ewarn
+ ewarn "mailgraph.cgi is installed in /usr/share/${PN}/"
+ ewarn "You need to put it somewhere accessible though a web-server."
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-mail/mailgraph: ChangeLog mailgraph-1.14-r1.ebuild
@ 2011-08-19 19:18 Eray Aslan (eras)
0 siblings, 0 replies; 3+ messages in thread
From: Eray Aslan (eras) @ 2011-08-19 19:18 UTC (permalink / raw
To: gentoo-commits
eras 11/08/19 19:18:38
Modified: ChangeLog
Removed: mailgraph-1.14-r1.ebuild
Log:
remove un-upgradable version
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Revision Changes Path
1.39 net-mail/mailgraph/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/ChangeLog?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/ChangeLog?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/mailgraph/ChangeLog?r1=1.38&r2=1.39
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog 19 Aug 2011 19:00:53 -0000 1.38
+++ ChangeLog 19 Aug 2011 19:18:38 -0000 1.39
@@ -1,6 +1,9 @@
# ChangeLog for net-mail/mailgraph
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.38 2011/08/19 19:00:53 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailgraph/ChangeLog,v 1.39 2011/08/19 19:18:38 eras Exp $
+
+ 19 Aug 2011; Eray Aslan <eras@gentoo.org> -mailgraph-1.14-r1.ebuild:
+ remove un-upgradable version
19 Aug 2011; Eray Aslan <eras@gentoo.org> +mailgraph-1.14-r2.ebuild:
Drop webapps eclass - bug #379535
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-19 19:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-19 19:18 [gentoo-commits] gentoo-x86 commit in net-mail/mailgraph: ChangeLog mailgraph-1.14-r1.ebuild Eray Aslan (eras)
-- strict thread matches above, loose matches on Subject: below --
2011-08-19 18:54 Eray Aslan (eras)
2011-07-07 15:08 Eray Aslan (eras)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox