Date: Sat, 19 Feb 2022 13:06:00 GMT From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 374c8089ee26 - 2022Q1 - databases/mariadb104-server: Security update to 10.4.24 Message-ID: <202202191306.21JD606r063253@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=374c8089ee26a45c0d8555c9d360c264f088271e commit 374c8089ee26a45c0d8555c9d360c264f088271e Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2022-02-17 14:09:54 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> CommitDate: 2022-02-19 13:05:52 +0000 databases/mariadb104-server: Security update to 10.4.24 PR: 261969 Security: ff5606f7-8a45-11ec-8be6-d4c9ef517024 MFH: 2022Q1 (cherry picked from commit 94df86eca53ee6a0196d010200ae3cd65e672945) --- databases/mariadb104-client/pkg-plist | 1 + databases/mariadb104-server/Makefile | 4 ++-- databases/mariadb104-server/distinfo | 6 +++--- .../files/patch-libmariadb_libmariadb_CMakeLists.txt | 18 +++++++++++------- .../files/patch-scripts_wsrep__sst__mariabackup.sh | 6 +++--- databases/mariadb104-server/pkg-plist | 1 + 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/databases/mariadb104-client/pkg-plist b/databases/mariadb104-client/pkg-plist index 1e1470cde0b9..10ef8d556ee5 100644 --- a/databases/mariadb104-client/pkg-plist +++ b/databases/mariadb104-client/pkg-plist @@ -60,6 +60,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/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index eb7cfef65782..ca56908807e9 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -1,10 +1,10 @@ # Created by: Bernard Spil <brnrd@FreeBSD.org> PORTNAME?= mariadb -PORTVERSION= 10.4.22 +PORTVERSION= 10.4.24 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ +MASTER_SITES= http://ftp.nluug.nl/db/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo index 6691d74395ca..28d88b848050 100644 --- a/databases/mariadb104-server/distinfo +++ b/databases/mariadb104-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636537152 -SHA256 (mariadb-10.4.22.tar.gz) = 44bdc36eeb02888296e961718bae808f3faab268ed49160a785248db60500c00 -SIZE (mariadb-10.4.22.tar.gz) = 84916052 +TIMESTAMP = 1645092859 +SHA256 (mariadb-10.4.24.tar.gz) = fe975551b37f095640ea5e380eb896a37e331caf113dbe5d05564714338df846 +SIZE (mariadb-10.4.24.tar.gz) = 85669405 diff --git a/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt b/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt index 0542221db134..8f6733715ad3 100644 --- a/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt +++ b/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt @@ -1,14 +1,18 @@ ---- libmariadb/libmariadb/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC +--- libmariadb/libmariadb/CMakeLists.txt.orig 2022-02-10 19:42:57 UTC +++ libmariadb/libmariadb/CMakeLists.txt -@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT +@@ -459,6 +459,7 @@ IF(NOT WIN32) + SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}") + ENDIF() + ++IF(NOT WITHOUT_CLIENT) INSTALL(TARGETS mariadbclient COMPONENT Development DESTINATION ${INSTALL_LIBDIR}) -+IF(NOT WITHOUT_CLIENT) - INSTALL(TARGETS libmariadb - COMPONENT SharedLibraries - DESTINATION ${INSTALL_LIBDIR}) +@@ -470,6 +471,7 @@ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTA + COMPONENT SharedLibraries NAMELINK_SKIP) + INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} + COMPONENT Development NAMELINK_ONLY) +ENDIF() - IF(WIN32) + IF(MSVC) # On Windows, install PDB diff --git a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh index dc45c2d238c7..3e3d42812b67 100644 --- a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh +++ b/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh @@ -1,9 +1,9 @@ ---- scripts/wsrep_sst_mariabackup.sh.orig 2021-06-09 14:23:11.000000000 +0200 +--- scripts/wsrep_sst_mariabackup.sh.orig 2022-02-17 10:18:49 UTC +++ scripts/wsrep_sst_mariabackup.sh -@@ -696,7 +696,7 @@ +@@ -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/mariadb104-server/pkg-plist b/databases/mariadb104-server/pkg-plist index ac3a50adb345..7a65cd836c1d 100644 --- a/databases/mariadb104-server/pkg-plist +++ b/databases/mariadb104-server/pkg-plist @@ -147,6 +147,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202191306.21JD606r063253>