MFH: r429507

mail/phpmailer: Update to 5.2.18

  - Update to 5.2.18
  - Adjust pkg-plist for new release
  - Remove LICENSE install from DOCS option
  - Fix Remote Code Execution vulnerability

PR:		215576
Approved by:	ports-secteam (amdmi3)
Security:	CVE-2016-10033
Security:	c7656d4c-cb60-11e6-a9a5-b499baebfeaf

Approved by:	ports-secteam (amdmi3)

3 files changed, 11 insertions, 18 deletions

diff --git a/mail/phpmailer/Makefile b/mail/phpmailer/Makefile
index 1f242b543cba..8b6244c7b72e 100644
--- a/mail/phpmailer/Makefile
+++ b/mail/phpmailer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	phpmailer
-PORTVERSION=	5.2.14
+PORTVERSION=	5.2.18
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 
@@ -30,14 +30,14 @@ do-install:
 	class.smtp.php composer.json
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}
 .endfor
-.for d in extras language test
+.for d in extras language
 	@${MKDIR} ${STAGEDIR}${DATADIR}/$d
 	${INSTALL_DATA} ${WRKSRC}/$d/* ${STAGEDIR}${DATADIR}/$d
 .endfor
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in changelog.md README.md LICENSE
+.for f in changelog.md README.md
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
 	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
diff --git a/mail/phpmailer/distinfo b/mail/phpmailer/distinfo
index bb549c0872a4..a1f7103ae0a4 100644
--- a/mail/phpmailer/distinfo
+++ b/mail/phpmailer/distinfo
@@ -1,2 +1,3 @@
-SHA256 (PHPMailer-PHPMailer-v5.2.14_GH0.tar.gz) = 54acc99a6cdd807c5646e712e4499308d885bc76a3dc27679388fe0359bd3a93
-SIZE (PHPMailer-PHPMailer-v5.2.14_GH0.tar.gz) = 192100
+TIMESTAMP = 1482753476
+SHA256 (PHPMailer-PHPMailer-v5.2.18_GH0.tar.gz) = a6f64aeac133929f80a3f948839e0f3c2b21c62d6e95ebca33cc99b830a136b6
+SIZE (PHPMailer-PHPMailer-v5.2.18_GH0.tar.gz) = 156322
diff --git a/mail/phpmailer/pkg-plist b/mail/phpmailer/pkg-plist
index 9c7f227daa14..ccce3369a6a7 100644
--- a/mail/phpmailer/pkg-plist
+++ b/mail/phpmailer/pkg-plist
@@ -66,12 +66,11 @@
 %%DATADIR%%/language/phpmailer.lang-az.php
 %%DATADIR%%/language/phpmailer.lang-be.php
 %%DATADIR%%/language/phpmailer.lang-bg.php
-%%DATADIR%%/language/phpmailer.lang-br.php
 %%DATADIR%%/language/phpmailer.lang-ca.php
 %%DATADIR%%/language/phpmailer.lang-ch.php
-%%DATADIR%%/language/phpmailer.lang-cz.php
+%%DATADIR%%/language/phpmailer.lang-cs.php
+%%DATADIR%%/language/phpmailer.lang-da.php
 %%DATADIR%%/language/phpmailer.lang-de.php
-%%DATADIR%%/language/phpmailer.lang-dk.php
 %%DATADIR%%/language/phpmailer.lang-el.php
 %%DATADIR%%/language/phpmailer.lang-eo.php
 %%DATADIR%%/language/phpmailer.lang-es.php
@@ -92,26 +91,19 @@
 %%DATADIR%%/language/phpmailer.lang-lt.php
 %%DATADIR%%/language/phpmailer.lang-lv.php
 %%DATADIR%%/language/phpmailer.lang-ms.php
+%%DATADIR%%/language/phpmailer.lang-nb.php
 %%DATADIR%%/language/phpmailer.lang-nl.php
-%%DATADIR%%/language/phpmailer.lang-no.php
 %%DATADIR%%/language/phpmailer.lang-pl.php
 %%DATADIR%%/language/phpmailer.lang-pt.php
+%%DATADIR%%/language/phpmailer.lang-pt_br.php
 %%DATADIR%%/language/phpmailer.lang-ro.php
 %%DATADIR%%/language/phpmailer.lang-ru.php
-%%DATADIR%%/language/phpmailer.lang-se.php
 %%DATADIR%%/language/phpmailer.lang-sk.php
 %%DATADIR%%/language/phpmailer.lang-sl.php
 %%DATADIR%%/language/phpmailer.lang-sr.php
+%%DATADIR%%/language/phpmailer.lang-sv.php
 %%DATADIR%%/language/phpmailer.lang-tr.php
 %%DATADIR%%/language/phpmailer.lang-uk.php
 %%DATADIR%%/language/phpmailer.lang-vi.php
 %%DATADIR%%/language/phpmailer.lang-zh.php
 %%DATADIR%%/language/phpmailer.lang-zh_cn.php
-%%DATADIR%%/test/bootstrap.php
-%%DATADIR%%/test/fakepopserver.sh
-%%DATADIR%%/test/fakesendmail.sh
-%%DATADIR%%/test/phpmailerLangTest.php
-%%DATADIR%%/test/phpmailerTest.php
-%%DATADIR%%/test/runfakepopserver.sh
-%%DATADIR%%/test/test_callback.php
-%%DATADIR%%/test/testbootstrap-dist.php