summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-03-25 06:14:33 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-03-25 06:14:33 +0000
commit08d23c348636ea0d38e4396439b2c07f5f8ed555 (patch)
treee0f4769b12787d71051108499f7d6be37a0696ee /mail-mta
parentAnd a dir for the pid file. (diff)
downloadgentoo-2-08d23c348636ea0d38e4396439b2c07f5f8ed555.tar.gz
gentoo-2-08d23c348636ea0d38e4396439b2c07f5f8ed555.tar.bz2
gentoo-2-08d23c348636ea0d38e4396439b2c07f5f8ed555.zip
Clean up file and dir ownership.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'mail-mta')
-rw-r--r--mail-mta/qpsmtpd/ChangeLog5
-rw-r--r--mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild23
2 files changed, 16 insertions, 12 deletions
diff --git a/mail-mta/qpsmtpd/ChangeLog b/mail-mta/qpsmtpd/ChangeLog
index 81b5aa37cae9..8b60bebd8f7e 100644
--- a/mail-mta/qpsmtpd/ChangeLog
+++ b/mail-mta/qpsmtpd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for mail-mta/qpsmtpd
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.10 2010/03/25 06:08:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.11 2010/03/25 06:14:33 robbat2 Exp $
+
+ 25 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> qpsmtpd-0.83-r1.ebuild:
+ Clean up file and dir ownership.
25 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> qpsmtpd-0.83-r1.ebuild:
And a dir for the pid file.
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild
index 9d007d10c924..1904aaf272d8 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild,v 1.2 2010/03/25 06:08:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild,v 1.3 2010/03/25 06:14:33 robbat2 Exp $
EAPI=2
@@ -50,23 +50,19 @@ src_install() {
dodir /usr/share/qpsmtpd
cp -Rf plugins "${D}"/usr/share/qpsmtpd/
- diropts -m 0755 -o smtpd -g smtpd
- dodir /var/spool/qpsmtpd
- keepdir /var/spool/qpsmtpd /var/run/qpsmtpd
-
- dodir /etc/qpsmtpd
insinto /etc/qpsmtpd
doins config.sample/*
echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
+ cat >"${D}"/etc/qpsmtpd/logging <<-EOF
+ #logging/syslog loglevel LOGINFO priority LOG_NOTICE
+ #logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d
+ EOF
if use syslog; then
- echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${D}"/etc/qpsmtpd/logging
+ sed -i -e '/^#logging\/syslog/s,^#,,g' "${D}"/etc/qpsmtpd/logging
else
- diropts -m 0755 -o smtpd -g smtpd
- dodir /var/log/qpsmtpd
- keepdir /var/log/qpsmtpd
- echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${D}"/etc/qpsmtpd/logging
+ sed -i -e '/^#logging\/file/s,^#,,g' "${D}"/etc/qpsmtpd/logging
fi
newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
@@ -75,4 +71,9 @@ src_install() {
newinitd "${FILESDIR}"/qpsmtpd.initd qpsmtpd || die "Installing init.d file"
dodoc CREDITS Changes README README.plugins STATUS
+
+ diropts -m 0755 -o smtpd -g smtpd
+ dodir /var/spool/qpsmtpd /var/run/qpsmtpd /var/log/qpsmtpd
+ keepdir /var/spool/qpsmtpd /var/run/qpsmtpd /var/log/qpsmtpd
+
}