Date: Sun, 1 Dec 2019 19:48:09 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518808 - in head/databases/mariadb101-server: . files Message-ID: <201912011948.xB1Jm9mm089246@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sun Dec 1 19:48:08 2019 New Revision: 518808 URL: https://svnweb.freebsd.org/changeset/ports/518808 Log: databases/mariadb101-server: Security update to 10.1.43 MFH: 2019Q4 Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf Added: head/databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt - copied unchanged from r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt Deleted: head/databases/mariadb101-server/files/patch-storage_xtradb_include_ut0ut.h Modified: head/databases/mariadb101-server/Makefile head/databases/mariadb101-server/distinfo head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake Modified: head/databases/mariadb101-server/Makefile ============================================================================== --- head/databases/mariadb101-server/Makefile Sun Dec 1 19:17:47 2019 (r518807) +++ head/databases/mariadb101-server/Makefile Sun Dec 1 19:48:08 2019 (r518808) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.41 -PORTREVISION= 1 +PORTVERSION= 10.1.43 +PORTREVISION= 0 CATEGORIES= databases MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -24,7 +24,6 @@ LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mir SUB_FILES= pkg-message -SLAVEDIRS= databases/mariadb101-client USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe libedit ncurses \ shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql @@ -169,6 +168,7 @@ post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh + @${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake Modified: head/databases/mariadb101-server/distinfo ============================================================================== --- head/databases/mariadb101-server/distinfo Sun Dec 1 19:17:47 2019 (r518807) +++ head/databases/mariadb101-server/distinfo Sun Dec 1 19:48:08 2019 (r518808) @@ -1,3 +1,3 @@ -TIMESTAMP = 1564600761 -SHA256 (mariadb-10.1.41.tar.gz) = 2b47c3afdae81eab2b9c29ba6a10328acb8d07166e8112744f6d704cc70100f2 -SIZE (mariadb-10.1.41.tar.gz) = 63615288 +TIMESTAMP = 1575218029 +SHA256 (mariadb-10.1.43.tar.gz) = c3d4c579cfa112be53ea538dba8643466b36e8d010cde35709e55c82cfc0bedf +SIZE (mariadb-10.1.43.tar.gz) = 63635313 Copied: head/databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt (from r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt Sun Dec 1 19:48:08 2019 (r518808, copy of r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt) @@ -0,0 +1,11 @@ +--- 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) Modified: head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake ============================================================================== --- head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake Sun Dec 1 19:17:47 2019 (r518807) +++ head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake Sun Dec 1 19:48:08 2019 (r518808) @@ -1,10 +1,7 @@ -Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports - ---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2016-01-28 12:12:55 UTC +--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2019-11-06 06:20:37 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 +13,7 @@ Do NOT use bundled libs, use xz/lzma from base and arc ## 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 +29,7 @@ Do NOT use bundled libs, use xz/lzma from base and arc ## 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912011948.xB1Jm9mm089246>