From c198df9279783e0237d178dd83dcd9d8d4e6156f Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Thu, 25 Mar 2010 06:14:33 +0000 Subject: [PATCH] Clean up file and dir ownership. Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- mail-mta/qpsmtpd/ChangeLog | 5 ++++- mail-mta/qpsmtpd/Manifest | 4 ++-- mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild | 23 ++++++++++++----------- 3 files changed, 18 insertions(+), 14 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 qpsmtpd-0.83-r1.ebuild: + Clean up file and dir ownership. 25 Mar 2010; Robin H. Johnson qpsmtpd-0.83-r1.ebuild: And a dir for the pid file. diff --git a/mail-mta/qpsmtpd/Manifest b/mail-mta/qpsmtpd/Manifest index 90e9e3c6fe25..3e4b857fd444 100644 --- a/mail-mta/qpsmtpd/Manifest +++ b/mail-mta/qpsmtpd/Manifest @@ -14,8 +14,8 @@ DIST qpsmtpd-0.83.tar.gz 177298 RMD160 b65f81b88635bc00465fe1493ee1d5f073b36255 EBUILD qpsmtpd-0.43_rc2_pre955.ebuild 2496 RMD160 057e325094aa85dc264a570b4f13dfad2b88094c SHA1 60a5fb8e09c1660c7dd7a0077b5329d4d936af1a SHA256 3b19c2fb0516a78a6403d2faded4f388ba10ca0d1f0ef73208447e3d94daae11 EBUILD qpsmtpd-0.81.ebuild 2334 RMD160 26d7f5faaea8ab0acaae8d08c12acb0bfd0080ed SHA1 1ac279d8a1f7908143ea16ada54b218bff3f8b22 SHA256 ffb06381ad72b21ce16a75fc2a6a39a41de440011832e573f6816ff0024cbb9c EBUILD qpsmtpd-0.82.ebuild 2173 RMD160 da339be1d8e7ea2a6d537649d16d6d9e9efcfe1a SHA1 543f8ecdd9a0098588d39f1cf4bd8a5d4ab704f7 SHA256 0b6007749b592edeafcff31c285d2a87f3db9b5ba032c9d6b8bed0ec8fa2329c -EBUILD qpsmtpd-0.83-r1.ebuild 2135 RMD160 111f9651752897f23ce357ae29cc210fd41270c6 SHA1 ddfda7b2245bb2a53e8f45e8cad8b080aaf30cd3 SHA256 0581caae6e400d3b2220d6de2602352358a0d586ed2daeff3ced03759f354ea5 +EBUILD qpsmtpd-0.83-r1.ebuild 2189 RMD160 3258f10d619936e30cbf958b67abeff7c995c791 SHA1 ec25aff1ffb95fd5a0025a3c9ec433a75395e701 SHA256 583ddbe3fd90ceb8561fc93908294aa19abe800a5171173c8da0a83fea80bd10 EBUILD qpsmtpd-0.83.ebuild 2115 RMD160 a6b72c34e9812ac93a2fb1637d81db0e72bedcf7 SHA1 00e4ec6e015dc674f5c15a4b18e8a90116d2c2f2 SHA256 feee2ed9c6eb4479a163f4aa875dc427b744d44597ed67b7735e2869954a884a EBUILD qpsmtpd-9999.ebuild 2105 RMD160 436045fb5eb1c03a48042ffd5afd39b58d3eaa2b SHA1 a40957386cd49edeffe0869ced0988ae0ebf7895 SHA256 44f99376fcdf1f2864091d85a167d9ac3d5b76f9a47eb8ac5173ccdebd54c44b -MISC ChangeLog 2444 RMD160 07447228a620943de680bb72253c24abdae71c6b SHA1 0794437f4b311f797f3484bac11c23f1b4560e1c SHA256 44b05508024cb29bea62d2718d4f2909de6e20f45f244704983c32f78a439099 +MISC ChangeLog 2557 RMD160 c80f9e5de8c5de400b0610d65f0239ff4dfaaa67 SHA1 a95c7544117e4c45853abbb597f673baa98926c5 SHA256 b9ac465733e3fef61b4dd0b961788f9a308ac465e87d48ae005967cd9aef23c0 MISC metadata.xml 485 RMD160 0362a983d522720988a075feb3fe643ef09d7e36 SHA1 2fa98543a44b5b9a73f248f4fd605c1de32f56d1 SHA256 5f825ec7910cf1e3486d9d490f2bdbbacb68a2532a7a691500150c1b10c09e06 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 + } -- 2.26.2