CVS commit: pkgsrc/databases/mariadb-connector-c

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases/mariadb-connector-c
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Thu, 13 May 2021 11:46:13 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu May 13 11:46:13 UTC 2021

Modified Files:
        pkgsrc/databases/mariadb-connector-c: Makefile PLIST buildlink3.mk
            distinfo options.mk
        pkgsrc/databases/mariadb-connector-c/patches:
            patch-plugins_auth_CMakeLists.txt
Removed Files:
        pkgsrc/databases/mariadb-connector-c/patches: patch-CMakeLists.txt
            patch-libmariadb_ma__context.c

Log Message:
mariadb-connector-c: update to 3.1.13

release notes:
https://mariadb.com/kb/en/mariadb-connector-c-31-release-notes/


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/mariadb-connector-c/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb-connector-c/PLIST \
    pkgsrc/databases/mariadb-connector-c/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/mariadb-connector-c/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb-connector-c/options.mk
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/databases/mariadb-connector-c/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/mariadb-connector-c/patches/patch-libmariadb_ma__context.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/mariadb-connector-c/patches/patch-plugins_auth_CMakeLists.txt

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

Modified files:

Index: pkgsrc/databases/mariadb-connector-c/Makefile
diff -u pkgsrc/databases/mariadb-connector-c/Makefile:1.16 pkgsrc/databases/mariadb-connector-c/Makefile:1.17
--- pkgsrc/databases/mariadb-connector-c/Makefile:1.16  Wed Apr 21 13:24:09 2021
+++ pkgsrc/databases/mariadb-connector-c/Makefile       Thu May 13 11:46:13 2021
@@ -1,25 +1,22 @@
-# $NetBSD: Makefile,v 1.16 2021/04/21 13:24:09 adam Exp $
+# $NetBSD: Makefile,v 1.17 2021/05/13 11:46:13 nia Exp $
 
-DISTNAME=      mariadb-connector-c-3.0.6
-PKGREVISION=   10
+DISTNAME=      mariadb-connector-c-3.1.13-src
+PKGNAME=       ${DISTNAME:S/-src//g}
 CATEGORIES=    databases
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=MariaDB/}
+MASTER_SITES=  https://archive.mariadb.org/connector-c-${PKGVERSION_NOREV}/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/MariaDB/mariadb-connector-c/
-COMMENT=       MariaDB Connector/C library
+HOMEPAGE=      https://mariadb.com/kb/en/mariadb-connector-c/
+COMMENT=       MariaDB Connector C library
 LICENSE=       gnu-lgpl-v2.1
 
-GITHUB_PROJECT=        mariadb-connector-c
-GITHUB_TAG=    v${PKGVERSION_NOREV}
-
 USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
 
-.include "options.mk"
-
 CMAKE_ARGS+=   -DWITH_EXTERNAL_ZLIB=ON
 
+PKGCONFIG_OVERRIDE+=   mariadb_config/libmariadb.pc.in
+
+.include "options.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/mariadb-connector-c/PLIST
diff -u pkgsrc/databases/mariadb-connector-c/PLIST:1.2 pkgsrc/databases/mariadb-connector-c/PLIST:1.3
--- pkgsrc/databases/mariadb-connector-c/PLIST:1.2      Tue Sep 18 08:41:33 2018
+++ pkgsrc/databases/mariadb-connector-c/PLIST  Thu May 13 11:46:13 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/09/18 08:41:33 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/05/13 11:46:13 nia Exp $
 bin/mariadb_config
 include/mariadb/errmsg.h
 include/mariadb/ma_list.h
@@ -8,6 +8,7 @@ include/mariadb/mariadb/ma_io.h
 include/mariadb/mariadb_com.h
 include/mariadb/mariadb_ctype.h
 include/mariadb/mariadb_dyncol.h
+include/mariadb/mariadb_rpl.h
 include/mariadb/mariadb_stmt.h
 include/mariadb/mariadb_version.h
 include/mariadb/mysql.h
@@ -19,7 +20,10 @@ lib/mariadb/libmariadb.so
 lib/mariadb/libmariadb.so.3
 lib/mariadb/libmariadbclient.a
 ${PLIST.gss}lib/mariadb/plugin/auth_gssapi_client.so
+${PLIST.ssl}lib/mariadb/plugin/caching_sha2_password.so
+${PLIST.ssl}lib/mariadb/plugin/client_ed25519.so
 lib/mariadb/plugin/dialog.so
 lib/mariadb/plugin/mysql_clear_password.so
 ${PLIST.curl}lib/mariadb/plugin/remote_io.so
-lib/mariadb/plugin/sha256_password.so
+${PLIST.openssl}lib/mariadb/plugin/sha256_password.so
+lib/pkgconfig/libmariadb.pc
Index: pkgsrc/databases/mariadb-connector-c/distinfo
diff -u pkgsrc/databases/mariadb-connector-c/distinfo:1.2 pkgsrc/databases/mariadb-connector-c/distinfo:1.3
--- pkgsrc/databases/mariadb-connector-c/distinfo:1.2   Tue Sep 18 08:41:33 2018
+++ pkgsrc/databases/mariadb-connector-c/distinfo       Thu May 13 11:46:13 2021
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.2 2018/09/18 08:41:33 fhajny Exp $
+$NetBSD: distinfo,v 1.3 2021/05/13 11:46:13 nia Exp $
 
-SHA1 (mariadb-connector-c-3.0.6.tar.gz) = 47aed053468f183ae7ed4b5752cdf62597ea6fc7
-RMD160 (mariadb-connector-c-3.0.6.tar.gz) = c8b55f8eae850bf4d74e673d07360c7f6ce887e5
-SHA512 (mariadb-connector-c-3.0.6.tar.gz) = 772a45e77eb5aa02dec944bb16d883924519472a0362e2e3ae3846ecd3ce668c83c17fbb6f8d0ff36d61992f08a62ec7f913c41e0c3e248ded7a58df83d1bbd4
-Size (mariadb-connector-c-3.0.6.tar.gz) = 672420 bytes
-SHA1 (patch-CMakeLists.txt) = 438b1fc18e34f74ac3430ca73307a32cfa7be32c
+SHA1 (mariadb-connector-c-3.1.13-src.tar.gz) = fbace9504a1ee9daa40ae203f619e858fe7156f2
+RMD160 (mariadb-connector-c-3.1.13-src.tar.gz) = 3ee07f5acb80362df23deb0951aa633398724435
+SHA512 (mariadb-connector-c-3.1.13-src.tar.gz) = a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
+Size (mariadb-connector-c-3.1.13-src.tar.gz) = 968401 bytes
 SHA1 (patch-cmake_CheckTypes.cmake) = 7b8184efcaee685d4b3db39441ed50ca08a8df6f
-SHA1 (patch-libmariadb_ma__context.c) = 56ec0f9f4ab75826b87b0074523c235907e0507f
-SHA1 (patch-plugins_auth_CMakeLists.txt) = 410c7cb8f1d04911628ab8b62563b91d65cf633e
+SHA1 (patch-plugins_auth_CMakeLists.txt) = 9c2bc9448b2087fbdfa43fcfebb8f5451188efe2

Index: pkgsrc/databases/mariadb-connector-c/buildlink3.mk
diff -u pkgsrc/databases/mariadb-connector-c/buildlink3.mk:1.13 pkgsrc/databases/mariadb-connector-c/buildlink3.mk:1.14
--- pkgsrc/databases/mariadb-connector-c/buildlink3.mk:1.13     Wed Apr 21 13:24:09 2021
+++ pkgsrc/databases/mariadb-connector-c/buildlink3.mk  Thu May 13 11:46:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2021/04/21 13:24:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2021/05/13 11:46:13 nia Exp $
 
 BUILDLINK_TREE+=       mariadb-connector-c
 
@@ -12,15 +12,21 @@ BUILDLINK_PKGSRCDIR.mariadb-connector-c?
 pkgbase := mariadb-connector-c
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.mariadb-connector-c:Mcurl)
+.if ${PKG_BUILD_OPTIONS.mariadb-connector-c:Mcurl}
 .  include "../../www/curl/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.mariadb-connector-c:Mkerberos)
+.if ${PKG_BUILD_OPTIONS.mariadb-connector-c:Mkerberos}
 .  include "../../mk/krb5.buildlink3.mk"
 .endif
 
-.include "../../security/openssl/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.mariadb-connector-c:Mgnutls}
+.  include "../../security/gnutls/buildlink3.mk"
+.endif
+
+.if ${PKG_BUILD_OPTIONS.mariadb-connector-c:Mopenssl}
+.  include "../../security/openssl/buildlink3.mk"
+.endif
 .endif # MARIADB_CONNECTOR_C_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -mariadb-connector-c

Index: pkgsrc/databases/mariadb-connector-c/options.mk
diff -u pkgsrc/databases/mariadb-connector-c/options.mk:1.1 pkgsrc/databases/mariadb-connector-c/options.mk:1.2
--- pkgsrc/databases/mariadb-connector-c/options.mk:1.1 Fri Apr 13 08:04:14 2018
+++ pkgsrc/databases/mariadb-connector-c/options.mk     Thu May 13 11:46:13 2021
@@ -1,23 +1,40 @@
-# $NetBSD: options.mk,v 1.1 2018/04/13 08:04:14 fhajny Exp $
+# $NetBSD: options.mk,v 1.2 2021/05/13 11:46:13 nia Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.mariadb-connector-c
-PKG_SUPPORTED_OPTIONS= curl kerberos
-PKG_SUGGESTED_OPTIONS= # empty
+PKG_OPTIONS_VAR=               PKG_OPTIONS.mariadb-connector-c
+PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
+PKG_OPTIONS_GROUP.ssl=         gnutls openssl
+PKG_SUPPORTED_OPTIONS=         curl kerberos
+PKG_SUGGESTED_OPTIONS=         openssl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           curl gss
+PLIST_VARS+=   curl gss openssl ssl
+
+.if !empty(PKG_OPTIONS:Mgnutls)
+PLIST.ssl=     yes
+CMAKE_ARGS+=   -DWITH_SSL=GNUTLS
+.  include "../../security/gnutls/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mopenssl)
+PLIST.openssl= yes
+PLIST.ssl=     yes
+CMAKE_ARGS+=   -DWITH_SSL=OPENSSL
+.  include "../../security/openssl/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DWITH_SSL=OFF
+.endif
 
 .if !empty(PKG_OPTIONS:Mcurl)
-PLIST.curl=            yes
+PLIST.curl=    yes
 .  include "../../www/curl/buildlink3.mk"
 .else
-CMAKE_ARGS+=           -DWITH_CURL=OFF
+CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON
+CMAKE_ARGS+=   -DREMOTEIO_PLUGIN_TYPE=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mkerberos)
-PLIST.gss=             yes
+PLIST.gss=     yes
 .  include "../../mk/krb5.buildlink3.mk"
 .else
-CMAKE_ARGS+=           -DWITH_GSS=OFF
+CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI=ON
+CMAKE_ARGS+=   -DAUTH_GSSAPI_PLUGIN_TYPE=OFF
 .endif

Index: pkgsrc/databases/mariadb-connector-c/patches/patch-plugins_auth_CMakeLists.txt
diff -u pkgsrc/databases/mariadb-connector-c/patches/patch-plugins_auth_CMakeLists.txt:1.1 pkgsrc/databases/mariadb-connector-c/patches/patch-plugins_auth_CMakeLists.txt:1.2
--- pkgsrc/databases/mariadb-connector-c/patches/patch-plugins_auth_CMakeLists.txt:1.1  Tue Sep 18 08:41:34 2018
+++ pkgsrc/databases/mariadb-connector-c/patches/patch-plugins_auth_CMakeLists.txt      Thu May 13 11:46:13 2021
@@ -1,15 +1,15 @@
-$NetBSD: patch-plugins_auth_CMakeLists.txt,v 1.1 2018/09/18 08:41:34 fhajny Exp $
+$NetBSD: patch-plugins_auth_CMakeLists.txt,v 1.2 2021/05/13 11:46:13 nia Exp $
 
-Make sure Kerberos/GSS support can be turned off.
+Don't peek into Kerberos if we don't want it.
 
---- plugins/auth/CMakeLists.txt.orig   2018-07-31 07:44:20.000000000 +0000
+--- plugins/auth/CMakeLists.txt.orig   2021-05-03 11:58:17.000000000 +0000
 +++ plugins/auth/CMakeLists.txt
-@@ -19,12 +19,12 @@ REGISTER_PLUGIN(TARGET dialog
-                         ${CC_SOURCE_DIR}/libmariadb/get_password.c)
+@@ -94,12 +94,12 @@ IF(CRYPTO_PLUGIN)
+ ENDIF()
  
  #GSSAPI client authentication plugin
 -IF(NOT WIN32)
-+IF(WITH_GSS)
++IF(NOT WIN32 AND NOT AUTH_GSSAPI_PLUGIN_TYPE MATCHES "OFF")
    INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake)
    IF(GSSAPI_FOUND)
      SET(GSSAPI_SOURCES ${AUTH_DIR}/auth_gssapi_client.c ${AUTH_DIR}/gssapi_client.c ${AUTH_DIR}/gssapi_errmsg.c)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/www
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/www
Indexes:

Home | Main Index | Thread Index | Old Index