Merge branch '3.6' into 3.7

mariadb/.footprint

@@ -109,6 +109,7 @@ lrwxrwxrwx	root/root	usr/bin/mysqltest_embedded -> mariadb-test-embedded
 -rwxr-xr-x	root/root	usr/bin/resolveip
 -rwxr-xr-x	root/root	usr/bin/sst_dump
 -rwxr-xr-x	root/root	usr/bin/test-connect-t
+-rwxr-xr-x	root/root	usr/bin/wsrep_sst_backup
 -rw-r--r--	root/root	usr/bin/wsrep_sst_common
 -rwxr-xr-x	root/root	usr/bin/wsrep_sst_mariabackup
 -rwxr-xr-x	root/root	usr/bin/wsrep_sst_mysqldump

mariadb/.signature

@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/SWS+C6d9ZAuqy4LDeFCgM2jKdHZxGdGKIxQbVBnDT2pZPAAbNUuDjg+3+IQSX3c6G+r/PMG9Y+7rBir/StFoQc=
-SHA256 (Pkgfile) = 0a15ff5d550091f4b3104a964b1803dc20c17c58f27e49d629bb18a916be938f
-SHA256 (.footprint) = bb632917e67f748d6fe5698c60a9a26ef8e8d6e4ec31af249de0b735af3dcbff
-SHA256 (mariadb-10.8.2.tar.gz) = 14e0f7f8817a41bbcb5ebdd2345a9bd44035fde7db45c028b6d4c35887ae956c
+RWSE3ohX2g5d/frhwtsi0z1XxHheXd9wnJxvx6Alep5VWhSV8xw8b97kohv4LCjR5L1EOPXYcz0b3xwK9RSVjlDEQmSvUJCPeA4=
+SHA256 (Pkgfile) = af31ae9b46de3e1128a1f0a380d53a8e38d3b783afe835ea91cab1b9a107c9a6
+SHA256 (.footprint) = 95fc1385900d48afa7b929fd8596b16cf5317d86657babf2cb0db6622eead46d
+SHA256 (mariadb-10.8.3.tar.gz) = 887eadc55176ac1ead1fccfc89ade4b5990ef192745ad4dcd879acb41c050892
 SHA256 (mariadb.rc) = f0b6fe3b360fcc03c4fae19d5505859b475d8db1630d95e521e5da7b7561bf04
 SHA256 (mariadb.pam) = 962b53d37719ed4798643a8fe3557454d23f74c2b14f1dfc1c1c67d361cab891
 SHA256 (pre-install) = 62040c17eeb3da88172d49240633c871a93c3c642ad7f61911ce2e83d8414d1c

mariadb/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: ncurses zlib openssl cmake libaio linux-pam libpcre2
 
 name=mariadb
-version=10.8.2
+version=10.8.3
 release=1
 source=(https://downloads.mariadb.com/MariaDB//$name-$version/source/$name-$version.tar.gz
 	mariadb.rc mariadb.pam