diff options
author | Michael Cummings <mcummings@gentoo.org> | 2005-06-28 23:08:52 +0000 |
---|---|---|
committer | Michael Cummings <mcummings@gentoo.org> | 2005-06-28 23:08:52 +0000 |
commit | 4efd3164011d6597d28f566145e3651473d897db (patch) | |
tree | a6869e09efa16898104343cf8715b6fb0b508548 /mail-filter | |
parent | Fix use invocation, it was completely broken. Fix indentation (diff) | |
download | gentoo-2-4efd3164011d6597d28f566145e3651473d897db.tar.gz gentoo-2-4efd3164011d6597d28f566145e3651473d897db.tar.bz2 gentoo-2-4efd3164011d6597d28f566145e3651473d897db.zip |
Bug 96704
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'mail-filter')
-rw-r--r-- | mail-filter/spamassassin/ChangeLog | 10 | ||||
-rw-r--r-- | mail-filter/spamassassin/Manifest | 16 | ||||
-rw-r--r-- | mail-filter/spamassassin/files/3.0.0-spamd.init | 3 | ||||
-rw-r--r-- | mail-filter/spamassassin/spamassassin-3.0.4.ebuild | 58 |
4 files changed, 45 insertions, 42 deletions
diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog index 62ae19836b31..d00f5948ce71 100644 --- a/mail-filter/spamassassin/ChangeLog +++ b/mail-filter/spamassassin/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for mail-filter/spamassassin # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.66 2005/06/28 22:48:48 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.67 2005/06/28 23:08:52 mcummings Exp $ + + 28 Jun 2005; Michael Cummings <mcummings@gentoo.org> + files/3.0.0-spamd.init, spamassassin-3.0.4.ebuild: + Bug 96704 + + 28 Jun 2005; Michael Cummings <mcummings@gentoo.org> + files/3.0.0-spamd.init, spamassassin-3.0.4.ebuild: + Bug 85205 28 Jun 2005; Michael Cummings <mcummings@gentoo.org> spamassassin-3.0.4.ebuild: diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index fef3cbeaf152..2f7b23226155 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -1,24 +1,14 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 284177238fc1cfde6037eb83ff67a930 ChangeLog 19286 +MD5 391857b1523ad2b8bcf287e23ca19e47 ChangeLog 19407 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 -MD5 fbb5c6066b6f143d378082154c221f74 spamassassin-3.0.4.ebuild 5934 +MD5 5e79429aa7d7e6b8ebcf57ec1c2a8fa5 spamassassin-3.0.4.ebuild 5917 MD5 0dc3669ecd2b16304953702f296131fe spamassassin-3.0.2-r1.ebuild 5786 MD5 c6b400456b9e96b064ff3d445034754e spamassassin-2.64-r1.ebuild 2524 MD5 b2e1c1869a28e383f102d68857f260ff spamassassin-3.0.3.ebuild 5941 MD5 1951dd84955cce642d59c03780a5fb6f files/3.0.0-spamd.conf 932 -MD5 41ff0f440896156774d0f4073820f848 files/3.0.0-spamd.init 726 +MD5 33af4cee80518e8f05da9813e3db9122 files/3.0.0-spamd.init 738 MD5 6a161feb8320fadb55f440aab192d008 files/digest-spamassassin-2.64-r1 75 MD5 faa89d7205b3bde710ddc585969a3992 files/digest-spamassassin-3.0.2-r1 76 MD5 8bae43ab6b7e9fc82d663ebe76535484 files/digest-spamassassin-3.0.3 76 MD5 66f6531ea3b0a382b4d97bd1234c43a1 files/spamd.conf 604 MD5 9ab5a9bd40752148b4cb0982dd1a5581 files/spamd.init 617 MD5 4783482f6c574067f3c8fa48e3202fae files/digest-spamassassin-3.0.4 76 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCwdMntG5z4I8BtQoRArMlAJ9Pztpwy1sWIB1AygJ41m1QsPZZswCggG9p -Wv7YGadatcBsQefQ2govQ7g= -=KISh ------END PGP SIGNATURE----- diff --git a/mail-filter/spamassassin/files/3.0.0-spamd.init b/mail-filter/spamassassin/files/3.0.0-spamd.init index 6ea2dfb6e37a..f3d48824f8ee 100644 --- a/mail-filter/spamassassin/files/3.0.0-spamd.init +++ b/mail-filter/spamassassin/files/3.0.0-spamd.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.0.0-spamd.init,v 1.4 2005/06/10 11:44:48 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.0.0-spamd.init,v 1.5 2005/06/28 23:08:52 mcummings Exp $ # NB: Config is in /etc/conf.d/spamd @@ -11,6 +11,7 @@ PIDFILE=${PIDFILE:-/var/run/spamd.pid} depend() { need net before mta + use logger } start() { diff --git a/mail-filter/spamassassin/spamassassin-3.0.4.ebuild b/mail-filter/spamassassin/spamassassin-3.0.4.ebuild index 505a0de1abcf..123b28e2dd02 100644 --- a/mail-filter/spamassassin/spamassassin-3.0.4.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.4.ebuild,v 1.9 2005/06/28 22:48:48 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.4.ebuild,v 1.10 2005/06/28 23:08:52 mcummings Exp $ inherit perl-module @@ -82,23 +82,24 @@ src_compile() { # Some more files to be installed (README* and Changes are already # included per default) mydoc="NOTICE - TRADEMARK - LICENSE - CREDITS - INSTALL - UPGRADE - BUGS - USAGE - README.spamd - README.sql - README.ldap - procmailrc.example - sample-nonspam.txt - sample-spam.txt - STATISTICS.set0 - STATISTICS.set1 - STATISTICS.set2 - STATISTICS.set3" + TRADEMARK + LICENSE + CREDITS + INSTALL + UPGRADE + BUGS + USAGE + README.spamd + README.sql + README.ldap + procmailrc.example + sample-nonspam.txt + sample-spam.txt + STATISTICS.set0 + STATISTICS.set1 + STATISTICS.set2 + STATISTICS.set3" + use qmail && mydoc="${mydoc} README.qmail" @@ -163,6 +164,7 @@ src_install () { newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd if use doc; then + dodoc ${mydoc} dodoc spamd/PROTOCOL dohtml doc/*.html fi @@ -187,15 +189,17 @@ pkg_postinst() { fi fi - einfo - einfo "Please read the file" - einfo " /usr/share/doc/${PF}/INSTALL.gz" - einfo "to find out which optional modules you need to install to enable" - einfo "additional features which depend on them." - einfo - einfo "If upgraded from 2.x, please read the file" - einfo " /usr/share/doc/${PF}/UPGRADE.gz" - einfo + if use doc; then + einfo + einfo "Please read the file" + einfo " /usr/share/doc/${PF}/INSTALL.gz" + einfo "to find out which optional modules you need to install to enable" + einfo "additional features which depend on them." + einfo + einfo "If upgraded from 2.x, please read the file" + einfo " /usr/share/doc/${PF}/UPGRADE.gz" + einfo + fi ewarn ewarn "spamd is not designed to listen to an untrusted network" ewarn "and is vulnerable to DoS attacks (and eternal doom) if" |