mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
databases/mariadb101-server: Security update to 10.1.35
Security: 909be51b-9b3b-11e8-add2-b499baebfeaf
This commit is contained in:
parent
738458fe49
commit
ff0e021d48
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=476659
@ -1,22 +1,22 @@
|
||||
--- scripts/CMakeLists.txt.orig 2016-07-14 01:10:23 UTC
|
||||
+++ scripts/CMakeLists.txt
|
||||
@@ -73,6 +73,7 @@ IF(UNIX)
|
||||
)
|
||||
@@ -45,6 +45,7 @@ ELSE()
|
||||
MESSAGE(FATAL_ERROR "Cannot concatenate files")
|
||||
ENDIF()
|
||||
|
||||
+IF(FALSE)
|
||||
INSTALL(FILES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
|
||||
@@ -83,6 +84,7 @@ INSTALL(FILES
|
||||
${FIX_PRIVILEGES_SQL}
|
||||
DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
|
||||
# Build mysql_fix_privilege_tables.c
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
|
||||
@@ -65,6 +66,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
|
||||
ALL
|
||||
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
|
||||
)
|
||||
+ENDIF()
|
||||
|
||||
# TCMalloc hacks
|
||||
IF(MALLOC_LIB)
|
||||
@@ -135,6 +137,7 @@ ENDIF()
|
||||
IF(UNIX)
|
||||
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
|
||||
@@ -164,6 +166,7 @@ ENDIF()
|
||||
SET(HOSTNAME "hostname")
|
||||
SET(MYSQLD_USER "mysql")
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
# Required for mysqlbug until autotools are deprecated, once done remove these
|
||||
# and expand default cmake variables
|
||||
SET(CC ${CMAKE_C_COMPILER})
|
||||
@@ -169,6 +172,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
|
||||
@@ -198,6 +201,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
|
||||
DESTINATION ${INSTALL_BINDIR}
|
||||
COMPONENT Server
|
||||
)
|
||||
@ -32,15 +32,15 @@
|
||||
|
||||
ENDIF(UNIX)
|
||||
|
||||
@@ -194,6 +198,7 @@ ELSE()
|
||||
SET(localstatedir ${MYSQL_DATADIR})
|
||||
ENDIF()
|
||||
@@ -228,6 +232,7 @@ SET(mysqld_locations "$basedir/${INSTALL
|
||||
SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english")
|
||||
SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql")
|
||||
|
||||
+IF()
|
||||
IF(UNIX)
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
|
||||
${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
|
||||
@@ -207,6 +212,7 @@ INSTALL_SCRIPT(
|
||||
@@ -241,6 +246,7 @@ INSTALL_SCRIPT(
|
||||
COMPONENT Server
|
||||
)
|
||||
ENDIF()
|
||||
@ -48,7 +48,7 @@
|
||||
|
||||
SET(prefix "${CMAKE_INSTALL_PREFIX}")
|
||||
IF(INSTALL_SYSCONFDIR)
|
||||
@@ -294,13 +300,8 @@ ELSE()
|
||||
@@ -333,13 +339,8 @@ ELSE()
|
||||
SET(BIN_SCRIPTS
|
||||
msql2mysql
|
||||
mysql_config
|
||||
@ -60,5 +60,5 @@
|
||||
- mytop
|
||||
- mysqlhotcopy
|
||||
${SERVER_SCRIPTS}
|
||||
${WSREP_BINARIES}
|
||||
${WSREP_SCRIPTS}
|
||||
${SYSTEMD_SCRIPTS}
|
||||
|
@ -1,17 +1,6 @@
|
||||
--- support-files/CMakeLists.txt.orig 2015-12-23 15:33:33 UTC
|
||||
+++ support-files/CMakeLists.txt
|
||||
@@ -41,15 +41,18 @@ ELSE()
|
||||
SET(inst_location ${INSTALL_SUPPORTFILESDIR})
|
||||
ENDIF()
|
||||
|
||||
+IF(FALSE)
|
||||
FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small wsrep)
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh
|
||||
${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
|
||||
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
|
||||
DESTINATION ${inst_location} COMPONENT IniFiles)
|
||||
ENDFOREACH()
|
||||
+ENDIF()
|
||||
@@ -59,6 +59,7 @@ ENDIF()
|
||||
|
||||
IF(UNIX)
|
||||
SET(prefix ${CMAKE_INSTALL_PREFIX})
|
||||
@ -19,9 +8,9 @@
|
||||
FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure wsrep_notify)
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
|
||||
${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
|
||||
@@ -60,12 +63,14 @@ IF(UNIX)
|
||||
INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
|
||||
INSTALL(DIRECTORY policy DESTINATION ${inst_location} COMPONENT SupportFiles)
|
||||
@@ -88,12 +89,14 @@ IF(UNIX)
|
||||
ENDFOREACH()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
+ ENDIF()
|
||||
|
||||
@ -35,7 +24,7 @@
|
||||
SET(bindir ${INSTALL_BINDIRABS})
|
||||
SET(sbindir ${INSTALL_SBINDIRABS})
|
||||
SET(scriptdir ${INSTALL_SCRIPTDIRABS})
|
||||
@@ -115,6 +120,7 @@ IF(UNIX)
|
||||
@@ -160,6 +163,7 @@ IF(UNIX)
|
||||
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server
|
||||
DESTINATION ${INSTALL_SYSCONFDIR}/init.d
|
||||
RENAME mysql COMPONENT SupportFiles)
|
||||
|
@ -117,3 +117,4 @@ man/man1/mysqldump.1.gz
|
||||
man/man1/mysqlimport.1.gz
|
||||
man/man1/mysqlshow.1.gz
|
||||
man/man1/mysqlslap.1.gz
|
||||
@comment %%DATADIR%%/wsrep.cnf
|
||||
|
@ -1,8 +1,8 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME?= mariadb
|
||||
PORTVERSION= 10.1.33
|
||||
PORTREVISION?= 1
|
||||
PORTVERSION= 10.1.35
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES= databases ipv6
|
||||
MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
|
||||
http://mirrors.supportex.net/${SITESDIR}/ \
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1525903240
|
||||
SHA256 (mariadb-10.1.33.tar.gz) = 94312c519f2c0c25e1964c64e22aff0036fb22dfb2685638f43a6b2211395d2d
|
||||
SIZE (mariadb-10.1.33.tar.gz) = 65292094
|
||||
TIMESTAMP = 1533675828
|
||||
SHA256 (mariadb-10.1.35.tar.gz) = 9e91d985ed4f662126e3e5791fe91ec8a2f44ec811113c2b6fbc72fa14553c4d
|
||||
SIZE (mariadb-10.1.35.tar.gz) = 65324620
|
||||
|
@ -41,6 +41,7 @@ bin/wsrep_sst_common
|
||||
bin/wsrep_sst_mariabackup
|
||||
bin/wsrep_sst_mysqldump
|
||||
bin/wsrep_sst_rsync
|
||||
bin/wsrep_sst_rsync_wan
|
||||
bin/wsrep_sst_xtrabackup
|
||||
bin/wsrep_sst_xtrabackup-v2
|
||||
include/mysql/private/atomic/gcc_builtins.h
|
||||
|
Loading…
Reference in New Issue
Block a user