Bug #64574 solved in new version.

diff --git a/mail-filter/spamassassin-ruledujour/ChangeLog b/mail-filter/spamassassin-ruledujour/ChangeLog
index 399e543002de3bdc5b7f3f3e047bb22f984bc854..61d5ea94af37c2e838c54ba2e8e57003950e3f11 100644 (file)
--- a/mail-filter/spamassassin-ruledujour/ChangeLog
+++ b/mail-filter/spamassassin-ruledujour/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/spamassassin-ruledujour
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-ruledujour/ChangeLog,v 1.3 2004/09/25 21:28:31 slarti Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-ruledujour/ChangeLog,v 1.4 2005/01/07 06:13:33 robbat2 Exp $
+
+  06 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +spamassassin-ruledujour-20050106.ebuild:
+  Bug #64574 solved in new version.
 
   25 Sep 2004; Tom Martin <slarti@gentoo.org>
   spamassassin-ruledujour-20040701.ebuild:

diff --git a/mail-filter/spamassassin-ruledujour/Manifest b/mail-filter/spamassassin-ruledujour/Manifest
index 4977d254309a7caa3c153aecfbc771315ec4e30e..18a23bd1f7d0711e006f9ed45ec12d897e8e3292 100644 (file)
--- a/mail-filter/spamassassin-ruledujour/Manifest
+++ b/mail-filter/spamassassin-ruledujour/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 eedb2fbc1622278d4d282eb63f29f515 spamassassin-ruledujour-20040701.ebuild 1392
-MD5 5271ee9dd97e9195eb2cebe2c4ef1666 ChangeLog 670
+MD5 3d895c3b7a803b0387205de2c93694b5 spamassassin-ruledujour-20050106.ebuild 1962
+MD5 0abf003ad1a8b69cead3732abb2c4e5d spamassassin-ruledujour-20040701.ebuild 1414
+MD5 0aafc5f46d0346715eeac0d1b12fea01 ChangeLog 805
 MD5 5e658b705b2985d36d82b2a5d218ec78 metadata.xml 224
 MD5 998db9369c998907270da8bc9ac54da6 files/digest-spamassassin-ruledujour-20040701 85
+MD5 9d1bea9ead3b9e70de27441abf853ea6 files/digest-spamassassin-ruledujour-20050106 85
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-Comment: .//Manifest 1096320642
+Version: GnuPG v1.2.6 (GNU/Linux)
+Comment: Robbat2 @ Orbis-Terrarum Networks
 
-iD8DBQFBWIaIPpIsIjIzwiwRAoC0AJsHjqg4MRWnc9g6veYxY8CeIs8kmACfW42U
-o9BRFrak+Wg437tYZ6Lr/oo=
-=4ZsI
+iD8DBQFB3gNlPpIsIjIzwiwRAg4OAKCOQdbdu4F50b5glq8dmn5HG2JasgCdFCPM
+gLiPueWeJJ/VipO/DC+n3KE=
+=u0SY
 -----END PGP SIGNATURE-----

diff --git a/mail-filter/spamassassin-ruledujour/files/digest-spamassassin-ruledujour-20050106 b/mail-filter/spamassassin-ruledujour/files/digest-spamassassin-ruledujour-20050106
new file mode 100644 (file)
index 0000000..82d83ba
--- /dev/null
+++ b/mail-filter/spamassassin-ruledujour/files/digest-spamassassin-ruledujour-20050106
@@ -0,0 +1 @@
+MD5 8f25cf3275859a2666314133666ab686 spamassassin-ruledujour-20050106.tar.bz2 159514

diff --git a/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20040701.ebuild b/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20040701.ebuild
index aa96761372327852b4bdde957ce71129e930ee5b..a9407a9d45e5f137e76f3730815be54304bc265a 100644 (file)
--- a/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20040701.ebuild
+++ b/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20040701.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20040701.ebuild,v 1.4 2004/09/25 21:28:31 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20040701.ebuild,v 1.5 2005/01/07 06:13:33 robbat2 Exp $
 
 DESCRIPTION="SpamAssassin - Rules Du Jour & My Rules Du Jour"
 HOMEPAGE="http://www.exit0.us/index.php/RulesDuJour http://www.rulesemporium.com/rules.htm"
@@ -17,7 +17,8 @@ RDEPEND="app-shells/bash
                 sys-apps/sed
                 dev-lang/perl
                 sys-apps/coreutils
-                virtual/cron"
+                virtual/cron
+                mail-client/mailx"
 
 src_install() {
        SPAMASSASSIN_CONFDIR=/etc/mail/spamassassin

diff --git a/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050106.ebuild b/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050106.ebuild
new file mode 100644 (file)
index 0000000..7fe8de0
--- /dev/null
+++ b/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050106.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050106.ebuild,v 1.1 2005/01/07 06:13:33 robbat2 Exp $
+
+DESCRIPTION="SpamAssassin - Rules Du Jour & My Rules Du Jour"
+HOMEPAGE="http://www.exit0.us/index.php/RulesDuJour http://www.rulesemporium.com/rules.htm"
+SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+DEPEND="" # this is correct!
+RDEPEND="app-shells/bash
+                mail-filter/spamassassin
+                || ( net-misc/wget net-misc/curl )
+                sys-apps/grep
+                sys-apps/sed
+                dev-lang/perl
+                sys-apps/coreutils
+                virtual/cron
+                mail-client/mailx"
+
+SPAMASSASSIN_CONFDIR=/etc/mail/spamassassin
+SPAMASSASSIN_LIBDIR=/var/lib/spamassassin
+
+src_install() {
+       keepdir $SPAMASSASSIN_CONFDIR $SPAMASSASSIN_LIBDIR
+
+       # new config files
+       insinto /etc/rulesdujour
+       doins bin/config bin/rulesets
+       
+       # rules_du_jour itself
+       exeinto ${SPAMASSASSIN_LIBDIR}
+
+       doexe bin/rules_du_jour
+
+       # some spamassassin rules
+       insinto $SPAMASSASSIN_CONFDIR
+       doins rules/*
+
+       insinto /etc/cron.daily
+       # new cronjob
+       newins cron-rulesdujour rulesdujour
+       fperms 644 /etc/cron.daily/rulesdujour
+       # my_rules_du_jour is deprecated, but be gentle about it
+       if [ -f "${ROOT}/etc/cron.daily/myrulesdujour" ]; then
+               newins cron-myrulesdujour myrulesdujour
+               fperms 644 /etc/cron.daily/myrulesdujour
+       fi
+}
+
+pkg_postinst() {
+       einfo "If you want RulesDuJour to run automatically, be sure to:"
+       einfo "chmod +x /etc/cron.daily/rulesdujour"
+       [ -f "${ROOT}/etc/cron.daily/myrulesdujour" ] && einfo "my_rules_du_jour is deprecated by upstream now, please remove the old cronjob if applicable"
+
+       einfo "It is also recommended that you clean out your rulesets in"
+       einfo "$SPAMASSASSIN_CONFDIR ocassionally, to ensure that old rules"
+       einfo "are not being used."
+}