From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F82B139694 for ; Wed, 28 Jun 2017 18:47:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D90C425402F; Wed, 28 Jun 2017 18:47:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4B0625402F for ; Wed, 28 Jun 2017 18:47:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C68A341683 for ; Wed, 28 Jun 2017 18:47:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A545B7466 for ; Wed, 28 Jun 2017 18:47:00 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1498675608.7885817ceeeac4deac019c594e3e0333dfb8ff93.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20025_all_mariadb-10.2.6-gssapi-detect.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 7885817ceeeac4deac019c594e3e0333dfb8ff93 X-VCS-Branch: master Date: Wed, 28 Jun 2017 18:47:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b7a4b3a9-3031-43da-b338-f098ae496595 X-Archives-Hash: 8e99bdb18147051c625636e05196f723 commit: 7885817ceeeac4deac019c594e3e0333dfb8ff93 Author: Brian Evans gentoo org> AuthorDate: Wed Jun 28 18:46:48 2017 +0000 Commit: Brian Evans gentoo 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