diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2022-05-23 20:18:04 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2022-05-23 20:18:04 +0000 |
| commit | 6b0d6cbbfacf1e3a82847ef03df8d9e184318a77 (patch) | |
| tree | 680d53c8853f73862b725da36189432bb15e4222 | |
| parent | 517c69a3c29c53d165e17ed5aafceccc97f34c2c (diff) | |
| download | ports-6b0d6cbbfacf1e3a82847ef03df8d9e184318a77.tar.gz ports-6b0d6cbbfacf1e3a82847ef03df8d9e184318a77.zip | |
databases/mariadb106-server: Security update to 10.6.8
Security: 04fecc47-dad2-11ec-8fbd-d4c9ef517024
MFH: 2022Q2
4 files changed, 25 insertions, 22 deletions
diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 64546e66af14..687df7a0af18 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -1,11 +1,10 @@ # Created by: Bernard Spil <brnrd@FreeBSD.org> PORTNAME?= mariadb -PORTVERSION= 10.6.7 -PORTREVISION?= 3 +PORTVERSION= 10.6.8 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/ \ - https://mirror.nodesdirect.com/${SITESDIR}/ \ +MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ https://mirror.one.com/${SITESDIR}/ \ https://ftp.nluug.nl/db/${SITESDIR}/ \ https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \ @@ -15,7 +14,8 @@ MASTER_SITES= https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/ \ https://mirror.kku.ac.th/${SITESDIR}/ \ https://espejito.fder.edu.uy/${SITESDIR}/ \ https://mirror1.cl.netactuate.com/${SITESDIR}/ \ - https://ftp.osuosl.org/pub/${SITESDIR}/ + https://ftp.osuosl.org/pub/${SITESDIR}/ \ + https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/ PKGNAMESUFFIX?= 106-server MAINTAINER= brnrd@FreeBSD.org diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo index f825cab9228e..3d6ae5474293 100644 --- a/databases/mariadb106-server/distinfo +++ b/databases/mariadb106-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1645292669 -SHA256 (mariadb-10.6.7.tar.gz) = 75ee0f1f865a765fc461ab165419417a719e308faba784b2c97ecbe9e4b4b2c5 -SIZE (mariadb-10.6.7.tar.gz) = 85882896 +TIMESTAMP = 1653247917 +SHA256 (mariadb-10.6.8.tar.gz) = 57a9488559ccbdfb8506b781089a7a08d8e0e1b647cffb8f2706af06f69ed438 +SIZE (mariadb-10.6.8.tar.gz) = 88794744 diff --git a/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp b/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp index da71156da758..26ea3d16ecd7 100644 --- a/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp +++ b/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp @@ -1,24 +1,24 @@ ---- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig 2021-08-04 18:07:21 UTC +--- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig 2022-05-18 08:34:17 UTC +++ storage/columnstore/columnstore/utils/common/threadnaming.cpp @@ -22,13 +22,21 @@ namespace utils { - void setThreadName(const char *threadName) - { + void setThreadName(const char* threadName) + { +#ifdef __FreeBSD__ -+ pthread_set_name_np(pthread_self(), threadName); ++ pthread_set_name_np(pthread_self(), threadName); +#else - prctl(PR_SET_NAME, threadName, 0, 0, 0); + prctl(PR_SET_NAME, threadName, 0, 0, 0); +#endif - } + } - std::string getThreadName() - { - char buf[32]; + std::string getThreadName() + { + char buf[32]; +#ifdef __FreeBSD__ -+ pthread_get_name_np(pthread_self(), buf, sizeof(buf)); ++ pthread_get_name_np(pthread_self(), buf, sizeof(buf)); +#else - prctl(PR_GET_NAME, buf, 0, 0, 0); + prctl(PR_GET_NAME, buf, 0, 0, 0); +#endif - return std::string(buf); - } - } // end of namespace + return std::string(buf); + } + } // namespace utils diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist index b1614ec8210c..91d79f960925 100644 --- a/databases/mariadb106-server/pkg-plist +++ b/databases/mariadb106-server/pkg-plist @@ -54,6 +54,7 @@ bin/test-connect-t %%WSREP%%bin/wsrep_sst_mysqldump %%WSREP%%bin/wsrep_sst_rsync %%WSREP%%bin/wsrep_sst_rsync_wan +%%WSREP%%bin/wsrep_sst_backup @comment %%ETCDIR%%/conf.d/client.cnf %%ETCDIR%%/conf.d/enable_encryption.preset %%ETCDIR%%/conf.d/mysql-clients.cnf @@ -439,6 +440,7 @@ share/aclocal/mysql.m4 %%MROONGA%%share/groonga-normalizer-mysql/README.md %%MROONGA%%share/groonga-normalizer-mysql/lgpl-2.0.txt %%DATADIR%%/binary-configure +%%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml @@ -465,6 +467,7 @@ share/aclocal/mysql.m4 %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/chinese/errmsg.sys %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys |