Date: Wed, 10 Feb 2010 17:41:51 GMT From: Michael Scheidell <scheidell@secnap.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/143729: MAINTAINER UPDATE mail/p5-Mail-SpamAssassin FIX some 330 issues Message-ID: <201002101741.o1AHfppr016419@www.freebsd.org> Resent-Message-ID: <201002101750.o1AHo1HL092348@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143729 >Category: ports >Synopsis: MAINTAINER UPDATE mail/p5-Mail-SpamAssassin FIX some 330 issues >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Feb 10 17:50:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Michael Scheidell >Release: 7.1, 6.4 >Organization: SECNAP Network Security >Environment: na >Description: portupgrade or make deinstall/reinstall seemed to work, but make from a greenfields install didn't always work. SA needs to have tar-archive and net-ip in build_depends, move a lot of dependencies from run_depends to build_depends. put tar_archive and net_ip first. also, added in patch for patch-Parser.pm Note: SOMETIMES I needed to run a 'make clean' in ../p5-Mail-SpamAssassin if there were old p5-* files still around. if you get a missing Makefile, or stop when you build, then run make clean first. >How-To-Repeat: make >Fix: this patch, bump port version to 2 thanks to several people who found this, and Gabor for getting it most of the way there with port version 1. Patch attached with submission follows: diff -bBru SA330_1/Makefile SA330_2/Makefile --- SA330_1/Makefile 2010-02-10 08:37:11.000000000 -0500 +++ SA330_2/Makefile 2010-02-10 12:33:18.000000000 -0500 @@ -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 @@ 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 - -RUN_DEPENDS= ${BUILD_DEPENDS} \ + p5-Test-Harness>=3.16:${PORTSDIR}/devel/p5-Test-Harness \ ${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}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools + +RUN_DEPENDS= ${BUILD_DEPENDS} \ + ${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 @@ .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 @@ .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+= ${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 diff -bBru SA330_1/files/patch-Parser.pm SA330_2/files/patch-Parser.pm --- SA330_1/files/patch-Parser.pm 2010-02-10 12:34:05.000000000 -0500 +++ SA330_2/files/patch-Parser.pm 2010-02-05 09:50:59.000000000 -0500 @@ -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*$/); + >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002101741.o1AHfppr016419>