aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@gmail.com>2010-10-27 10:01:36 +0000
committerLeonardo Arena <rnalrd@gmail.com>2010-10-27 10:01:36 +0000
commit50bd43f7c5fa7818b318b1fdeefab6e4d05d569d (patch)
treed1fddc78eab79880fa7133e1ac5d570e65101276
parent9d8faa1b93d7045a7869a7f00eefd387c7064698 (diff)
parent1046df4b4567b737b7b43e54ff03f93cd3c824b8 (diff)
downloadalpine_aports-50bd43f7c5fa7818b318b1fdeefab6e4d05d569d.tar.bz2
alpine_aports-50bd43f7c5fa7818b318b1fdeefab6e4d05d569d.tar.xz
alpine_aports-50bd43f7c5fa7818b318b1fdeefab6e4d05d569d.zip
Merge ../aports-larena
Diffstat
-rw-r--r--main/bacula/APKBUILD2
-rw-r--r--main/bacula/bacula.post-install2
-rw-r--r--main/perl-db_file/APKBUILD2
-rw-r--r--main/perl-digest-sha1/APKBUILD6
-rw-r--r--main/perl-html-parser/APKBUILD6
-rw-r--r--main/perl-libwww/APKBUILD4
-rw-r--r--main/perl-mail-dkim/APKBUILD4
-rw-r--r--main/perl-net-dns/APKBUILD2
-rw-r--r--main/perl-netaddr-ip/APKBUILD6
-rw-r--r--main/perl-time-hires/APKBUILD2
-rw-r--r--main/spamassassin/APKBUILD9
-rw-r--r--main/spamassassin/spamassassin-3.3.1-PERL-5-12.patch240
12 files changed, 264 insertions, 21 deletions
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index 9b9f38b827..cf2f7f545d 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -2,7 +2,7 @@
2# Maintainer: Leonardo Arena <rnalrd@gmail.com> 2# Maintainer: Leonardo Arena <rnalrd@gmail.com>
3pkgname="bacula" 3pkgname="bacula"
4pkgver=5.0.3 4pkgver=5.0.3
5pkgrel=1 5pkgrel=2
6pkgdesc="Enterprise ready, network based backup program" 6pkgdesc="Enterprise ready, network based backup program"
7url="http://www.bacula.org" 7url="http://www.bacula.org"
8license="GPL2" 8license="GPL2"
diff --git a/main/bacula/bacula.post-install b/main/bacula/bacula.post-install
index e64a59915d..c134e8e4fa 100644
--- a/main/bacula/bacula.post-install
+++ b/main/bacula/bacula.post-install
@@ -1,5 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2mkdir /var/lib/bacula /var/log/bacula 2mkdir /var/lib/bacula /var/log/bacula &>/dev/null
3for dir in /var/bacula /var/log/bacula /var/run/bacula /var/lib/bacula /etc/bacula/scripts/make_catalog_backup* 3for dir in /var/bacula /var/log/bacula /var/run/bacula /var/lib/bacula /etc/bacula/scripts/make_catalog_backup*
4do 4do
5 chown bacula.bacula $dir 5 chown bacula.bacula $dir
diff --git a/main/perl-db_file/APKBUILD b/main/perl-db_file/APKBUILD
index 7f3d6875d3..7a46989d1e 100644
--- a/main/perl-db_file/APKBUILD
+++ b/main/perl-db_file/APKBUILD
@@ -3,7 +3,7 @@
3pkgname=perl-db_file 3pkgname=perl-db_file
4_realname=DB_File 4_realname=DB_File
5pkgver=1.820 5pkgver=1.820
6pkgrel=2 6pkgrel=3
7pkgdesc="Perl5 access to Berkeley DB" 7pkgdesc="Perl5 access to Berkeley DB"
8url="http://search.cpan.org/~pmqs/DB_File-1.820/" 8url="http://search.cpan.org/~pmqs/DB_File-1.820/"
9license="GPL PerlArtistic" 9license="GPL PerlArtistic"
diff --git a/main/perl-digest-sha1/APKBUILD b/main/perl-digest-sha1/APKBUILD
index 044d84423b..25b1fb8a21 100644
--- a/main/perl-digest-sha1/APKBUILD
+++ b/main/perl-digest-sha1/APKBUILD
@@ -2,8 +2,8 @@
2# Maintainer: Leonardo Arena <rnalrd@gmail.com> 2# Maintainer: Leonardo Arena <rnalrd@gmail.com>
3pkgname=perl-digest-sha1 3pkgname=perl-digest-sha1
4_realname=Digest-SHA1 4_realname=Digest-SHA1
5pkgver=2.12 5pkgver=2.13
6pkgrel=1 6pkgrel=0
7pkgdesc="Perl interface to the SHA-1 algorithm" 7pkgdesc="Perl interface to the SHA-1 algorithm"
8url="http://search.cpan.org/~gaas/Digest-SHA1-2.12/" 8url="http://search.cpan.org/~gaas/Digest-SHA1-2.12/"
9license="GPL PerlArtistic" 9license="GPL PerlArtistic"
@@ -23,4 +23,4 @@ build() {
23 find "$pkgdir" -name perllocal.pod -delete 23 find "$pkgdir" -name perllocal.pod -delete
24} 24}
25 25
26md5sums="eeb0292868801a202bd7ead87b291374 Digest-SHA1-2.12.tar.gz" 26md5sums="bd22388f268434f2b24f64e28bf1aa35 Digest-SHA1-2.13.tar.gz"
diff --git a/main/perl-html-parser/APKBUILD b/main/perl-html-parser/APKBUILD
index 56c1efd5ec..ea74f45b03 100644
--- a/main/perl-html-parser/APKBUILD
+++ b/main/perl-html-parser/APKBUILD
@@ -2,8 +2,8 @@
2# Maintainer: Leonardo Arena <rnalrd@gmail.com> 2# Maintainer: Leonardo Arena <rnalrd@gmail.com>
3pkgname=perl-html-parser 3pkgname=perl-html-parser
4_realname=HTML-Parser 4_realname=HTML-Parser
5pkgver=3.66 5pkgver=3.68
6pkgrel=1 6pkgrel=0
7pkgdesc="Parse section of HTML documents" 7pkgdesc="Parse section of HTML documents"
8url="http://search.cpan.org/~gaas/HTML-Parser-3.60/" 8url="http://search.cpan.org/~gaas/HTML-Parser-3.60/"
9license="GPL PerlArtistic" 9license="GPL PerlArtistic"
@@ -23,4 +23,4 @@ build() {
23 find "$pkgdir" -name perllocal.pod -delete 23 find "$pkgdir" -name perllocal.pod -delete
24} 24}
25 25
26md5sums="0ef1cad08c85f56ca2dfcdafdc820842 HTML-Parser-3.66.tar.gz" 26md5sums="5550b2da7aa94341f1e8a17a4ac20c68 HTML-Parser-3.68.tar.gz"
diff --git a/main/perl-libwww/APKBUILD b/main/perl-libwww/APKBUILD
index 283b0455db..6b4d4cda0e 100644
--- a/main/perl-libwww/APKBUILD
+++ b/main/perl-libwww/APKBUILD
@@ -2,7 +2,7 @@
2# Maintainer: Leonardo Arena <rnalrd@gmail.com> 2# Maintainer: Leonardo Arena <rnalrd@gmail.com>
3pkgname=perl-libwww 3pkgname=perl-libwww
4_realname=libwww-perl 4_realname=libwww-perl
5pkgver=5.834 5pkgver=5.837
6pkgrel=0 6pkgrel=0
7pkgdesc="Perl World Wide Web library" 7pkgdesc="Perl World Wide Web library"
8url="http://search.cpan.org/~gaas/libwww-perl-5.834/" 8url="http://search.cpan.org/~gaas/libwww-perl-5.834/"
@@ -28,4 +28,4 @@ package() {
28 find "$pkgdir" -name perllocal.pod -delete 28 find "$pkgdir" -name perllocal.pod -delete
29} 29}
30 30
31md5sums="f2ed8a461f76556c9caed9087f47c86c libwww-perl-5.834.tar.gz" 31md5sums="9bbf1bce482b0bac98bb4f04253c03d0 libwww-perl-5.837.tar.gz"
diff --git a/main/perl-mail-dkim/APKBUILD b/main/perl-mail-dkim/APKBUILD
index 7eb62b2e68..27467db141 100644
--- a/main/perl-mail-dkim/APKBUILD
+++ b/main/perl-mail-dkim/APKBUILD
@@ -1,7 +1,7 @@
1# Maintainer: Leonardo Arena <rnalrd@gmail.com> 1# Maintainer: Leonardo Arena <rnalrd@gmail.com>
2pkgname=perl-mail-dkim 2pkgname=perl-mail-dkim
3_realname=Mail-DKIM 3_realname=Mail-DKIM
4pkgver=0.37 4pkgver=0.38
5pkgrel=0 5pkgrel=0
6pkgdesc="Signs/verifies Internet mail with DKIM/DomainKey signatures" 6pkgdesc="Signs/verifies Internet mail with DKIM/DomainKey signatures"
7url="http://search.cpan.org/~jaslong/Mail-DKIM-0.36/" 7url="http://search.cpan.org/~jaslong/Mail-DKIM-0.36/"
@@ -22,4 +22,4 @@ build() {
22 find "$pkgdir" -name perllocal.pod -delete 22 find "$pkgdir" -name perllocal.pod -delete
23} 23}
24 24
25md5sums="f3e84ec6b5e42d4cbcc7c42ea2900649 Mail-DKIM-0.37.tar.gz" 25md5sums="bdf2233c9b1c9a4615c7396b660feb7a Mail-DKIM-0.38.tar.gz"
diff --git a/main/perl-net-dns/APKBUILD b/main/perl-net-dns/APKBUILD
index 7f3580d061..e01a211d06 100644
--- a/main/perl-net-dns/APKBUILD
+++ b/main/perl-net-dns/APKBUILD
@@ -3,7 +3,7 @@
3pkgname=perl-net-dns 3pkgname=perl-net-dns
4_realname=Net-DNS 4_realname=Net-DNS
5pkgver=0.66 5pkgver=0.66
6pkgrel=1 6pkgrel=2
7pkgdesc="Perl interface to the DNS resolver" 7pkgdesc="Perl interface to the DNS resolver"
8url="http://search.cpan.org/dist/Archive-Zip/" 8url="http://search.cpan.org/dist/Archive-Zip/"
9license="unknown" 9license="unknown"
diff --git a/main/perl-netaddr-ip/APKBUILD b/main/perl-netaddr-ip/APKBUILD
index b23fd63ab5..f6491b938f 100644
--- a/main/perl-netaddr-ip/APKBUILD
+++ b/main/perl-netaddr-ip/APKBUILD
@@ -2,8 +2,8 @@
2# Maintainer: Leonardo Arena <rnalrd@gmail.com> 2# Maintainer: Leonardo Arena <rnalrd@gmail.com>
3pkgname=perl-netaddr-ip 3pkgname=perl-netaddr-ip
4_realname=NetAddr-IP 4_realname=NetAddr-IP
5pkgver=4.028 5pkgver=4.034
6pkgrel=1 6pkgrel=0
7pkgdesc="Perl extension for managing IPv4 and IPv6 addresses and subnets" 7pkgdesc="Perl extension for managing IPv4 and IPv6 addresses and subnets"
8url="http://search.cpan.org/~miker/NetAddr-IP-$pkgver/" 8url="http://search.cpan.org/~miker/NetAddr-IP-$pkgver/"
9license="Unknown" 9license="Unknown"
@@ -23,4 +23,4 @@ build() {
23 find "$pkgdir" -name perllocal.pod -delete 23 find "$pkgdir" -name perllocal.pod -delete
24} 24}
25 25
26md5sums="fc1e79db336d0acbe99dff559080c5d1 NetAddr-IP-4.028.tar.gz" 26md5sums="830b05a730ee4dfdde528e3100e92024 NetAddr-IP-4.034.tar.gz"
diff --git a/main/perl-time-hires/APKBUILD b/main/perl-time-hires/APKBUILD
index 6c2dc445b6..4f7de89e78 100644
--- a/main/perl-time-hires/APKBUILD
+++ b/main/perl-time-hires/APKBUILD
@@ -2,7 +2,7 @@
2pkgname=perl-time-hires 2pkgname=perl-time-hires
3_realname=Time-HiRes 3_realname=Time-HiRes
4pkgver=1.9721 4pkgver=1.9721
5pkgrel=1 5pkgrel=2
6pkgdesc="High resolution alarm, sleep, gettimeofday, interval timers" 6pkgdesc="High resolution alarm, sleep, gettimeofday, interval timers"
7url="http://search.cpan.org/~jhi/Time-HiRes-${pkgver}/" 7url="http://search.cpan.org/~jhi/Time-HiRes-${pkgver}/"
8license="unknown" 8license="unknown"
diff --git a/main/spamassassin/APKBUILD b/main/spamassassin/APKBUILD
index 87ec63dced..25134e6805 100644
--- a/main/spamassassin/APKBUILD
+++ b/main/spamassassin/APKBUILD
@@ -2,7 +2,7 @@
2pkgname=spamassassin 2pkgname=spamassassin
3_realname=Mail-SpamAssassin 3_realname=Mail-SpamAssassin
4pkgver=3.3.1 4pkgver=3.3.1
5pkgrel=3 5pkgrel=4
6pkgdesc="The Powerful #1 Open-Source Spam Filter" 6pkgdesc="The Powerful #1 Open-Source Spam Filter"
7url="http://spamassassin.apache.org" 7url="http://spamassassin.apache.org"
8license="Apache" 8license="Apache"
@@ -10,10 +10,12 @@ depends="perl perl-digest-sha1 perl-time-hires perl-netaddr-ip perl-mail-dkim pe
10makedepends="perl-dev zlib-dev" 10makedepends="perl-dev zlib-dev"
11install= 11install=
12subpackages="$pkgname-doc" 12subpackages="$pkgname-doc"
13source="http://www.apache.org/dist/spamassassin/source/$_realname-$pkgver.tar.gz" 13source="http://www.apache.org/dist/spamassassin/source/$_realname-$pkgver.tar.gz
14 spamassassin-3.3.1-PERL-5-12.patch"
14 15
15prepare() { 16prepare() {
16 cd "$srcdir/$_realname-$pkgver" 17 cd "$srcdir/$_realname-$pkgver"
18 patch -p2 < ../spamassassin-3.3.1-PERL-5-12.patch || return 1
17} 19}
18 20
19build() { 21build() {
@@ -34,4 +36,5 @@ package() {
34 find "$pkgdir" -name perllocal.pod -delete 36 find "$pkgdir" -name perllocal.pod -delete
35} 37}
36 38
37md5sums="5a93f81fda315411560ff5da099382d2 Mail-SpamAssassin-3.3.1.tar.gz" 39md5sums="5a93f81fda315411560ff5da099382d2 Mail-SpamAssassin-3.3.1.tar.gz
40aea0b415deb2a827c50653dafb80d6e4 spamassassin-3.3.1-PERL-5-12.patch"
diff --git a/main/spamassassin/spamassassin-3.3.1-PERL-5-12.patch b/main/spamassassin/spamassassin-3.3.1-PERL-5-12.patch
new file mode 100644
index 0000000000..5b4039c4d5
--- /dev/null
+++ b/main/spamassassin/spamassassin-3.3.1-PERL-5-12.patch
@@ -0,0 +1,240 @@
1diff -ur a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Dns.pm b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Dns.pm
2--- a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Dns.pm 2010-03-16 10:49:21.000000000 -0400
3+++ b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Dns.pm 2010-07-20 15:54:23.000000000 -0400
4@@ -754,7 +754,7 @@
5 dbg("dns: entering helper-app run mode");
6 $self->{old_slash} = $/; # Razor pollutes this
7 %{$self->{old_env}} = ();
8- if ( defined %ENV ) {
9+ if ( %ENV ) {
10 # undefined values in %ENV can result due to autovivification elsewhere,
11 # this prevents later possible warnings when we restore %ENV
12 while (my ($key, $value) = each %ENV) {
13Only in b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin: Dns.pm~
14diff -ur a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/HTML.pm b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/HTML.pm
15--- a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/HTML.pm 2010-03-16 10:49:21.000000000 -0400
16+++ b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/HTML.pm 2010-07-20 15:52:50.000000000 -0400
17@@ -191,7 +191,7 @@
18 my $self = shift;
19 my %options = @_;
20
21- return join('', @{ $self->{text} }) unless keys %options;
22+ return join('', @{ $self->{text} }) unless %options;
23
24 my $mask;
25 while (my ($k, $v) = each %options) {
26Only in b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin: HTML.pm~
27diff -ur a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/BodyEval.pm b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/BodyEval.pm
28--- a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/BodyEval.pm 2010-03-16 10:49:21.000000000 -0400
29+++ b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/BodyEval.pm 2010-07-20 16:04:57.000000000 -0400
30@@ -119,7 +119,7 @@
31 }
32
33 # If there are no words, mark if there's at least 1 image ...
34- if (keys %html == 0 && exists $pms->{html}{inside}{img}) {
35+ if (!%html && exists $pms->{html}{inside}{img}) {
36 # Use "\n" as the mark since it can't ever occur normally
37 $html{"\n"}=1;
38 }
39Only in b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin: BodyEval.pm~
40Only in b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin: check.patch
41diff -ur a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/Check.pm b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/Check.pm
42--- a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/Check.pm 2010-03-16 10:49:21.000000000 -0400
43+++ b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/Check.pm 2010-07-20 16:03:00.000000000 -0400
44@@ -307,64 +307,51 @@
45 my $package_name = __PACKAGE__;
46 my $methodname = $package_name."::_".$ruletype."_tests_".$clean_priority;
47
48- if (defined &{$methodname} && !$doing_user_rules) {
49-run_compiled_method:
50- # dbg("rules: run_generic_tests - calling %s", $methodname);
51- my $t = Mail::SpamAssassin::Timeout->new({ deadline => $master_deadline });
52- my $err = $t->run(sub {
53- no strict "refs";
54- $methodname->($pms, @{$opts{args}});
55- });
56- if ($t->timed_out() && $master_deadline && time > $master_deadline) {
57- info("check: exceeded time limit in $methodname, skipping further tests");
58- $pms->{deadline_exceeded} = 1;
59- }
60- return;
61- }
62+ if (!defined &{$methodname} || $doing_user_rules) {
63
64- # use %nopts for named parameter-passing; it's more friendly to future-proof
65- # subclassing, since new parameters can be added without breaking third-party
66- # subclassed implementations of this plugin.
67- my %nopts = (
68- ruletype => $ruletype,
69- doing_user_rules => $doing_user_rules,
70- priority => $priority,
71- clean_priority => $clean_priority
72- );
73-
74- # build up the eval string...
75- $self->{evalstr_methodname} = $methodname;
76- $self->{evalstr_chunk_current_methodname} = undef;
77- $self->{evalstr_chunk_methodnames} = [];
78- $self->{evalstr_chunk_prefix} = []; # stack (array) of source code sections
79- $self->{evalstr} = ''; $self->{evalstr_l} = 0;
80- $self->{evalstr2} = '';
81- $self->begin_evalstr_chunk($pms);
82-
83- $self->push_evalstr_prefix($pms, '
84- # start_rules_plugin_code '.$ruletype.' '.$priority.'
85- my $scoresptr = $self->{conf}->{scores};
86- ');
87- if (defined $opts{pre_loop_body}) {
88- $opts{pre_loop_body}->($self, $pms, $conf, %nopts);
89- }
90- $self->add_evalstr($pms,
91- $self->start_rules_plugin_code($ruletype, $priority) );
92- while (my($rulename, $test) = each %{$opts{testhash}->{$priority}}) {
93- $opts{loop_body}->($self, $pms, $conf, $rulename, $test, %nopts);
94- }
95- if (defined $opts{post_loop_body}) {
96- $opts{post_loop_body}->($self, $pms, $conf, %nopts);
97- }
98+ # use %nopts for named parameter-passing; it's more friendly
99+ # to future-proof subclassing, since new parameters can be added without
100+ # breaking third-party subclassed implementations of this plugin.
101+ my %nopts = (
102+ ruletype => $ruletype,
103+ doing_user_rules => $doing_user_rules,
104+ priority => $priority,
105+ clean_priority => $clean_priority
106+ );
107+
108+ # build up the eval string...
109+ $self->{evalstr_methodname} = $methodname;
110+ $self->{evalstr_chunk_current_methodname} = undef;
111+ $self->{evalstr_chunk_methodnames} = [];
112+ $self->{evalstr_chunk_prefix} = []; # stack (array) of source code sections
113+ $self->{evalstr} = ''; $self->{evalstr_l} = 0;
114+ $self->{evalstr2} = '';
115+ $self->begin_evalstr_chunk($pms);
116+
117+ $self->push_evalstr_prefix($pms, '
118+ # start_rules_plugin_code '.$ruletype.' '.$priority.'
119+ my $scoresptr = $self->{conf}->{scores};
120+ ');
121+ if (defined $opts{pre_loop_body}) {
122+ $opts{pre_loop_body}->($self, $pms, $conf, %nopts);
123+ }
124+ $self->add_evalstr($pms,
125+ $self->start_rules_plugin_code($ruletype, $priority) );
126+ while (my($rulename, $test) = each %{$opts{testhash}->{$priority}}) {
127+ $opts{loop_body}->($self, $pms, $conf, $rulename, $test, %nopts);
128+ }
129+ if (defined $opts{post_loop_body}) {
130+ $opts{post_loop_body}->($self, $pms, $conf, %nopts);
131+ }
132
133- $self->flush_evalstr($pms, 'run_generic_tests');
134- $self->free_ruleset_source($pms, $ruletype, $priority);
135+ $self->flush_evalstr($pms, 'run_generic_tests');
136+ $self->free_ruleset_source($pms, $ruletype, $priority);
137
138- # clear out a previous version of this method
139- undef &{$methodname};
140+ # clear out a previous version of this method
141+ undef &{$methodname};
142
143- # generate the loop that goes through each line...
144- my $evalstr = <<"EOT";
145+ # generate the loop that goes through each line...
146+ my $evalstr = <<"EOT";
147 {
148 package $package_name;
149
150@@ -373,40 +360,51 @@
151 sub $methodname {
152 EOT
153
154- for my $chunk_methodname (@{$self->{evalstr_chunk_methodnames}}) {
155- $evalstr .= " $chunk_methodname(\@_);\n";
156- }
157+ for my $chunk_methodname (@{$self->{evalstr_chunk_methodnames}}) {
158+ $evalstr .= " $chunk_methodname(\@_);\n";
159+ }
160
161- $evalstr .= <<"EOT";
162+ $evalstr .= <<"EOT";
163 }
164
165 1;
166 }
167 EOT
168
169- delete $self->{evalstr}; # free up some RAM before we eval()
170- delete $self->{evalstr2};
171- delete $self->{evalstr_methodname};
172- delete $self->{evalstr_chunk_current_methodname};
173- delete $self->{evalstr_chunk_methodnames};
174- delete $self->{evalstr_chunk_prefix};
175-
176- dbg("rules: run_generic_tests - compiling eval code: %s, priority %s",
177- $ruletype, $priority);
178-# dbg("rules: eval code to compile: $evalstr");
179- my $eval_result;
180- { my $timer = $self->{main}->time_method('compile_gen');
181- $eval_result = eval($evalstr);
182- }
183- if (!$eval_result) {
184- my $eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat;
185- warn "rules: failed to compile $ruletype tests, skipping:\n".
186- "\t($eval_stat)\n";
187- $pms->{rule_errors}++;
188- }
189- else {
190+ delete $self->{evalstr}; # free up some RAM before we eval()
191+ delete $self->{evalstr2};
192+ delete $self->{evalstr_methodname};
193+ delete $self->{evalstr_chunk_current_methodname};
194+ delete $self->{evalstr_chunk_methodnames};
195+ delete $self->{evalstr_chunk_prefix};
196+
197+ dbg("rules: run_generic_tests - compiling eval code: %s, priority %s",
198+ $ruletype, $priority);
199+ # dbg("rules: eval code to compile: $evalstr");
200+ my $eval_result;
201+ { my $timer = $self->{main}->time_method('compile_gen');
202+ $eval_result = eval($evalstr);
203+ }
204+ if (!$eval_result) {
205+ my $eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat;
206+ warn "rules: failed to compile $ruletype tests, skipping:\n".
207+ "\t($eval_stat)\n";
208+ $pms->{rule_errors}++;
209+ return;
210+ }
211 dbg("rules: compiled $ruletype tests");
212- goto run_compiled_method;
213+ }
214+
215+#run_compiled_method:
216+# dbg("rules: run_generic_tests - calling %s", $methodname);
217+ my $t = Mail::SpamAssassin::Timeout->new({ deadline => $master_deadline });
218+ my $err = $t->run(sub {
219+ no strict "refs";
220+ $methodname->($pms, @{$opts{args}});
221+ });
222+ if ($t->timed_out() && $master_deadline && time > $master_deadline) {
223+ info("check: exceeded time limit in $methodname, skipping further tests");
224+ $pms->{deadline_exceeded} = 1;
225 }
226 }
227
228diff -ur a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
229--- a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm 2010-03-16 10:49:21.000000000 -0400
230+++ b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm 2010-07-20 16:06:47.000000000 -0400
231@@ -498,7 +498,7 @@
232 # perhaps just limit to test, and image?
233 next if ($ctype eq 'application/ics');
234
235- my $cte = lc $p->get_header('content-transfer-encoding') || '';
236+ my $cte = lc($p->get_header('content-transfer-encoding') || '');
237 next if ($cte !~ /^base64$/);
238 foreach my $l ( @{$p->raw()} ) {
239 my $len = length $l;
240Only in b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin: MIMEEval.pm~
© 2015 Mike Crute