Attachment 231835 Details for Bug 261969 – Update to 10.3.34

[patch] Update to 10.3.34

mariadb10-3-34.patch (text/plain), 2.76 KB, created by Dani I. on 2022-02-15 11:59:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dani I.

Created: 2022-02-15 11:59:48 UTC

Size: 2.76 KB

patch

obsolete

>--- databases/mariadb103-server/Makefile
>+++ databases/mariadb103-server/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Bernard Spil <brnrd@FreeBSD.org>
> 
> PORTNAME?=	mariadb
>-PORTVERSION=	10.3.32
>+PORTVERSION=	10.3.34
> PORTREVISION?=	0
> CATEGORIES=	databases
> MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
>--- databases/mariadb103-server/distinfo
>+++ 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 = 1644918755
>+SHA256 (mariadb-10.3.34.tar.gz) = 7b7013448519d20590ec90eac54ca54e9ac9c4b7d90eaacb7451650e38be0627
>+SIZE (mariadb-10.3.34.tar.gz) = 73455446
>--- databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
>+++ 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
>-@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT
>+--- libmariadb/libmariadb/CMakeLists.txt.orig	2022-02-10 20:31:02.000000000 +0100
>++++ libmariadb/libmariadb/CMakeLists.txt	2022-02-15 11:12:33.000000000 +0100
>+@@ -462,6 +462,7 @@ ENDIF()
>  INSTALL(TARGETS mariadbclient
>            COMPONENT Development
>            DESTINATION ${INSTALL_LIBDIR})
> +IF(NOT WITHOUT_CLIENT)
>- INSTALL(TARGETS libmariadb
>-           COMPONENT SharedLibraries
>-         DESTINATION ${INSTALL_LIBDIR})
>+ # in cmake 3.12+ we can use
>+ #INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
>+ #        COMPONENT SharedLibraries NAMELINK_COMPONENT Development)
>+@@ -470,6 +471,7 @@ INSTALL(TARGETS libmariadb LIBRARY DESTI
>+         COMPONENT SharedLibraries NAMELINK_SKIP)
>+ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
>+         COMPONENT Development NAMELINK_ONLY)
> +ENDIF()
>- 
>- IF(WIN32)
>+
>+ IF(MSVC)
>     # On Windows, install PDB
>--- databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh
>+++ 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
>-@@ -696,7 +696,7 @@
>+--- scripts/wsrep_sst_mariabackup.sh.orig	2022-02-10 20:31:00.000000000 +0100
>++++ scripts/wsrep_sst_mariabackup.sh	2022-02-15 11:34:45.000000000 +0100
>+@@ -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"

Actions: View | Diff

Attachments on bug 261969: 231835