Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Feb 2019 13:15:51 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r493366 - in head/databases: mariadb102-client/files mariadb102-server mariadb102-server/files
Message-ID:  <201902191315.x1JDFp4i052323@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Tue Feb 19 13:15:51 2019
New Revision: 493366
URL: https://svnweb.freebsd.org/changeset/ports/493366

Log:
  databases/mariadb102-server: Security update to 10.2.22
  
  MFH:		2019Q1
  Security:	d3d02d3a-2242-11e9-b95c-b499baebfeaf

Deleted:
  head/databases/mariadb102-client/files/patch-libmariadb_include_ma__pthread.h
Modified:
  head/databases/mariadb102-client/files/patch-client_CMakeLists.txt
  head/databases/mariadb102-server/Makefile
  head/databases/mariadb102-server/distinfo
  head/databases/mariadb102-server/files/patch-client_CMakeLists.txt

Modified: head/databases/mariadb102-client/files/patch-client_CMakeLists.txt
==============================================================================
--- head/databases/mariadb102-client/files/patch-client_CMakeLists.txt	Tue Feb 19 12:49:04 2019	(r493365)
+++ head/databases/mariadb102-client/files/patch-client_CMakeLists.txt	Tue Feb 19 13:15:51 2019	(r493366)
@@ -1,20 +1,21 @@
---- client/CMakeLists.txt.orig	2017-04-04 19:11:32 UTC
+--- client/CMakeLists.txt.orig	2019-02-09 23:24:08 UTC
 +++ client/CMakeLists.txt
-@@ -43,11 +43,12 @@ IF(UNIX)
+@@ -44,12 +44,13 @@ IF(UNIX)
    SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
  ENDIF(UNIX)
  
 +IF(NOT WITHOUT_SERVER)
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
  SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest  ${CLIENT_LIB} pcre pcreposix)
+ TARGET_LINK_LIBRARIES(mysqltest  ${CLIENT_LIB} pcreposix pcre)
  SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
--
 +ENDIF()
  
+-
  MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
  TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB})
-@@ -60,15 +61,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
+ 
+@@ -61,15 +62,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
  SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
  TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB})
  
@@ -34,7 +35,7 @@
  
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB})
-@@ -89,14 +94,21 @@ ENDIF(WIN32)
+@@ -90,14 +95,21 @@ ENDIF(WIN32)
  ADD_EXECUTABLE(async_example async_example.c)
  TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB})
  
@@ -48,7 +49,7 @@
    mysqladmin mysqlslap async_example)
    ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
  ENDFOREACH()
- 
++
 +IF(NOT WITHOUT_SERVER)
 +SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin PROPERTIES HAS_CXX TRUE)
 +FOREACH(t mysqltest mysql_upgrade mysql_plugin)
@@ -56,6 +57,6 @@
 +ENDFOREACH()
 +ENDIF()
 +
-+
+ 
  ADD_DEFINITIONS(-DHAVE_DLOPEN)
  

Modified: head/databases/mariadb102-server/Makefile
==============================================================================
--- head/databases/mariadb102-server/Makefile	Tue Feb 19 12:49:04 2019	(r493365)
+++ head/databases/mariadb102-server/Makefile	Tue Feb 19 13:15:51 2019	(r493366)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.2.21
+PORTVERSION=	10.2.22
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
@@ -27,7 +27,7 @@ SUB_FILES=	pkg-message
 SLAVEDIRS=	databases/mariadb102-client
 USES=		bison:build cmake compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
 USE_LDCONFIG=	${PREFIX}/lib/mysql
-SHEBANG_FILES=	scripts/*.sh storage/rocksdb/myrocks_hotbackup
+SHEBANG_FILES=	scripts/*.sh
 SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
 DOCSDIR=	${PREFIX}/share/doc/mysql
 
@@ -207,6 +207,7 @@ CMAKE_ARGS+=	-DWITHOUT_TOKUDB
 .endif
 
 post-patch:
+	${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
 	${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh

Modified: head/databases/mariadb102-server/distinfo
==============================================================================
--- head/databases/mariadb102-server/distinfo	Tue Feb 19 12:49:04 2019	(r493365)
+++ head/databases/mariadb102-server/distinfo	Tue Feb 19 13:15:51 2019	(r493366)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546460692
-SHA256 (mariadb-10.2.21.tar.gz) = 637f0808b65ec06902897a2f885a60377828d019d35802402dca541f8113536c
-SIZE (mariadb-10.2.21.tar.gz) = 71878359
+TIMESTAMP = 1549889973
+SHA256 (mariadb-10.2.22.tar.gz) = 42f4c54c29b7c196bd105bbf4d2ea721f869b14cb7ba436c3566e6dd2760614c
+SIZE (mariadb-10.2.22.tar.gz) = 71907765

Modified: head/databases/mariadb102-server/files/patch-client_CMakeLists.txt
==============================================================================
--- head/databases/mariadb102-server/files/patch-client_CMakeLists.txt	Tue Feb 19 12:49:04 2019	(r493365)
+++ head/databases/mariadb102-server/files/patch-client_CMakeLists.txt	Tue Feb 19 13:15:51 2019	(r493366)
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
+--- client/CMakeLists.txt.orig	2019-02-09 23:24:08 UTC
 +++ client/CMakeLists.txt
-@@ -35,6 +35,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
+@@ -36,6 +36,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
  SET(CLIENT_LIB mariadbclient mysys)
  
  ADD_DEFINITIONS(${SSL_DEFINES})
@@ -9,19 +9,20 @@
  MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
                             ${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
  TARGET_LINK_LIBRARIES(mysql ${CLIENT_LIB})
-@@ -43,11 +45,6 @@ IF(UNIX)
+@@ -44,12 +46,6 @@ IF(UNIX)
    SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
  ENDIF(UNIX)
  
 -MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
 -SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
--TARGET_LINK_LIBRARIES(mysqltest  ${CLIENT_LIB} pcre pcreposix)
+-TARGET_LINK_LIBRARIES(mysqltest  ${CLIENT_LIB} pcreposix pcre)
 -SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
 -
- 
+-
  MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
  TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB})
-@@ -60,16 +57,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
+ 
+@@ -61,16 +57,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
  SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
  TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB})
  
@@ -38,7 +39,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB})
  
-@@ -89,14 +76,34 @@ ENDIF(WIN32)
+@@ -90,12 +76,32 @@ ENDIF(WIN32)
  ADD_EXECUTABLE(async_example async_example.c)
  TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB})
  
@@ -50,9 +51,9 @@
 -FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog
 +FOREACH(t mysql mysqlcheck mysqldump mysqlimport mysqlshow mysqlbinlog
    mysqladmin mysqlslap async_example)
-   ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
- ENDFOREACH()
- 
++  ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
++ENDFOREACH()
++
 +ENDIF()
 +
 +MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
@@ -71,8 +72,6 @@
 +PROPERTIES HAS_CXX TRUE)
 +
 +FOREACH(t mysqltest mysql_plugin mysql_upgrade)
-+  ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
-+ENDFOREACH()
-+
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
+   ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
+ ENDFOREACH()
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902191315.x1JDFp4i052323>