diff options
| -rw-r--r-- | databases/mariadb104-client/Makefile | 2 | ||||
| -rw-r--r-- | databases/mariadb104-server/Makefile | 5 | ||||
| -rw-r--r-- | databases/mariadb104-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mariadb104-server/files/patch-MDEV-20248 | 13 | ||||
| -rw-r--r-- | databases/mariadb104-server/files/patch-MDEV-20258 | 22 |
5 files changed, 43 insertions, 5 deletions
diff --git a/databases/mariadb104-client/Makefile b/databases/mariadb104-client/Makefile index e0020ebcafe7..1e60b7fb5473 100644 --- a/databases/mariadb104-client/Makefile +++ b/databases/mariadb104-client/Makefile @@ -6,6 +6,8 @@ PKGNAMESUFFIX= 104-client COMMENT= Multithreaded SQL database (client) +BROKEN_i386= compile error: undeclared identifier 'my_atomic_add32' + MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/} FILESDIR= ${.CURDIR}/files diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index 3224808b8f40..e3eaf9cc66d5 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.4.6 -PORTREVISION?= 2 +PORTVERSION= 10.4.7 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -149,6 +149,7 @@ 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 diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo index ef66a463ba48..b55920f35e94 100644 --- a/databases/mariadb104-server/distinfo +++ b/databases/mariadb104-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561918517 -SHA256 (mariadb-10.4.6.tar.gz) = a270fe6169a1aaf6f2cbbc945de2c954d818c48e1a0fc02fbed92ecb94678e70 -SIZE (mariadb-10.4.6.tar.gz) = 76710358 +TIMESTAMP = 1564591340 +SHA256 (mariadb-10.4.7.tar.gz) = c8e6a6d0bb4f22c416ed675d24682a3ecfa383c5283efee70c8edf131374d817 +SIZE (mariadb-10.4.7.tar.gz) = 78155161 diff --git a/databases/mariadb104-server/files/patch-MDEV-20248 b/databases/mariadb104-server/files/patch-MDEV-20248 new file mode 100644 index 000000000000..ef0d97b17225 --- /dev/null +++ b/databases/mariadb104-server/files/patch-MDEV-20248 @@ -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 diff --git a/databases/mariadb104-server/files/patch-MDEV-20258 b/databases/mariadb104-server/files/patch-MDEV-20258 new file mode 100644 index 000000000000..3a3aace9f0b3 --- /dev/null +++ b/databases/mariadb104-server/files/patch-MDEV-20258 @@ -0,0 +1,22 @@ +--- 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) |