| 1 |
commit: 848893453814ffa2b548180a1b3cdd96ec187a6f |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 30 12:08:18 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 30 12:08:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=84889345 |
| 7 |
|
| 8 |
Respin GSSAPI detection patch for 10.1.26 |
| 9 |
|
| 10 |
20025_all_mariadb-10.1.26-gssapi-detect.patch | 33 +++++++++++++++++++++++++++ |
| 11 |
1 file changed, 33 insertions(+) |
| 12 |
|
| 13 |
diff --git a/20025_all_mariadb-10.1.26-gssapi-detect.patch b/20025_all_mariadb-10.1.26-gssapi-detect.patch |
| 14 |
new file mode 100644 |
| 15 |
index 0000000..846737e |
| 16 |
--- /dev/null |
| 17 |
+++ b/20025_all_mariadb-10.1.26-gssapi-detect.patch |
| 18 |
@@ -0,0 +1,33 @@ |
| 19 |
+diff -aurN a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake b/plugin/auth_gssapi/cmake/FindGSSAPI.cmake |
| 20 |
+--- a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake 2017-05-14 19:13:17.000000000 -0400 |
| 21 |
++++ b/plugin/auth_gssapi/cmake/FindGSSAPI.cmake 2017-06-28 14:42:30.307704810 -0400 |
| 22 |
+@@ -39,6 +39,29 @@ |
| 23 |
+ |
| 24 |
+ else(GSSAPI_LIBS AND GSSAPI_FLAVOR) |
| 25 |
+ |
| 26 |
++ find_package(PkgConfig) |
| 27 |
++ IF(PKG_CONFIG_FOUND) |
| 28 |
++ pkg_check_modules(GSSAPI mit-krb5-gssapi mit-krb5) |
| 29 |
++ IF(GSSAPI_FOUND) |
| 30 |
++ set(GSSAPI_FLAVOR "MIT") |
| 31 |
++ ELSE() |
| 32 |
++ pkg_check_modules(GSSAPI heimdal-gssapi heimdal-krb5) |
| 33 |
++ IF(GSSAPI_FOUND) |
| 34 |
++ set(GSSAPI_FLAVOR "HEIMDAL") |
| 35 |
++ ENDIF() |
| 36 |
++ ENDIF() |
| 37 |
++ IF(GSSAPI_FOUND) |
| 38 |
++ message(STATUS "Found GSSAPI: ${GSSAPI_LIBRARIES}") |
| 39 |
++ |
| 40 |
++ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "" FORCE) |
| 41 |
++ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "" FORCE) |
| 42 |
++ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "" FORCE) |
| 43 |
++ |
| 44 |
++ mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) |
| 45 |
++ RETURN() |
| 46 |
++ ENDIF() |
| 47 |
++ ENDIF(PKG_CONFIG_FOUND) |
| 48 |
++ |
| 49 |
+ find_program(KRB5_CONFIG NAMES krb5-config heimdal-krb5-config PATHS |
| 50 |
+ /opt/local/bin |
| 51 |
+ ONLY_CMAKE_FIND_ROOT_PATH # this is required when cross compiling with cmake 2.6 and ignored with cmake 2.4, Alex |
Archives