diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2022-02-15 11:47:37 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2022-02-15 11:47:37 +0000 |
| commit | 4e7a17eee56a05ef998bf35a17453da5b6c96c8b (patch) | |
| tree | 145403ce380e355ef3346b89bd38ee7710aeea35 | |
| parent | x11-wm/gamescope: update to 3.11.19 (diff) | |
databases/mariadb105-server: Security update to 10.5.15
security: ff5606f7-8a45-11ec-8be6-d4c9ef517024
MFH: 2022Q1
| -rw-r--r-- | databases/mariadb105-client/pkg-plist | 1 | ||||
| -rw-r--r-- | databases/mariadb105-server/Makefile | 5 | ||||
| -rw-r--r-- | databases/mariadb105-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh | 6 | ||||
| -rw-r--r-- | databases/mariadb105-server/pkg-plist | 1 |
5 files changed, 10 insertions, 9 deletions
diff --git a/databases/mariadb105-client/pkg-plist b/databases/mariadb105-client/pkg-plist index 1e24b40d271a..01ecd70b93c6 100644 --- a/databases/mariadb105-client/pkg-plist +++ b/databases/mariadb105-client/pkg-plist @@ -66,6 +66,7 @@ include/mysql/mysql/plugin_auth.h include/mysql/mysql/plugin_auth_common.h include/mysql/mysqld_error.h %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so +lib/mysql/libmariadb.a lib/mysql/libmariadb.so lib/mysql/libmariadb.so.3 lib/mysql/libmariadbclient.a diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index a5e8c48668ad..1145faf77529 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,11 +1,10 @@ # Created by: Bernard Spil <brnrd@FreeBSD.org> PORTNAME?= mariadb -PORTVERSION= 10.5.13 +PORTVERSION= 10.5.15 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ - http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ +MASTER_SITES= http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo index c5d7eddf1096..ff789d036591 100644 --- a/databases/mariadb105-server/distinfo +++ b/databases/mariadb105-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636446066 -SHA256 (mariadb-10.5.13.tar.gz) = 16f008c66831130e9263b2601265d566ffc4e890d37bacecd4dcecebfd0d1c58 -SIZE (mariadb-10.5.13.tar.gz) = 102047279 +TIMESTAMP = 1644826126 +SHA256 (mariadb-10.5.15.tar.gz) = 8980ed37f870ce3217c3c7a1b223a8362c28f277afc4d0005d1a9f1256f7db59 +SIZE (mariadb-10.5.15.tar.gz) = 102803624 diff --git a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh index 291b11edadbe..0c2fb501b208 100644 --- a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh +++ b/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh @@ -1,9 +1,9 @@ ---- scripts/wsrep_sst_mariabackup.sh.orig 2021-06-24 09:33:04 UTC +--- scripts/wsrep_sst_mariabackup.sh.orig 2022-02-14 08:10:09 UTC +++ scripts/wsrep_sst_mariabackup.sh -@@ -696,7 +696,7 @@ recv_joiner() +@@ -715,7 +715,7 @@ recv_joiner() local ltcmd="$tcmd" if [ $tmt -gt 0 ]; then - if [ -n "$(command -v timeout)" ]; then + if [ -n "$(commandex timeout)" ]; then - if timeout --help | grep -qw -- '-k'; then + if timeout --help 2>&1 | grep -qw -- '-k'; then ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd" diff --git a/databases/mariadb105-server/pkg-plist b/databases/mariadb105-server/pkg-plist index 2e6f8dd92eb7..42bfa4d8e6a8 100644 --- a/databases/mariadb105-server/pkg-plist +++ b/databases/mariadb105-server/pkg-plist @@ -163,6 +163,7 @@ include/mysql/server/sslopt-case.h include/mysql/server/sslopt-longopts.h include/mysql/server/sslopt-vars.h include/mysql/server/typelib.h +@comment lib/mysql/libmariadb.a @comment lib/mysql/libmariadbclient.a lib/mysql/libmariadbd.a lib/mysql/libmariadbd.so |