diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-06-15 15:14:29 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-06-15 20:07:17 +0000 |
| commit | 2caf8027a8afe0dc7ce8b8fad2c53c961595b77a (patch) | |
| tree | 94bdc2fb0c92ef777b6180a24421a91be68ed4b7 /main | |
| parent | 6d9f95199d0493aa5b893ccc665c0f1a37d51e14 (diff) | |
| download | aports-2caf8027a8afe0dc7ce8b8fad2c53c961595b77a.tar.bz2 aports-2caf8027a8afe0dc7ce8b8fad2c53c961595b77a.tar.xz | |
main/spamassassin: rebuild against perl 5.26
Diffstat (limited to 'main')
| -rw-r--r-- | main/spamassassin/APKBUILD | 28 | ||||
| -rw-r--r-- | main/spamassassin/Mail-SpamAssassin.patch | 22 |
2 files changed, 31 insertions, 19 deletions
diff --git a/main/spamassassin/APKBUILD b/main/spamassassin/APKBUILD index 3f1379da07..6b2429db7d 100644 --- a/main/spamassassin/APKBUILD +++ b/main/spamassassin/APKBUILD @@ -3,7 +3,7 @@ pkgname=spamassassin _pkgreal=Mail-SpamAssassin pkgver=3.4.1 -pkgrel=5 +pkgrel=6 pkgdesc="The Powerful #1 Open-Source Spam Filter" url="http://search.cpan.org/dist/Mail-SpamAssassin/" arch="all" @@ -19,22 +19,21 @@ source="http://search.cpan.org/CPAN/authors/id/K/KM/KMCGRAIL/${_pkgreal#*-}/$_pk spamd.confd spamd.crond net-dns-1.01-compat.patch + Mail-SpamAssassin.patch " builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - default_prepare || return 1 - +build() { cd "$builddir" + rm t/dnsbl_subtests.t export CFLAGS="$(perl -MConfig -E 'say $Config{ccflags}')" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - rm t/dnsbl_subtests.t + make } -build() { +check() { cd "$builddir" - export CFLAGS="$(perl -MConfig -E 'say $Config{ccflags}')" - make && make test || return 1 + make test } package() { @@ -74,18 +73,9 @@ cpan() { sed -i '/^#\*/d' "$subpkgdir"/etc/mail/$pkgname/user_prefs } -md5sums="76eca1f38c11635d319e62c26d5b034b Mail-SpamAssassin-3.4.1.tar.gz -a348c160f2a7e90b24a5b995e984248c spamd.initd -d72f889cdbcd1289b773db3c00651a9c spamd.confd -d11273ff56e329842174cc1f68e91555 spamd.crond -f0b128cfd7491a7ea75e74fb4dfc7510 net-dns-1.01-compat.patch" -sha256sums="9b7a95a594cdca4f265707364478b57813b82a0ec7e520d9bc818bfbcafdd726 Mail-SpamAssassin-3.4.1.tar.gz -99dd743c53861bab603538638170f7c7adcc8bc1b3363422873674d915f7ca39 spamd.initd -6533298faf4b0f50f9d7fcf32d60366c02ecc27deeb2725265035fe3267277f5 spamd.confd -39487360aa9ee536e6f04f8fb86ed755f0536143b792f134667e5cd2a0e0846b spamd.crond -4dd3a37fecffed36eae4e0cef29454f8a727b7c1b2cc1947fbf2ac413d76b841 net-dns-1.01-compat.patch" sha512sums="6a074f1a4177e1969cef575fe3b1b844d27c813d48fe1e07a46f56ffa728fc780897597d00f11acb269317a6308f284f0dee544d504da874d93b0549d094a6a3 Mail-SpamAssassin-3.4.1.tar.gz 0a22933290a3abd147689bf3a9de4b6b277628c22966f353c5da932cd98560babf1d0bb9d92c456ea24decfb5af0bbc960192d29a90d9cab437e7986c75c8278 spamd.initd 274d3aa0d9aab05e83c8d5ad3e93a457649360021a67c8cb19088365bed681ebe26889cfa86f8c46a6044c7ee969231f2a71e3227adf8ad9e38d0286b9caf48d spamd.confd c8c00e4281cefd5e5e15507c8890264a25aa59663c57ccdf7a77905e2550999cfbbfa7271189a9491b0a0e98dff432361f13becdb99e1b583cd9d45d68022a47 spamd.crond -7651b0b6a13322ecc338cd43ef67246c02c846162d419e3d1586e2d53161fc055d1ba80800f5210658cc360ac3ccd3c2176f1463780b0486ec65c0bac3b338fd net-dns-1.01-compat.patch" +7651b0b6a13322ecc338cd43ef67246c02c846162d419e3d1586e2d53161fc055d1ba80800f5210658cc360ac3ccd3c2176f1463780b0486ec65c0bac3b338fd net-dns-1.01-compat.patch +66a6daa7e9898864497e7d8e17efc6094aabc5a9a94afbc7da08acf4cf2430fad2cb0128b8db4be637f5dcabe3fa9f03490f9d7cbba3c1cc02b7824f63cd0965 Mail-SpamAssassin.patch" diff --git a/main/spamassassin/Mail-SpamAssassin.patch b/main/spamassassin/Mail-SpamAssassin.patch new file mode 100644 index 0000000000..3f1111765e --- /dev/null +++ b/main/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 "***" |