Better automatize clamav integration

Package-Manager: portage-2.1.3.19

diff --git a/mail-filter/qmail-scanner/ChangeLog b/mail-filter/qmail-scanner/ChangeLog
index efb54229d62c8bce27dc00d29d9c3ba7ed739e8c..e8946b4d8908b11ba92f91bb80e3fc38d608b903 100644 (file)
--- a/mail-filter/qmail-scanner/ChangeLog
+++ b/mail-filter/qmail-scanner/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/qmail-scanner
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.40 2008/01/22 22:35:08 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.41 2008/02/13 06:03:51 tupone Exp $
+
+*qmail-scanner-2.02-r1 (13 Feb 2008)
+
+  13 Feb 2008; <atupone@gentoo.org> -qmail-scanner-2.02.ebuild,
+  +qmail-scanner-2.02-r1.ebuild:
+  Better automatize clamav integration
 
   22 Jan 2008; Tupone Alfredo <tupone@gentoo.org> qmail-scanner-2.02.ebuild:
   Fixing instructions for clamav integration

diff --git a/mail-filter/qmail-scanner/Manifest b/mail-filter/qmail-scanner/Manifest
index 5a71806a1ec23b6cd7797d667fec39a7af38ff0a..b4e060e53fa940100cfcfeaa0fe47d5ecd337e50 100644 (file)
--- a/mail-filter/qmail-scanner/Manifest
+++ b/mail-filter/qmail-scanner/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qmail-scanner-2.01.logrotate 135 RMD160 2958597e646453f198ec6a4a3533e9b9398c9fe7 SHA1 f31c44239f9d56af3d4be6b422b3a4a834351748 SHA256 d61514a06570b55089915c134beefe5222eaa1199cba7afbe91681b7d67248f5
 AUX qmail-scanner-2.02.logrotate 135 RMD160 2958597e646453f198ec6a4a3533e9b9398c9fe7 SHA1 f31c44239f9d56af3d4be6b422b3a4a834351748 SHA256 d61514a06570b55089915c134beefe5222eaa1199cba7afbe91681b7d67248f5
 AUX qmail-scanner-queue.pl.patch 240 RMD160 6d644003bb6386ad2e21e775352fe01bf8cc81c1 SHA1 98be0f8c45f7917ea809a68c19627217b8c4c3d7 SHA256 77f09de11c2d448c17dd0b377cae3cedd756e404b1e611e2bf69e74d7e05be8e
@@ -13,6 +16,13 @@ DIST qmail-scanner-2.02.tgz 236440 RMD160 49a8b3465546071e6ff07a6faa8059f11e185a
 EBUILD qmail-scanner-1.25-r1.ebuild 4943 RMD160 ecc34b4f580318694c2fe392c35a398c2f6fe87a SHA1 5cb9f503bc381c1db3e59e3e3c96d77f01b0925b SHA256 4a723d46700d58c291026a76536b52316defef7c92ec499aea1d416f49ef0efb
 EBUILD qmail-scanner-2.01-r1.ebuild 5524 RMD160 3d98c524b9acfcdbddfc54107fe926fd1b5563ff SHA1 0cb62baead635a4c7f63656dbc1d73892ef91a52 SHA256 6b83b5e0fd3b38c554ae7281f84f86143f1bff5b7430e8a708fdb9fb3a5d5f15
 EBUILD qmail-scanner-2.01.ebuild 4973 RMD160 19d44f0d8f18806c1f29991a66527afcb845ee01 SHA1 39fec8460e663e1f9d722196af0efcf46f691df3 SHA256 a3dd91f71b5a7c7522ca69c566b25f300431aa916df41b1616058806af9cc6f4
-EBUILD qmail-scanner-2.02.ebuild 5666 RMD160 3e7e7cbf8a4c60a6b87908d81bcf17f35788e957 SHA1 6f2fd8b91577f8139574c9861e35a2cffa69d872 SHA256 e09863c05588ecf99daa74fec25eba561d26e13571200257281e4c5c40f082b7
-MISC ChangeLog 9730 RMD160 aae80e7f7922dbb0fd0a6264580c8d71d1ab2303 SHA1 99661c599514b81a924783253bc70e8d50961837 SHA256 3a4ce85c1885a1946e3e952d81087239b55cb560f20a1f2f7b65790545337bf1
+EBUILD qmail-scanner-2.02-r1.ebuild 5630 RMD160 95aaaec19422adc2ceab2bb9d67afba2db0dd56f SHA1 3e8504b5eb20ec3907272e5054c4c75f2a4dd1ab SHA256 299282c157b135332642d4cab687392060dcfb88ba22bf299462c659dde0fb5c
+MISC ChangeLog 9905 RMD160 400bd174ad3139ed82bb831b2a6c285d879b74c0 SHA1 aaf4e1164cf2262bfd585ac5b2c8c4994cfec40c SHA256 afbf790c7090408154d85f31329bd14fa08ae0c6e0cbd4d9612511e9a5094e28
 MISC metadata.xml 158 RMD160 1bd73d3a80f2670284225f39ce0a4a1c01954966 SHA1 d4831c624efba996486f0fd640d04e06d9e6d1fa SHA256 940554be041a57d02888d9f414efb7768e9f72565c642327ecb4f9f64ca6d8d4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHsohT8qKy9+b2Hl0RAtWSAJ461hc7Ugq9DB8i/wFo7cnES5HRrgCgnxeQ
+HW7JW6Q2oP9kKWFUKmHZPvA=
+=HjUk
+-----END PGP SIGNATURE-----

diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.02.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.02-r1.ebuild
similarity index 92%
rename from mail-filter/qmail-scanner/qmail-scanner-2.02.ebuild
rename to mail-filter/qmail-scanner/qmail-scanner-2.02-r1.ebuild
index 3fc80d863ef62fd64d96a0e0b51d6c6b338dcd71..0a59bd7d61f129d82a85ab0c09a0aee56ac74d5a 100644 (file)
--- a/mail-filter/qmail-scanner/qmail-scanner-2.02.ebuild
+++ b/mail-filter/qmail-scanner/qmail-scanner-2.02-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.02.ebuild,v 1.2 2008/01/22 22:35:08 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.02-r1.ebuild,v 1.1 2008/02/13 06:03:51 tupone Exp $
 
 inherit fixheadtails toolchain-funcs eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://qmail-scanner.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
                http://toribio.apollinare.org/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
 
-IUSE="spamassassin"
+IUSE="clamav spamassassin"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,11 +26,13 @@ DEPEND=">=dev-lang/perl-5.6.1-r1
        >=app-arch/unzip-5.42-r1
        sys-process/daemontools
        virtual/antivirus
+       clamav? ( app-antivirus/clamav )
        spamassassin? ( >=mail-filter/spamassassin-2.64 )"
 
 pkg_setup() {
        enewgroup qscand 210
        enewuser qscand 210 -1 /var/spool/qscan qscand
+       use clamav && usermod -a -G qscand,nofiles clamav
 }
 
 pkg_preinst() {
@@ -179,10 +181,10 @@ pkg_postinst () {
        ewarn "user is changed. Please update it manually to /var/spool/qscan"
        ewarn "or remove the user and emerge again this package"
 
-       ewarn "For an integration with clamav, clamav user should have access"
-       ewarn "to files in the qscand and nofiles group."
-       ewarn "To allow that, add clamav user to the qscan and nofiles group and"
-       ewarn "comment-out in /etc/clamd.conf AllowSupplementaryGroups putting yes."
-       ewarn "After that, restart clamd with"
-       ewarn "/etc/init.d/clamd restart"
+       if use clamav; then
+               ewarn "To allow clamav integration comment-out in /etc/clamd.conf:"
+               ewarn "AllowSupplementaryGroups putting yes."
+               ewarn "After that, restart clamd with"
+               ewarn "/etc/init.d/clamd restart"
+       fi
 }