mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
databases/mariadb102-server: Security update to 10.2.26
MFH: 2019Q3 Security: 198e6220-ac8b-11e9-a1c7-b499baebfeaf
This commit is contained in:
parent
2263df9a49
commit
0d99ef2381
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=510711
6 changed files with 30 additions and 19 deletions
11
databases/mariadb102-client/files/patch-MDEV-20463
Normal file
11
databases/mariadb102-client/files/patch-MDEV-20463
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
--- plugin/auth_ed25519/CMakeLists.txt.orig 2019-07-26 21:26:44 UTC
|
||||||
|
+++ plugin/auth_ed25519/CMakeLists.txt
|
||||||
|
@@ -11,7 +11,7 @@ SET(REF10_SOURCES
|
||||||
|
ref10/ge_sub.c ref10/ge_tobytes.c ref10/keypair.c ref10/open.c
|
||||||
|
ref10/sc_muladd.c ref10/sc_reduce.c ref10/sign.c ref10/verify.c)
|
||||||
|
|
||||||
|
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ../../include)
|
||||||
|
|
||||||
|
ADD_CONVENIENCE_LIBRARY(ref10 ${REF10_SOURCES})
|
||||||
|
IF(MSVC)
|
|
@ -20,6 +20,7 @@ include/mysql/mariadb/ma_io.h
|
||||||
include/mysql/mariadb_com.h
|
include/mysql/mariadb_com.h
|
||||||
include/mysql/mariadb_ctype.h
|
include/mysql/mariadb_ctype.h
|
||||||
include/mysql/mariadb_dyncol.h
|
include/mysql/mariadb_dyncol.h
|
||||||
|
include/mysql/mariadb_rpl.h
|
||||||
include/mysql/mariadb_stmt.h
|
include/mysql/mariadb_stmt.h
|
||||||
include/mysql/mariadb_version.h
|
include/mysql/mariadb_version.h
|
||||||
include/mysql/my_config.h
|
include/mysql/my_config.h
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PORTNAME?= mariadb
|
PORTNAME?= mariadb
|
||||||
PORTVERSION= 10.2.25
|
PORTVERSION= 10.2.26
|
||||||
PORTREVISION?= 2
|
PORTREVISION?= 0
|
||||||
CATEGORIES= databases ipv6
|
CATEGORIES= databases ipv6
|
||||||
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
|
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
|
||||||
http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
|
http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
TIMESTAMP = 1560710508
|
TIMESTAMP = 1564593111
|
||||||
SHA256 (mariadb-10.2.25.tar.gz) = face0818bb51b7dc20712ae225489c85a477d505cb6c2f6a6f6cf7d51ecfecc9
|
SHA256 (mariadb-10.2.26.tar.gz) = 152fe941c4f2a352b2b3a4db1ef64e70235fd9ff055af62ad7bda9f2b2191528
|
||||||
SIZE (mariadb-10.2.25.tar.gz) = 71997847
|
SIZE (mariadb-10.2.26.tar.gz) = 73037655
|
||||||
|
|
13
databases/mariadb102-server/files/patch-MDEV-20248
Normal file
13
databases/mariadb102-server/files/patch-MDEV-20248
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
--- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig 2019-07-30 11:32:15 UTC
|
||||||
|
+++ storage/rocksdb/rocksdb/port/jemalloc_helper.h
|
||||||
|
@@ -12,6 +12,10 @@
|
||||||
|
#include <jemalloc/jemalloc.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifdef __FreeBSD__
|
||||||
|
+#define JEMALLOC_USABLE_SIZE_CONST const
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#ifndef JEMALLOC_CXX_THROW
|
||||||
|
#define JEMALLOC_CXX_THROW
|
||||||
|
#endif
|
|
@ -1,14 +0,0 @@
|
||||||
--- plugin/auth_ed25519/CMakeLists.txt.orig 2019-06-14 18:29:42 UTC
|
|
||||||
+++ plugin/auth_ed25519/CMakeLists.txt
|
|
||||||
@@ -23,9 +23,11 @@ ENDIF()
|
|
||||||
# compiled with MYSQL_DYNAMIC_PLUGIN
|
|
||||||
MYSQL_ADD_PLUGIN(auth_ed25519 server_ed25519.c ${REF10_SOURCES} MODULE_ONLY)
|
|
||||||
|
|
||||||
+IF(NOT WITHOUT_CLIENT)
|
|
||||||
# client plugin and unit test ed25519-t can use the library
|
|
||||||
MYSQL_ADD_PLUGIN(client_ed25519 client_ed25519.c MODULE_ONLY
|
|
||||||
CLIENT LINK_LIBRARIES ref10 mysys_ssl COMPONENT ClientPlugins)
|
|
||||||
+ENDIF()
|
|
||||||
|
|
||||||
IF(WITH_UNIT_TESTS)
|
|
||||||
MY_ADD_TESTS(ed25519 LINK_LIBRARIES ref10 mysys_ssl)
|
|
Loading…
Add table
Reference in a new issue