From 1d34ce60a6cc6f021f0e9254921e6f33b8bc3cd2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 26 Mar 2021 10:44:55 +0100 Subject: remove __autoload usage from autoloader for PHP 8 --- php-PHPMailer.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'php-PHPMailer.spec') diff --git a/php-PHPMailer.spec b/php-PHPMailer.spec index 6166a86..a7b1b59 100644 --- a/php-PHPMailer.spec +++ b/php-PHPMailer.spec @@ -17,7 +17,7 @@ Name: php-PHPMailer Summary: PHP email transport class with a lot of features Version: 5.2.28 -Release: 2%{?dist} +Release: 6%{?dist} License: LGPLv2+ URL: https://github.com/%{github_user}/%{github_app} @@ -25,6 +25,7 @@ Source0: https://github.com/%{github_user}/%{github_app}/archive/%{github_tag}/% # Fix language default path # Don't rely on autoloader (for app which overides __construct) +# Cleanup autoloader Patch0: %{github_app}-path.patch Patch1: %{github_app}-5.2.28-cve2020-13625.patch @@ -37,7 +38,11 @@ BuildRequires: php-cli Requires: php-date Requires: php-filter Requires: php-hash +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Recommends: php-imap +%else Requires: php-imap +%endif Requires: php-intl Requires: php-mbstring Requires: php-openssl @@ -141,6 +146,13 @@ version_compare($mailer->Version, "%{version}", "=") or exit(1); %changelog +* Fri Mar 26 2021 Remi Collet - 5.2.28-6 +- remove __autoload usage from autoloader for PHP 8 + +* Thu Feb 25 2021 Patrick Monnerat 5.2.28-5 +- php-imap is optional. + https://bugzilla.redhat.com/show_bug.cgi?id=1933024 + * Sun Jun 21 2020 Patrick Monnerat 5.2.28-2 - Patch "cve2020-13625" fixes CVE-2020-13625 vulnerability. This is a backport of https://github.com/PHPMailer/PHPMailer/commit/c2796cb. -- cgit