- Update to 3.2.3
- Add reinplace_cmd to respect CC - From maintainer: Several security updates from 3.2.1 to 3.2.2, but 3.2.2 broke spamd. This fixes the spamd problem in 3.2.2 as well. Build depends for DNS bumped to .60 due to DOS condition, crypt to 0.24 due to segv in spamd with malformed DomainKey message. DomainKey plugin turned BACK OFF in default installs (not needed now that DKIM does work) PR: ports/115369 Submitted by: Michael Scheidell <scheidell@secnap.net>` Approved by: sat (mentor)
This commit is contained in:
Beech Rintoul
parent
322c99e0f0
commit
5dcb72b777
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=197609
@ -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 @@ RUN_DEPENDS+= razor-agents>=2.84:${PORTSDIR}/mail/razor-agents
|
||||
.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 @@ post-patch:
|
||||
-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 @@ post-patch:
|
||||
.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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 @@
|
||||
# </@LICENSE>
|
||||
--- 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 <dallase@uribl.com>
|
||||
+#
|
||||
+# 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>)
|
||||
+# 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 {
|
||||
|
||||
sub image_to_text_ratio {
|
||||
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);
|
||||
|
||||
@ -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/<version>)
|
||||
+ (default: @@LOCAL_STATE_DIR@@/compiled/<version>)
|
||||
- (default: /var/lib/spamassassin/compiled/<version>)
|
||||
+ (default: @@LOCAL_STATE_DIR@@/compiled/<version>)
|
||||
--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<path>, B<--configpath>=I<path>, B<--config-file>=I<path>
|
||||
|
||||
Use the specified path for locating the distributed configuration files.
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
PKG_PREFIX=${PKG_PREFIX:=/usr/local}
|
||||
PKG_PREFIX=${PKG_PREFIX:-/usr/local}
|
||||
|
||||
ask() {
|
||||
local question default answer
|
||||
|
||||
Loading…
Reference in New Issue
Block a user