[packages/spamassassin] - adapted to perl 5.26 requirements - rel 7

[adwol]

commit 0867863ed650a8e6812a3a0d1166d4cdeeb1f673
Author: Adam Osuchowski <adwol at pld-linux.org>
Date:   Fri Jul 21 23:42:05 2017 +0200

    - adapted to perl 5.26 requirements
    - rel 7

 spamassassin-perl-fix.patch    | 12 ++++++++++++
 spamassassin-perl-regexp.patch | 12 ++++++++++++
 spamassassin.spec              |  6 +++++-
 3 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/spamassassin.spec b/spamassassin.spec
index 059ea10..0e7bb2e 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -13,7 +13,7 @@ Summary:	A spam filter for email which can be invoked from mail delivery agents
 Summary(pl.UTF-8):	Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA)
 Name:		spamassassin
 Version:	3.4.1
-Release:	6
+Release:	7
 License:	Apache v2.0
 Group:		Applications/Mail
 Source0:	http://ftp.ps.pl/pub/apache//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
@@ -29,6 +29,8 @@ Source8:	sought.conf
 Source9:	cronjob-sa-update.service
 Source10:	cronjob-sa-update.timer
 Patch0:		spamassassin-3.4.1-netdns.patch
+Patch1:		%{name}-perl-regexp.patch
+Patch2:		%{name}-perl-fix.patch
 URL:		http://spamassassin.apache.org/
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.16
@@ -264,6 +266,8 @@ aplikacji do czytania poczty.
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 # disable broken test
 %{__mv} t/sa_compile.t{,.disabled}
diff --git a/spamassassin-perl-fix.patch b/spamassassin-perl-fix.patch
new file mode 100644
index 0000000..10c66f1
--- /dev/null
+++ b/spamassassin-perl-fix.patch
@@ -0,0 +1,12 @@
+diff -ruNp Mail-SpamAssassin-3.4.1.orig/spamc/configure.pl Mail-SpamAssassin-3.4.1/spamc/configure.pl
+--- Mail-SpamAssassin-3.4.1.orig/spamc/configure.pl	2015-04-28 21:56:59.000000000 +0200
++++ Mail-SpamAssassin-3.4.1/spamc/configure.pl	2017-07-21 23:34:50.122992872 +0200
+@@ -66,7 +66,7 @@ print join(' ', $Config{'perlpath'}, "ve
+   # Do the same thing as for the preprocessor below.
+   package version_h;
+   my $Z = $0;
+-  local $0    = "version.h.pl";
++  local $0    = "./version.h.pl";
+   local @ARGV = ();
+   # Got to check for defined because the script returns shell error level!
+   unless (defined do $0) {
diff --git a/spamassassin-perl-regexp.patch b/spamassassin-perl-regexp.patch
new file mode 100644
index 0000000..4980102
--- /dev/null
+++ b/spamassassin-perl-regexp.patch
@@ -0,0 +1,12 @@
+diff -ruNp Mail-SpamAssassin-3.4.1.orig/lib/Mail/SpamAssassin/PerMsgStatus.pm Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm
+--- Mail-SpamAssassin-3.4.1.orig/lib/Mail/SpamAssassin/PerMsgStatus.pm	2015-04-28 21:56:49.000000000 +0200
++++ Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm	2017-07-21 23:30:28.831982090 +0200
+@@ -918,7 +918,7 @@ sub get_content_preview {
+ 
+   # in case the last line was huge, trim it back to around 200 chars
+   local $1;
+-  $str =~ s/^(.{,200}).*$/$1/gs;
++  $str =~ s/^(.{1,200}).*$/$1/gs;
+ 
+   # now, some tidy-ups that make things look a bit prettier
+   $str =~ s/-----Original Message-----.*$//gs;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/spamassassin.git/commitdiff/0867863ed650a8e6812a3a0d1166d4cdeeb1f673