cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r518601

Browse Source 
databases/mariadb104-server: Security update to 10.4.10

PR:             241335
Submitted by:   nbari tequilla io, Ralf van der Enden <tremere cainites net>
Security:       fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf

Approved by:	ports-secteam (miwi)
This commit is contained in:
Bernard Spil 2019-11-29 07:35:30 +00:00
parent ed83ed3c2a
commit ff706be76c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2019Q4/; revision=518628
9 changed files with 58 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
databases/mariadb104-server/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= mariadb
PORTVERSION= 10.4.7
PORTVERSION= 10.4.10
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
@ -24,11 +24,12 @@ LICENSE_NAME_PerconaFT= PerconaFT patents license
LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS
LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
SLAVEDIRS= databases/mariadb102-client
USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
USE_LDCONFIG= ${PREFIX}/lib/mysql
SHEBANG_FILES= scripts/*.sh
SITESDIR= mariadb/mariadb-${PORTVERSION}/source
@ -42,12 +43,12 @@ OPTIONS_DEFAULT= GSSAPI_BASE
# MySQL-Server options
OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP
OPTIONS_GROUP= COMPRESSION ENGINES GROONGA
OPTIONS_DEFINE= AWS_KMS CONNECT_EXTRA DOCS
OPTIONS_DEFINE= CONNECT_EXTRA DOCS
OPTIONS_DEFINE_amd64= WSREP
OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD
OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB
OPTIONS_GROUP_GROONGA= ZMQ MSGPACK
OPTIONS_EXCLUDE_i386= TOKUDB
OPTIONS_EXCLUDE_i386= ROCKSDB TOKUDB
CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine
COMPRESSION_DESC= Optional page compression
@ -149,11 +150,11 @@ OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
ROCKSDB_USES= python
SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy
SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy
TOKUDB_BROKEN= Error with bundled liblzma
TOKUDB_IMPLIES= SNAPPY
TOKUDB_PORTDOCS= README.md
TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi
WSREP_CMAKE_BOOL= WITH_WSREP
WSREP_LIB_DEPENDS= libgalera.so:databases/galera26
ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4
ZSTD_CMAKE_BOOL= WITH_ROCKSDB_ZSTD
ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
@ -201,8 +202,8 @@ post-configure:
-e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072
post-configure-INNOBASE-on:
# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072
post-configure-INNOBASE-on:
${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \
-e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \
-e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \

6
databases/mariadb104-server/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1564591340
SHA256 (mariadb-10.4.7.tar.gz) = c8e6a6d0bb4f22c416ed675d24682a3ecfa383c5283efee70c8edf131374d817
SIZE (mariadb-10.4.7.tar.gz) = 78155161
TIMESTAMP = 1574142229
SHA256 (mariadb-10.4.10.tar.gz) = cd50fddf86c2a47405737e342f78ebd40d5716f0fb32b976245de713bed01421
SIZE (mariadb-10.4.10.tar.gz) = 78352896

13
databases/mariadb104-server/files/patch-CMakeLists.txt Normal file
View File

@ -0,0 +1,13 @@
--- CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
+++ CMakeLists.txt
@@ -498,8 +498,10 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
+IF(FALSE)
INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY
EXCEPTIONS-CLIENT COMPONENT Readme)
+ENDIF()
# MDEV-6526 these files are not installed anymore
#INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC

22
databases/mariadb104-server/files/patch-MDEV-20258
View File

@ -1,22 +0,0 @@
--- plugin/auth_pam/testing/pam_mariadb_mtr.c.orig 2019-07-30 11:32:16.000000000 +0000
+++ plugin/auth_pam/testing/pam_mariadb_mtr.c 2019-08-20 18:31:37.712246000 +0000
@@ -15,6 +15,9 @@
#define N 3
+typedef unsigned int uint;
+typedef unsigned short ushort;
+
int pam_sm_authenticate(pam_handle_t *pamh, int flags,
int argc, const char *argv[])
{
--- plugin/auth_pam/CMakeLists.txt.orig 2019-07-30 11:32:16.000000000 +0000
+++ plugin/auth_pam/CMakeLists.txt 2019-08-23 12:04:17.702326000 +0000
@@ -21,7 +21,4 @@ IF(HAVE_PAM_APPL_H)
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)"
COMPONENT Server)
ENDIF()
- IF(TARGET auth_pam OR TARGET auth_pam_v1)
- ADD_SUBDIRECTORY(testing)
- ENDIF()
ENDIF(HAVE_PAM_APPL_H)

28
databases/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
View File

@ -1,25 +1,25 @@
--- libmariadb/plugins/auth/CMakeLists.txt.orig 2018-05-23 20:38:41 UTC
--- libmariadb/plugins/auth/CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
+++ libmariadb/plugins/auth/CMakeLists.txt
@@ -38,6 +38,7 @@ IF(GSSAPI_SOURCES)
LIBRARIES ${GSSAPI_LIBS})
ENDIF()
@@ -3,6 +3,7 @@ SET(AUTH_DIR ${CC_SOURCE_DIR}/plugins/auth)
INCLUDE_DIRECTORIES(${AUTH_DIR})
INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include)
+IF(NOT WITHOUT_CLIENT)
IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${WITH_SSL} STREQUAL "SCHANNEL")
IF(WIN32)
SET(SHA256_LIBS crypt32)
@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W
SOURCES ${AUTH_DIR}/sha256_pw.c
LIBRARIES ${SHA256_LIBS})
SET(CRYPTO_PLUGIN 1)
IF(WIN32)
SET(CRYPT_SOURCE ${CC_SOURCE_DIR}/libmariadb/secure/win_crypt.c)
@@ -18,6 +19,7 @@ ELSEIF(WITH_SSL STREQUAL "GNUTLS")
ELSE()
UNSET(CRYPTO_PLUGIN)
ENDIF()
+ENDIF()
# old_password plugin
REGISTER_PLUGIN(TARGET mysql_old_password
@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor
#native password
REGISTER_PLUGIN(TARGET mysql_native_password
@@ -119,10 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password
DEFAULT STATIC
SOURCES ${AUTH_DIR}/old_password.c)
+IF(NOT WITHOUT_CLIENT)
# Cleartext
REGISTER_PLUGIN(TARGET mysql_clear_password

7
databases/mariadb104-server/files/patch-man_CMakeLists.txt
View File

@ -1,8 +1,8 @@
Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
--- man/CMakeLists.txt.orig 2017-05-14 23:13:16 UTC
--- man/CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
+++ man/CMakeLists.txt
@@ -38,7 +38,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys
@@ -40,10 +40,11 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl
INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
@ -12,3 +12,6 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
-
+ENDIF()
macro(MARIADB_SYMLINK_MANPAGE)
list(LENGTH MARIADB_SYMLINK_FROMS _len)
math(EXPR _listlen "${_len}-1")

10
databases/mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt Normal file
View File

@ -0,0 +1,10 @@
--- plugin/auth_pam/testing/CMakeLists.txt.orig 2019-11-07 05:52:22 UTC
+++ plugin/auth_pam/testing/CMakeLists.txt
@@ -5,5 +5,7 @@ SET_TARGET_PROPERTIES (pam_mariadb_mtr PROPERTIES PREF
TARGET_LINK_LIBRARIES(pam_mariadb_mtr pam)
SET(dest DESTINATION "${INSTALL_MYSQLTESTDIR}/suite/plugins/pam" COMPONENT Test)
+IF(FALSE)
INSTALL(TARGETS pam_mariadb_mtr ${dest})
INSTALL(FILES mariadb_mtr.conf RENAME mariadb_mtr ${dest})
+ENDIF()

11
databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
View File

@ -1,10 +1,9 @@
Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports
--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2017-05-14 23:13:20 UTC
--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2019-11-07 05:52:23 UTC
+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
@@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB)
endif ()
endif ()
@@ -1,5 +1,12 @@
include(ExternalProject)
+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ include_directories("/usr/include")
@ -16,7 +15,7 @@ Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports
## add lzma with an external project
set(xz_configure_opts --with-pic --enable-static)
if (APPLE)
@@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED)
@@ -71,8 +78,15 @@ add_library(lzma STATIC IMPORTED)
set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
add_dependencies(lzma build_lzma)
@ -32,7 +31,7 @@ Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports
## add snappy with an external project
set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")
if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")
@@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED)
@@ -109,3 +123,4 @@ add_library(snappy STATIC IMPORTED)
set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")
add_dependencies(snappy build_snappy)

3
databases/mariadb104-server/pkg-plist
View File

@ -309,12 +309,9 @@ man/man8/mysqld.8.gz
%%DATADIR%%/ukrainian/errmsg.sys
%%WSREP%%%%DATADIR%%/wsrep.cnf
%%WSREP%%%%DATADIR%%/wsrep_notify
%%DOCSDIR%%/CREDITS
@comment %%DOCSDIR%%/COPYING
%%DOCSDIR%%/EXCEPTIONS-CLIENT
%%DOCSDIR%%/INSTALL-BINARY
%%WSREP%%%%DOCSDIR%%/README-wsrep
%%DOCSDIR%%/README.md
@comment %%DOCSDIR%%/THIRDPARTY
@comment share/groonga-normalizer-mysql/lgpl-2.0.txt
@comment share/groonga/COPYING