commit: 7885817ceeeac4deac019c594e3e0333dfb8ff93 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Wed Jun 28 18:46:48 2017 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Wed Jun 28 18:46:48 2017 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=7885817c
Add patch for 10.2.6 GSSAPI detection via pkg-config 20025_all_mariadb-10.2.6-gssapi-detect.patch | 66 ++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/20025_all_mariadb-10.2.6-gssapi-detect.patch b/20025_all_mariadb-10.2.6-gssapi-detect.patch new file mode 100644 index 0000000..b828a52 --- /dev/null +++ b/20025_all_mariadb-10.2.6-gssapi-detect.patch @@ -0,0 +1,66 @@ +diff -aurN a/libmariadb/cmake/FindGSSAPI.cmake b/libmariadb/cmake/FindGSSAPI.cmake +--- a/libmariadb/cmake/FindGSSAPI.cmake 2017-05-14 19:13:15.000000000 -0400 ++++ b/libmariadb/cmake/FindGSSAPI.cmake 2017-06-28 14:43:30.324029111 -0400 +@@ -46,6 +46,29 @@ + + else(GSSAPI_LIBS AND GSSAPI_FLAVOR) + ++ find_package(PkgConfig) ++ IF(PKG_CONFIG_FOUND) ++ pkg_search_module(GSSAPI mit-krb5-gssapi) ++ IF(GSSAPI_FOUND) ++ set(GSSAPI_FLAVOR "MIT") ++ ELSE() ++ pkg_search_module(GSSAPI heimdal-gssapi) ++ IF(GSSAPI_FOUND) ++ set(GSSAPI_FLAVOR "HEIMDAL") ++ ENDIF() ++ ENDIF() ++ IF(GSSAPI_FOUND) ++ message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}") ++ ++ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "") ++ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "") ++ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "") ++ ++ mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) ++ RETURN() ++ ENDIF() ++ ENDIF(PKG_CONFIG_FOUND) ++ + find_program(KRB5_CONFIG NAMES krb5-config PATHS + /opt/local/bin + /usr/lib/mit/bin/ +diff -aurN a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake b/plugin/auth_gssapi/cmake/FindGSSAPI.cmake +--- a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake 2017-05-14 19:13:17.000000000 -0400 ++++ b/plugin/auth_gssapi/cmake/FindGSSAPI.cmake 2017-06-28 14:42:30.307704810 -0400 +@@ -39,6 +39,29 @@ + + else(GSSAPI_LIBS AND GSSAPI_FLAVOR) + ++ find_package(PkgConfig) ++ IF(PKG_CONFIG_FOUND) ++ pkg_search_module(GSSAPI mit-krb5-gssapi) ++ IF(GSSAPI_FOUND) ++ set(GSSAPI_FLAVOR "MIT") ++ ELSE() ++ pkg_search_module(GSSAPI heimdal-gssapi) ++ IF(GSSAPI_FOUND) ++ set(GSSAPI_FLAVOR "HEIMDAL") ++ ENDIF() ++ ENDIF() ++ IF(GSSAPI_FOUND) ++ message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}") ++ ++ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "") ++ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "") ++ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "") ++ ++ mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) ++ RETURN() ++ ENDIF() ++ ENDIF(PKG_CONFIG_FOUND) ++ + find_program(KRB5_CONFIG NAMES krb5-config heimdal-krb5-config PATHS + /opt/local/bin + ONLY_CMAKE_FIND_ROOT_PATH # this is required when cross compiling with cmake 2.6 and ignored with cmake 2.4, Alex