From debc4ef08b1358772b4c023312703bfd3a5f7cf7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 1 Aug 2017 17:36:46 +0200 Subject: v5.2.24 (from Fedora) --- .gitignore | 7 +++++++ composer.json | 1 + php-PHPMailer.spec | 12 +++++++----- 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ab5c4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/composer.json b/composer.json index f361147..a0ac296 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ } ], "require": { + "ext-ctype": "*", "php": ">=5.0.0" }, "require-dev": { diff --git a/php-PHPMailer.spec b/php-PHPMailer.spec index 0b20281..6abada0 100644 --- a/php-PHPMailer.spec +++ b/php-PHPMailer.spec @@ -9,14 +9,14 @@ # %global github_user PHPMailer %global github_app PHPMailer -%global github_tag 7115df4a6f76281109ebe352900c42403b728bb4 +%global github_tag 22d04c6a58145a244696f3f254c1875aa653b26a %global github_short %(c=%{github_tag}; echo ${c:0:7}) %global arch_name %{github_app}-%{github_tag} Name: php-PHPMailer Summary: PHP email transport class with a lot of features -Version: 5.2.23 +Version: 5.2.24 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -85,9 +85,7 @@ Full Featured Email Transfer Class for PHP. PHPMailer features: %build #------------------------------------------------------------------------------- -# Make sure all file lines are \n terminated. - -find . -type f -exec sed -i -e 's/[\r\t ]*$//' '{}' ';' +# Nothing to do. #------------------------------------------------------------------------------- @@ -152,6 +150,10 @@ rm -rf "${RPM_BUILD_ROOT}" %changelog +* Thu Jul 27 2017 Patrick Monnerat 5.2.24-1 +- Update to 5.2.24: fixes XSS vulnerability CVE-2017-11503. + https://bugzilla.redhat.com/show_bug.cgi?id=1474416 + * Thu Mar 16 2017 Remi Collet - 5.2.23-1 - Update to 5.2.23 -- cgit