Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
sambuc
2014-11-05 12:41:07 +01:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail/spamassassin/Makefile
+7 -8
View File
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.107.2.1 2013/08/01 12:51:53 tron Exp $
# $NetBSD: Makefile,v 1.112 2014/02/12 23:18:10 tron Exp $
DISTNAME= Mail-SpamAssassin-3.3.2
PKGNAME= spamassassin-3.3.2
PKGREVISION= 5
PKGREVISION= 8
SVR4_PKGNAME= sa
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/}
@@ -29,17 +29,16 @@ PLIST_SUBST+= RULESARCHIVE=${RULESARCHIVE:Q}
PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q}
PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q}
DEPENDS+= gnupg-[0-9]*:../../security/gnupg
DEPENDS+= p5-Archive-Tar>=1.23:../../archivers/p5-Archive-Tar
DEPENDS+= p5-DB_File-[0-9]*:../../databases/p5-DB_File
DEPENDS+= {perl>=5.9.3,p5-Archive-Tar>=1.23}:../../archivers/p5-Archive-Tar
DEPENDS+= {perl>=5,p5-DB_File-[0-9]*}:../../databases/p5-DB_File
DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
DEPENDS+= p5-HTML-Parser>=3.43:../../www/p5-HTML-Parser
DEPENDS+= p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress
DEPENDS+= p5-IO-Zlib>=1.04:../../devel/p5-IO-Zlib
DEPENDS+= {perl>=5.9.3,p5-IO-Compress-[0-9]*}:../../devel/p5-IO-Compress # Compress::Zlib>=0
DEPENDS+= {perl>=5.9.3,p5-IO-Zlib>=1.04}:../../devel/p5-IO-Zlib
DEPENDS+= p5-NetAddr-IP>=4.007:../../net/p5-NetAddr-IP
DEPENDS+= p5-Net-DNS>=0.58:../../net/p5-Net-DNS
DEPENDS+= {p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64
DEPENDS+= p5-Time-HiRes-[0-9]*:../../time/p5-Time-HiRes
DEPENDS+= {perl>=5.7.3,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
USE_TOOLS+= perl
mail/spamassassin/PLIST
+1 -2
View File
@@ -1,6 +1,5 @@
@comment $NetBSD: PLIST,v 1.21 2010/03/24 21:41:10 heinz Exp $
@comment $NetBSD: PLIST,v 1.22 2014/03/11 14:05:05 jperkin Exp $
@comment Most of this PLIST is auto-generated; see Makefile.
share/examples/rc.d/spamd
share/examples/spamassassin/local.cf
share/examples/spamassassin/netbsd_lists.cf
share/examples/spamassassin/procmailrc.example
mail/spamassassin/distinfo
+8 -1
View File
@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.58.4.1 2013/08/01 12:51:53 tron Exp $
$NetBSD: distinfo,v 1.61 2013/12/04 15:14:19 jperkin Exp $
SHA1 (Mail-SpamAssassin-3.3.2.tar.gz) = de954f69e190496eff4a796a9bab61747f03072b
RMD160 (Mail-SpamAssassin-3.3.2.tar.gz) = 78e22ba6ba62a48fb7d24c40170124881b975fd9
@@ -17,4 +17,11 @@ SHA1 (patch-ab) = 84ebc0f611365c00205a85cb84970772a0931ef8
SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424
SHA1 (patch-ba) = 1842e3fc17b3d23309336e542635eeacb67461e8
SHA1 (patch-lib_Mail_SpamAssassin_AsyncLoop.pm) = a305fc866785905bcb6b65b013525cb130ddf4a3
SHA1 (patch-lib_Mail_SpamAssassin_Conf_Parser.pm) = bbb41a5667f88d485b027860973d205f6ccec0d1
SHA1 (patch-lib_Mail_SpamAssassin_DnsResolver.pm) = ec66585e49d1cfa5acfb6989508958a75a824bc5
SHA1 (patch-lib_Mail_SpamAssassin_Message.pm) = 402b9769df65ae87c3beebcc9441e29619eed367
SHA1 (patch-lib_Mail_SpamAssassin_PerMsgStatus.pm) = 9eb3a5135ab7f2ca3aa18686bad9bbe818bdf761
SHA1 (patch-lib_Mail_SpamAssassin_Util.pm) = 930b99127847057aeadf6c2c6c9558afec2ff2c8
SHA1 (patch-sa-update) = 893d8c2ebe68524b620a438f30e2b9ba764aaa6e
mail/spamassassin/options.mk
+17 -2
View File
@@ -1,7 +1,7 @@
# $NetBSD: options.mk,v 1.10 2012/06/12 15:45:59 wiz Exp $
# $NetBSD: options.mk,v 1.11 2013/07/24 16:17:02 drochner Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.spamassassin
PKG_SUPPORTED_OPTIONS= inet6 ssl
PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg2
#
# Default options
@@ -49,3 +49,18 @@ MAKE_PARAMS+= ENABLE_SSL=no
.if !empty(PKG_OPTIONS:Minet6)
DEPENDS+= p5-IO-Socket-INET6-[0-9]*:../../net/p5-IO-Socket-INET6
.endif
#
# use gnupg2 instead of gnupg1
#
.if !empty(PKG_OPTIONS:Mgnupg2)
DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2
GPGPATH= ${LOCALBASE}/bin/gpg2
.else
DEPENDS+= gnupg>=1.0.0:../../security/gnupg
GPGPATH= ${LOCALBASE}/bin/gpg
.endif
SUBST_CLASSES+= gpgpath
SUBST_STAGE.gpgpath= pre-configure
SUBST_FILES.gpgpath= sa-update.raw
SUBST_VARS.gpgpath= GPGPATH
mail/spamassassin/patches/patch-ba
+25
View File
@@ -0,0 +1,25 @@
$NetBSD: patch-ba,v 1.4 2013/07/24 16:17:02 drochner Exp $
prepare for SUBST
--- sa-update.raw.orig 2011-06-06 23:59:19.000000000 +0000
+++ sa-update.raw
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w -T
+#!/usr/pkg/bin/perl -w -T
# <@LICENSE>
# Licensed to the Apache Software Foundation (ASF) under one or more
@@ -281,10 +281,10 @@ my $GPGPath;
if ($GPG_ENABLED || $opt{'import'}) {
# find GPG in the PATH
# bug 4958: for *NIX it's "gpg", in Windows it's "gpg.exe"
- $GPGPath = 'gpg' . $Config{_exe};
+ $GPGPath = '@GPGPATH@' . $Config{_exe};
dbg("gpg: Searching for '$GPGPath'");
- if ($GPGPath = Mail::SpamAssassin::Util::find_executable_in_env_path($GPGPath)) {
+ if (-f $GPGPath) {
dbg("gpg: found $GPGPath");
# bug 5030: if GPGPath has a space, put it in quotes
mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_AsyncLoop.pm
+31
View File
@@ -0,0 +1,31 @@
$NetBSD: patch-lib_Mail_SpamAssassin_AsyncLoop.pm,v 1.1 2013/12/04 15:14:19 jperkin Exp $
Part of backport of bug#6937
--- lib/Mail/SpamAssassin/AsyncLoop.pm.orig 2011-06-06 23:59:17.000000000 +0000
+++ lib/Mail/SpamAssassin/AsyncLoop.pm
@@ -360,7 +360,13 @@ sub complete_lookups {
}
$now = time; # capture new timestamp, after possible sleep in 'select'
- while (my($key,$ent) = each %$pending) {
+ # A callback routine may generate another DNS query, which may insert
+ # an entry into the %$pending hash thus invalidating the each() context.
+ # So, make sure that callbacks are not called while the each() context
+ # is open, or avoid using each(). [Bug 6937]
+ #
+ foreach my $key (keys %$pending) {
+ my $ent = $pending->{$key};
my $id = $ent->{id};
if (defined $ent->{poll_callback}) { # call a "poll_callback" if exists
# be nice, provide fresh info to a callback routine
@@ -448,7 +454,8 @@ sub abort_remaining_lookups {
my $pending = $self->{pending_lookups};
my $foundcnt = 0;
my $now = time;
- while (my($key,$ent) = each %$pending) {
+ foreach my $key (keys %$pending) {
+ my $ent = $pending->{$key};
dbg("async: aborting after %.3f s, %s: %s",
$now - $ent->{start_time},
(defined $ent->{timeout_initial} &&
mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_Conf_Parser.pm
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-lib_Mail_SpamAssassin_Conf_Parser.pm,v 1.1 2013/12/04 15:14:19 jperkin Exp $
Part of backport of bug#6937
--- lib/Mail/SpamAssassin/Conf/Parser.pm.orig 2011-06-06 23:59:17.000000000 +0000
+++ lib/Mail/SpamAssassin/Conf/Parser.pm
@@ -1248,7 +1248,7 @@ sub is_regexp_valid {
my $safere = $re;
my $mods = '';
local ($1,$2);
- if ($re =~ s/^m{//) {
+ if ($re =~ s/^m\{//) {
$re =~ s/}([a-z]*)$//; $mods = $1;
}
elsif ($re =~ s/^m\(//) {
mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm
+24
View File
@@ -0,0 +1,24 @@
$NetBSD: patch-lib_Mail_SpamAssassin_DnsResolver.pm,v 1.1 2013/12/04 15:14:19 jperkin Exp $
Part of backport of bug#6937
--- lib/Mail/SpamAssassin/DnsResolver.pm.orig 2011-06-06 23:59:17.000000000 +0000
+++ lib/Mail/SpamAssassin/DnsResolver.pm
@@ -440,10 +440,16 @@ sub poll_responses {
{ my $timer; # collects timestamp when variable goes out of scope
if (!defined($timeout) || $timeout > 0)
{ $timer = $self->{main}->time_method("poll_dns_idle") }
+ $! = 0;
($nfound, $timeleft) = select($rout=$rin, undef, undef, $timeout);
}
if (!defined $nfound || $nfound < 0) {
- warn "dns: select failed: $!";
+ if ($!) { warn "dns: select failed: $!\n" }
+ else { info("dns: select interrupted") }
+ return;
+ } elsif (!$nfound) {
+ if (!defined $timeout) { warn("dns: select returned empty-handed\n") }
+ elsif ($timeout > 0) { dbg("dns: select timed out %.3f s", $timeout) }
return;
}
mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_Message.pm
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-lib_Mail_SpamAssassin_Message.pm,v 1.1 2013/12/04 15:14:19 jperkin Exp $
Part of backport of bug#6937
--- lib/Mail/SpamAssassin/Message.pm.orig 2011-06-06 23:59:17.000000000 +0000
+++ lib/Mail/SpamAssassin/Message.pm
@@ -566,7 +566,7 @@ sub finish {
while (my $part = shift @toclean) {
# bug 5557: windows requires tmp file be closed before it can be rm'd
if (ref $part->{'raw'} eq 'GLOB') {
- close($part->{'raw'}) or die "error closing input file: $!";
+ close($part->{'raw'}) or warn "error closing input file: $!";
}
# bug 5858: avoid memory leak with deep MIME structure
mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_PerMsgStatus.pm
+36
View File
@@ -0,0 +1,36 @@
$NetBSD: patch-lib_Mail_SpamAssassin_PerMsgStatus.pm,v 1.1 2013/12/04 15:14:19 jperkin Exp $
Part of backport of bug#6937
--- lib/Mail/SpamAssassin/PerMsgStatus.pm.orig 2011-06-06 23:59:17.000000000 +0000
+++ lib/Mail/SpamAssassin/PerMsgStatus.pm
@@ -420,8 +420,8 @@ sub _get_autolearn_points {
}
}
- # ignore tests with 0 score in this scoreset
- next if ($scores->{$test} == 0);
+ # ignore tests with 0 score (or undefined) in this scoreset
+ next if !$scores->{$test};
# Go ahead and add points to the proper locations
if (!$self->{conf}->maybe_header_only ($test)) {
@@ -1252,13 +1252,12 @@ sub _get_tag {
my $arg = (shift || ",");
my $line = '';
foreach my $test (sort @{$self->{test_names_hit}}) {
- if (!$line) {
- $line .= $test . "=" . $self->{conf}->{scores}->{$test};
- } else {
- $line .= $arg . $test . "=" . $self->{conf}->{scores}->{$test};
- }
+ my $score = $self->{conf}->{scores}->{$test};
+ $score = '0' if !defined $score;
+ $line .= $arg if $line ne '';
+ $line .= $test . "=" . $score;
}
- $line ? $line : 'none';
+ $line ne '' ? $line : 'none';
},
PREVIEW => sub { $self->get_content_preview() },
mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_Util.pm
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-lib_Mail_SpamAssassin_Util.pm,v 1.1 2013/12/04 15:14:19 jperkin Exp $
Part of backport of bug#6937
--- lib/Mail/SpamAssassin/Util.pm.orig 2011-06-06 23:59:17.000000000 +0000
+++ lib/Mail/SpamAssassin/Util.pm
@@ -1582,7 +1582,7 @@ sub regexp_remove_delimiters {
warn "cannot remove delimiters from null regexp";
return undef; # invalid
}
- elsif ($re =~ s/^m{//) { # m{foo/bar}
+ elsif ($re =~ s/^m\{//) { # m{foo/bar}
$delim = '}';
}
elsif ($re =~ s/^m\(//) { # m(foo/bar)
mail/spamassassin/patches/patch-sa-update
+1 -1
View File
@@ -1,4 +1,4 @@
$NetBSD: patch-sa-update,v 1.1.2.2 2013/08/01 12:51:54 tron Exp $
$NetBSD: patch-sa-update,v 1.1 2013/08/01 10:29:00 bouyer Exp $
from https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6872,
fix for new Net::DNS