From 6d9f95199d0493aa5b893ccc665c0f1a37d51e14 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 15 Jun 2017 15:04:45 +0000
Subject: main/perl-mail-spamassassin: rebuild against perl 5.26

---
 main/perl-mail-spamassassin/APKBUILD               | 24 +++++++++-------------
 .../perl-mail-spamassassin/Mail-SpamAssassin.patch | 22 ++++++++++++++++++++
 2 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 main/perl-mail-spamassassin/Mail-SpamAssassin.patch

(limited to 'main/perl-mail-spamassassin')

diff --git a/main/perl-mail-spamassassin/APKBUILD b/main/perl-mail-spamassassin/APKBUILD
index d3f7e3021f..6cdb0d9e54 100644
--- a/main/perl-mail-spamassassin/APKBUILD
+++ b/main/perl-mail-spamassassin/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-mail-spamassassin
 _pkgreal=Mail-SpamAssassin
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="SpamAssassin is an extensible email filter which is used to identify spam"
 url="http://search.cpan.org/dist/Mail-SpamAssassin/"
 arch="all"
@@ -14,27 +14,23 @@ cpanmakedepends="   "
 depends="$cpandepends"
 makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/K/KM/KMCGRAIL/SpamAssassin/$_pkgreal-$pkgver.tar.gz"
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+source="http://search.cpan.org/CPAN/authors/id/K/KM/KMCGRAIL/SpamAssassin/$_pkgreal-$pkgver.tar.gz
+	Mail-SpamAssassin.patch
+	"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="76eca1f38c11635d319e62c26d5b034b  Mail-SpamAssassin-3.4.1.tar.gz"
-sha256sums="9b7a95a594cdca4f265707364478b57813b82a0ec7e520d9bc818bfbcafdd726  Mail-SpamAssassin-3.4.1.tar.gz"
-sha512sums="6a074f1a4177e1969cef575fe3b1b844d27c813d48fe1e07a46f56ffa728fc780897597d00f11acb269317a6308f284f0dee544d504da874d93b0549d094a6a3  Mail-SpamAssassin-3.4.1.tar.gz"
+sha512sums="6a074f1a4177e1969cef575fe3b1b844d27c813d48fe1e07a46f56ffa728fc780897597d00f11acb269317a6308f284f0dee544d504da874d93b0549d094a6a3  Mail-SpamAssassin-3.4.1.tar.gz
+66a6daa7e9898864497e7d8e17efc6094aabc5a9a94afbc7da08acf4cf2430fad2cb0128b8db4be637f5dcabe3fa9f03490f9d7cbba3c1cc02b7824f63cd0965  Mail-SpamAssassin.patch"
diff --git a/main/perl-mail-spamassassin/Mail-SpamAssassin.patch b/main/perl-mail-spamassassin/Mail-SpamAssassin.patch
new file mode 100644
index 0000000000..3f1111765e
--- /dev/null
+++ b/main/perl-mail-spamassassin/Mail-SpamAssassin.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Todd Rinaldo <toddr@cpanel.net>
+Date: Fri, 8 Jan 2016 01:46:15 -0600
+Subject: Add support for . not in @INC via PERL_USE_UNSAFE_INC
+
+---
+ modules/Mail-SpamAssassin/Mail-SpamAssassin/Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/Mail-SpamAssassin/Mail-SpamAssassin/Makefile.PL b/modules/Mail-SpamAssassin/Mail-SpamAssassin/Makefile.PL
+index 33ca2af01..2142dfff0 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1050,7 +1050,7 @@ QSPAMC_SRC      = spamc/qmail-spamc.c spamc/utils.c
+ LIBSPAMC_SRC    = spamc/libspamc.c spamc/utils.c
+ 
+ $(SPAMC_MAKEFILE): $(SPAMC_MAKEFILE).in $(SPAMC_MAKEFILE).win spamc/spamc.h.in
+-	$(CONFIGURE) --prefix="$(I_PREFIX)" --sysconfdir="$(I_CONFDIR)" --datadir="$(I_DATADIR)" --enable-ssl="$(ENABLE_SSL)"
++	PERL_USE_UNSAFE_INC=1 $(CONFIGURE) --prefix="$(I_PREFIX)" --sysconfdir="$(I_CONFDIR)" --datadir="$(I_DATADIR)" --enable-ssl="$(ENABLE_SSL)"
+ 
+ spamc_has_moved:
+ 	$(NOECHO) echo "***"
-- 
cgit v1.2.3