diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2018-07-09 11:01:44 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2018-07-09 11:01:44 +0000 |
| commit | 2c9a1b098aacb1c2a1120a4e8a6eae5d08b13c96 (patch) | |
| tree | 27930e5f715480dfdd6c0033700a2f9fd7e10ed3 /databases/mariadb103-server | |
| parent | c05aa3c7360e144e65e75da2d9407cf73e37fdb1 (diff) | |
| download | ports-2c9a1b098aacb1c2a1120a4e8a6eae5d08b13c96.tar.gz ports-2c9a1b098aacb1c2a1120a4e8a6eae5d08b13c96.zip | |
databases/mariadb103-server: Mark broken
- And merge 10.3.8 changes for -client
Notes
Notes:
svn path=/head/; revision=474250
Diffstat (limited to 'databases/mariadb103-server')
| -rw-r--r-- | databases/mariadb103-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/mariadb103-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mariadb103-server/files/patch-sql-common_client.c | 13 | ||||
| -rw-r--r-- | databases/mariadb103-server/files/patch-sql_mysqld.cc | 8 |
4 files changed, 6 insertions, 25 deletions
diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index 7c4f9bd4a5f0..ef0879f3ff5e 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.7 +PORTVERSION= 10.3.8 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ @@ -23,6 +23,8 @@ 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 +BROKEN= Segfaults on start, see https://jira.mariadb.org/browse/MDEV-16495 + SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo index 28832e0134a4..5dcc6fb71303 100644 --- a/databases/mariadb103-server/distinfo +++ b/databases/mariadb103-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527449277 -SHA256 (mariadb-10.3.7.tar.gz) = e990afee6ae7cf9ac40154d0e150be359385dd6ef408ad80ea30df34e2c164cf -SIZE (mariadb-10.3.7.tar.gz) = 71816160 +TIMESTAMP = 1530523784 +SHA256 (mariadb-10.3.8.tar.gz) = 44b409bc22775261b96f373bc01591065a680f46d295617b304cdf9ffb503ccf +SIZE (mariadb-10.3.8.tar.gz) = 72147179 diff --git a/databases/mariadb103-server/files/patch-sql-common_client.c b/databases/mariadb103-server/files/patch-sql-common_client.c deleted file mode 100644 index ad77fc7f4321..000000000000 --- a/databases/mariadb103-server/files/patch-sql-common_client.c +++ /dev/null @@ -1,13 +0,0 @@ ---- sql-common/client.c.orig 2017-05-14 23:13:18 UTC -+++ sql-common/client.c -@@ -104,6 +104,10 @@ my_bool net_flush(NET *net); - #define CONNECT_TIMEOUT 0 - #endif - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) || defined(HAVE_YASSL) -+#define ASN1_STRING_get0_data(X) ASN1_STRING_data(X) -+#endif -+ - #include "client_settings.h" - #include <ssl_compat.h> - #include <sql_common.h> diff --git a/databases/mariadb103-server/files/patch-sql_mysqld.cc b/databases/mariadb103-server/files/patch-sql_mysqld.cc index 360b1f4117b6..ab4a1ed810a5 100644 --- a/databases/mariadb103-server/files/patch-sql_mysqld.cc +++ b/databases/mariadb103-server/files/patch-sql_mysqld.cc @@ -1,13 +1,5 @@ --- sql/mysqld.cc.orig 2017-05-14 23:13:18 UTC +++ sql/mysqld.cc -@@ -120,6 +121,7 @@ - #define HAVE_CLOSE_SERVER_SOCK 1 - #endif - -+ - extern "C" { // Because of SCO 3.2V4.2 - #include <sys/stat.h> - #ifndef __GNU_LIBRARY__ @@ -4838,8 +4840,9 @@ static void init_ssl() while ((err= ERR_get_error())) sql_print_warning("SSL error: %s", ERR_error_string(err, NULL)); |