mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-21 08:42:23 +00:00
Code Issues Releases Activity

- update to 3.4-20180401

Browse Source 
Changelog:
20180224
  Workaround: postconf build did not abort if the m4 command
  is not installed (on a system that does have the make command,
  the awk command, the perl command, and the C compiler?!).
  File: postconf/extract_cfg.sh.

20180303
  Portability: slight differences between MySQL and MariaDB.
  Olli Hauer. File: global/dict_mysql.c.

20180306
  Bugfix (introduced: 19990302): when luser_relay specifies
  a non-existent local address, the luser_relay feature becomes
  a black hole. Reported by Juergen Thomsen. File: local/unknown.c.

  Portability: FreeBSD 11 is supported. Files: makedefs,
  util/sys_defs.h.
This commit is contained in:
Olli Hauer 2018-04-02 07:37:29 +00:00
parent 80a876b524
commit 3482ab88d2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=466205
5 changed files with 9 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/postfix-current/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= postfix
DISTVERSION= 3.4-20180222
DISTVERSION= 3.4-20180401
PORTREVISION?= 0
PORTEPOCH= 5
CATEGORIES= mail ipv6

6
mail/postfix-current/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1519345697
SHA256 (postfix/postfix-3.4-20180222.tar.gz) = bd136d4542e7a9114d0afcb1d16421c116e7ad97f75fbf0abf6fa5be76d69881
SIZE (postfix/postfix-3.4-20180222.tar.gz) = 4422765
TIMESTAMP = 1522600680
SHA256 (postfix/postfix-3.4-20180401.tar.gz) = 1bebdff068dcc40ca0190e2a5bffac9a1379c21220e613d1e5af3cf95ed3d18f
SIZE (postfix/postfix-3.4-20180401.tar.gz) = 4423216

13
mail/postfix-current/files/patch-makedefs
View File

@ -1,18 +1,9 @@
--- makedefs.orig 2016-06-26 00:02:58 UTC
--- makedefs.orig 2018-03-07 00:46:20 UTC
+++ makedefs
@@ -279,6 +279,24 @@ case "$SYSTEM.$RELEASE" in
@@ -296,6 +296,15 @@ case "$SYSTEM.$RELEASE" in
: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
: ${PLUGIN_LD="${CC} -shared"}
;;
+ FreeBSD.11*) SYSTYPE=FREEBSD11
+ : ${CC=cc}
+ : ${SHLIB_SUFFIX=.so}
+ : ${SHLIB_CFLAGS=-fPIC}
+ : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'}
+ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
+ : ${PLUGIN_LD="${CC} -shared"}
+ ;;
+ FreeBSD.12*) SYSTYPE=FREEBSD12
+ : ${CC=cc}
+ : ${SHLIB_SUFFIX=.so}

55
mail/postfix-current/files/patch-src_global_dict__mysql.c
View File

@ -1,55 +0,0 @@
# PR: 220224 fix build against mysql 8.x
#
# from https://dev.mysql.com/doc/refman/5.7/en/mysql-options.html
# o MYSQL_OPT_SSL_VERIFY_SERVER_CERT (argument type: my_bool *)
# This option is deprecated as of MySQL 5.7.11 and is removed in MySQL 8.0.
# Instead, use MYSQL_OPT_SSL_MODE with a value of SSL_MODE_VERIFY_IDENTITY.
#
--- src/global/dict_mysql.c.orig 2017-02-19 01:58:20 UTC
+++ src/global/dict_mysql.c
@@ -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 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,
&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

5
mail/postfix-current/files/patch-src_util_sys__defs.h
View File

@ -1,9 +1,10 @@
--- src/util/sys_defs.h.orig 2017-06-18 19:30:20 UTC
--- src/util/sys_defs.h.orig 2018-03-04 19:01:27 UTC
+++ src/util/sys_defs.h
@@ -30,6 +30,7 @@
@@ -30,7 +30,7 @@
#if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
|| defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
|| defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
- || defined(FREEBSD11) \
+ || defined(FREEBSD11) || defined(FREEBSD12) \
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \