From nobody Sat Feb 19 13:05:59 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4D1D419DEFA9; Sat, 19 Feb 2022 13:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K182J0NDLz4VJN; Sat, 19 Feb 2022 13:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645275960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WghpF8jLz0khpE7/1O9bdJiTiYXRUMJq2FeEI5MAEyc=; b=A6z3bzf9Llhm7YfTcEGiv2qWt3aecQHa2i+mkMSCYnbR35Op15pszhtBJ/rSAto7gPoZ5x d29AaVCspCFsqvozeasvA3vFColhi9M7d0AwD97FpPN5nqlqdeLJ2k8o+bmxNHTTQhWsCM SYgRc1k6ah8/NSQyLdq4p6cMVEyyQIPVP1BzrKOCAEC/KGednzK2xf8YUxxd+6ksvedhBM zByYYf6XSJnW8QmaeayRBHyKvcJ7ZQ51Hvq160od7kzuM1hnc/vL2d891pf0ErFGQNJkfV tq96zlwJT+uVA3E7KIL18b4Ma1p7qY2/OoDXfqtyl4a1vJOqIWX2wtKHsezD9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D16F1154A; Sat, 19 Feb 2022 13:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21JD5xUS063230; Sat, 19 Feb 2022 13:05:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21JD5xDe063229; Sat, 19 Feb 2022 13:05:59 GMT (envelope-from git) Date: Sat, 19 Feb 2022 13:05:59 GMT Message-Id: <202202191305.21JD5xDe063229@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernard Spil Subject: git: 343566fef1e1 - 2022Q1 - databases/mariadb103-server: Security update to 10.3.34 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 343566fef1e114a293b66e3fa04808529fee6981 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645275960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WghpF8jLz0khpE7/1O9bdJiTiYXRUMJq2FeEI5MAEyc=; b=iJ/kLLhr7JFZDveFU2jdFZU2YU8KtH4KTfkTJ2kRRA4elH2i01WhazD0pXOol5ti40zS7S OmviWBU3UcdKyZknID2rf2cX4CihjjKVi+FxH+nxLcQXHhCQ5aloInLgPGDJL3a5lGYCQ5 hNGjjM7pn529FG/1hazdmLeWPivvBJ3KqbcSZw7N6WYNzk5yioC+Txlz3A/lAEI/qTqHvC BZ1bkL1I3nzqSFeNIVLxDwE2YKbr7ih7D5DGTULiUDfeR8YFWQn2Em5AWySJLYdee0u6Lr Qhjx40K3ProQaidYshPVfxBERo8V2R5uf+oLyO84ksMyAwhDcb3jEb3+efuAyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645275960; a=rsa-sha256; cv=none; b=ZJBNqoKnkCcxdGpgp/V41y7UDYbrvlDV9UyDRbMizowPlBx2PTiI0nNxYfev1FuV+mfM7V G6O+d691TdxqvjOvF5haD9kjR7gRnhdtfi6DVz8TaJ5kXdCXmKpPU2TN1GK2qlLiaMwP9B X1XyNf7jZCIJ+wPgfAddRH5E8bCeZr0TY9XTrNDXuT0Zgs2KV11Tn9RgP/+C7bxmWozpL9 8bTyl09PdAKN/EhWumNZq4glJfV9dtRKMkM7HdvfYGVeyJJY6RbCdZe6SF8OffCTrTNCua KZC98H23lWcqrZI60tF1H0PmXnaoa38dlfM0BiCEdI8ba5TicH5ynITXRuSUwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=343566fef1e114a293b66e3fa04808529fee6981 commit 343566fef1e114a293b66e3fa04808529fee6981 Author: Bernard Spil AuthorDate: 2022-02-17 10:09:09 +0000 Commit: Bernard Spil CommitDate: 2022-02-19 13:05:40 +0000 databases/mariadb103-server: Security update to 10.3.34 PR: 261969 Security: ff5606f7-8a45-11ec-8be6-d4c9ef517024 MFH: 2022Q1 (cherry picked from commit b7f811a8ea8132998af511b9a105a25137dcb20d) --- databases/mariadb103-client/pkg-plist | 1 + databases/mariadb103-server/Makefile | 4 ++-- databases/mariadb103-server/distinfo | 6 +++--- .../files/patch-libmariadb_libmariadb_CMakeLists.txt | 18 +++++++++++------- .../files/patch-scripts_wsrep__sst__mariabackup.sh | 6 +++--- databases/mariadb103-server/pkg-plist | 1 + 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/databases/mariadb103-client/pkg-plist b/databases/mariadb103-client/pkg-plist index 2bf148b27732..7e71f3d1ebe8 100644 --- a/databases/mariadb103-client/pkg-plist +++ b/databases/mariadb103-client/pkg-plist @@ -46,6 +46,7 @@ include/mysql/mysqld_error.h @sample etc/my.cnf.sample @comment libexec/rcmysql %%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/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index 8ae086ab6851..e909d791df8c 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -1,10 +1,10 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.3.32 +PORTVERSION= 10.3.34 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/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo index 12faf4cdb3be..0531466b9f73 100644 --- a/databases/mariadb103-server/distinfo +++ b/databases/mariadb103-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636550062 -SHA256 (mariadb-10.3.32.tar.gz) = 948d0cdf2f92c60cff4232af9d724e0a4bbeafbb35762fa429e7ba5c3811c064 -SIZE (mariadb-10.3.32.tar.gz) = 73389214 +TIMESTAMP = 1645042460 +SHA256 (mariadb-10.3.34.tar.gz) = 7b7013448519d20590ec90eac54ca54e9ac9c4b7d90eaacb7451650e38be0627 +SIZE (mariadb-10.3.34.tar.gz) = 73455446 diff --git a/databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt b/databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt index 0542221db134..d94132520da5 100644 --- a/databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt +++ b/databases/mariadb103-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:31:02 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/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh index dc45c2d238c7..74b1efd3cb67 100644 --- a/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh +++ b/databases/mariadb103-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-16 20:18:40 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/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist index 8ec9d7fffce5..1fc101501ad0 100644 --- a/databases/mariadb103-server/pkg-plist +++ b/databases/mariadb103-server/pkg-plist @@ -150,6 +150,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