From owner-svn-ports-all@freebsd.org Sat Apr 29 18:54:09 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A6CCD56C75; Sat, 29 Apr 2017 18:54:09 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D4D5C88B; Sat, 29 Apr 2017 18:54:08 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3TIs8Sx000834; Sat, 29 Apr 2017 18:54:08 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3TIs7Hg000827; Sat, 29 Apr 2017 18:54:07 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201704291854.v3TIs7Hg000827@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 29 Apr 2017 18:54:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439769 - in head/databases: mariadb55-client/files mariadb55-server mariadb55-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Apr 2017 18:54:09 -0000 Author: brnrd Date: Sat Apr 29 18:54:07 2017 New Revision: 439769 URL: https://svnweb.freebsd.org/changeset/ports/439769 Log: databases/mariadb55-server: Update to 5.5.55 - Security and bugfix update to 5.5.55 - Fix up patches - Remove CVE-2017-3302 patch (now included) - Add upstream patch for WITHOUT_SERVER issue MFH: 2017Q2 Security: d9e01c35-2531-11e7-b291-b499baebfeaf Security: CVE-2017-3308 Security: CVE-2017-3309 Security: CVE-2017-3313 Security: CVE-2017-3453 Security: CVE-2017-3456 Security: CVE-2017-3464 Added: head/databases/mariadb55-client/files/patch-MDEV-12230 (contents, props changed) head/databases/mariadb55-server/files/patch-MDEV-12230 (contents, props changed) Deleted: head/databases/mariadb55-client/files/patch-CVE-2017-3302 head/databases/mariadb55-server/files/patch-CVE-2017-3302 Modified: head/databases/mariadb55-client/files/patch-CMakeLists.txt head/databases/mariadb55-server/Makefile head/databases/mariadb55-server/distinfo head/databases/mariadb55-server/files/patch-CMakeLists.txt head/databases/mariadb55-server/files/patch-support-files_CMakeLists.txt Modified: head/databases/mariadb55-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mariadb55-client/files/patch-CMakeLists.txt Sat Apr 29 17:55:55 2017 (r439768) +++ head/databases/mariadb55-client/files/patch-CMakeLists.txt Sat Apr 29 18:54:07 2017 (r439769) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-10-08 15:19:53.000000000 +0200 -+++ CMakeLists.txt 2014-10-17 21:36:43.000000000 +0200 -@@ -411,28 +411,8 @@ +--- CMakeLists.txt.orig 2017-04-11 22:03:13.000000000 +0200 ++++ CMakeLists.txt 2017-04-18 10:11:38.582817000 +0200 +@@ -393,28 +393,8 @@ ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) ADD_SUBDIRECTORY(scripts) @@ -29,7 +29,7 @@ IF(UNIX) ADD_SUBDIRECTORY(man) ENDIF() -@@ -444,7 +424,6 @@ +@@ -426,7 +406,6 @@ IF(WIN32) ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) ENDIF() @@ -37,15 +37,15 @@ CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h) CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h) -@@ -477,6 +456,7 @@ +@@ -460,6 +439,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) - INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT - COMPONENT Readme) + INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme) -@@ -487,6 +467,7 @@ + # MDEV-6526 these files are not installed anymore +@@ -469,6 +449,7 @@ INSTALL_DOCUMENTATION(README COPYING EXC IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() Added: head/databases/mariadb55-client/files/patch-MDEV-12230 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb55-client/files/patch-MDEV-12230 Sat Apr 29 18:54:07 2017 (r439769) @@ -0,0 +1,205 @@ +From 4fe65ca33a6012ec60c665f6eeb5ff08969fb267 Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik +Date: Tue, 18 Apr 2017 12:35:05 +0200 +Subject: [PATCH] =?UTF-8?q?MDEV-12230=20include/my=5Fsys.h:600:43:=20error?= + =?UTF-8?q?:=20unknown=20type=20name=20=E2=80=98PSI=5Ffile=5Fkey=E2=80=99"?= + =?UTF-8?q?=20when=20-DWITHOUT=5FSERVER=3D1?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +cherry-pick 2c2bd8c155 (MDEV-12261 build failure without P_S) from 10.0 +--- + include/my_sys.h | 3 +-- + include/mysql/psi/mysql_file.h | 47 ++++++++++++++++++++++++++++++++++++++++ + mysys/my_symlink2.c | 14 +++++------- + sql/handler.cc | 2 +- + sql/sql_db.cc | 4 ++-- + storage/maria/ma_delete_table.c | 4 ++-- + storage/myisam/mi_delete_table.c | 4 ++-- + 7 files changed, 61 insertions(+), 17 deletions(-) + +diff --git a/include/my_sys.h b/include/my_sys.h +index 10551e1..2794068 100644 +--- include/my_sys.h.orig ++++ include/my_sys.h +@@ -580,8 +580,7 @@ extern File my_create_with_symlink(const char *linkname, const char *filename, + myf MyFlags); + extern int my_rename_with_symlink(const char *from,const char *to,myf MyFlags); + extern int my_symlink(const char *content, const char *linkname, myf MyFlags); +-extern int my_handler_delete_with_symlink(PSI_file_key key, const char *name, +- const char *ext, myf sync_dir); ++extern int my_handler_delete_with_symlink(const char *filename, myf sync_dir); + + extern size_t my_read(File Filedes,uchar *Buffer,size_t Count,myf MyFlags); + extern size_t my_pread(File Filedes,uchar *Buffer,size_t Count,my_off_t offset, +diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h +index 4a0f3fd..aa3ed7e 100644 +--- include/mysql/psi/mysql_file.h.orig ++++ include/mysql/psi/mysql_file.h +@@ -435,6 +435,20 @@ + #endif + + /** ++ @def mysql_file_delete_with_symlink(K, P1, P2, P3) ++ Instrumented delete with symbolic link. ++ @c mysql_file_delete_with_symlink is a replacement ++ for @c my_handler_delete_with_symlink. ++*/ ++#ifdef HAVE_PSI_INTERFACE ++ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ ++ inline_mysql_file_delete_with_symlink(K, __FILE__, __LINE__, P1, P2, P3) ++#else ++ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ ++ inline_mysql_file_delete_with_symlink(P1, P2, P3) ++#endif ++ ++/** + @def mysql_file_rename_with_symlink(K, P1, P2, P3) + Instrumented rename with symbolic link. + @c mysql_file_rename_with_symlink is a replacement +@@ -1305,6 +1319,7 @@ inline_mysql_file_rename( + return result; + } + ++ + static inline File + inline_mysql_file_create_with_symlink( + #ifdef HAVE_PSI_INTERFACE +@@ -1335,6 +1350,38 @@ inline_mysql_file_create_with_symlink( + } + + static inline int ++inline_mysql_file_delete_with_symlink( ++#ifdef HAVE_PSI_INTERFACE ++ PSI_file_key key, const char *src_file, uint src_line, ++#endif ++ const char *name, const char *ext, myf flags) ++{ ++ int result; ++ char fullname[FN_REFLEN]; ++#ifdef HAVE_PSI_INTERFACE ++ struct PSI_file_locker *locker= NULL; ++ PSI_file_locker_state state; ++#endif ++ fn_format(fullname, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); ++#ifdef HAVE_PSI_INTERFACE ++ if (likely(PSI_server != NULL)) ++ { ++ locker= PSI_server->get_thread_file_name_locker(&state, key, PSI_FILE_DELETE, ++ fullname, &locker); ++ if (likely(locker != NULL)) ++ PSI_server->start_file_wait(locker, (size_t) 0, src_file, src_line); ++ } ++#endif ++ result= my_handler_delete_with_symlink(fullname, flags); ++#ifdef HAVE_PSI_INTERFACE ++ if (likely(locker != NULL)) ++ PSI_server->end_file_wait(locker, (size_t) 0); ++#endif ++ return result; ++} ++ ++ ++static inline int + inline_mysql_file_rename_with_symlink( + #ifdef HAVE_PSI_INTERFACE + PSI_file_key key, const char *src_file, uint src_line, +diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c +index 5fe7b8f..c851468 100644 +--- mysys/my_symlink2.c.orig ++++ mysys/my_symlink2.c +@@ -170,22 +170,20 @@ int my_rename_with_symlink(const char *from, const char *to, myf MyFlags) + in this case both the symlink and the symlinked file are deleted, + but only if the symlinked file is not in the datadir. + */ +-int my_handler_delete_with_symlink(PSI_file_key key, const char *name, +- const char *ext, myf sync_dir) ++int my_handler_delete_with_symlink(const char *filename, myf sync_dir) + { +- char orig[FN_REFLEN], real[FN_REFLEN]; ++ char real[FN_REFLEN]; + int res= 0; + DBUG_ENTER("my_handler_delete_with_symlink"); + +- fn_format(orig, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); +- if (my_is_symlink(orig)) ++ if (my_is_symlink(filename)) + { + /* + Delete the symlinked file only if the symlink is not + pointing into datadir. + */ +- if (!(my_realpath(real, orig, MYF(0)) || mysys_test_invalid_symlink(real))) +- res= mysql_file_delete(key, real, MYF(MY_NOSYMLINKS | MY_WME | sync_dir)); ++ if (!(my_realpath(real, filename, MYF(0)) || mysys_test_invalid_symlink(real))) ++ res= my_delete(real, MYF(MY_NOSYMLINKS | sync_dir)); + } +- DBUG_RETURN(mysql_file_delete(key, orig, MYF(MY_WME | sync_dir)) || res); ++ DBUG_RETURN(my_delete(filename, MYF(sync_dir)) || res); + } +diff --git a/sql/handler.cc b/sql/handler.cc +index 2ae144a..dc40e34 100644 +--- sql/handler.cc.orig ++++ sql/handler.cc +@@ -3381,7 +3381,7 @@ int handler::delete_table(const char *name) + + for (const char **ext=bas_ext(); *ext ; ext++) + { +- if (my_handler_delete_with_symlink(key_file_misc, name, *ext, 0)) ++ if (mysql_file_delete_with_symlink(key_file_misc, name, *ext, 0)) + { + if (my_errno != ENOENT) + { +diff --git a/sql/sql_db.cc b/sql/sql_db.cc +index 7bb4f0f..580590b 100644 +--- sql/sql_db.cc.orig ++++ sql/sql_db.cc +@@ -1085,7 +1085,7 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp, + We ignore ENOENT error in order to skip files that was deleted + by concurrently running statement like REPAIR TABLE ... + */ +- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && ++ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && + my_errno != ENOENT) + { + my_error(EE_DELETE, MYF(0), filePath, my_errno); +@@ -1206,7 +1206,7 @@ long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path) + continue; + } + strxmov(filePath, org_path, "/", file->name, NullS); +- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) ++ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) + { + goto err; + } +diff --git a/storage/maria/ma_delete_table.c b/storage/maria/ma_delete_table.c +index c4bcd5b..f80ec13 100644 +--- storage/maria/ma_delete_table.c.orig ++++ storage/maria/ma_delete_table.c +@@ -86,8 +86,8 @@ int maria_delete_table_files(const char *name, myf sync_dir) + { + DBUG_ENTER("maria_delete_table_files"); + +- if (my_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) || +- my_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) ++ if (mysql_file_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) || ++ mysql_file_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) + DBUG_RETURN(my_errno); + DBUG_RETURN(0); + } +diff --git a/storage/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c +index ebedfbd..ca395ff 100644 +--- storage/myisam/mi_delete_table.c.orig ++++ storage/myisam/mi_delete_table.c +@@ -28,8 +28,8 @@ int mi_delete_table(const char *name) + check_table_is_closed(name,"delete"); + #endif + +- if (my_handler_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) || +- my_handler_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) ++ if (mysql_file_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) || ++ mysql_file_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) + DBUG_RETURN(my_errno); + DBUG_RETURN(0); + } Modified: head/databases/mariadb55-server/Makefile ============================================================================== --- head/databases/mariadb55-server/Makefile Sat Apr 29 17:55:55 2017 (r439768) +++ head/databases/mariadb55-server/Makefile Sat Apr 29 18:54:07 2017 (r439769) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 5.5.54 -PORTREVISION?= 3 +PORTVERSION= 5.5.55 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ @@ -25,7 +25,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb55-client USES= cmake execinfo shebangfix ssl -SHEBANG_FILES= scripts/*.sh +SHEBANG_FILES= scripts/*.sh sql-bench/[a-km-z]* CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ @@ -43,7 +43,6 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ - -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 \ -DWITH_SSL=yes \ -DEXECINFO_ROOT=${LOCALBASE} \ Modified: head/databases/mariadb55-server/distinfo ============================================================================== --- head/databases/mariadb55-server/distinfo Sat Apr 29 17:55:55 2017 (r439768) +++ head/databases/mariadb55-server/distinfo Sat Apr 29 18:54:07 2017 (r439769) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482613700 -SHA256 (mariadb-5.5.54.tar.gz) = 54405ad9beff02339819eb73c59b4bf25f58a2c5abffbf17e81c4940a893538c -SIZE (mariadb-5.5.54.tar.gz) = 45765936 +TIMESTAMP = 1492502977 +SHA256 (mariadb-5.5.55.tar.gz) = cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86 +SIZE (mariadb-5.5.55.tar.gz) = 45757922 Modified: head/databases/mariadb55-server/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mariadb55-server/files/patch-CMakeLists.txt Sat Apr 29 17:55:55 2017 (r439768) +++ head/databases/mariadb55-server/files/patch-CMakeLists.txt Sat Apr 29 18:54:07 2017 (r439769) @@ -1,45 +1,46 @@ ---- CMakeLists.txt.orig 2014-06-13 13:53:43.304277057 +0300 -+++ CMakeLists.txt 2014-06-13 13:57:07.790256621 +0300 -@@ -407,18 +407,12 @@ +--- CMakeLists.txt.orig 2017-04-11 20:03:13 UTC ++++ CMakeLists.txt +@@ -397,22 +397,22 @@ ADD_SUBDIRECTORY(sql/share) ADD_SUBDIRECTORY(support-files) IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) ++# ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(sql) OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) ADD_SUBDIRECTORY(libmysqld) - ADD_SUBDIRECTORY(libmysqld/examples) ++# ADD_SUBDIRECTORY(libmysqld/examples) ENDIF(WITH_EMBEDDED_SERVER) -- ADD_SUBDIRECTORY(mysql-test) -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) + ADD_SUBDIRECTORY(mysql-test) + ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(sql-bench) -- ++# ADD_SUBDIRECTORY(sql-bench) + IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) ENDIF() -@@ -437,7 +431,6 @@ - ADD_SUBDIRECTORY(win/upgrade_wizard) - ADD_SUBDIRECTORY(win/packaging) +- ADD_SUBDIRECTORY(packaging/rpm-oel) ++# ADD_SUBDIRECTORY(packaging/rpm-oel) ENDIF() --ADD_SUBDIRECTORY(packaging/solaris) - CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h) - CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h) -@@ -470,6 +463,7 @@ + IF(UNIX) +@@ -460,14 +460,14 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) -+IF(FALSE) - INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT - COMPONENT Readme) - INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC -@@ -477,6 +471,7 @@ +-INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme) ++#INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme) + + # MDEV-6526 these files are not installed anymore + #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC + # ${CMAKE_BINARY_DIR}/Docs/INFO_BIN) + IF(UNIX) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) +- INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ++# INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() -+ENDIF() INCLUDE(CPack) - Added: head/databases/mariadb55-server/files/patch-MDEV-12230 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb55-server/files/patch-MDEV-12230 Sat Apr 29 18:54:07 2017 (r439769) @@ -0,0 +1,205 @@ +From 4fe65ca33a6012ec60c665f6eeb5ff08969fb267 Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik +Date: Tue, 18 Apr 2017 12:35:05 +0200 +Subject: [PATCH] =?UTF-8?q?MDEV-12230=20include/my=5Fsys.h:600:43:=20error?= + =?UTF-8?q?:=20unknown=20type=20name=20=E2=80=98PSI=5Ffile=5Fkey=E2=80=99"?= + =?UTF-8?q?=20when=20-DWITHOUT=5FSERVER=3D1?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +cherry-pick 2c2bd8c155 (MDEV-12261 build failure without P_S) from 10.0 +--- + include/my_sys.h | 3 +-- + include/mysql/psi/mysql_file.h | 47 ++++++++++++++++++++++++++++++++++++++++ + mysys/my_symlink2.c | 14 +++++------- + sql/handler.cc | 2 +- + sql/sql_db.cc | 4 ++-- + storage/maria/ma_delete_table.c | 4 ++-- + storage/myisam/mi_delete_table.c | 4 ++-- + 7 files changed, 61 insertions(+), 17 deletions(-) + +diff --git a/include/my_sys.h b/include/my_sys.h +index 10551e1..2794068 100644 +--- include/my_sys.h.orig ++++ include/my_sys.h +@@ -580,8 +580,7 @@ extern File my_create_with_symlink(const char *linkname, const char *filename, + myf MyFlags); + extern int my_rename_with_symlink(const char *from,const char *to,myf MyFlags); + extern int my_symlink(const char *content, const char *linkname, myf MyFlags); +-extern int my_handler_delete_with_symlink(PSI_file_key key, const char *name, +- const char *ext, myf sync_dir); ++extern int my_handler_delete_with_symlink(const char *filename, myf sync_dir); + + extern size_t my_read(File Filedes,uchar *Buffer,size_t Count,myf MyFlags); + extern size_t my_pread(File Filedes,uchar *Buffer,size_t Count,my_off_t offset, +diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h +index 4a0f3fd..aa3ed7e 100644 +--- include/mysql/psi/mysql_file.h.orig ++++ include/mysql/psi/mysql_file.h +@@ -435,6 +435,20 @@ + #endif + + /** ++ @def mysql_file_delete_with_symlink(K, P1, P2, P3) ++ Instrumented delete with symbolic link. ++ @c mysql_file_delete_with_symlink is a replacement ++ for @c my_handler_delete_with_symlink. ++*/ ++#ifdef HAVE_PSI_INTERFACE ++ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ ++ inline_mysql_file_delete_with_symlink(K, __FILE__, __LINE__, P1, P2, P3) ++#else ++ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ ++ inline_mysql_file_delete_with_symlink(P1, P2, P3) ++#endif ++ ++/** + @def mysql_file_rename_with_symlink(K, P1, P2, P3) + Instrumented rename with symbolic link. + @c mysql_file_rename_with_symlink is a replacement +@@ -1305,6 +1319,7 @@ inline_mysql_file_rename( + return result; + } + ++ + static inline File + inline_mysql_file_create_with_symlink( + #ifdef HAVE_PSI_INTERFACE +@@ -1335,6 +1350,38 @@ inline_mysql_file_create_with_symlink( + } + + static inline int ++inline_mysql_file_delete_with_symlink( ++#ifdef HAVE_PSI_INTERFACE ++ PSI_file_key key, const char *src_file, uint src_line, ++#endif ++ const char *name, const char *ext, myf flags) ++{ ++ int result; ++ char fullname[FN_REFLEN]; ++#ifdef HAVE_PSI_INTERFACE ++ struct PSI_file_locker *locker= NULL; ++ PSI_file_locker_state state; ++#endif ++ fn_format(fullname, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); ++#ifdef HAVE_PSI_INTERFACE ++ if (likely(PSI_server != NULL)) ++ { ++ locker= PSI_server->get_thread_file_name_locker(&state, key, PSI_FILE_DELETE, ++ fullname, &locker); ++ if (likely(locker != NULL)) ++ PSI_server->start_file_wait(locker, (size_t) 0, src_file, src_line); ++ } ++#endif ++ result= my_handler_delete_with_symlink(fullname, flags); ++#ifdef HAVE_PSI_INTERFACE ++ if (likely(locker != NULL)) ++ PSI_server->end_file_wait(locker, (size_t) 0); ++#endif ++ return result; ++} ++ ++ ++static inline int + inline_mysql_file_rename_with_symlink( + #ifdef HAVE_PSI_INTERFACE + PSI_file_key key, const char *src_file, uint src_line, +diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c +index 5fe7b8f..c851468 100644 +--- mysys/my_symlink2.c.orig ++++ mysys/my_symlink2.c +@@ -170,22 +170,20 @@ int my_rename_with_symlink(const char *from, const char *to, myf MyFlags) + in this case both the symlink and the symlinked file are deleted, + but only if the symlinked file is not in the datadir. + */ +-int my_handler_delete_with_symlink(PSI_file_key key, const char *name, +- const char *ext, myf sync_dir) ++int my_handler_delete_with_symlink(const char *filename, myf sync_dir) + { +- char orig[FN_REFLEN], real[FN_REFLEN]; ++ char real[FN_REFLEN]; + int res= 0; + DBUG_ENTER("my_handler_delete_with_symlink"); + +- fn_format(orig, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); +- if (my_is_symlink(orig)) ++ if (my_is_symlink(filename)) + { + /* + Delete the symlinked file only if the symlink is not + pointing into datadir. + */ +- if (!(my_realpath(real, orig, MYF(0)) || mysys_test_invalid_symlink(real))) +- res= mysql_file_delete(key, real, MYF(MY_NOSYMLINKS | MY_WME | sync_dir)); ++ if (!(my_realpath(real, filename, MYF(0)) || mysys_test_invalid_symlink(real))) ++ res= my_delete(real, MYF(MY_NOSYMLINKS | sync_dir)); + } +- DBUG_RETURN(mysql_file_delete(key, orig, MYF(MY_WME | sync_dir)) || res); ++ DBUG_RETURN(my_delete(filename, MYF(sync_dir)) || res); + } +diff --git a/sql/handler.cc b/sql/handler.cc +index 2ae144a..dc40e34 100644 +--- sql/handler.cc.orig ++++ sql/handler.cc +@@ -3381,7 +3381,7 @@ int handler::delete_table(const char *name) + + for (const char **ext=bas_ext(); *ext ; ext++) + { +- if (my_handler_delete_with_symlink(key_file_misc, name, *ext, 0)) ++ if (mysql_file_delete_with_symlink(key_file_misc, name, *ext, 0)) + { + if (my_errno != ENOENT) + { +diff --git a/sql/sql_db.cc b/sql/sql_db.cc +index 7bb4f0f..580590b 100644 +--- sql/sql_db.cc.orig ++++ sql/sql_db.cc +@@ -1085,7 +1085,7 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp, + We ignore ENOENT error in order to skip files that was deleted + by concurrently running statement like REPAIR TABLE ... + */ +- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && ++ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && + my_errno != ENOENT) + { + my_error(EE_DELETE, MYF(0), filePath, my_errno); +@@ -1206,7 +1206,7 @@ long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path) + continue; + } + strxmov(filePath, org_path, "/", file->name, NullS); +- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) ++ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) + { + goto err; + } +diff --git a/storage/maria/ma_delete_table.c b/storage/maria/ma_delete_table.c +index c4bcd5b..f80ec13 100644 +--- storage/maria/ma_delete_table.c.orig ++++ storage/maria/ma_delete_table.c +@@ -86,8 +86,8 @@ int maria_delete_table_files(const char *name, myf sync_dir) + { + DBUG_ENTER("maria_delete_table_files"); + +- if (my_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) || +- my_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) ++ if (mysql_file_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) || ++ mysql_file_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) + DBUG_RETURN(my_errno); + DBUG_RETURN(0); + } +diff --git a/storage/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c +index ebedfbd..ca395ff 100644 +--- storage/myisam/mi_delete_table.c.orig ++++ storage/myisam/mi_delete_table.c +@@ -28,8 +28,8 @@ int mi_delete_table(const char *name) + check_table_is_closed(name,"delete"); + #endif + +- if (my_handler_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) || +- my_handler_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) ++ if (mysql_file_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) || ++ mysql_file_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) + DBUG_RETURN(my_errno); + DBUG_RETURN(0); + } Modified: head/databases/mariadb55-server/files/patch-support-files_CMakeLists.txt ============================================================================== --- head/databases/mariadb55-server/files/patch-support-files_CMakeLists.txt Sat Apr 29 17:55:55 2017 (r439768) +++ head/databases/mariadb55-server/files/patch-support-files_CMakeLists.txt Sat Apr 29 18:54:07 2017 (r439769) @@ -1,10 +1,11 @@ ---- support-files/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ support-files/CMakeLists.txt 2012-12-23 05:40:39.000000000 +0200 -@@ -66,10 +66,11 @@ +--- support-files/CMakeLists.txt.orig 2017-04-11 20:03:17 UTC ++++ support-files/CMakeLists.txt +@@ -67,10 +67,12 @@ IF(UNIX) ENDFOREACH() IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) -- INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles) +- ADD_SUBDIRECTORY(SELinux) ++# ADD_SUBDIRECTORY(SELinux) ENDIF() +IF(FALSE)