View | Details | Raw Unified | Return to bug 42938 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-8 / +7 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	Mail-SpamAssassin
8
PORTNAME=	Mail-SpamAssassin
9
PORTVERSION=	2.31
9
PORTVERSION=	2.41
10
PORTREVISION=	2
10
PORTREVISION=	2
11
CATEGORIES=	mail perl5
11
CATEGORIES=	mail perl5
12
MASTER_SITES=	http://spamassassin.org/released/ \
12
MASTER_SITES=	http://spamassassin.org/released/ \
Lines 17-23 Link Here
17
MAINTAINER=	ports@geeksrus.net
17
MAINTAINER=	ports@geeksrus.net
18
18
19
BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
19
BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
20
		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
20
		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
21
		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser/
21
RUN_DEPENDS=	${BUILD_DEPENDS} \
22
RUN_DEPENDS=	${BUILD_DEPENDS} \
22
		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
23
		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
23
		razor-client:${PORTSDIR}/mail/razor-agents
24
		razor-client:${PORTSDIR}/mail/razor-agents
Lines 30-39 Link Here
30
MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
31
MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
31
MAN3=		Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \
32
MAN3=		Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \
32
		Mail::SpamAssassin::Conf.3 \
33
		Mail::SpamAssassin::Conf.3 \
33
		Mail::SpamAssassin::PersistentAddrList.3 \
34
		Mail::SpamAssassin::PersistentAddrList.3
34
		Mail::SpamAssassin::SMTP::SmartHost.3
35
MAN1PREFIX=	${PREFIX}
35
MAN1PREFIX=	${PREFIX}
36
MAN1=		spamd.1 spamassassin.1 spamc.1 spamproxyd.1
36
MAN1=		spamd.1 spamassassin.1 spamc.1
37
DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
37
DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
38
EXAMPLESDIR=	${PREFIX}/share/examples//${PKGNAMEPREFIX}${PORTNAME}
38
EXAMPLESDIR=	${PREFIX}/share/examples//${PKGNAMEPREFIX}${PORTNAME}
39
39
Lines 47-56 Link Here
47
.if !defined(NOPORTDOCS)
47
.if !defined(NOPORTDOCS)
48
	${MKDIR} ${DOCSDIR}
48
	${MKDIR} ${DOCSDIR}
49
	${INSTALL_DATA} ${WRKSRC}/sql/README ${DOCSDIR}/README.sql
49
	${INSTALL_DATA} ${WRKSRC}/sql/README ${DOCSDIR}/README.sql
50
	${INSTALL_DATA} ${WRKSRC}/spamproxy/README ${DOCSDIR}/README.spamproxy
51
	cd ${WRKSRC} ; ${INSTALL_DATA} \
50
	cd ${WRKSRC} ; ${INSTALL_DATA} \
52
	    Changes README TODO TRADEMARK procmailrc.example sample* \
51
	    Changes README TRADEMARK procmailrc.example sample* \
53
	    spamd/README* spamproxy/README.SmartHost sql/spamassassin.sql \
52
	    spamd/README* sql/spamassassin.sql \
54
	    ${DOCSDIR}
53
	    ${DOCSDIR}
55
.endif
54
.endif
56
55
(-)./distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (Mail-SpamAssassin-2.31.tar.gz) = a9878b4ea035964c04c4899ee154e222
1
MD5 (Mail-SpamAssassin-2.41.tar.gz) = e96b278beecb4b549a79b1497bd354e3
(-)./files/patch-use_dcc-option (-37 / +22 lines)
Lines 1-16 Link Here
1
diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Conf.pm ./lib/Mail/SpamAssassin/Conf.pm
1
diff -ruN ../Mail-SpamAssassin-2.41-old/lib/Mail/SpamAssassin/Conf.pm ./lib/Mail/SpamAssassin/Conf.pm
2
--- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Conf.pm	Mon Jun 10 00:59:38 2002
2
--- ../Mail-SpamAssassin-2.41-old/lib/Mail/SpamAssassin/Conf.pm	Thu Sep  5 11:47:38 2002
3
+++ ./lib/Mail/SpamAssassin/Conf.pm	Sat Jun 15 01:35:42 2002
3
+++ ./lib/Mail/SpamAssassin/Conf.pm	Wed Sep 18 13:40:59 2002
4
@@ -135,6 +135,8 @@
4
@@ -140,6 +140,7 @@
5
   $self->{allow_user_rules} = 0;
5
   $self->{allow_user_rules} = 0;
6
   $self->{user_rules_to_compile} = 0;
6
   $self->{user_rules_to_compile} = 0;
7
 
7
   $self->{fold_headers} = 1;
8
+  $self->{use_dcc} = 1;
8
+  $self->{use_dcc} = 1;
9
+
9
 
10
   $self->{dcc_body_max} = 999999;
10
   $self->{dcc_body_max} = 999999;
11
   $self->{dcc_fuz1_max} = 999999;
11
   $self->{dcc_fuz1_max} = 999999;
12
   $self->{dcc_fuz2_max} = 999999;
12
@@ -757,6 +758,16 @@
13
@@ -613,6 +615,16 @@
14
 
13
 
15
     if (/^rbl[-_]timeout\s+(\d+)$/) {
14
     if (/^rbl[-_]timeout\s+(\d+)$/) {
16
       $self->{rbl_timeout} = $1+0; next;
15
       $self->{rbl_timeout} = $1+0; next;
Lines 26-36 Link Here
26
+      $self->{use_dcc} = $1+0; next;
25
+      $self->{use_dcc} = $1+0; next;
27
     }
26
     }
28
 
27
 
29
 =item ok_locales xx [ yy zz ... ]		(default: en)
28
 =item ok_locales xx [ yy zz ... ]		(default: all)
30
diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Dns.pm ./lib/Mail/SpamAssassin/Dns.pm
29
diff -ruN ../Mail-SpamAssassin-2.41-old/lib/Mail/SpamAssassin/Dns.pm ./lib/Mail/SpamAssassin/Dns.pm
31
--- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Dns.pm	Wed Jun 12 02:10:43 2002
30
--- ../Mail-SpamAssassin-2.41-old/lib/Mail/SpamAssassin/Dns.pm	Thu Sep  5 06:55:58 2002
32
+++ ./lib/Mail/SpamAssassin/Dns.pm	Sat Jun 15 01:37:22 2002
31
+++ ./lib/Mail/SpamAssassin/Dns.pm	Wed Sep 18 13:43:29 2002
33
@@ -301,6 +301,10 @@
32
@@ -444,6 +444,10 @@
34
 
33
 
35
 sub is_dcc_available {
34
 sub is_dcc_available {
36
   my ($self) = @_;
35
   my ($self) = @_;
Lines 41-47 Link Here
41
   my (@resp);
40
   my (@resp);
42
 
41
 
43
   if ($self->{main}->{local_tests_only}) {
42
   if ($self->{main}->{local_tests_only}) {
44
@@ -324,6 +328,10 @@
43
@@ -473,6 +477,10 @@
45
 
44
 
46
 sub dcc_lookup {
45
 sub dcc_lookup {
47
   my ($self, $fulltext) = @_;
46
   my ($self, $fulltext) = @_;
Lines 52-61 Link Here
52
   my $response = undef;
51
   my $response = undef;
53
   my %count;
52
   my %count;
54
   my $left;
53
   my $left;
55
diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/EvalTests.pm ./lib/Mail/SpamAssassin/EvalTests.pm
54
diff -ruN ../Mail-SpamAssassin-2.41-old/lib/Mail/SpamAssassin/EvalTests.pm ./lib/Mail/SpamAssassin/EvalTests.pm
56
--- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/EvalTests.pm	Fri Jun 14 10:21:47 2002
55
--- ../Mail-SpamAssassin-2.41-old/lib/Mail/SpamAssassin/EvalTests.pm	Thu Sep  5 06:55:58 2002
57
+++ ./lib/Mail/SpamAssassin/EvalTests.pm	Sat Jun 15 01:37:34 2002
56
+++ ./lib/Mail/SpamAssassin/EvalTests.pm	Wed Sep 18 13:45:26 2002
58
@@ -1430,6 +1430,9 @@
57
@@ -2010,6 +2010,9 @@
59
 sub check_dcc {
58
 sub check_dcc {
60
   my ($self, $fulltext) = @_;
59
   my ($self, $fulltext) = @_;
61
 
60
 
Lines 65-93 Link Here
65
   return 0 unless ($self->is_dcc_available());
64
   return 0 unless ($self->is_dcc_available());
66
   return 0 if ($self->{already_checked_dcc});
65
   return 0 if ($self->{already_checked_dcc});
67
 
66
 
68
diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Reporter.pm ./lib/Mail/SpamAssassin/Reporter.pm
67
diff -ruN ../Mail-SpamAssassin-2.41-old/rules/10_misc.cf ./rules/10_misc.cf
69
--- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Reporter.pm	Fri Jun 14 11:52:17 2002
68
--- ../Mail-SpamAssassin-2.41-old/rules/10_misc.cf	Thu Sep  5 06:55:58 2002
70
+++ ./lib/Mail/SpamAssassin/Reporter.pm	Sat Jun 15 00:56:39 2002
69
+++ ./rules/10_misc.cf	Wed Sep 18 13:47:09 2002
71
@@ -147,6 +147,10 @@
70
@@ -103,6 +103,9 @@
72
 
73
 sub is_dcc_available {
74
   my ($self) = @_;
75
+
76
+  # Added by FreeBSD ports
77
+  return 0 unless $self->{conf}->{use_dcc};
78
+
79
   my (@resp);
80
 
81
   if ($self->{main}->{local_tests_only}) {
82
diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/rules/10_misc.cf ./rules/10_misc.cf
83
--- /usr/local/home/doug/Mail-SpamAssassin-2.30/rules/10_misc.cf	Thu May 30 19:12:10 2002
84
+++ ./rules/10_misc.cf	Sat Jun 15 00:56:39 2002
85
@@ -102,6 +102,9 @@
86
 # test, so it is set to "all" so the test will not be used by default.
71
 # test, so it is set to "all" so the test will not be used by default.
87
 ok_languages            all
72
 ok_languages            all
88
 
73
 
89
+# Added by FreeBSD ports
74
+# Added by FreeBSD ports
90
+use_dcc			0
75
+use_dcc                 0
91
+
76
+
92
 # Some common prefs settings can be set here, to take effect site-wide
77
 # Some common prefs settings can be set here, to take effect site-wide
93
 # unless the user override them. See the .prefs file for explanations.
78
 # unless the user override them. See the .prefs file for explanations.
(-)./files/spamd.sh (+1 lines)
Lines 10-15 Link Here
10
	[ -x ${PREFIX}/bin/spamd ] && ${PREFIX}/bin/spamd -a -c -d && echo -n ' spamd'
10
	[ -x ${PREFIX}/bin/spamd ] && ${PREFIX}/bin/spamd -a -c -d && echo -n ' spamd'
11
	;;
11
	;;
12
stop)
12
stop)
13
	kill `ps ax | grep /usr/local/bin/spamd | grep -v grep | awk '{ print $1 }'` && echo -n ' spamd'
13
	;;
14
	;;
14
*)
15
*)
15
	echo "Usage: `basename $0` {start|stop}" >&2
16
	echo "Usage: `basename $0` {start|stop}" >&2
(-)./pkg-plist (-11 / +9 lines)
Lines 1-7 Link Here
1
bin/spamassassin
2
bin/spamc
1
bin/spamc
3
bin/spamd
2
bin/spamd
4
bin/spamproxyd
3
bin/spamassassin
5
etc/rc.d/spamd.sh-dist
4
etc/rc.d/spamd.sh-dist
6
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
5
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
7
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin.pm
6
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin.pm
Lines 11-20 Link Here
11
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ConfSourceSQL.pm
10
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ConfSourceSQL.pm
12
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/DBBasedAddrList.pm
11
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/DBBasedAddrList.pm
13
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Dns.pm
12
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Dns.pm
13
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMIME.pm
14
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMessage.pm
14
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMessage.pm
15
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EvalTests.pm
15
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EvalTests.pm
16
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ExposedMessage.pm
16
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ExposedMessage.pm
17
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/HTML.pm
17
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Locales.pm
18
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Locales.pm
19
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/MailingList.pm
18
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Message.pm
20
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Message.pm
19
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/NoMailAudit.pm
21
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/NoMailAudit.pm
20
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PerMsgStatus.pm
22
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PerMsgStatus.pm
Lines 22-46 Link Here
22
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PhraseFreqs.pm
24
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PhraseFreqs.pm
23
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Replier.pm
25
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Replier.pm
24
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Reporter.pm
26
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Reporter.pm
25
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/SMTP/SmartHost.pm
27
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/SHA1.pm
26
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/TextCat.pm
28
lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/TextCat.pm
27
lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/SpamAssassin/SMTP/SmartHost/autosplit.ix
28
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/Changes
29
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/Changes
29
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README
30
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README
30
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.SmartHost
31
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd
31
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd
32
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd-vpopmail
32
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd-vpopmail
33
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamproxy
34
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.sql
33
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.sql
35
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/TODO
36
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/TRADEMARK
34
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/TRADEMARK
37
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/procmailrc.example
35
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/procmailrc.example
38
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-nonspam.txt
36
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-nonspam.txt
39
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-spam.txt
37
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-spam.txt
40
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/spamassassin.sql
38
%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/spamassassin.sql
41
share/spamassassin/10_misc.cf
39
share/spamassassin/10_misc.cf
40
share/spamassassin/20_anti_ratware.cf
42
share/spamassassin/20_body_tests.cf
41
share/spamassassin/20_body_tests.cf
42
share/spamassassin/20_compensate.cf
43
share/spamassassin/20_head_tests.cf
43
share/spamassassin/20_head_tests.cf
44
share/spamassassin/20_meta_tests.cf
45
share/spamassassin/20_ratware.cf
44
share/spamassassin/20_uri_tests.cf
46
share/spamassassin/20_uri_tests.cf
45
share/spamassassin/25_body_tests_es.cf
47
share/spamassassin/25_body_tests_es.cf
46
share/spamassassin/25_body_tests_pl.cf
48
share/spamassassin/25_body_tests_pl.cf
Lines 58-68 Link Here
58
share/spamassassin/user_prefs.template
60
share/spamassassin/user_prefs.template
59
%%PORTDOCS%%@dirrm share/doc/p5-Mail-SpamAssassin
61
%%PORTDOCS%%@dirrm share/doc/p5-Mail-SpamAssassin
60
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
62
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
61
@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/SMTP
62
@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin
63
@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin
63
@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/SpamAssassin/SMTP/SmartHost
64
@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/SpamAssassin/SMTP
65
@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/SpamAssassin
66
@dirrm share/spamassassin
64
@dirrm share/spamassassin
67
@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
65
@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
68
@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
66
@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true

Return to bug 42938