kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- update to 3.3.1

Browse source 
- rework MySQL patch
This commit is contained in:
Olli Hauer 2018-06-02 11:38:40 +00:00
parent afddbcd969
commit 42126eb23e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=471364
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mail/postfix/Makefile
View file

@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= postfix
PORTVERSION= 3.3.0
PORTREVISION?= 1
DISTVERSION= 3.3.1
PORTREVISION?= 0
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \

6
mail/postfix/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1519259037
SHA256 (postfix/postfix-3.3.0.tar.gz) = 7942e89721e30118d7050675b0d976955e3160e21f7898b85a79cac4f4baef39
SIZE (postfix/postfix-3.3.0.tar.gz) = 4419450
TIMESTAMP = 1526761800
SHA256 (postfix/postfix-3.3.1.tar.gz) = 54f514dae42b5275cb4bc9c69283f16c06200b71813d0bb696568c4ba7ae7e3b
SIZE (postfix/postfix-3.3.1.tar.gz) = 4420912

17
mail/postfix/files/patch-src_global_dict__mysql.c
View file

@ -7,23 +7,22 @@
#
--- src/global/dict_mysql.c.orig 2017-02-19 01:58:20 UTC
+++ src/global/dict_mysql.c
@@ -198,6 +198,15 @@
@@ -198,6 +198,14 @@
#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
+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50023
+#define DICT_MYSQL_SSL_VERIFY_SERVER_CERT MYSQL_OPT_SSL_VERIFY_SERVER_CERT
+#elif MYSQL_VERSION_ID >= 80000
+#define DICT_MYSQL_SSL_VERIFY_SERVER_CERT MYSQL_OPT_SSL_MODE
+#endif
+
+
/* need some structs to help organize things */
typedef struct {
MYSQL *db;
@@ -237,7 +246,7 @@ typedef struct {
@@ -237,7 +245,7 @@ typedef struct {
char *tls_CAfile;
char *tls_CApath;
char *tls_ciphers;
@ -32,7 +31,7 @@
int tls_verify_cert;
#endif
#endif
@@ -656,9 +665,9 @@ static void plmysql_connect_single(DICT_
@@ -656,9 +664,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);
@ -40,11 +39,11 @@
+#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, DICT_MYSQL_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
@@ -723,7 +731,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);