pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/mariadb-connector-c mariadb-connector-c: upd...
details: https://anonhg.NetBSD.org/pkgsrc/rev/34700dd027e7
branches: trunk
changeset: 452576:34700dd027e7
user: nia <nia%pkgsrc.org@localhost>
date: Thu May 13 11:46:13 2021 +0000
description:
mariadb-connector-c: update to 3.1.13
release notes:
https://mariadb.com/kb/en/mariadb-connector-c-31-release-notes/
diffstat:
databases/mariadb-connector-c/Makefile | 21 +-
databases/mariadb-connector-c/PLIST | 8 +-
databases/mariadb-connector-c/buildlink3.mk | 14 +-
databases/mariadb-connector-c/distinfo | 14 +-
databases/mariadb-connector-c/options.mk | 35 ++-
databases/mariadb-connector-c/patches/patch-CMakeLists.txt | 41 ----
databases/mariadb-connector-c/patches/patch-libmariadb_ma__context.c | 102 ----------
databases/mariadb-connector-c/patches/patch-plugins_auth_CMakeLists.txt | 12 +-
8 files changed, 63 insertions(+), 184 deletions(-)
diffs (truncated from 350 to 300 lines):
diff -r 66702c3e597f -r 34700dd027e7 databases/mariadb-connector-c/Makefile
--- a/databases/mariadb-connector-c/Makefile Thu May 13 11:06:07 2021 +0000
+++ b/databases/mariadb-connector-c/Makefile Thu May 13 11:46:13 2021 +0000
@@ -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"
diff -r 66702c3e597f -r 34700dd027e7 databases/mariadb-connector-c/PLIST
--- a/databases/mariadb-connector-c/PLIST Thu May 13 11:06:07 2021 +0000
+++ b/databases/mariadb-connector-c/PLIST Thu May 13 11:46:13 2021 +0000
@@ -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_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.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
diff -r 66702c3e597f -r 34700dd027e7 databases/mariadb-connector-c/buildlink3.mk
--- a/databases/mariadb-connector-c/buildlink3.mk Thu May 13 11:06:07 2021 +0000
+++ b/databases/mariadb-connector-c/buildlink3.mk Thu May 13 11:46:13 2021 +0000
@@ -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 @@
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
diff -r 66702c3e597f -r 34700dd027e7 databases/mariadb-connector-c/distinfo
--- a/databases/mariadb-connector-c/distinfo Thu May 13 11:06:07 2021 +0000
+++ b/databases/mariadb-connector-c/distinfo Thu May 13 11:46:13 2021 +0000
@@ -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
diff -r 66702c3e597f -r 34700dd027e7 databases/mariadb-connector-c/options.mk
--- a/databases/mariadb-connector-c/options.mk Thu May 13 11:06:07 2021 +0000
+++ b/databases/mariadb-connector-c/options.mk Thu May 13 11:46:13 2021 +0000
@@ -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
diff -r 66702c3e597f -r 34700dd027e7 databases/mariadb-connector-c/patches/patch-CMakeLists.txt
--- a/databases/mariadb-connector-c/patches/patch-CMakeLists.txt Thu May 13 11:06:07 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2018/09/18 08:41:34 fhajny Exp $
-
-Make sure Kerberos/GSS support can be turned off.
-
---- CMakeLists.txt.orig 2018-07-31 07:44:20.000000000 +0000
-+++ CMakeLists.txt
-@@ -24,7 +24,7 @@ get_directory_property(IS_SUBPROJECT PAR
- # do not inherit include directories from the parent project
- SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
- FOREACH(V WITH_MYSQLCOMPAT WITH_MSI WITH_SIGNCODE WITH_RTC WITH_UNIT_TESTS
-- WITH_DYNCOL WITH_EXTERNAL_ZLIB WITH_CURL WITH_SQLITE WITH_SSL
-+ WITH_DYNCOL WITH_EXTERNAL_ZLIB WITH_CURL WITH_GSS WITH_SQLITE WITH_SSL
- INSTALL_LAYOUT WITH_TEST_SRCPKG)
- SET(${V} ${${OPT}${V}})
- ENDFOREACH()
-@@ -62,6 +62,7 @@ ADD_OPTION(WITH_UNIT_TESTS "build test s
- ADD_OPTION(WITH_DYNCOL "Enables support of dynamic coluumns" ON)
- ADD_OPTION(WITH_EXTERNAL_ZLIB "Enables use of external zlib" OFF)
- ADD_OPTION(WITH_CURL "Enables use of curl" ON)
-+ADD_OPTION(WITH_GSS "Enables use of Kerberos auth" ON)
- ADD_OPTION(WITH_SSL "Enables use of TLS/SSL library" ON)
- ###############
-
-@@ -82,7 +83,7 @@ IF(WITH_RTC)
- SET(RTC_OPTIONS "/RTC1 /RTCc")
- ENDIF()
-
--IF(NOT WIN32)
-+IF(WITH_GSS)
- INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake)
- IF(GSSAPI_FOUND)
- INCLUDE_DIRECTORIES(${GSSAPI_INCS})
-@@ -361,7 +362,7 @@ IF(NOT REMOTEIO_PLUGIN_TYPE MATCHES "OFF
- ADD_DEFINITIONS("-DHAVE_REMOTEIO=1")
- ENDIF()
- ENDIF()
--IF(NOT WIN32)
-+IF(WITH_GSS)
- IF(NOT AUTH_GSSAPI_PLUGIN_TYPE MATCHES "OFF")
- INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake)
- IF(GSSAPI_FOUND)
diff -r 66702c3e597f -r 34700dd027e7 databases/mariadb-connector-c/patches/patch-libmariadb_ma__context.c
--- a/databases/mariadb-connector-c/patches/patch-libmariadb_ma__context.c Thu May 13 11:06:07 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-$NetBSD: patch-libmariadb_ma__context.c,v 1.1 2018/04/13 08:04:14 fhajny Exp $
-
-Fix incorrect assembler syntax.
-
---- libmariadb/ma_context.c.orig 2018-01-17 11:43:58.000000000 +0000
-+++ libmariadb/ma_context.c
-@@ -200,6 +200,7 @@ my_context_spawn(struct my_context *c, v
- */
- __asm__ __volatile__
- (
-+ ".cfi_startproc\n\t"
- "movq %%rsp, (%[save])\n\t"
- "movq %[stack], %%rsp\n\t"
- #if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER)
-@@ -240,6 +241,7 @@ my_context_spawn(struct my_context *c, v
- "2:\n\t"
- "movl $1, %[ret]\n"
- "3:\n"
-+ ".cfi_endproc\n"
- : [ret] "=a" (ret),
- [f] "+S" (f),
- /* Need this in %rdi to follow calling convention. */
-@@ -260,6 +262,7 @@ my_context_continue(struct my_context *c
-
- __asm__ __volatile__
- (
-+ ".cfi_startproc\n\t"
- "movq (%[save]), %%rax\n\t"
- "movq %%rsp, (%[save])\n\t"
- "movq %%rax, %%rsp\n\t"
-@@ -309,6 +312,7 @@ my_context_continue(struct my_context *c
- "2:\n\t"
- "movl $1, %[ret]\n"
- "3:\n"
-+ ".cfi_endproc\n"
- : [ret] "=a" (ret)
- : /* Need this in callee-save register to preserve in function call. */
- [save] "b" (&c->save[0])
-@@ -324,6 +328,7 @@ my_context_yield(struct my_context *c)
- uint64_t *save= &c->save[0];
- __asm__ __volatile__
- (
-+ ".cfi_startproc\n\t"
- "movq (%[save]), %%rax\n\t"
- "movq %%rsp, (%[save])\n\t"
- "movq %%rax, %%rsp\n\t"
-@@ -352,6 +357,7 @@ my_context_yield(struct my_context *c)
- "jmpq *%%rax\n"
-
- "1:\n"
-+ ".cfi_endproc\n"
- : [save] "+D" (save)
- :
- : "rax", "rcx", "rdx", "rsi", "r8", "r9", "r10", "r11", "memory", "cc"
-@@ -439,6 +445,7 @@ my_context_spawn(struct my_context *c, v
- */
- __asm__ __volatile__
- (
-+ ".cfi_startproc\n\t"
- "movl %%esp, (%[save])\n\t"
- "movl %[stack], %%esp\n\t"
- #if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER)
-@@ -479,6 +486,7 @@ my_context_spawn(struct my_context *c, v
- "3:\n\t"
- "movl $1, %[ret]\n"
- "4:\n"
-+ ".cfi_endproc\n"
- : [ret] "=a" (ret),
- [f] "+c" (f),
- [d] "+d" (d)
-@@ -498,6 +506,7 @@ my_context_continue(struct my_context *c
-
- __asm__ __volatile__
- (
-+ ".cfi_startproc\n\t"
- "movl (%[save]), %%eax\n\t"
- "movl %%esp, (%[save])\n\t"
Home |
Main Index |
Thread Index |
Old Index