summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/mariadb101-server/Makefile3
-rw-r--r--databases/mariadb101-server/distinfo6
-rw-r--r--databases/mariadb101-server/files/extra-patch-MDEV-152887
3 files changed, 4 insertions, 12 deletions
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile
index 2529649d5957..42217cf31cb2 100644
--- a/databases/mariadb101-server/Makefile
+++ b/databases/mariadb101-server/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME?= mariadb
-PORTVERSION= 10.1.31
+PORTVERSION= 10.1.32
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
@@ -136,7 +136,6 @@ ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC
CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC
CONNECT_EXTRA_USE= gnome=libxml2
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO
-INNOBASE_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-MDEV-15288
LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF
LZ4_CMAKE_ON= -DGRN_WITH_LZ4=${LOCALBASE}/lib -DWITH_INNODB_LZ4=${LOCALBASE}/lib
LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4
diff --git a/databases/mariadb101-server/distinfo b/databases/mariadb101-server/distinfo
index 445dbc99fbcf..50562707084d 100644
--- a/databases/mariadb101-server/distinfo
+++ b/databases/mariadb101-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518260559
-SHA256 (mariadb-10.1.31.tar.gz) = ab7641c2fe4e5289da6141766a9c3350e013def56fafd6f1377080bc8048b2e6
-SIZE (mariadb-10.1.31.tar.gz) = 67982786
+TIMESTAMP = 1522324355
+SHA256 (mariadb-10.1.32.tar.gz) = 0e2aae6a6a190d07c8e36e87dd43377057fa82651ca3c583462563f3e9369096
+SIZE (mariadb-10.1.32.tar.gz) = 68001321
diff --git a/databases/mariadb101-server/files/extra-patch-MDEV-15288 b/databases/mariadb101-server/files/extra-patch-MDEV-15288
deleted file mode 100644
index d5a1b81c80de..000000000000
--- a/databases/mariadb101-server/files/extra-patch-MDEV-15288
+++ /dev/null
@@ -1,7 +0,0 @@
---- storage/innobase/CMakeLists.txt.orig 2018-02-04 02:30:31 UTC
-+++ storage/innobase/CMakeLists.txt
-@@ -520,4 +520,3 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOU
- MODULE_OUTPUT_NAME ha_innodb
- LINK_LIBRARIES ${ZLIB_LIBRARY} ${LIBSYSTEMD} ${LINKER_SCRIPT})
-
--ADD_DEPENDENCIES(innobase GenError)