CVS commit: pkgsrc/databases/mariadb1011-client

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jul 22 19:26:30 UTC 2024

Modified Files:
        pkgsrc/databases/mariadb1011-client: Makefile.common distinfo
Added Files:
        pkgsrc/databases/mariadb1011-client/patches:
            patch-libmariadb_cmake_FindGSSAPI.cmake
            patch-plugin_auth__gssapi_cmake_FindGSSAPI.cmake

Log Message:
mariadb1011-client: use pkgsrc provided krb5-config; fixes builds when other kerberos implementations exist in the system


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
    pkgsrc/databases/mariadb1011-client/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/mariadb1011-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mariadb1011-client/patches/patch-libmariadb_cmake_FindGSSAPI.cmake \
    pkgsrc/databases/mariadb1011-client/patches/patch-plugin_auth__gssapi_cmake_FindGSSAPI.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mariadb1011-client/Makefile.common
diff -u pkgsrc/databases/mariadb1011-client/Makefile.common:1.12 pkgsrc/databases/mariadb1011-client/Makefile.common:1.13
--- pkgsrc/databases/mariadb1011-client/Makefile.common:1.12    Tue May 21 09:52:52 2024
+++ pkgsrc/databases/mariadb1011-client/Makefile.common Mon Jul 22 19:26:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2024/05/21 09:52:52 nia Exp $
+# $NetBSD: Makefile.common,v 1.13 2024/07/22 19:26:30 adam Exp $
 #
 # used by databases/mariadb1011-client/Makefile
 # used by databases/mariadb1011-server/Makefile
@@ -16,13 +16,13 @@ DISTINFO_FILE?=     ${.CURDIR}/../../databas
 PATCHDIR?=     ${.CURDIR}/../../databases/mariadb1011-client/patches
 
 USE_CMAKE=     yes
+USE_CURSES=    wide
 USE_LANGUAGES= c c++
 USE_TOOLS+=    perl:run pkg-config bison
-USE_CURSES=    wide
 
 PLIST_SRC=     ${PLIST_SRC_DFLT}
 
-USE_CXX_FEATURES+=     c++11
+USE_CXX_FEATURES=      c++11
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -60,6 +60,7 @@ CMAKE_ARGS+=          -DINSTALL_SUPPORTFILESDIR=
 CMAKE_ARGS+=           -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}"
 CMAKE_ARGS+=           -DMYSQL_DATADIR=${MARIADB_DATADIR}
 
+CMAKE_ARGS+=           -DKRB5_CONFIG=${KRB5_CONFIG}
 CMAKE_ARGS+=           -DWITH_UNIT_TESTS=OFF
 CMAKE_ARGS+=           -DWITH_LIBWRAP=ON
 CMAKE_ARGS+=           -DWITH_PCRE="system"
@@ -128,8 +129,8 @@ CPPFLAGS+=  -DHAVE_CURSES_H
 .endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
-.include "../../archivers/zstd/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/fmtlib/buildlink3.mk"

Index: pkgsrc/databases/mariadb1011-client/distinfo
diff -u pkgsrc/databases/mariadb1011-client/distinfo:1.8 pkgsrc/databases/mariadb1011-client/distinfo:1.9
--- pkgsrc/databases/mariadb1011-client/distinfo:1.8    Wed Jul 10 21:11:03 2024
+++ pkgsrc/databases/mariadb1011-client/distinfo        Mon Jul 22 19:26:30 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2024/07/10 21:11:03 wiz Exp $
+$NetBSD: distinfo,v 1.9 2024/07/22 19:26:30 adam Exp $
 
 BLAKE2s (mariadb-10.11.8.tar.gz) = 786329da47785061212e877e1e0cc56451f155f48c61de743b15b7afa8a52dc3
 SHA512 (mariadb-10.11.8.tar.gz) = 61bdbe4a51adb438335c22bfcf75f59864fa0412c7ed6e938ef73fd602c2ef27131dbeef83cd314f2bea54135c6e8f8646608ff96a7ce6ce2c74f34ef6a8675f
@@ -10,7 +10,9 @@ SHA1 (patch-client_mysql.cc) = e9c33cd51
 SHA1 (patch-cmake_libfmt.cmake) = 2337c62c19d625b44e5082d0f1cae6afde708601
 SHA1 (patch-extra_readline_CMakeLists.txt) = 37873deaeccb37e1313179103bb12dcde4a496d6
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
+SHA1 (patch-libmariadb_cmake_FindGSSAPI.cmake) = 94b268478e680b82b1c108a12c0f37f3dc68ffce
 SHA1 (patch-mysys_my__gethwaddr.c) = c3f179aa659e16f2fd9b858a718dd1cdd6f93c9f
+SHA1 (patch-plugin_auth__gssapi_cmake_FindGSSAPI.cmake) = 215d48d80fe4dd018678ec7b03fc40ca1caf4f16
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51
 SHA1 (patch-scripts_CMakeLists.txt) = b8a13304e314162ab0a1fc06c5620d6b757975f5
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f

Added files:

Index: pkgsrc/databases/mariadb1011-client/patches/patch-libmariadb_cmake_FindGSSAPI.cmake
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-libmariadb_cmake_FindGSSAPI.cmake:1.1
--- /dev/null   Mon Jul 22 19:26:30 2024
+++ pkgsrc/databases/mariadb1011-client/patches/patch-libmariadb_cmake_FindGSSAPI.cmake Mon Jul 22 19:26:30 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-libmariadb_cmake_FindGSSAPI.cmake,v 1.1 2024/07/22 19:26:30 adam Exp $
+
+Use pkgsrc provided krb5-config.
+
+--- libmariadb/cmake/FindGSSAPI.cmake.orig     2024-07-22 18:44:49.199556247 +0000
++++ libmariadb/cmake/FindGSSAPI.cmake
+@@ -46,11 +46,6 @@ if(GSSAPI_LIBS AND GSSAPI_FLAVOR)
+ 
+ else(GSSAPI_LIBS AND GSSAPI_FLAVOR)
+ 
+-  find_program(KRB5_CONFIG NAMES krb5-config PATHS
+-     /opt/local/bin
+-     /usr/lib/mit/bin/
+-     ONLY_CMAKE_FIND_ROOT_PATH               # this is required when cross compiling with cmake 2.6 and ignored with cmake 2.4, Alex
+-  )
+   mark_as_advanced(KRB5_CONFIG)
+ 
+   #reset vars
Index: pkgsrc/databases/mariadb1011-client/patches/patch-plugin_auth__gssapi_cmake_FindGSSAPI.cmake
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-plugin_auth__gssapi_cmake_FindGSSAPI.cmake:1.1
--- /dev/null   Mon Jul 22 19:26:30 2024
+++ pkgsrc/databases/mariadb1011-client/patches/patch-plugin_auth__gssapi_cmake_FindGSSAPI.cmake        Mon Jul 22 19:26:30 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-plugin_auth__gssapi_cmake_FindGSSAPI.cmake,v 1.1 2024/07/22 19:26:30 adam Exp $
+
+Use pkgsrc provided krb5-config.
+
+--- plugin/auth_gssapi/cmake/FindGSSAPI.cmake.orig     2024-07-22 18:49:17.598571330 +0000
++++ plugin/auth_gssapi/cmake/FindGSSAPI.cmake
+@@ -39,10 +39,6 @@ if(GSSAPI_LIBS AND GSSAPI_FLAVOR)
+ 
+ else(GSSAPI_LIBS AND GSSAPI_FLAVOR)
+ 
+-  find_program(KRB5_CONFIG NAMES krb5-config heimdal-krb5-config PATHS
+-     /opt/local/bin /usr/lib/mit/bin
+-     ONLY_CMAKE_FIND_ROOT_PATH               # this is required when cross compiling with cmake 2.6 and ignored with cmake 2.4, Alex
+-  )
+   mark_as_advanced(KRB5_CONFIG)
+ 
+   #reset vars