Fixed chown troubles (Commit authorized by Ticho)

Package-Manager: portage-2.1

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index e19a41ea7cd02a1a9b851ed3f9d507e309e8cb57..79a20fc4354ebec7c8bd6db86eedcabbc112fc5e 100644 (file)
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.85 2006/06/09 21:02:48 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.86 2006/06/14 08:22:57 ian Exp $
+
+  14 Jun 2006; Christian Hartmann <ian@gentoo.org>
+  amavisd-new-2.3.3-r2.ebuild:
+  Fixed chown troubles (Commit authorized by Ticho)
 
   09 Jun 2006; Andrej Kacian <ticho@gentoo.org>
   -files/amavisd-new-2.4.0-amavisd.conf-gentoo.patch,

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index c868002e0189329056eb0469019fb3f61b5b27ca..5947527e196456f90247320e207e3d4fefceb3e9 100644 (file)
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX amavisd-new-2.2.1-qmail-lf-workaround.patch 688 RMD160 45092cfb4180d5cac8abc38068105b619945dfe6 SHA1 5ab50c58bd125d545dd6a2081c3b4bc2892af7a2 SHA256 5e32e1fbcf172ce108ba1b494722894719ea31ed90d55610bffdb241246cfb57
 MD5 ee33de51df853bd8426a4304f264245f files/amavisd-new-2.2.1-qmail-lf-workaround.patch 688
 RMD160 45092cfb4180d5cac8abc38068105b619945dfe6 files/amavisd-new-2.2.1-qmail-lf-workaround.patch 688
@@ -27,18 +24,18 @@ RMD160 c06ac94f57382b5cbb7f9dea94007b927aaf6c8c files/amavisd.rc6 310
 SHA256 c136451b550176c6292554c60e0d41d91e6ad3538dedecbdb48925898623dbd8 files/amavisd.rc6 310
 DIST amavisd-new-2.3.3.tar.gz 772280 RMD160 c2213190582fe8fea9b8f1736e3b3e49b2906887 SHA1 5676f7df377b5af8349c989b9da8fd07ce383242 SHA256 8c6d78cc0a703f0aa36d52fdf833e074c6adca2d21bd334ef381f9e9c92b8f0b
 DIST amavisd-new-2.4.1.tar.gz 841988 RMD160 edd91dde774838345159064ef6012f7927d5aa6c SHA1 1de9fdac377c58a29a93c8a246553c8e363b212c SHA256 c067cbae60ccff3932574fcaf7971c04b118f6b2e9fe6db772d33538b53b0a54
-EBUILD amavisd-new-2.3.3-r2.ebuild 5489 RMD160 e1957c225187e0d85652adb83e2b3fe4c4b2a559 SHA1 905e58fd52cae8f854b1227b2dc7a9bf2b1c52a8 SHA256 883d41ea495fe942dc20078a38fc897634fab91b0a0d248f78e23dbeee876a51
-MD5 de7d1997fec041935959665b31b9269e amavisd-new-2.3.3-r2.ebuild 5489
-RMD160 e1957c225187e0d85652adb83e2b3fe4c4b2a559 amavisd-new-2.3.3-r2.ebuild 5489
-SHA256 883d41ea495fe942dc20078a38fc897634fab91b0a0d248f78e23dbeee876a51 amavisd-new-2.3.3-r2.ebuild 5489
+EBUILD amavisd-new-2.3.3-r2.ebuild 5438 RMD160 929d2ca4c4c54025eec4282093e64f572266a277 SHA1 c1b7b46f7bc8c0928e7ed439b70ba20f82faec90 SHA256 cfc83a3d508d48c848183d962b6be68db995fd6ecddac1b83a1353d625950003
+MD5 12630497684433a3a7f2a69936153738 amavisd-new-2.3.3-r2.ebuild 5438
+RMD160 929d2ca4c4c54025eec4282093e64f572266a277 amavisd-new-2.3.3-r2.ebuild 5438
+SHA256 cfc83a3d508d48c848183d962b6be68db995fd6ecddac1b83a1353d625950003 amavisd-new-2.3.3-r2.ebuild 5438
 EBUILD amavisd-new-2.4.1.ebuild 5333 RMD160 98ee9b4d3aa51a4c17ef0cbd32f057870468fc48 SHA1 20b725a0d31fbaaf98e1977ea60457c7446219b9 SHA256 e341775864c7543a8ccbb2105093ac11355a87d9fbebcde9026c79963a7a2883
 MD5 2e2c8ce31fdebc7cf5892c24816800ba amavisd-new-2.4.1.ebuild 5333
 RMD160 98ee9b4d3aa51a4c17ef0cbd32f057870468fc48 amavisd-new-2.4.1.ebuild 5333
 SHA256 e341775864c7543a8ccbb2105093ac11355a87d9fbebcde9026c79963a7a2883 amavisd-new-2.4.1.ebuild 5333
-MISC ChangeLog 18477 RMD160 9897de5ec3ff7d403ab843814f8d8a6d35c906ad SHA1 5ad12cfd2767635b24dbba0e24b8fb35c084e6cb SHA256 47541f26acb3ac24656df0abcf765211cd794c40f6180a765894acc6fcfa2c73
-MD5 c43a21318aa6d50e774cb8fbe0cb59ab ChangeLog 18477
-RMD160 9897de5ec3ff7d403ab843814f8d8a6d35c906ad ChangeLog 18477
-SHA256 47541f26acb3ac24656df0abcf765211cd794c40f6180a765894acc6fcfa2c73 ChangeLog 18477
+MISC ChangeLog 18610 RMD160 c9d825c1132f716a5a0892fd7b9d639082d052f9 SHA1 b86d9ea3f88ad26c6549f054caff1ed24fffa53f SHA256 f5903b8173c97d6b371e476ac6fa991aa0d7cc37553d49431826045a79ee735e
+MD5 808ee28449d991775200b2a481892ded ChangeLog 18610
+RMD160 c9d825c1132f716a5a0892fd7b9d639082d052f9 ChangeLog 18610
+SHA256 f5903b8173c97d6b371e476ac6fa991aa0d7cc37553d49431826045a79ee735e ChangeLog 18610
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -49,10 +46,3 @@ SHA256 267bc36b4f38da775864aa2215b314c36652a5be4ce55d173f733d8edd60537d files/di
 MD5 bde25cc23c0895235b8c9f281256d6d4 files/digest-amavisd-new-2.4.1 253
 RMD160 e7931a5f593031c730abfbdcc42e43d906e1abca files/digest-amavisd-new-2.4.1 253
 SHA256 3112111007ffb987dca3f6a4fdf95b670c09c8974696d373d725a809fe5e5c2a files/digest-amavisd-new-2.4.1 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEieIDQlM6RnzZP+IRAgpoAJsFkp8SPrnoD3HlCjXFToHC4/eg0wCfbC7W
-2bX/giqWmCRjFN4oWdMB4II=
-=kusf
------END PGP SIGNATURE-----

diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
index d0219535002cfcbc7e2d1d14c019eec118836f8d..b1769d69c85211f45bc38119dd97e97afd084343 100644 (file)
--- a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.11 2006/04/10 20:35:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.12 2006/06/14 08:22:57 ian Exp $
 
 inherit eutils
 
@@ -102,7 +102,6 @@ src_install() {
        insinto /etc
        insopts -m0640
        newins amavisd.conf-sample amavisd.conf
-       fowners root:amavis /etc/amavisd.conf
        dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
                /etc/amavisd.conf
        if [ "$(dnsdomainname)" = "(none)" ] ; then
@@ -165,7 +164,6 @@ src_install() {
                fi
        fi
 
-       chown -R amavis:amavis ${D}/${AMAVIS_ROOT}
        find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
        find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
 }
@@ -184,4 +182,5 @@ pkg_postinst() {
        echo
        chmod o-rwx /etc/amavisd.conf
        chown root:amavis /etc/amavisd.conf
+       chown -R amavis:amavis ${AMAVIS_ROOT}
 }