From 93c9ec8240d88737820b7172ba0ee1e38f26eaac Mon Sep 17 00:00:00 2001 From: brnrd Date: Sun, 4 Nov 2018 09:47:45 +0000 Subject: [PATCH] databases/mariadb101-server: 12 not broken with security/openssl - Backport to 5.5 and 10.0 too - See also https://reviews.freebsd.org/D17834 PR: 232944 Reported by: iron udjin gmail com --- databases/mariadb100-server/Makefile | 9 +++++---- databases/mariadb101-server/Makefile | 9 +++++---- databases/mariadb55-server/Makefile | 8 +++++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile index 7fc137d6c8c8c..0fdc10e351d9f 100644 --- a/databases/mariadb100-server/Makefile +++ b/databases/mariadb100-server/Makefile @@ -25,10 +25,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_SSL= openssl-devel openssl111 -BROKEN_SSL_REASON= incomplete definition of type 'struct dh_st' -BROKEN_FreeBSD_12= Does not support OpenSSL 1.1, use the 10.2 or 10.3 port -BROKEN_FreeBSD_13= ${BROKEN_FreeBSD_12} +BROKEN_SSL= openssl111 +BROKEN_SSL_REASON_openssl111= Does not support OpenSSL 1.1, use MariaDB 10.2 or 10.3 SUB_FILES= pkg-message @@ -147,6 +145,9 @@ post-install-TOKUDB-on: .include .if ${OPSYS} == FreeBSD +. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base +BROKEN= ${BROKEN_SSL_REASON_openssl111} +. endif CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile index edae2cd5bd460..5ecc9a2a8adef 100644 --- a/databases/mariadb101-server/Makefile +++ b/databases/mariadb101-server/Makefile @@ -21,10 +21,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_SSL= openssl-devel openssl111 -BROKEN_SSL_REASON= incomplete definition of type 'struct dh_st' -BROKEN_FreeBSD_12= Does not support OpenSSL 1.1, use the 10.2 or 10.3 port -BROKEN_FreeBSD_13= ${BROKEN_FreeBSD_12} +BROKEN_SSL= openssl111 +BROKEN_SSL_REASON_openssl111= Does not support OpenSSL 1.1, use MariaDB 10.2 or 10.3 SUB_FILES= pkg-message @@ -194,6 +192,9 @@ IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI .if ${OPSYS} == FreeBSD CMAKE_ARGS+= -DWITH_JEMALLOC="system" +. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base +BROKEN= ${BROKEN_SSL_REASON_openssl111} +. endif .endif post-patch: diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile index 36a98ea153e67..1e0e2c0b95f52 100644 --- a/databases/mariadb55-server/Makefile +++ b/databases/mariadb55-server/Makefile @@ -49,10 +49,9 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ DATADIR= ${PREFIX}/share/mysql -BROKEN_FreeBSD_12= Does not support OpenSSL 1.1 BROKEN_sparc64= Does not compile: Unsupported platform -BROKEN_SSL= openssl-devel -BROKEN_SSL_REASON_openssl-devel= incomplete definition of type 'struct dh_st' +BROKEN_SSL= openssl111 +BROKEN_SSL_REASON_openssl111= Does not support OpenSSL 1.1, use MariaDB 10.2 or 10.3 .if defined(USE_MYSQL) .error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. @@ -112,6 +111,9 @@ SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .include .if ${OPSYS} == FreeBSD +. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base +BROKEN= ${BROKEN_SSL_REASON_openssl111} +. endif CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no"