diff options
author | Bernard Spil <brnrd@FreeBSD.org> | 2018-08-08 20:25:39 +0000 |
---|---|---|
committer | Bernard Spil <brnrd@FreeBSD.org> | 2018-08-08 20:25:39 +0000 |
commit | 1eb1f8cb7719c49af3fbb237ee9c88f967680ba6 (patch) | |
tree | e08803aa6aadc512e0b3fea0afb4ef2b61c4880f /databases/mariadb100-client | |
parent | 5c9b91fc059388f4f4bc9dd68098c33be117fd5d (diff) | |
download | ports-1eb1f8cb7719c49af3fbb237ee9c88f967680ba6.tar.gz ports-1eb1f8cb7719c49af3fbb237ee9c88f967680ba6.zip |
databases/mariadb100-server: Security update to 10.0.36
MFH: 2018Q3
Security: 909be51b-9b3b-11e8-add2-b499baebfeaf
Notes
Notes:
svn path=/head/; revision=476674
Diffstat (limited to 'databases/mariadb100-client')
3 files changed, 9 insertions, 126 deletions
diff --git a/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index 1464eba1f8e2..000000000000 --- a/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,78 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2017-01-12 01:45:19 UTC -+++ scripts/CMakeLists.txt -@@ -73,6 +73,7 @@ IF(UNIX) - ) - ENDIF() - -+IF(FALSE) - INSTALL(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -82,6 +83,7 @@ INSTALL(FILES - ${FIX_PRIVILEGES_SQL} - DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server - ) -+ENDIF() - - # TCMalloc hacks - IF(MALLOC_LIB) -@@ -134,6 +136,7 @@ ENDIF() - SET(HOSTNAME "hostname") - SET(MYSQLD_USER "mysql") - -+IF(FALSE) - # Required for mysqlbug until autotools are deprecated, once done remove these - # and expand default cmake variables - SET(CC ${CMAKE_C_COMPILER}) -@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI - DESTINATION ${INSTALL_BINDIR} - COMPONENT Server - ) -+ENDIF() - - ENDIF(UNIX) - -@@ -192,6 +196,7 @@ ELSE() - SET(localstatedir ${MYSQL_DATADIR}) - ENDIF() - -+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( - COMPONENT Server - ) - ENDIF() -+ENDIF() - - SET(prefix "${CMAKE_INSTALL_PREFIX}") - IF(INSTALL_SYSCONFDIR) -@@ -269,6 +275,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -+ ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) - ELSE() - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -@@ -327,18 +335,8 @@ ELSE() - SET(BIN_SCRIPTS - msql2mysql - mysql_config -- mysql_fix_extensions -- mysql_setpermission -- mysql_secure_installation -- mysql_zap - mysqlaccess -- mysql_convert_table_format - mysql_find_rows -- mytop -- mysqlhotcopy -- mysqldumpslow -- mysqld_multi -- mysqld_safe - ) - FOREACH(file ${BIN_SCRIPTS}) - IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) diff --git a/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index a001da40a730..000000000000 --- a/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2017-01-12 01:45:23 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) - 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() - - IF(UNIX) - SET(prefix ${CMAKE_INSTALL_PREFIX}) -+ IF(FALSE) - FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -69,8 +72,10 @@ IF(UNIX) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ADD_SUBDIRECTORY(SELinux) - ENDIF() -+ ENDIF() - - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+ IF(FALSE) - CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) - CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) - -@@ -94,6 +99,7 @@ IF(UNIX) - DESTINATION ${inst_location} COMPONENT SupportFiles - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -+ - - IF (INSTALL_SYSCONFDIR) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d -@@ -103,6 +109,7 @@ IF(UNIX) - RENAME mysql COMPONENT SupportFiles - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -+ ENDIF() - - INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} - COMPONENT Common) diff --git a/databases/mariadb100-client/pkg-plist b/databases/mariadb100-client/pkg-plist index f098dab1aea5..ba56d5f41131 100644 --- a/databases/mariadb100-client/pkg-plist +++ b/databases/mariadb100-client/pkg-plist @@ -102,3 +102,12 @@ man/man1/mysqldump.1.gz man/man1/mysqlimport.1.gz man/man1/mysqlshow.1.gz man/man1/mysqlslap.1.gz +@comment bin/mytop +@comment %%DATADIR%%/SELinux/mariadb.te +@comment %%DATADIR%%/SELinux/rhel4-mysql.fc +@comment %%DATADIR%%/SELinux/rhel4-mysql.te +@comment %%DATADIR%%/binary-configure +@comment %%DATADIR%%/magic +@comment %%DATADIR%%/mysql-log-rotate +@comment %%DATADIR%%/mysql.server +@comment %%DATADIR%%/mysqld_multi.server |