Date: Sun, 12 Sep 2021 12:09:29 GMT From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 2a060a40d54d - 2021Q3 - databases/mariadb103-server: Security update to 10.3.31 Message-ID: <202109121209.18CC9Th9014258@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q3 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a060a40d54da7f4a75396478ae4c55aa17c36a1 commit 2a060a40d54da7f4a75396478ae4c55aa17c36a1 Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2021-08-08 18:47:18 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> CommitDate: 2021-09-12 12:09:06 +0000 databases/mariadb103-server: Security update to 10.3.31 Security: 38a4a043-e937-11eb-9b84-d4c9ef517024 MFH: 2021Q3 (cherry picked from commit d46194044ba61ece43081618c10fbc283b56cc5d) --- databases/mariadb103-server/Makefile | 1 - databases/mariadb103-server/distinfo | 6 +++--- .../files/patch-storage_innobase_lz4.cmake | 18 +++++++++--------- .../files/patch-storage_innobase_lzo.cmake | 22 ++++------------------ .../files/patch-storage_innobase_snappy.cmake | 9 +++++---- .../files/patch-storage_mroonga_CMakeLists.txt | 11 ----------- 6 files changed, 21 insertions(+), 46 deletions(-) diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index a35c659198e7..0d2562ab2541 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -192,7 +192,6 @@ post-patch: ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake ${REINPLACE_CMD} 's|/etc/my.cnf.d|${LOCALBASE}/etc/mysql/conf.d|' \ ${WRKSRC}/support-files/rpm/my.cnf - ${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo index 44a2b011dbcd..31e29a79b9ae 100644 --- a/databases/mariadb103-server/distinfo +++ b/databases/mariadb103-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624605956 -SHA256 (mariadb-10.3.30.tar.gz) = bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b -SIZE (mariadb-10.3.30.tar.gz) = 73266479 +TIMESTAMP = 1628426460 +SHA256 (mariadb-10.3.31.tar.gz) = 20421dfe5750f510ab0ee23420337332e6799cd38fa31332e2841dfa956eb771 +SIZE (mariadb-10.3.31.tar.gz) = 73298653 diff --git a/databases/mariadb103-server/files/patch-storage_innobase_lz4.cmake b/databases/mariadb103-server/files/patch-storage_innobase_lz4.cmake index 096529fae9f5..245725cd4801 100644 --- a/databases/mariadb103-server/files/patch-storage_innobase_lz4.cmake +++ b/databases/mariadb103-server/files/patch-storage_innobase_lz4.cmake @@ -1,6 +1,6 @@ ---- storage/innobase/lz4.cmake.orig 2017-05-14 23:13:18 UTC +--- storage/innobase/lz4.cmake.orig 2021-08-02 10:58:57 UTC +++ storage/innobase/lz4.cmake -@@ -17,21 +17,29 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING +@@ -17,9 +17,16 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING MACRO (MYSQL_CHECK_LZ4) IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO") @@ -19,18 +19,18 @@ + CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default ${LZ4_LIBDIR} HAVE_LZ4_COMPRESS_DEFAULT) IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H) - ADD_DEFINITIONS(-DHAVE_LZ4=1) + SET(HAVE_INNODB_LZ4 TRUE) +@@ -27,11 +34,12 @@ MACRO (MYSQL_CHECK_LZ4) IF (HAVE_LZ4_COMPRESS_DEFAULT) - ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1) + ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1) ENDIF() - LINK_LIBRARIES(lz4) -+ LINK_LIBRARIES(innobase ${LZ4_LIBRARY}) ++ LINK_LIBRARIES(${LZ4_LIBRARY}) ELSE() IF (WITH_INNODB_LZ4 STREQUAL "ON") - MESSAGE(FATAL_ERROR "Required lz4 library is not found") + MESSAGE(FATAL_ERROR "Required lz4 library is not found") ENDIF() - ENDIF() + ENDIF() + ENDIF() ENDIF() - ENDMACRO() - + ADD_FEATURE_INFO(INNODB_LZ4 HAVE_INNODB_LZ4 "LZ4 compression in the InnoDB storage engine") diff --git a/databases/mariadb103-server/files/patch-storage_innobase_lzo.cmake b/databases/mariadb103-server/files/patch-storage_innobase_lzo.cmake index afabe8542926..54de34c4f0d8 100644 --- a/databases/mariadb103-server/files/patch-storage_innobase_lzo.cmake +++ b/databases/mariadb103-server/files/patch-storage_innobase_lzo.cmake @@ -1,21 +1,6 @@ ---- storage/innobase/lzo.cmake.orig 2017-05-14 23:13:18 UTC +--- storage/innobase/lzo.cmake.orig 2021-08-02 10:58:57 UTC +++ storage/innobase/lzo.cmake -@@ -17,12 +17,10 @@ SET(WITH_INNODB_LZO AUTO CACHE STRING - - MACRO (MYSQL_CHECK_LZO_STATIC) - IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO") -- CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H) -- CHECK_LIBRARY_EXISTS(liblzo2.a lzo1x_1_compress "" HAVE_LZO_LIB) -- -+ CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "${LZO_LIBDIR}" HAVE_LZO_LIB) - IF(HAVE_LZO_LIB AND HAVE_LZO_H) - ADD_DEFINITIONS(-DHAVE_LZO=1) -- LINK_LIBRARIES(liblzo2.a) -+ LINK_LIBRARIES(lzo2) - ELSE() - IF (WITH_INNODB_LZO STREQUAL "ON") - MESSAGE(FATAL_ERROR "Required lzo library is not found") -@@ -33,12 +31,16 @@ ENDMACRO() +@@ -17,13 +17,17 @@ SET(WITH_INNODB_LZO AUTO CACHE STRING MACRO (MYSQL_CHECK_LZO) IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO") @@ -30,9 +15,10 @@ + ENDIF() + CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress ${LZO_LIBDIR} HAVE_LZO_SHARED_LIB) IF(HAVE_LZO_SHARED_LIB AND HAVE_LZO_H) + SET(HAVE_INNODB_LZO TRUE) ADD_DEFINITIONS(-DHAVE_LZO=1) - LINK_LIBRARIES(lzo2) + LINK_LIBRARIES(${LZO_LIBRARY}) ELSE() IF (WITH_INNODB_LZO STREQUAL "ON") - MESSAGE(FATAL_ERROR "Required lzo library is not found") + MESSAGE(FATAL_ERROR "Required lzo library is not found") diff --git a/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake b/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake index 42c80e08d04a..9e8fc040616c 100644 --- a/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake +++ b/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake @@ -1,6 +1,6 @@ ---- storage/innobase/snappy.cmake.orig 2017-05-14 23:13:18 UTC +--- storage/innobase/snappy.cmake.orig 2021-08-02 10:58:58 UTC +++ storage/innobase/snappy.cmake -@@ -17,12 +17,17 @@ SET(WITH_INNODB_SNAPPY AUTO CACHE STRING +@@ -17,13 +17,18 @@ SET(WITH_INNODB_SNAPPY AUTO CACHE STRING MACRO (MYSQL_CHECK_SNAPPY) IF (WITH_INNODB_SNAPPY STREQUAL "ON" OR WITH_INNODB_SNAPPY STREQUAL "AUTO") @@ -14,11 +14,12 @@ + SET(HAVE_SNAPPY_H 1) + ENDIF() + CHECK_LIBRARY_EXISTS(snappy snappy_uncompress ${SNAPPY_LIBDIR} HAVE_SNAPPY_SHARED_LIB) -+MESSAGE(STATUS "HAVE_SNAPPY_H=${HAVE_SNAPPY_H} HAVE_SNAPPY_SHARED_LIB=${HAVE_SNAPPY_SHARED_LIB} SNAPPY_LIBDIR=${SNAPPY_LIBDIR} ") ++#MESSAGE(STATUS "HAVE_SNAPPY_H=${HAVE_SNAPPY_H} HAVE_SNAPPY_SHARED_LIB=${HAVE_SNAPPY_SHARED_LIB} SNAPPY_LIBDIR=${SNAPPY_LIBDIR} ") IF(HAVE_SNAPPY_SHARED_LIB AND HAVE_SNAPPY_H) + SET(HAVE_INNODB_SNAPPY TRUE) ADD_DEFINITIONS(-DHAVE_SNAPPY=1) - LINK_LIBRARIES(snappy) + LINK_LIBRARIES(${SNAPPY_LIBRARY}) ELSE() IF (WITH_INNODB_SNAPPY STREQUAL "ON") - MESSAGE(FATAL_ERROR "Required snappy library is not found") + MESSAGE(FATAL_ERROR "Required snappy library is not found") diff --git a/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt b/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt deleted file mode 100644 index 3a9984980272..000000000000 --- a/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- storage/mroonga/CMakeLists.txt.orig 2019-11-06 16:01:58 UTC -+++ storage/mroonga/CMakeLists.txt -@@ -80,7 +80,7 @@ else() - set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) - endif() - --file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) -+file(READ ${MRN_SOURCE_DIR}/version_txt MRN_VERSION) - file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) - file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) - file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109121209.18CC9Th9014258>