4 files changed, 15 insertions, 25 deletions

diff --git a/databases/couchdb3/Makefile b/databases/couchdb3/Makefile
index 57c515dc070e..95f3c8b36e7c 100644
--- a/databases/couchdb3/Makefile
+++ b/databases/couchdb3/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	couchdb3
-DISTVERSION=	3.2.0
-PORTREVISION=	1
+DISTVERSION=	3.2.1
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/couchdb/source/${DISTVERSION}
 DISTNAME=	apache-couchdb-${DISTVERSION}
@@ -13,8 +12,7 @@ LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	rebar:devel/rebar \
 		erlang-runtime${ERLVER}>=${ERLVER}.0:lang/erlang-runtime${ERLVER}
-LIB_DEPENDS=	libicudata.so:devel/icu \
-		libmozjs-78.so:lang/spidermonkey78
+LIB_DEPENDS=	libmozjs-78.so:lang/spidermonkey78
 RUN_DEPENDS=	erlang-runtime${ERLVER}>=${ERLVER}.0:lang/erlang-runtime${ERLVER}
 
 USES=		compiler:c++17-lang cpe gmake libtool ncurses
diff --git a/databases/couchdb3/distinfo b/databases/couchdb3/distinfo
index 7296be528a8d..44a56d2beb36 100644
--- a/databases/couchdb3/distinfo
+++ b/databases/couchdb3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634040933
-SHA256 (apache-couchdb-3.2.0.tar.gz) = 8bea574faa6bb0926c670542d8318c322268cf7e6614dab318dea734ccf1b00c
-SIZE (apache-couchdb-3.2.0.tar.gz) = 16535264
+TIMESTAMP = 1639469898
+SHA256 (apache-couchdb-3.2.1.tar.gz) = 11de2d1c3a5b317017a7459ec3f76230d5c43aba427a1e71ca3437845874acf8
+SIZE (apache-couchdb-3.2.1.tar.gz) = 16514227
diff --git a/databases/couchdb3/files/patch-rel_reltool.config b/databases/couchdb3/files/patch-rel_reltool.config
index 502e362492cf..8f9402504e59 100644
--- a/databases/couchdb3/files/patch-rel_reltool.config
+++ b/databases/couchdb3/files/patch-rel_reltool.config
@@ -6,5 +6,5 @@
  {sys, [
 +    {excl_lib, otp_root}, %% require erts runtime from FreeBSD ports
      {lib_dirs, ["../src"]},
-     {rel, "couchdb", "3.1.1", [
+     {rel, "couchdb", "3.2.1", [
          %% stdlib
diff --git a/databases/couchdb3/pkg-plist b/databases/couchdb3/pkg-plist
index 04598b35494a..9e6e1368d5c7 100644
--- a/databases/couchdb3/pkg-plist
+++ b/databases/couchdb3/pkg-plist
@@ -1,5 +1,4 @@
 @dir libexec/couchdb3/lib/couch-%%VERSION%%/priv/couch_ejson_compare
-@dir libexec/couchdb3/lib/couch-%%VERSION%%/priv/icu_driver
 @dir(couchdb,couchdb,700) /var/db/couchdb3
 @dir(couchdb,couchdb,700) /var/log/couchdb3
 @sample(couchdb,couchdb,640) %%ETCDIR%%/local.ini.sample
@@ -77,7 +76,6 @@ libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_db_split.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_db_updater.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_debug.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_doc.beam
-libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_drv.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_ejson_compare.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_ejson_size.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_emsort.beam
@@ -124,7 +122,6 @@ libexec/couchdb3/lib/couch-%%VERSION%%/include/couch_eunit.hrl
 libexec/couchdb3/lib/couch-%%VERSION%%/include/couch_eunit_proper.hrl
 libexec/couchdb3/lib/couch-%%VERSION%%/include/couch_js_functions.hrl
 libexec/couchdb3/lib/couch-%%VERSION%%/priv/couch_ejson_compare.so
-libexec/couchdb3/lib/couch-%%VERSION%%/priv/couch_icu_driver.so
 libexec/couchdb3/lib/couch-%%VERSION%%/priv/stats_descriptions.cfg
 libexec/couchdb3/lib/couch_dist-%%VERSION%%/ebin/couch_dist.app
 libexec/couchdb3/lib/couch_dist-%%VERSION%%/ebin/couch_dist.beam
@@ -440,6 +437,7 @@ libexec/couchdb3/lib/mango-%%VERSION%%/ebin/mango_util.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3.app
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_app.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_bdu.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_cluster.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_epi.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_hash.beam
@@ -675,6 +673,7 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/cve/2018-17188.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/cve/2018-8007.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/cve/2020-1955.rst.txt
+%%PORTDOCS%%%%WWWDIR%%/docs/_sources/cve/2021-38295.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/cve/index.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/ddocs/ddocs.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/ddocs/index.rst.txt
@@ -746,11 +745,7 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/whatsnew/3.1.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/whatsnew/3.2.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/whatsnew/index.rst.txt
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/ajax-loader.gif
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/basic.css
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/comment-bright.png
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/comment-close.png
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/comment.png
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/css/badge_only.css
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/Roboto-Slab-Bold.woff
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/Roboto-Slab-Bold.woff2
@@ -773,16 +768,15 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/css/theme.css
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/doctools.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/documentation_options.js
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/down-pressed.png
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/down.png
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/favicon.ico
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/file.png
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/jquery-3.2.1.js
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/jquery-3.4.1.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/jquery.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/js/badge_only.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/js/html5shiv-printshiv.min.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/js/html5shiv.min.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/js/theme.js
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/language_data.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/logo.png
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/minus.png
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/plus.png
@@ -790,9 +784,6 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/searchtools.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/underscore-1.3.1.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/underscore.js
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/up-pressed.png
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/up.png
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/websupport.js
 %%PORTDOCS%%%%WWWDIR%%/docs/about.html
 %%PORTDOCS%%%%WWWDIR%%/docs/api/basics.html
 %%PORTDOCS%%%%WWWDIR%%/docs/api/database/bulk-api.html
@@ -865,6 +856,7 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/cve/2018-17188.html
 %%PORTDOCS%%%%WWWDIR%%/docs/cve/2018-8007.html
 %%PORTDOCS%%%%WWWDIR%%/docs/cve/2020-1955.html
+%%PORTDOCS%%%%WWWDIR%%/docs/cve/2021-38295.html
 %%PORTDOCS%%%%WWWDIR%%/docs/cve/index.html
 %%PORTDOCS%%%%WWWDIR%%/docs/ddocs/ddocs.html
 %%PORTDOCS%%%%WWWDIR%%/docs/ddocs/index.html
@@ -944,8 +936,8 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/favicon.ico
 %%PORTDOCS%%%%WWWDIR%%/index.html
 @comment fauxton core UI
-%%WWWDIR%%/dashboard.assets/css/styles.85efbe9abd87bd8f6f65.css
-%%WWWDIR%%/dashboard.assets/css/styles.bee89075389da7c063d7.css
+%%WWWDIR%%/dashboard.assets/css/styles.01f570698487acedea0d.css
+%%WWWDIR%%/dashboard.assets/css/styles.4b6c0c97075e44520158.css
 %%WWWDIR%%/dashboard.assets/fonts/fauxtonicon5.eot
 %%WWWDIR%%/dashboard.assets/fonts/fauxtonicon5.ttf
 %%WWWDIR%%/dashboard.assets/fonts/fauxtonicon5.woff
@@ -963,6 +955,6 @@ man/man1/apachecouchdb.1.gz
 %%WWWDIR%%/dashboard.assets/img/linkedin.png
 %%WWWDIR%%/dashboard.assets/img/loader.gif
 %%WWWDIR%%/dashboard.assets/img/twitter.png
-%%WWWDIR%%/dashboard.assets/js/bundle.85efbe9abd87bd8f6f65.js
+%%WWWDIR%%/dashboard.assets/js/bundle.01f570698487acedea0d.js
 %%WWWDIR%%/dashboard.assets/js/manifest.9d15b7c24fc8359d2668.js
-%%WWWDIR%%/dashboard.assets/js/vendor.bee89075389da7c063d7.js
+%%WWWDIR%%/dashboard.assets/js/vendor.4b6c0c97075e44520158.js