MFH: r504029

Update to 1.8.21

Changelog: https://blog.mybb.com/2019/06/10/mybb-1-8-21-released-security-maintenance-release/

Security:	13960f55-8d35-11e9-9ba0-4c72b94353b5
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (joneum)

3 files changed, 36 insertions, 72 deletions

diff --git a/www/mybb/Makefile b/www/mybb/Makefile
index f075a1b6179a..7b48efa90c54 100644
--- a/www/mybb/Makefile
+++ b/www/mybb/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mybb
-DISTVERSION=	1.8.20
-PORTREVISION=	1
+DISTVERSION=	1.8.21
 CATEGORIES=	www
 
 MAINTAINER=	joneum@FreeBSD.org
@@ -12,7 +11,7 @@ COMMENT=	PHP-based bulletin board / discussion forum system
 LICENSE=	GPLv3
 
 USE_GITHUB=	yes
-GH_TAGNAME=	${PORTNAME}_1820
+GH_TAGNAME=	${PORTNAME}_1821pl1
 
 USES=		cpe mysql php:web
 NO_BUILD=	yes
@@ -25,7 +24,7 @@ PLIST_SUB=	WWWOWN=${WWWOWN}
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}
-	${TOUCH} ${STAGEDIR}${WWWDIR}/inc/config.php.sample
+#	${TOUCH} ${STAGEDIR}${WWWDIR}/inc/config.php.sample
 	${MV} ${STAGEDIR}${WWWDIR}/inc/settings.php \
 		${STAGEDIR}${WWWDIR}/inc/settings.php.sample
 
diff --git a/www/mybb/distinfo b/www/mybb/distinfo
index e7b92af341cc..f2a73789d523 100644
--- a/www/mybb/distinfo
+++ b/www/mybb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551692753
-SHA256 (mybb-mybb-1.8.20-mybb_1820_GH0.tar.gz) = 8796b7ecacac2bffa2aebd273483e847b5fac0d3791980553101c3decfc98a0f
-SIZE (mybb-mybb-1.8.20-mybb_1820_GH0.tar.gz) = 1871405
+TIMESTAMP = 1560347158
+SHA256 (mybb-mybb-1.8.21-mybb_1821pl1_GH0.tar.gz) = 87bdbe262d2cce73fa4ce8338a54869faab68643e2b42cdeebe5f6075700944c
+SIZE (mybb-mybb-1.8.21-mybb_1821pl1_GH0.tar.gz) = 1855863
diff --git a/www/mybb/pkg-plist b/www/mybb/pkg-plist
index 0c7a8f05be1c..73e0039389b8 100644
--- a/www/mybb/pkg-plist
+++ b/www/mybb/pkg-plist
@@ -418,7 +418,6 @@
 %%WWWDIR%%/inc/class_timers.php
 %%WWWDIR%%/inc/class_xml.php
 %%WWWDIR%%/inc/config.default.php
-%%WWWDIR%%/inc/config.php.sample
 %%WWWDIR%%/inc/datahandler.php
 %%WWWDIR%%/inc/datahandlers/event.php
 %%WWWDIR%%/inc/datahandlers/index.html
@@ -648,6 +647,7 @@
 %%WWWDIR%%/install/resources/upgrade45.php
 %%WWWDIR%%/install/resources/upgrade46.php
 %%WWWDIR%%/install/resources/upgrade47.php
+%%WWWDIR%%/install/resources/upgrade48.php
 %%WWWDIR%%/install/resources/upgrade5.php
 %%WWWDIR%%/install/resources/upgrade6.php
 %%WWWDIR%%/install/resources/upgrade7.php
@@ -671,73 +671,38 @@
 %%WWWDIR%%/jscripts/question.js
 %%WWWDIR%%/jscripts/rating.js
 %%WWWDIR%%/jscripts/report.js
-%%WWWDIR%%/jscripts/sceditor/editor_plugins/bbcode.js
-%%WWWDIR%%/jscripts/sceditor/editor_plugins/format.js
-%%WWWDIR%%/jscripts/sceditor/editor_plugins/index.html
-%%WWWDIR%%/jscripts/sceditor/editor_plugins/undo.js
-%%WWWDIR%%/jscripts/sceditor/editor_plugins/xhtml.js
-%%WWWDIR%%/jscripts/sceditor/editor_themes/buttons.css
-%%WWWDIR%%/jscripts/sceditor/editor_themes/default.css
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/alien.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/angel.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/angry.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/blink.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/blush.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/cheerful.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/cool.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/credits.txt
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/cwy.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/devil.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/dizzy.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/ermm.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/face.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/getlost.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/grin.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/happy.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/heart.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/kissing.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/laughing.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/ninja.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/pinch.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/pouty.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/sad.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/shocked.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/sick.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/sideways.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/silly.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/sleeping.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/smile.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/tongue.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/unsure.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/w00t.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/wassat.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/whistling.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/wink.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/wub.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/famfamfam.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/index.html
-%%WWWDIR%%/jscripts/sceditor/editor_themes/modern.css
-%%WWWDIR%%/jscripts/sceditor/editor_themes/monocons.css
-%%WWWDIR%%/jscripts/sceditor/editor_themes/monocons/monocons.eot
-%%WWWDIR%%/jscripts/sceditor/editor_themes/monocons/monocons.ttf
-%%WWWDIR%%/jscripts/sceditor/editor_themes/mybb.css
-%%WWWDIR%%/jscripts/sceditor/editor_themes/office-toolbar.css
-%%WWWDIR%%/jscripts/sceditor/editor_themes/office.css
-%%WWWDIR%%/jscripts/sceditor/editor_themes/php.png
-%%WWWDIR%%/jscripts/sceditor/editor_themes/square.css
-%%WWWDIR%%/jscripts/sceditor/editor_themes/video.png
+%%WWWDIR%%/jscripts/sceditor/formats/bbcode.js
+%%WWWDIR%%/jscripts/sceditor/formats/index.html
+%%WWWDIR%%/jscripts/sceditor/formats/xhtml.js
+%%WWWDIR%%/jscripts/sceditor/icons/index.html
+%%WWWDIR%%/jscripts/sceditor/icons/material.js
+%%WWWDIR%%/jscripts/sceditor/icons/monocons.js
 %%WWWDIR%%/jscripts/sceditor/jquery.sceditor.bbcode.min.js
-%%WWWDIR%%/jscripts/sceditor/jquery.sceditor.default.min.css
 %%WWWDIR%%/jscripts/sceditor/jquery.sceditor.min.js
 %%WWWDIR%%/jscripts/sceditor/jquery.sceditor.xhtml.min.js
-%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.buttons.css
-%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.default.css
-%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.modern.css
-%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.monocons.css
-%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.mybb.css
-%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.office-toolbar.css
-%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.office.css
-%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.square.css
+%%WWWDIR%%/jscripts/sceditor/plugins/format.js
+%%WWWDIR%%/jscripts/sceditor/plugins/index.html
+%%WWWDIR%%/jscripts/sceditor/plugins/undo.js
+%%WWWDIR%%/jscripts/sceditor/sceditor.min.js
+%%WWWDIR%%/jscripts/sceditor/styles/index.html
+%%WWWDIR%%/jscripts/sceditor/styles/jquery.sceditor.default.css
+%%WWWDIR%%/jscripts/sceditor/styles/jquery.sceditor.modern.css
+%%WWWDIR%%/jscripts/sceditor/styles/jquery.sceditor.mybb.css
+%%WWWDIR%%/jscripts/sceditor/styles/jquery.sceditor.office-toolbar.css
+%%WWWDIR%%/jscripts/sceditor/styles/jquery.sceditor.office.css
+%%WWWDIR%%/jscripts/sceditor/styles/jquery.sceditor.square.css
+%%WWWDIR%%/jscripts/sceditor/themes/content/default.min.css
+%%WWWDIR%%/jscripts/sceditor/themes/default.css
+%%WWWDIR%%/jscripts/sceditor/themes/defaultdark.css
+%%WWWDIR%%/jscripts/sceditor/themes/famfamfam.png
+%%WWWDIR%%/jscripts/sceditor/themes/index.html
+%%WWWDIR%%/jscripts/sceditor/themes/modern.css
+%%WWWDIR%%/jscripts/sceditor/themes/mybb.css
+%%WWWDIR%%/jscripts/sceditor/themes/office-toolbar.css
+%%WWWDIR%%/jscripts/sceditor/themes/office.css
+%%WWWDIR%%/jscripts/sceditor/themes/php.png
+%%WWWDIR%%/jscripts/sceditor/themes/square.css
+%%WWWDIR%%/jscripts/sceditor/themes/video.png
 %%WWWDIR%%/jscripts/select2/select2-spinner.gif
 %%WWWDIR%%/jscripts/select2/select2.css
 %%WWWDIR%%/jscripts/select2/select2.min.js