Attachment #231835 for bug #261969

View | Details | Raw Unified | Return to bug 261969
Collapse All | Expand All

Lines 1-7 Link Here

(-)databases/mariadb103-server/Makefile (-1 / +1 lines)
1	# Created by: Bernard Spil <brnrd@FreeBSD.org>	1	# Created by: Bernard Spil <brnrd@FreeBSD.org>
2		2
3	PORTNAME?= mariadb	3	PORTNAME?= mariadb
4	PORTVERSION= 10.3.32	4	PORTVERSION= 10.3.34
5	PORTREVISION?= 0	5	PORTREVISION?= 0
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \	7	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \

Lines 1-3 Link Here

(-)databases/mariadb103-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1636550062	1	TIMESTAMP = 1644918755
2	SHA256 (mariadb-10.3.32.tar.gz) = 948d0cdf2f92c60cff4232af9d724e0a4bbeafbb35762fa429e7ba5c3811c064	2	SHA256 (mariadb-10.3.34.tar.gz) = 7b7013448519d20590ec90eac54ca54e9ac9c4b7d90eaacb7451650e38be0627
3	SIZE (mariadb-10.3.32.tar.gz) = 73389214	3	SIZE (mariadb-10.3.34.tar.gz) = 73455446




--- 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)
 # 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(MSVC)
    # On Windows, install PDB

Lines 1-9 Link Here

(-)databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh (-4 / +4 lines)
1	--- scripts/wsrep_sst_mariabackup.sh.orig 2021-06-09 14:23:11.000000000 +0200	1	--- scripts/wsrep_sst_mariabackup.sh.orig 2022-02-10 20:31:00.000000000 +0100
2	+++ scripts/wsrep_sst_mariabackup.sh	2	+++ scripts/wsrep_sst_mariabackup.sh 2022-02-15 11:34:45.000000000 +0100
3	@@ -696,7 +696,7 @@	3	@@ -715,7 +715,7 @@ recv_joiner()
4	local ltcmd="$tcmd"	4	local ltcmd="$tcmd"
5	if [ $tmt -gt 0 ]; then	5	if [ $tmt -gt 0 ]; then
6	if [ -n "$(command -v timeout)" ]; then	6	if [ -n "$(commandex timeout)" ]; then
7	- if timeout --help \| grep -qw -- '-k'; then	7	- if timeout --help \| grep -qw -- '-k'; then
8	+ if timeout --help 2>&1 \| grep -qw -- '-k'; then	8	+ if timeout --help 2>&1 \| grep -qw -- '-k'; then
9	ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"	9	ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"

Return to bug 261969

Lines 1-14 Link Here

(-)databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt (-8 / +12 lines)
1	--- libmariadb/libmariadb/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC	1	--- libmariadb/libmariadb/CMakeLists.txt.orig 2022-02-10 20:31:02.000000000 +0100
2	+++ libmariadb/libmariadb/CMakeLists.txt	2	+++ libmariadb/libmariadb/CMakeLists.txt 2022-02-15 11:12:33.000000000 +0100
3	@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT	3	@@ -462,6 +462,7 @@ ENDIF()
4	INSTALL(TARGETS mariadbclient	4	INSTALL(TARGETS mariadbclient
5	COMPONENT Development	5	COMPONENT Development
6	DESTINATION ${INSTALL_LIBDIR})	6	DESTINATION ${INSTALL_LIBDIR})
7	+IF(NOT WITHOUT_CLIENT)	7	+IF(NOT WITHOUT_CLIENT)
8	INSTALL(TARGETS libmariadb	8	# in cmake 3.12+ we can use
9	COMPONENT SharedLibraries	9	#INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
10	DESTINATION ${INSTALL_LIBDIR})	10	# COMPONENT SharedLibraries NAMELINK_COMPONENT Development)
		11	@@ -470,6 +471,7 @@ INSTALL(TARGETS libmariadb LIBRARY DESTI
		12	COMPONENT SharedLibraries NAMELINK_SKIP)
		13	INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
		14	COMPONENT Development NAMELINK_ONLY)
11	+ENDIF()	15	+ENDIF()
12		16
13	IF(WIN32)	17	IF(MSVC)
14	# On Windows, install PDB	18	# On Windows, install PDB