mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-23 09:10:43 +00:00
- Some dependency adjustments
- Fix syntax error, which was kept undetected so far because of the optional case [1] PR: ports/143729 Submitted by: Michael Scheidell <scheidell@secnap.net> Reported by: koitsu [1]
This commit is contained in:
parent
8a2b5ec5da
commit
cd71602040
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=249584
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= Mail-SpamAssassin
|
||||
PORTVERSION= 3.3.0
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= mail perl5
|
||||
MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
|
||||
MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan
|
||||
@ -17,18 +17,20 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:apache,cpan
|
||||
MAINTAINER= scheidell@secnap.net
|
||||
COMMENT= A highly efficient mail filter for identifying spam
|
||||
|
||||
BUILD_DEPENDS= p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \
|
||||
BUILD_DEPENDS= p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
|
||||
p5-Archive-Tar>=1.23:${PORTSDIR}/archivers/p5-Archive-Tar \
|
||||
p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \
|
||||
p5-Compress-Zlib>=2.04:${PORTSDIR}/archivers/p5-Compress-Zlib \
|
||||
p5-IO-Zlib>=1.04:${PORTSDIR}/archivers/p5-IO-Zlib \
|
||||
p5-HTML-Parser>=3.43:${PORTSDIR}/www/p5-HTML-Parser \
|
||||
p5-IO-Compress-Zlib>=2.04:${PORTSDIR}/archivers/p5-IO-Compress-Zlib \
|
||||
p5-Compress-Zlib>=2.04:${PORTSDIR}/archivers/p5-Compress-Zlib \
|
||||
${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
|
||||
p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
|
||||
p5-Test-Harness>=3.16:${PORTSDIR}/devel/p5-Test-Harness \
|
||||
${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
|
||||
${SITE_PERL}/${PERL_ARCH}/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect \
|
||||
${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
|
||||
|
||||
RUN_DEPENDS= ${BUILD_DEPENDS} \
|
||||
${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
|
||||
p5-Archive-Tar>=1.23:${PORTSDIR}/archivers/p5-Archive-Tar \
|
||||
${SITE_PERL}/${PERL_ARCH}/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect \
|
||||
${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6 \
|
||||
${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
|
||||
|
||||
CONFLICTS= ja-p5-Mail-SpamAssassin-[0-9]*
|
||||
@ -71,7 +73,7 @@ WITHOUT_SSL=1
|
||||
.endif
|
||||
|
||||
.if defined(WITH_SPF_QUERY)
|
||||
RUN_DEPENDS+= ${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF
|
||||
BUILD_DEPENDS+= ${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_SSL)
|
||||
@ -103,16 +105,16 @@ RUN_DEPENDS+= razor-agents>=2.84:${PORTSDIR}/mail/razor-agents
|
||||
.else
|
||||
.if !defined(WITH_DKIM)
|
||||
.if ${PERL_LEVEL} < 501000
|
||||
RUN_DEPENDS=+ p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1
|
||||
BUILD_DEPENDS+= p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1
|
||||
.endif
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if defined(WITH_DKIM)
|
||||
RUN_DEPENDS+= p5-Mail-DKIM>=0.37:${PORTSDIR}/mail/p5-Mail-DKIM
|
||||
RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
|
||||
RUN_DEPENDS+= p5-Crypt-OpenSSL-RSA>=0.24:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
|
||||
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA
|
||||
BUILD_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
|
||||
BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA
|
||||
BUILD_DEPENDS+= p5-Mail-DKIM>=0.37:${PORTSDIR}/mail/p5-Mail-DKIM
|
||||
BUILD_DEPENDS+= p5-Crypt-OpenSSL-RSA>=0.24:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
|
||||
.endif
|
||||
|
||||
.if defined(WITH_SACOMPILE)
|
||||
@ -123,10 +125,6 @@ RUN_DEPENDS+= re2c>=.12.0:${PORTSDIR}/devel/re2c
|
||||
RUN_DEPENDS+= ${SITE_PERL}/IP/Country/Fast.pm:${PORTSDIR}/net/p5-IP-Country
|
||||
.endif
|
||||
|
||||
.if !defined(NO_INET6)
|
||||
RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6
|
||||
.endif
|
||||
|
||||
.if defined(WITH_DCC)
|
||||
RUN_DEPENDS+= dcc-dccd>=1.3.111:${PORTSDIR}/mail/dcc-dccd
|
||||
.endif
|
||||
|
13
mail/p5-Mail-SpamAssassin/files/patch-Parser.pm
Normal file
13
mail/p5-Mail-SpamAssassin/files/patch-Parser.pm
Normal file
@ -0,0 +1,13 @@
|
||||
--- lib/Mail/SpamAssassin/Conf/Parser.pm (revision 903394)
|
||||
+++ lib/Mail/SpamAssassin/Conf/Parser.pm (working copy)
|
||||
@@ -1127,7 +1127,8 @@
|
||||
}
|
||||
if ($type == $Mail::SpamAssassin::Conf::TYPE_HEAD_TESTS)
|
||||
{
|
||||
- if ($text =~ /^!?defined\([A-Za-z][A-Za-z0-9-]*\)$/) {
|
||||
+ # RFC 5322 section 3.6.8, ftext printable US-ASCII chars not including ":"
|
||||
+ if ($text =~ /^!?defined\([!-9;-\176]+\)$/) {
|
||||
# fine, implements 'exists:'
|
||||
} else {
|
||||
my ($pat) = ($text =~ /^\s*\S+\s*(?:\=|\!)\~\s*(\S.*?\S)\s*$/);
|
||||
|
Loading…
Reference in New Issue
Block a user