Index: Makefile =================================================================== RCS file: /home/pcvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v retrieving revision 1.108 diff -u -r1.108 Makefile --- Makefile 22 Jul 2007 22:40:58 -0000 1.108 +++ Makefile 13 Aug 2007 22:00:59 -0000 @@ -6,8 +6,7 @@ # PORTNAME= Mail-SpamAssassin -PORTVERSION= 3.2.1 -PORTREVISION= 1 +PORTVERSION= 3.2.3 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan @@ -97,7 +96,7 @@ .if defined(WITH_DKIM) RUN_DEPENDS+= p5-Mail-DKIM>=.20:${PORTSDIR}/mail/p5-Mail-DKIM RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL -RUN_DEPENDS+= p5-Mail-DomainKeys>=0.80:${PORTSDIR}/mail/p5-Mail-DomainKeys +RUN_DEPENDS+= p5-Crypt-OpenSSL-RSA>=0.24:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA .endif .if defined(WITH_SACOMPILE) @@ -203,6 +202,7 @@ -e 's#B_CONFDIR)/v320.pre#B_CONFDIR)/v320.pre.sample#g' \ -e 's/require DBI/0/' \ ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -e '/^CC =/d' ${WRKSRC}/spamc/Makefile.in .if defined(WITH_RAZOR) ${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre @@ -212,7 +212,6 @@ .endif .if defined(WITH_DKIM) ${REINPLACE_CMD} -e '/DKIM/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre - ${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre .endif .if !defined(WITH_SPF_QUERY) ${REINPLACE_CMD} -e '/SPF/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/init.pre Index: distinfo =================================================================== RCS file: /home/pcvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v retrieving revision 1.39 diff -u -r1.39 distinfo --- distinfo 16 Jun 2007 22:17:03 -0000 1.39 +++ distinfo 13 Aug 2007 22:00:59 -0000 @@ -1,3 +1,3 @@ -MD5 (Mail-SpamAssassin-3.2.1.tar.gz) = a7d51294c565999da01f212e5ad2a031 -SHA256 (Mail-SpamAssassin-3.2.1.tar.gz) = e0925d9c490bb8f1e56c3b850b50b12b124536dfe581b23d3c25715b1ce9ebf7 -SIZE (Mail-SpamAssassin-3.2.1.tar.gz) = 1193561 +MD5 (Mail-SpamAssassin-3.2.3.tar.gz) = 2e356b70b9458b44a828c19f6e816521 +SHA256 (Mail-SpamAssassin-3.2.3.tar.gz) = 2bf7635555dea4912512a32c7c567094ef264770b86029c49f653e97352efad8 +SIZE (Mail-SpamAssassin-3.2.3.tar.gz) = 1202082 Index: pkg-install =================================================================== RCS file: /home/pcvs/ports/mail/p5-Mail-SpamAssassin/pkg-install,v retrieving revision 1.3 diff -u -r1.3 pkg-install --- pkg-install 22 Jul 2007 22:40:58 -0000 1.3 +++ pkg-install 13 Aug 2007 22:00:59 -0000 @@ -1,5 +1,5 @@ #!/bin/sh -PKG_PREFIX=${PKG_PREFIX:=/usr/local} +PKG_PREFIX=${PKG_PREFIX:-/usr/local} ask() { local question default answer Index: files/patch-ImageInfo.pm =================================================================== RCS file: /home/pcvs/ports/mail/p5-Mail-SpamAssassin/files/patch-ImageInfo.pm,v retrieving revision 1.1 diff -u -r1.1 patch-ImageInfo.pm --- files/patch-ImageInfo.pm 2 Jun 2007 07:09:46 -0000 1.1 +++ files/patch-ImageInfo.pm 13 Aug 2007 22:00:59 -0000 @@ -1,98 +1,18 @@ ---- ImageInfo.pm.orig Tue May 1 09:54:09 2007 -+++ lib/Mail/SpamAssassin/Plugin/ImageInfo.pm Thu May 3 16:08:29 2007 -@@ -1,10 +1,9 @@ - # <@LICENSE> --# Licensed to the Apache Software Foundation (ASF) under one or more --# contributor license agreements. See the NOTICE file distributed with --# this work for additional information regarding copyright ownership. --# The ASF licenses this file to you under the Apache License, Version 2.0 --# (the "License"); you may not use this file except in compliance with --# the License. You may obtain a copy of the License at: -+# Copyright 2004 Apache Software Foundation -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # -@@ -16,6 +15,36 @@ - # +--- lib/Mail/SpamAssassin/Plugin/ImageInfo.pm.orig 2007-08-08 05:19:14.000000000 -0800 ++++ lib/Mail/SpamAssassin/Plugin/ImageInfo.pm 2007-08-11 12:20:22.000000000 -0800 +@@ -49,6 +49,11 @@ + # body LARGE_IMAGE_AREA eval:pixel_coverage('all',150000) + # body SMALL_GIF_AREA eval:pixel_coverage('gif',1,40000) # - # ------------------------------------------------------- -+# ImageInfo Plugin for SpamAssassin -+# Version: 0.7 -+# Current Home: http://www.rulesemporium.com/plugins.htm#imageinfo -+# Created: 2006-08-02 -+# Modified: 2007-01-17 -+# By: Dallas Engelken -+# -+# Changes: -+# 0.7 - added image_name_regex to allow pattern matching on the image name -+# - added support for image/pjpeg content types (progressive jpeg) -+# - updated imageinfo.cf with a few sample rules for using image_name_regex() -+# 0.6 - fixed dems_ bug in image_size_range_ -+# 0.5 - added image_named and image_to_text_ratio -+# 0.4 - added image_size_exact and image_size_range -+# 0.3 - added jpeg support -+# 0.2 - optimized by theo -+# 0.1 - added gif/png support -+# -+# Files: -+# ImageInfo.pm (plugin) - http://www.rulesemporium.com/plugins/ImageInfo.pm -+# imageinfo.cf (ruleset) - http://www.rulesemporium.com/plugins/imageinfo.cf -+# -+# Install: -+# 1) place ruleset in your local config dir -+# 2) place plugin in your plugins dir -+# 3) add to init.pre (or v310.pre) the following line -+# loadplugin Mail::SpamAssassin::Plugin::ImageInfo -+# or if not in plugin dir.. -+# loadplugin Mail::SpamAssassin::Plugin::ImageInfo /path/to/plugin -+# 4) restart spamd (if necessary) - # - # Usage: - # image_count() -@@ -27,7 +56,7 @@ - # max: optional, if specified, message must not - # contain more than this number of images - # --# examples -+# image_count() examples - # - # body ONE_IMAGE eval:image_count('all',1,1) - # body ONE_OR_MORE_IMAGES eval:image_count('all',1) -@@ -44,13 +73,24 @@ - # max: optional, if specified, message must not - # contain more than this much pixel area - # --# examples -+# pixel_coverage() examples -+# -+# body LARGE_IMAGE_AREA eval:pixel_coverage('all',150000) # catches any images that are 150k pixel/sq or higher -+# body SMALL_GIF_AREA eval:pixel_coverage('gif',1,40000) # catches only gifs that 1 to 40k pixel/sql -+# -+# image_name_regex() -+# -+# body RULENAME eval:image_name_regex() -+# regex: full quoted regexp, see examples below -+# +# image_name_regex() examples +# +# body CG_DOUBLEDOT_GIF eval:image_name_regex('/^\w{2,9}\.\.gif$/i') # catches double dot gifs abcd..gif ++# ++# + # See the ruleset for ways to meta image_count() + # and pixel_coverage() together. # --# body LARGE_IMAGE_AREA eval:pixel_coverage('all',150000) --# body SMALL_GIF_AREA eval:pixel_coverage('gif',1,40000) -+# See the ruleset for more examples that arent documented here. - # --# See the ruleset for ways to meta image_count() --# and pixel_coverage() together. -+# New functions added in v0.5+ need some documentation here. Or just -+# see .cf for sample rules. - # - # ------------------------------------------------------- - -@@ -80,6 +120,7 @@ +@@ -80,6 +85,7 @@ $self->register_eval_rule ("image_size_exact"); $self->register_eval_rule ("image_size_range"); $self->register_eval_rule ("image_named"); @@ -100,10 +20,10 @@ $self->register_eval_rule ("image_to_text_ratio"); return $self; -@@ -244,6 +285,34 @@ +@@ -275,6 +281,33 @@ + } # ----------------------------------------- - +sub image_name_regex { + my ($self,$pms,$body,$re) = @_; + return unless (defined $re); @@ -128,20 +48,9 @@ + } + return 0; + -+} ++ } + +# ----------------------------------------- -+ - sub image_count { - my ($self,$pms,$body,$type,$min,$max) = @_; - -@@ -323,7 +392,8 @@ - $self->_get_images($pms); - } -- return unless (exists $pms->{'imageinfo'}->{"dems_$type"}); -+ my $name = 'dems_'.$type; -+ return unless (exists $pms->{'imageinfo'}->{$name}); - - foreach my $dem ( keys %{$pms->{'imageinfo'}->{"dems_$type"}}) { - my ($h,$w) = split(/x/,$dem); + sub image_to_text_ratio { + my ($self,$pms,$body,$type,$min,$max) = @_; Index: files/patch-sa-compile.raw =================================================================== RCS file: /home/pcvs/ports/mail/p5-Mail-SpamAssassin/files/patch-sa-compile.raw,v retrieving revision 1.2 diff -u -r1.2 patch-sa-compile.raw --- files/patch-sa-compile.raw 16 Jun 2007 22:17:03 -0000 1.2 +++ files/patch-sa-compile.raw 13 Aug 2007 22:00:59 -0000 @@ -1,16 +1,18 @@ ---- sa-compile.raw.orig Tue May 1 09:54:33 2007 -+++ sa-compile.raw Thu May 3 13:35:23 2007 -@@ -643,7 +643,7 @@ +--- sa-compile.raw.orig 2007-08-08 05:19:47.000000000 -0800 ++++ sa-compile.raw 2007-08-11 12:31:07.000000000 -0800 +@@ -659,9 +659,9 @@ -p prefs, --prefspath=file, --prefs-file=file Set user preferences file --siteconfigpath=path Path for site configs - (default: /etc/mail/spamassassin) -+ (default: @@LOCAL_RULES_DIR@@) ++ (default: @@LOCAL_RULES_DIR@@) --updatedir=path Directory to place updates -- (default: /var/lib/spamassassin/compiled/) -+ (default: @@LOCAL_STATE_DIR@@/compiled/) +- (default: /var/lib/spamassassin/compiled/) ++ (default: @@LOCAL_STATE_DIR@@/compiled/) --cf='config line' Additional line of configuration -@@ -692,12 +692,12 @@ + -D, --debug [area=n,...] Print debugging messages + -V, --version Print version +@@ -708,12 +708,12 @@ =item B<-C> I, B<--configpath>=I, B<--config-file>=I Use the specified path for locating the distributed configuration files. Index: files/patch-spamc-Makefile.in =================================================================== RCS file: files/patch-spamc-Makefile.in diff -N files/patch-spamc-Makefile.in --- files/patch-spamc-Makefile.in 16 Jun 2007 22:17:03 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- spamc/Makefile.in~ Fri Jun 8 14:56:02 2007 -+++ spamc/Makefile.in Thu Jun 14 00:41:37 2007 -@@ -7,4 +7,5 @@ - LDFLAGS = @LDFLAGS@ - LDDLFLAGS = @LDDLFLAGS@ -+SHLIBFLAGS = -fPIC - - LIBS = @LIBS@ -@@ -33,9 +34,9 @@ - - spamc/libspamc$(SHLIBEXT): $(LIBSPAMC_FILES) -- $(CC) $(CCDLFLAGS) $(LIBSPAMC_FILES) \ -+ $(CC) $(CCDLFLAGS) $(SHLIBFLAGS) $(LIBSPAMC_FILES) \ - -o $@ $(LDDLFLAGS) $(LIBS) - - spamc/libsslspamc$(SHLIBEXT): $(LIBSPAMC_FILES) -- $(CC) $(SSLCFLAGS) $(CCDLFLAGS) $(LIBSPAMC_FILES) \ -+ $(CC) $(SSLCFLAGS) $(CCDLFLAGS) $(SHLIBFLAGS) $(LIBSPAMC_FILES) \ - -o $@ $(LDDLFLAGS) $(SSLLIBS) $(LIBS) -