Upgrade to version 1.2.

Approved by:	antoine (implicit)

3 files changed, 37 insertions, 26 deletions

diff --git a/www/privatebin/Makefile b/www/privatebin/Makefile
index 0228b3841796..35a73e73004b 100644
--- a/www/privatebin/Makefile
+++ b/www/privatebin/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	privatebin
-PORTVERSION=	1.1.1
+PORTVERSION=	1.2
 CATEGORIES=	www security
 
 MAINTAINER=	se@FreeBSD.org
diff --git a/www/privatebin/distinfo b/www/privatebin/distinfo
index 1ef32d9ca4ba..bc56e9715565 100644
--- a/www/privatebin/distinfo
+++ b/www/privatebin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509726100
-SHA256 (privatebin-PrivateBin-1.1.1_GH0.tar.gz) = ff2f5699712e6bf70ae1335ad51228855e21c0180029343e26b2e97dd0d542b8
-SIZE (privatebin-PrivateBin-1.1.1_GH0.tar.gz) = 433564
+TIMESTAMP = 1532363541
+SHA256 (privatebin-PrivateBin-1.2_GH0.tar.gz) = 67fbe652004f62858f9418f877c896727cc8dbc400af1d2f7d0b9478a8f53b7f
+SIZE (privatebin-PrivateBin-1.2_GH0.tar.gz) = 500432
diff --git a/www/privatebin/pkg-plist b/www/privatebin/pkg-plist
index f253d3e0a849..c5f33562823e 100644
--- a/www/privatebin/pkg-plist
+++ b/www/privatebin/pkg-plist
@@ -4,13 +4,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%WWWDIR%%/.htaccess.disabled
-%%WWWDIR%%/android-chrome-192x192.png
-%%WWWDIR%%/android-chrome-512x512.png
-%%WWWDIR%%/apple-touch-icon.png
 %%WWWDIR%%/browserconfig.xml
 %%WWWDIR%%/cfg/.htaccess
 @sample %%WWWDIR%%/cfg/conf.sample.php %%WWWDIR%%/cfg/conf.php
-%%WWWDIR%%/composer.json
 %%WWWDIR%%/css/bootstrap/bootstrap-3.3.5.css
 %%WWWDIR%%/css/bootstrap/bootstrap-theme-3.3.5.css
 %%WWWDIR%%/css/bootstrap/darkstrap-0.9.3.css
@@ -27,40 +23,61 @@
 %%WWWDIR%%/css/prettify/sons-of-obsidian.css
 %%WWWDIR%%/css/prettify/sunburst.css
 %%WWWDIR%%/css/privatebin.css
-%%WWWDIR%%/favicon-16x16.png
-%%WWWDIR%%/favicon-32x32.png
-%%WWWDIR%%/favicon.ico
 %%WWWDIR%%/i18n/de.json
+%%WWWDIR%%/i18n/es.json
 %%WWWDIR%%/i18n/fr.json
+%%WWWDIR%%/i18n/hu.json
 %%WWWDIR%%/i18n/it.json
 %%WWWDIR%%/i18n/languages.json
+%%WWWDIR%%/i18n/nl.json
+%%WWWDIR%%/i18n/no.json
+%%WWWDIR%%/i18n/oc.json
 %%WWWDIR%%/i18n/pl.json
+%%WWWDIR%%/i18n/pt.json
 %%WWWDIR%%/i18n/ru.json
 %%WWWDIR%%/i18n/sl.json
 %%WWWDIR%%/i18n/zh.json
+%%WWWDIR%%/img/android-chrome-192x192.png
+%%WWWDIR%%/img/android-chrome-512x512.png
+%%WWWDIR%%/img/apple-touch-icon.png
 %%WWWDIR%%/img/busy.gif
+%%WWWDIR%%/img/favicon-16x16.png
+%%WWWDIR%%/img/favicon-32x32.png
+%%WWWDIR%%/img/favicon.ico
 %%WWWDIR%%/img/icon.svg
 %%WWWDIR%%/img/icon_clone.png
 %%WWWDIR%%/img/icon_new.png
+%%WWWDIR%%/img/icon_qr.png
 %%WWWDIR%%/img/icon_raw.png
 %%WWWDIR%%/img/icon_send.png
 %%WWWDIR%%/img/icon_shorten.png
 %%WWWDIR%%/img/logo.svg
+%%WWWDIR%%/img/mstile-144x144.png
+%%WWWDIR%%/img/mstile-150x150.png
+%%WWWDIR%%/img/mstile-310x150.png
+%%WWWDIR%%/img/mstile-310x310.png
+%%WWWDIR%%/img/mstile-70x70.png
+%%WWWDIR%%/img/safari-pinned-tab.svg
 %%WWWDIR%%/index.php
+%%WWWDIR%%/index.php.bak
+%%WWWDIR%%/index.php.orig
 %%WWWDIR%%/js/base64-1.7.js
-%%WWWDIR%%/js/base64-2.1.9.js
-%%WWWDIR%%/js/bootstrap-3.3.5.js
+%%WWWDIR%%/js/base64-2.4.5.js
+%%WWWDIR%%/js/bootstrap-3.3.7.js
 %%WWWDIR%%/js/comment.jsonld
 %%WWWDIR%%/js/commentmeta.jsonld
-%%WWWDIR%%/js/jquery-3.1.1.js
+%%WWWDIR%%/js/common.js
+%%WWWDIR%%/js/jquery-3.3.1.js
+%%WWWDIR%%/js/kjua-0.1.2.js
 %%WWWDIR%%/js/paste.jsonld
 %%WWWDIR%%/js/pastemeta.jsonld
 %%WWWDIR%%/js/prettify.js
 %%WWWDIR%%/js/privatebin.js
+%%WWWDIR%%/js/purify-1.0.5.js
 %%WWWDIR%%/js/rawdeflate-0.5.js
 %%WWWDIR%%/js/rawinflate-0.3.js
-%%WWWDIR%%/js/showdown-1.4.1.js
-%%WWWDIR%%/js/sjcl-1.0.4.js
+%%WWWDIR%%/js/showdown-1.8.6.js
+%%WWWDIR%%/js/sjcl-1.0.7.js
 %%WWWDIR%%/lib/.htaccess
 %%WWWDIR%%/lib/Configuration.php
 %%WWWDIR%%/lib/Data/AbstractData.php
@@ -74,6 +91,7 @@
 %%WWWDIR%%/lib/Model/Comment.php
 %%WWWDIR%%/lib/Model/Paste.php
 %%WWWDIR%%/lib/Persistence/AbstractPersistence.php
+%%WWWDIR%%/lib/Persistence/DataStore.php
 %%WWWDIR%%/lib/Persistence/PurgeLimiter.php
 %%WWWDIR%%/lib/Persistence/ServerSalt.php
 %%WWWDIR%%/lib/Persistence/TrafficLimiter.php
@@ -83,19 +101,11 @@
 %%WWWDIR%%/lib/View.php
 %%WWWDIR%%/lib/Vizhash16x16.php
 %%WWWDIR%%/manifest.json
-%%WWWDIR%%/mstile-144x144.png
-%%WWWDIR%%/mstile-150x150.png
-%%WWWDIR%%/mstile-310x150.png
-%%WWWDIR%%/mstile-310x310.png
-%%WWWDIR%%/mstile-70x70.png
 %%WWWDIR%%/robots.txt
-%%WWWDIR%%/safari-pinned-tab.svg
-%%WWWDIR%%/tpl/bootstrap-compact.php
-%%WWWDIR%%/tpl/bootstrap-dark-page.php
-%%WWWDIR%%/tpl/bootstrap-dark.php
-%%WWWDIR%%/tpl/bootstrap-page.php
+%%WWWDIR%%/tpl/.htaccess
 %%WWWDIR%%/tpl/bootstrap.php
 %%WWWDIR%%/tpl/page.php
+%%WWWDIR%%/vendor/.htaccess
 %%WWWDIR%%/vendor/autoload.php
 %%WWWDIR%%/vendor/composer/ClassLoader.php
 %%WWWDIR%%/vendor/composer/autoload_classmap.php
@@ -115,6 +125,7 @@
 %%WWWDIR%%/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php
 %%WWWDIR%%/vendor/paragonie/random_compat/lib/random_int.php
 %%WWWDIR%%/vendor/paragonie/random_compat/other/build_phar.php
+%%WWWDIR%%/vendor/paragonie/random_compat/psalm-autoload.php
 %%WWWDIR%%/vendor/yzalis/identicon/src/Identicon/Generator/BaseGenerator.php
 %%WWWDIR%%/vendor/yzalis/identicon/src/Identicon/Generator/GdGenerator.php
 %%WWWDIR%%/vendor/yzalis/identicon/src/Identicon/Generator/GeneratorInterface.php