svn commit: r483982 - in head/databases: mariadb100-server mariadb101-server mariadb55-server

[Bernard Spil]

Author: brnrd
Date: Sun Nov  4 09:47:45 2018
New Revision: 483982
URL: https://svnweb.freebsd.org/changeset/ports/483982

Log:
  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

Modified:
  head/databases/mariadb100-server/Makefile
  head/databases/mariadb101-server/Makefile
  head/databases/mariadb55-server/Makefile

Modified: head/databases/mariadb100-server/Makefile
==============================================================================
--- head/databases/mariadb100-server/Makefile	Sun Nov  4 09:46:27 2018	(r483981)
+++ head/databases/mariadb100-server/Makefile	Sun Nov  4 09:47:45 2018	(r483982)
@@ -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 <bsd.port.pre.mk>
 
 .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"

Modified: head/databases/mariadb101-server/Makefile
==============================================================================
--- head/databases/mariadb101-server/Makefile	Sun Nov  4 09:46:27 2018	(r483981)
+++ head/databases/mariadb101-server/Makefile	Sun Nov  4 09:47:45 2018	(r483982)
@@ -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 fr
 
 .if ${OPSYS} == FreeBSD
 CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
+. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base
+BROKEN=	${BROKEN_SSL_REASON_openssl111}
+. endif
 .endif
 
 post-patch:

Modified: head/databases/mariadb55-server/Makefile
==============================================================================
--- head/databases/mariadb55-server/Makefile	Sun Nov  4 09:46:27 2018	(r483981)
+++ head/databases/mariadb55-server/Makefile	Sun Nov  4 09:47:45 2018	(r483982)
@@ -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 <bsd.port.pre.mk>
 
 .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"