cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

databases/mariadb101-server: Security update to 10.1.38

Browse Source 
- Unbreak: Uses bundled yaSSL if OpenSSL 1.1 detected

PR:		235574, 235574
Submitted by:	Pascal Christen <pascal.christen@hostpoint.ch>
MFH:		2019Q1
Security:	d3d02d3a-2242-11e9-b95c-b499baebfeaf
This commit is contained in:
Bernard Spil 2019-02-08 09:48:48 +00:00
parent c9131990e0
commit 73ccc8490e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=492419
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
databases/mariadb101-client/files/patch-client_CMakeLists.txt
View File

@ -1,20 +1,21 @@
--- client/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC
--- client/CMakeLists.txt.orig 2019-02-04 17:02:08 UTC
+++ client/CMakeLists.txt
@@ -38,11 +38,12 @@ IF(UNIX)
@@ -39,12 +39,13 @@ IF(UNIX)
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
ENDIF(UNIX)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix)
TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre)
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
-
+ENDIF()
-
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
@@ -54,21 +55,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
@@ -55,21 +56,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
@ -41,7 +42,7 @@
MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
@@ -80,10 +85,12 @@ IF(WIN32)
@@ -81,10 +86,12 @@ IF(WIN32)
ENDIF(WIN32)
# async_example is just a code example, do not install it.

1
databases/mariadb101-client/pkg-plist
View File

@ -106,6 +106,7 @@ lib/mysql/plugin/mysql_clear_password.so
man/man1/msql2mysql.1.gz
man/man1/mysql.1.gz
man/man1/mysql_config.1.gz
man/man1/mysql_embedded.1.gz
man/man1/mysql_find_rows.1.gz
man/man1/mysql_plugin.1.gz
man/man1/mysql_waitpid.1.gz

10
databases/mariadb101-server/Makefile
View File

@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME?= mariadb
PORTVERSION= 10.1.37
PORTREVISION= 2
PORTVERSION= 10.1.38
PORTREVISION= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
http://mirrors.supportex.net/${SITESDIR}/ \
@ -22,9 +22,6 @@ 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= openssl111
BROKEN_SSL_REASON_openssl111= Does not support OpenSSL 1.1, use MariaDB 10.2 or 10.3
SUB_FILES= pkg-message
SLAVEDIRS= databases/mariadb101-client
@ -193,9 +190,6 @@ 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:

6
databases/mariadb101-server/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1541157538
SHA256 (mariadb-10.1.37.tar.gz) = 8cd516b0a7f7aa36a7c1d6e687dbbad8c0b08c92d5fd60c6e691b19a6cab4d46
SIZE (mariadb-10.1.37.tar.gz) = 63492946
TIMESTAMP = 1549448520
SHA256 (mariadb-10.1.38.tar.gz) = caf1f4fc237d143343995b6625375aef911dfc366433645d400727e7063f077f
SIZE (mariadb-10.1.38.tar.gz) = 63535685