Date: Wed, 28 Feb 2018 21:50:21 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463265 - head/mail/postfix-current/files Message-ID: <201802282150.w1SLoLR5079862@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Wed Feb 28 21:50:21 2018 New Revision: 463265 URL: https://svnweb.freebsd.org/changeset/ports/463265 Log: - fix build agains maraidb100 [1] Firt definition of MARIADB_VERSION_ID can be found in mariadb102 therefore we have to use MARIADB_BASE_VERSION which is defined in mariadb55 and mariadb10x PR: 226266 [1], 220224 Reported by: Zilon [1] Modified: head/mail/postfix-current/files/patch-src_global_dict__mysql.c Modified: head/mail/postfix-current/files/patch-src_global_dict__mysql.c ============================================================================== --- head/mail/postfix-current/files/patch-src_global_dict__mysql.c Wed Feb 28 21:49:47 2018 (r463264) +++ head/mail/postfix-current/files/patch-src_global_dict__mysql.c Wed Feb 28 21:50:21 2018 (r463265) @@ -7,16 +7,49 @@ # --- src/global/dict_mysql.c.orig 2017-02-19 01:58:20 UTC +++ src/global/dict_mysql.c -@@ -656,7 +656,11 @@ static void plmysql_connect_single(DICT_ +@@ -198,6 +198,15 @@ + + #include "dict_mysql.h" + ++/* MySQL 8.x API change */ ++ ++#if MYSQL_VERSION_ID >= 80000 && !defined(MARIADB_BASE_VERSION) ++#define DICT_MYSQL_SSL_VERIFY_SERVER_CERT MYSQL_OPT_SSL_MODE ++#elif MYSQL_VERSION_ID >= 50023 ++#define DICT_MYSQL_SSL_VERIFY_SERVER_CERT MYSQL_OPT_SSL_VERIFY_SERVER_CERT ++#endif ++ ++ + /* need some structs to help organize things */ + typedef struct { + MYSQL *db; +@@ -237,7 +246,7 @@ typedef struct { + char *tls_CAfile; + char *tls_CApath; + char *tls_ciphers; +-#if MYSQL_VERSION_ID >= 50023 ++#if defined(DICT_MYSQL_SSL_VERIFY_SERVER_CERT) + int tls_verify_cert; + #endif + #endif +@@ -656,9 +665,9 @@ static void plmysql_connect_single(DICT_ dict_mysql->tls_key_file, dict_mysql->tls_cert_file, dict_mysql->tls_CAfile, dict_mysql->tls_CApath, dict_mysql->tls_ciphers); -#if MYSQL_VERSION_ID >= 50023 -+#if MYSQL_VERSION_ID >= 80000 && !defined(MARIADB_VERSION_ID) -+ if (dict_mysql->tls_verify_cert != -1) -+ mysql_options(host->db, MYSQL_OPT_SSL_MODE, -+ &dict_mysql->tls_verify_cert); -+#elif MYSQL_VERSION_ID >= 50023 ++#if defined(DICT_MYSQL_SSL_VERIFY_SERVER_CERT) if (dict_mysql->tls_verify_cert != -1) - mysql_options(host->db, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, +- mysql_options(host->db, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, ++ mysql_options(host->db, DICT_MYSQL_SSL_VERIFY_SERVER_CERT, &dict_mysql->tls_verify_cert); + #endif + #endif +@@ -723,7 +732,7 @@ static void mysql_parse_config(DICT_MYSQ + dict_mysql->tls_CAfile = cfg_get_str(p, "tls_CAfile", NULL, 0, 0); + dict_mysql->tls_CApath = cfg_get_str(p, "tls_CApath", NULL, 0, 0); + dict_mysql->tls_ciphers = cfg_get_str(p, "tls_ciphers", NULL, 0, 0); +-#if MYSQL_VERSION_ID >= 50023 ++#if defined(DICT_MYSQL_SSL_VERIFY_SERVER_CERT) + dict_mysql->tls_verify_cert = cfg_get_bool(p, "tls_verify_cert", -1); + #endif + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802282150.w1SLoLR5079862>