Index: head/mail/postfix/Makefile =================================================================== --- head/mail/postfix/Makefile (revision 499381) +++ head/mail/postfix/Makefile (revision 499382) @@ -1,379 +1,379 @@ # Created by: Torsten Blum # $FreeBSD$ PORTNAME= postfix -DISTVERSION= 3.3.4 +DISTVERSION= 3.4.5 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ http://de.postfix.org/ftpmirror/ \ http://cdn.postfix.johnriley.me/mirrors/postfix-release/ \ http://www.artfiles.org/postfix.org/postfix-release/ \ http://mirror.lhsolutions.nl/postfix-release/ \ ftp://postfix.mirrors.pair.com/ MASTER_SITES:= ${MASTER_SITES:S|$|official/|} DIST_SUBDIR= ${PORTNAME} MAINTAINER= ohauer@FreeBSD.org COMMENT?= Secure alternative to widely-used Sendmail LICENSE= IPL10 EPL LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_NAME_IPL10= IBM PUBLIC LICENSE VERSION 1.0 LICENSE_PERMS_IPL10= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept PORTSCOUT= limit:^3\.3\. CONFLICTS_INSTALL?= courier-0.* opensmtpd-[0-9]* \ sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* \ postfix-2.* postfix-base-2.* postfix21?-* postfix-current-* USERS= postfix GROUPS= mail maildrop postfix USES= shebangfix cpe SHEBANG_FILES= auxiliary/qshape/qshape.pl USE_RC_SUBR= postfix USE_SUBMAKE= yes SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" OPTIONS_SUB= yes OPTIONS_DEFINE= BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LDAP_SASL \ LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= SASLKRB5 SASLKMIT OPTIONS_DEFAULT?= EAI PCRE TLS BDB_USES= bdb BLACKLISTD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-blacklistd CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb EAI_LIB_DEPENDS= libicuuc.so:devel/icu LDAP_USE= OPENLDAP=yes LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MYSQL_USES= mysql PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PGSQL_USES= pgsql SASLKMIT_LIB_DEPENDS= libkrb5.so:security/krb5 SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SQLITE_USES= sqlite TLS_USES= ssl BLACKLISTD_DESC= Enable blacklistd support (FreeBSD 11.0 and later only) CDB_DESC= CDB maps lookups EAI_DESC= Email Address Internationalization (SMTPUTF8) support INST_BASE_DESC= Install into /usr and /etc/postfix LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER) LDAP_SASL_DESC= LDAP client-to-server SASL auth LMDB_DESC= LMDB maps TEST_DESC= SMTP/LMTP test server and generator SASL_DESC= Cyrus SASL support (Dovecot SASL is always built in) RG1_DESC= Kerberos network authentication protocol type SASLKRB5_DESC= If your SASL req. Kerberos5, select this SASLKMIT_DESC= If your SASL req. MIT Kerberos5, select this .include HTML1= body_checks.5.html bounce.5.html postfix-power.png \ scache.8.html tlsmgr.8.html STRIP_LIBEXEC= anvil bounce cleanup discard dnsblog error flush lmtp local master \ nqmgr oqmgr pickup pipe postscreen proxymap qmgr qmqpd scache showq \ smtp smtpd spawn tlsmgr tlsproxy trivial-rewrite verify virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= pie=yes CC="${CC}" OPT="${CFLAGS}" .if ${PORT_OPTIONS:MINST_BASE} .if defined(SASL_SLAVE) PKGNAMESUFFIX= -base-sasl .else PKGNAMESUFFIX= -base .endif PREFIX= /usr ETCDIR= /etc/postfix PLIST_SUB+= BMAN="share/" .else PLIST_SUB+= BMAN="" .endif PLIST_SUB+= PFETC=${ETCDIR} # check if mailwrapper supports $LOCALBASE .if ${OPSYS} == FreeBSD SUB_LIST+= USE_LOCALBASE_MAILER_CONF="yes" MC_PREFIX="${LOCALBASE}" .else SUB_LIST+= USE_LOCALBASE_MAILER_CONF="no" MC_PREFIX="" .endif .if ${PORT_OPTIONS:MDOCS} PORTDOCS= * READMEDIR= ${DOCSDIR} .else READMEDIR= no .endif # dynamic direcory location DAEMONDIR= ${PREFIX}/libexec/postfix SHLIB_DIRECTORY=${PREFIX}/lib/postfix # new proposed location is ETCDIR (see README_FILES/INSTALL) # keep compatiblity with Postfix 2.6 .. 2.11 and use DAEMOMDIR META_DIRECTORY= ${DAEMONDIR} SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" \ DAEMONDIR="${DAEMONDIR}" META_DIRECTORY="${META_DIRECTORY}" SUB_FILES+= pkg-install pkg-message mailer.conf.postfix POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \ -DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \ -DDEF_META_DIR=\\\"${META_DIRECTORY}\\\" \ -DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \ -DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \ -DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \ -DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \ -DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \ -DDEF_README_DIR=\\\"${READMEDIR}\\\" \ -DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \ -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \ -DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \ -DDEF_MAIL_OWNER=\\\"postfix\\\" \ -DDEF_SGID_GROUP=\\\"maildrop\\\" \ -Wmissing-prototypes -Wformat -Wno-comment # Default requirement for postfix rc script _REQUIRE= LOGIN cleanvar dovecot # always build with Dovecot SASL support, Cyrus is optional # see Postfix HISTORY 20051222 POSTFIX_CCARGS+= -DUSE_SASL_AUTH # Email Address Internationalization (EAI, RFC 6531..6533) .if ${PORT_OPTIONS:MEAI} POSTFIX_CCARGS+= -DHAS_EAI -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -licuuc .else POSTFIX_CCARGS+= -DNO_EAI .endif .if ${PORT_OPTIONS:MPCRE} DYN_EXT+= pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_PCRE=`${LOCALBASE}/bin/pcre-config --libs`" .else POSTFIX_CCARGS+= -DNO_PCRE .endif .if ${PORT_OPTIONS:MSASL} POSTFIX_CCARGS+= -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt .else POSTFIX_CCARGS+= -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\" .endif .if ${PORT_OPTIONS:MSASLKRB5} POSTFIX_AUXLIBS+= -lkrb5 -lhx509 -lcrypto -lcrypt -lcom_err -lasn1 -lroken .endif .if ${PORT_OPTIONS:MSASLKMIT} POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err .endif .if ${PORT_OPTIONS:MTLS} POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC} # XXX LDFLAGS possible breaks dynamic building POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto .else POSTFIX_CCARGS+= -DNO_TLS .endif .if ${PORT_OPTIONS:MBDB} POSTFIX_CCARGS+= -I${BDB_INCLUDE_DIR} POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} .endif .if ${PORT_OPTIONS:MBLACKLISTD} . if ${OPSYS} == FreeBSD POSTFIX_AUXLIBS+= -lblacklist . else IGNORE= blacklistd is only supported on FreeBSD >= 11.0 . endif .endif .if ${PORT_OPTIONS:MMYSQL} DYN_EXT+= mysql POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql POSTFIX_DYN_AUXLIBS+= "AUXLIBS_MYSQL=-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lm" _REQUIRE+= mysql .endif .if ${PORT_OPTIONS:MPGSQL} DYN_EXT+= pgsql POSTFIX_CCARGS+= -DHAS_PGSQL -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_PGSQL=-L${LOCALBASE}/lib -lpq" _REQUIRE+= postgresql .endif .if ${PORT_OPTIONS:MSQLITE} DYN_EXT+= sqlite POSTFIX_CCARGS+= -DHAS_SQLITE -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_SQLITE=-L${LOCALBASE}/lib -lsqlite3 -lpthread" .endif .if ${PORT_OPTIONS:MLDAP} DYN_EXT+= ldap . if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} . endif POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber" _REQUIRE+= slapd . if ${PORT_OPTIONS:MLDAP_SASL} . if ! ${PORT_OPTIONS:MSASL} LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 . endif WANT_OPENLDAP_SASL= yes POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL . endif .endif .if ${PORT_OPTIONS:MCDB} DYN_EXT+= cdb POSTFIX_CCARGS+= -DHAS_CDB -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_CDB=-L${LOCALBASE}/lib -lcdb" .endif .if ${PORT_OPTIONS:MNIS} POSTFIX_CCARGS+= -DHAS_NIS _REQUIRE+= ypserv .endif .if ${PORT_OPTIONS:MTEST} BINTEST= qmqp-sink qmqp-source smtp-sink smtp-source MANTEST= qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1 .endif .if ${PORT_OPTIONS:MLMDB} DYN_EXT+= lmdb POSTFIX_CCARGS+= -DHAS_LMDB -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LMDB=-L${LOCALBASE}/lib -llmdb" .endif # sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\ s!(_directory = )/usr/!\1${PREFIX}/!g;\ s!^(data_directory = /var/)lib/!\1db/!g;\ s!^\#(mynetworks_style = host)!\1!g;\ s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\ s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\ s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\ s!^(setgid_group =)!\1 maildrop!g;\ s!^(manpage_directory =)!\1 ${MANPREFIX}/man!g;\ s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\ \!^\#alias_database = dbm:/etc/mail/aliases$$!d;\ s!(:|= )/etc/postfix!\1$$config_directory!g;\ s!/etc/postfix!${ETCDIR}!g;\ s!^(sample_directory =)!\1 ${ETCDIR}!g;\ s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!; pre-patch: .if ${PORT_OPTIONS:MSASL} && ! ${PORT_OPTIONS:MMYSQL} && exists(${LOCALBASE}/lib/libsasl2.a) @if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "Your SASL library it's compiled with MYSQL"; \ ${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \ ${ECHO_MSG} "select MYSQL OPTION in config menu."; \ ${ECHO_MSG} "# make clean config"; \ ${ECHO_MSG}; \ sleep 5; \ fi .endif @${ECHO_CMD} 'See header_checks.5.html' \ > ${WRKSRC}/html/body_checks.5.html @${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \ ${WRKSRC}/src/global/mail_params.h @${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \ -type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \ ${REINPLACE_CMD} -E -e '${REINPLACE}' post-patch: .for f in ${HTML1} @${ECHO_CMD} '$$html_directory/$f:f:root:-:644' \ >> ${WRKSRC}/conf/postfix-files .endfor @${ECHO_CMD} '$$manpage_directory/man1/posttls-finger.1:f:root:-:644' \ >> ${WRKSRC}/conf/postfix-files @${ECHO_CMD} '$$command_directory/posttls-finger:f:root:-:755' \ >> ${WRKSRC}/conf/postfix-files do-configure: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles \ ${MAKEFILEFLAGS} CCARGS="${POSTFIX_CCARGS}" \ shared=yes shlib_directory=${SHLIB_DIRECTORY} \ dynamicmaps=yes \ ${POSTFIX_DYN_AUXLIBS} \ AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO_CMD} "all: default" >> Makefile) pre-install-INST_BASE-on: ${MKDIR} ${STAGEDIR}/etc/rc.d do-install: @(cd ${WRKSRC} && ${MAKE} non-interactive-package \ install_root=${STAGEDIR} tempdir=${WRKDIR} \ shlib_directory=${SHLIB_DIRECTORY} \ config_directory=${ETCDIR} \ command_directory=${PREFIX}/sbin \ daemon_directory=${DAEMONDIR} \ meta_directory=${META_DIRECTORY} \ html_directory=${READMEDIR} \ mailq_path=${PREFIX}/bin/mailq \ manpage_directory=${MANPREFIX}/man \ newaliases_path=${PREFIX}/bin/newaliases \ readme_directory=${READMEDIR} \ sendmail_path=${PREFIX}/sbin/sendmail ) ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${STAGEDIR}${PREFIX}/bin/rmail ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${MANPREFIX}/man/man1 # == do not overwrite existing config ${MV} ${STAGEDIR}${ETCDIR}/main.cf ${STAGEDIR}${ETCDIR}/main.cf.sample ${MV} ${STAGEDIR}${ETCDIR}/master.cf ${STAGEDIR}${ETCDIR}/master.cf.sample ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${STAGEDIR}${DATADIR} # == chop dynamicmaps.cf entries into dedicated .cf files # for future sub-packages support .for f in ${DYN_EXT} # adjust dynamicmaps.cf ${GREP} -e "^#" -e "^${f}" ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf \ > ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf.d/${f}.cf && \ ${SED} -i '' -e '/${f}/d' ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf # adjust / generate postfix-files for dynamic modules ${SED} -i '' -e '/postfix-${f}.so/d' ${STAGEDIR}${META_DIRECTORY}/postfix-files && \ ${PRINTF} '# Do not edit this file.\ \n$$shlib_directory/postfix-${f}.so:f:root:-:755\ \n$$meta_directory/postfix-files.d/${f}-files:f:root:-:644\ \n$$meta_directory/dynamicmaps.cf.d/${f}.cf:f:root:-:644\n' \ > ${STAGEDIR}${META_DIRECTORY}/postfix-files.d/${f}-files .endfor # Fix compressed man pages and strip executables ${SED} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${STAGEDIR}${META_DIRECTORY}/postfix-files -@${STRIP_CMD} ${STRIP_LIBEXEC:S|^|${STAGEDIR}${DAEMONDIR}/|} -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* -@${STRIP_CMD} ${STAGEDIR}${SHLIB_DIRECTORY}/*.so do-install-TEST-on: ${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${MANPREFIX}/man/man1 .include Index: head/mail/postfix/distinfo =================================================================== --- head/mail/postfix/distinfo (revision 499381) +++ head/mail/postfix/distinfo (revision 499382) @@ -1,3 +1,3 @@ -TIMESTAMP = 1553957353 -SHA256 (postfix/postfix-3.3.4.tar.gz) = 847818bb82d0d7e83303a30206330b5d6bd035bbbb0086782cd87dcb8ac99bd3 -SIZE (postfix/postfix-3.3.4.tar.gz) = 4429964 +TIMESTAMP = 1553956821 +SHA256 (postfix/postfix-3.4.5.tar.gz) = 8b2ba54f9d2a049582a0ed3ee2dbe96ba57e278feea9cb4f80e1a61844e6319f +SIZE (postfix/postfix-3.4.5.tar.gz) = 4581301 Index: head/mail/postfix/files/patch-src_tls_tls__dh.c =================================================================== --- head/mail/postfix/files/patch-src_tls_tls__dh.c (revision 499381) +++ head/mail/postfix/files/patch-src_tls_tls__dh.c (nonexistent) @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_tls_tls_dh_c,v 1.1 2017/03/04 22:09:43 sthen Exp $ - -Fix building with LibreSSL - ---- src/tls/tls_dh.c.orig 2016-12-26 23:47:24 UTC -+++ src/tls/tls_dh.c -@@ -314,7 +314,7 @@ void tls_auto_eecdh_curves(SSL_CTX *c - * This is a NOP in OpenSSL 1.1.0 and later, where curves are always - * auto-negotiated. - */ --#if OPENSSL_VERSION_NUMBER < 0x10100000UL -+#if OPENSSL_VERSION_NUMBER < 0x10100000UL || defined(LIBRESSL_VERSION_NUMBER) - if (SSL_CTX_set_ecdh_auto(ctx, 1) <= 0) { - msg_warn("failed to enable automatic ECDHE curve selection"); - tls_print_errors(); Property changes on: head/mail/postfix/files/patch-src_tls_tls__dh.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/postfix/files/patch-src_global_dict__mysql.c =================================================================== --- head/mail/postfix/files/patch-src_global_dict__mysql.c (revision 499381) +++ head/mail/postfix/files/patch-src_global_dict__mysql.c (nonexistent) @@ -1,54 +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,14 @@ - - #include "dict_mysql.h" - -+/* MySQL 8.x API change */ -+ -+#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 +245,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 +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); --#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 +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); --#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 Property changes on: head/mail/postfix/files/patch-src_global_dict__mysql.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/postfix/files/patch-src_tls_tls__client.c =================================================================== --- head/mail/postfix/files/patch-src_tls_tls__client.c (revision 499381) +++ head/mail/postfix/files/patch-src_tls_tls__client.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/tls/tls_client.c.orig 2016-08-27 20:27:50 UTC -+++ src/tls/tls_client.c -@@ -299,7 +299,7 @@ TLS_APPL_STATE *tls_client_init(const TL - */ - tls_check_version(); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - /* - * Initialize the OpenSSL library by the book! To start with, we must Property changes on: head/mail/postfix/files/patch-src_tls_tls__client.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/postfix/files/patch-src_tls_tls__dane.c =================================================================== --- head/mail/postfix/files/patch-src_tls_tls__dane.c (revision 499381) +++ head/mail/postfix/files/patch-src_tls_tls__dane.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/tls/tls_dane.c.orig 2016-08-27 20:27:50 UTC -+++ src/tls/tls_dane.c -@@ -2163,7 +2163,7 @@ static SSL_CTX *ctx_init(const char *CAf - tls_param_init(); - tls_check_version(); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - SSL_load_error_strings(); - SSL_library_init(); - #endif Property changes on: head/mail/postfix/files/patch-src_tls_tls__dane.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/postfix/files/patch-src_tls_tls.h =================================================================== --- head/mail/postfix/files/patch-src_tls_tls.h (revision 499381) +++ head/mail/postfix/files/patch-src_tls_tls.h (nonexistent) @@ -1,25 +0,0 @@ -$OpenBSD: patch-src_tls_tls_h,v 1.2 2017/03/04 22:09:43 sthen Exp $ - -Fix building with LibreSSL - ---- src/tls/tls.h.orig 2017-01-01 22:22:13 UTC -+++ src/tls/tls.h -@@ -89,7 +89,7 @@ extern const char *str_tls_level(int); - #endif - - /* Backwards compatibility with OpenSSL < 1.1.0 */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define OpenSSL_version_num SSLeay - #define OpenSSL_version SSLeay_version - #define OPENSSL_VERSION SSLEAY_VERSION -@@ -104,6 +104,9 @@ extern const char *str_tls_level(int); - #define ASN1_STRING_get0_data ASN1_STRING_data - #define X509_getm_notBefore X509_get_notBefore - #define X509_getm_notAfter X509_get_notAfter -+#endif -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - #define TLS_method SSLv23_method - #define TLS_client_method SSLv23_client_method - #define TLS_server_method SSLv23_server_method Property changes on: head/mail/postfix/files/patch-src_tls_tls.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/postfix/files/patch-makedefs =================================================================== --- head/mail/postfix/files/patch-makedefs (revision 499381) +++ head/mail/postfix/files/patch-makedefs (revision 499382) @@ -1,36 +1,36 @@ ---- makedefs.orig 2018-02-03 17:20:46 UTC +--- makedefs.orig 2019-03-10 23:42:59 UTC +++ makedefs -@@ -287,6 +287,33 @@ case "$SYSTEM.$RELEASE" in +@@ -298,6 +298,33 @@ 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} + : ${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.13*) SYSTYPE=FREEBSD13 + : ${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"} + ;; DragonFly.*) SYSTYPE=DRAGONFLY ;; OpenBSD.2*) SYSTYPE=OPENBSD2 Index: head/mail/postfix/files/patch-src_posttls-finger_posttls-finger.c =================================================================== --- head/mail/postfix/files/patch-src_posttls-finger_posttls-finger.c (revision 499381) +++ head/mail/postfix/files/patch-src_posttls-finger_posttls-finger.c (revision 499382) @@ -1,22 +1,22 @@ ---- src/posttls-finger/posttls-finger.c.orig 2016-08-27 20:27:50 UTC +--- src/posttls-finger/posttls-finger.c.orig 2019-02-12 13:17:45 UTC +++ src/posttls-finger/posttls-finger.c -@@ -1511,7 +1511,8 @@ static int finger(STATE *state) +@@ -1673,7 +1673,8 @@ static int finger(STATE *state) return (0); } -#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L +#if defined(USE_TLS) && \ + ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ) /* ssl_cleanup - free memory allocated in the OpenSSL library */ -@@ -1958,7 +1959,8 @@ int main(int argc, char *argv[]) +@@ -2156,7 +2157,8 @@ int main(int argc, char *argv[]) cleanup(&state); /* OpenSSL 1.1.0 and later (de)initialization is implicit */ -#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L +#if defined(USE_TLS) && \ + ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ) ssl_cleanup(); #endif Index: head/mail/postfix/files/patch-src_tls_tls__certkey.c =================================================================== --- head/mail/postfix/files/patch-src_tls_tls__certkey.c (nonexistent) +++ head/mail/postfix/files/patch-src_tls_tls__certkey.c (revision 499382) @@ -0,0 +1,11 @@ +--- src/tls/tls_certkey.c.orig 2019-03-07 23:57:10 UTC ++++ src/tls/tls_certkey.c +@@ -144,7 +144,7 @@ static void init_pem_load_state(pem_load + + /* use_chain - load cert, key and chain into ctx or ssl */ + +-#if OPENSSL_VERSION_NUMBER >= 0x1010100fUL ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fUL && !defined(LIBRESSL_VERSION_NUMBER) + static int use_chain(pem_load_state_t *st) + { + int ret; Property changes on: head/mail/postfix/files/patch-src_tls_tls__certkey.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/postfix/files/patch-src_tls_tls__server.c =================================================================== --- head/mail/postfix/files/patch-src_tls_tls__server.c (revision 499381) +++ head/mail/postfix/files/patch-src_tls_tls__server.c (revision 499382) @@ -1,12 +1,12 @@ ---- src/tls/tls_server.c.orig 2018-11-17 22:33:15 UTC +--- src/tls/tls_server.c.orig 2019-02-18 23:03:54 UTC +++ src/tls/tls_server.c -@@ -517,7 +517,9 @@ TLS_APPL_STATE *tls_server_init(const TL +@@ -518,7 +518,9 @@ TLS_APPL_STATE *tls_server_init(const TL * ticket decryption callback already (since 2.11) asks OpenSSL to * avoid issuing new tickets when the presented ticket is re-usable. */ +#ifndef LIBRESSL_VERSION_NUMBER SSL_CTX_set_num_tickets(server_ctx, 1); +#endif } #endif if (!ticketable) Index: head/mail/postfix/files/patch-src_util_sys__defs.h =================================================================== --- head/mail/postfix/files/patch-src_util_sys__defs.h (revision 499381) +++ head/mail/postfix/files/patch-src_util_sys__defs.h (revision 499382) @@ -1,10 +1,11 @@ ---- src/util/sys_defs.h.orig 2017-06-18 19:30:20 UTC +--- src/util/sys_defs.h.orig 2019-03-10 16:58:04 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(FREEBSD13) \ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ || defined(OPENBSD5) || defined(OPENBSD6) \ Index: head/mail/postfix/pkg-plist =================================================================== --- head/mail/postfix/pkg-plist (revision 499381) +++ head/mail/postfix/pkg-plist (revision 499382) @@ -1,188 +1,190 @@ bin/mailq bin/newaliases %%TEST%%bin/qmqp-sink %%TEST%%bin/qmqp-source bin/qshape bin/rmail %%TEST%%bin/smtp-sink %%TEST%%bin/smtp-source %%PFETC%%/LICENSE %%PFETC%%/TLS_LICENSE %%PFETC%%/bounce.cf.default %%PFETC%%/main.cf.default @sample %%PFETC%%/main.cf.sample @sample %%PFETC%%/master.cf.sample lib/postfix/libpostfix-dns.so lib/postfix/libpostfix-global.so lib/postfix/libpostfix-master.so lib/postfix/libpostfix-tls.so lib/postfix/libpostfix-util.so %%CDB%%lib/postfix/postfix-cdb.so %%LDAP%%lib/postfix/postfix-ldap.so %%LMDB%%lib/postfix/postfix-lmdb.so %%MYSQL%%lib/postfix/postfix-mysql.so %%PCRE%%lib/postfix/postfix-pcre.so %%PGSQL%%lib/postfix/postfix-pgsql.so %%SQLITE%%lib/postfix/postfix-sqlite.so libexec/postfix/anvil libexec/postfix/bounce libexec/postfix/cleanup libexec/postfix/discard libexec/postfix/dnsblog libexec/postfix/dynamicmaps.cf %%CDB%%libexec/postfix/dynamicmaps.cf.d/cdb.cf %%LDAP%%libexec/postfix/dynamicmaps.cf.d/ldap.cf %%LMDB%%libexec/postfix/dynamicmaps.cf.d/lmdb.cf %%MYSQL%%libexec/postfix/dynamicmaps.cf.d/mysql.cf %%PCRE%%libexec/postfix/dynamicmaps.cf.d/pcre.cf %%PGSQL%%libexec/postfix/dynamicmaps.cf.d/pgsql.cf %%SQLITE%%libexec/postfix/dynamicmaps.cf.d/sqlite.cf libexec/postfix/error libexec/postfix/flush libexec/postfix/lmtp libexec/postfix/local libexec/postfix/main.cf.proto libexec/postfix/makedefs.out libexec/postfix/master libexec/postfix/master.cf.proto libexec/postfix/nqmgr libexec/postfix/oqmgr libexec/postfix/pickup libexec/postfix/pipe libexec/postfix/post-install libexec/postfix/postfix-files %%CDB%%libexec/postfix/postfix-files.d/cdb-files %%LDAP%%libexec/postfix/postfix-files.d/ldap-files %%LMDB%%libexec/postfix/postfix-files.d/lmdb-files %%MYSQL%%libexec/postfix/postfix-files.d/mysql-files %%PCRE%%libexec/postfix/postfix-files.d/pcre-files %%PGSQL%%libexec/postfix/postfix-files.d/pgsql-files %%SQLITE%%libexec/postfix/postfix-files.d/sqlite-files libexec/postfix/postfix-script libexec/postfix/postfix-tls-script libexec/postfix/postfix-wrapper +libexec/postfix/postlogd libexec/postfix/postmulti-script libexec/postfix/postscreen libexec/postfix/proxymap libexec/postfix/qmgr libexec/postfix/qmqpd libexec/postfix/scache libexec/postfix/showq libexec/postfix/smtp libexec/postfix/smtpd libexec/postfix/spawn libexec/postfix/tlsmgr libexec/postfix/tlsproxy libexec/postfix/trivial-rewrite libexec/postfix/verify libexec/postfix/virtual %%BMAN%%man/man1/mailq.1.gz %%BMAN%%man/man1/newaliases.1.gz %%BMAN%%man/man1/postalias.1.gz %%BMAN%%man/man1/postcat.1.gz %%BMAN%%man/man1/postconf.1.gz %%BMAN%%man/man1/postdrop.1.gz %%BMAN%%man/man1/postfix-tls.1.gz %%BMAN%%man/man1/postfix.1.gz %%BMAN%%man/man1/postkick.1.gz %%BMAN%%man/man1/postlock.1.gz %%BMAN%%man/man1/postlog.1.gz %%BMAN%%man/man1/postmap.1.gz %%BMAN%%man/man1/postmulti.1.gz %%BMAN%%man/man1/postqueue.1.gz %%BMAN%%man/man1/postsuper.1.gz %%BMAN%%man/man1/posttls-finger.1.gz %%TEST%%%%BMAN%%man/man1/qmqp-sink.1.gz %%TEST%%%%BMAN%%man/man1/qmqp-source.1.gz %%BMAN%%man/man1/qshape.1.gz %%BMAN%%man/man1/sendmail.1.gz %%TEST%%%%BMAN%%man/man1/smtp-sink.1.gz %%TEST%%%%BMAN%%man/man1/smtp-source.1.gz %%BMAN%%man/man5/access.5.gz %%BMAN%%man/man5/aliases.5.gz %%BMAN%%man/man5/body_checks.5.gz %%BMAN%%man/man5/bounce.5.gz %%BMAN%%man/man5/canonical.5.gz %%BMAN%%man/man5/cidr_table.5.gz %%BMAN%%man/man5/generic.5.gz %%BMAN%%man/man5/header_checks.5.gz %%BMAN%%man/man5/ldap_table.5.gz %%BMAN%%man/man5/lmdb_table.5.gz %%BMAN%%man/man5/master.5.gz %%BMAN%%man/man5/memcache_table.5.gz %%BMAN%%man/man5/mysql_table.5.gz %%BMAN%%man/man5/nisplus_table.5.gz %%BMAN%%man/man5/pcre_table.5.gz %%BMAN%%man/man5/pgsql_table.5.gz %%BMAN%%man/man5/postconf.5.gz %%BMAN%%man/man5/postfix-wrapper.5.gz %%BMAN%%man/man5/regexp_table.5.gz %%BMAN%%man/man5/relocated.5.gz %%BMAN%%man/man5/socketmap_table.5.gz %%BMAN%%man/man5/sqlite_table.5.gz %%BMAN%%man/man5/tcp_table.5.gz %%BMAN%%man/man5/transport.5.gz %%BMAN%%man/man5/virtual.5.gz %%BMAN%%man/man8/anvil.8.gz %%BMAN%%man/man8/bounce.8.gz %%BMAN%%man/man8/cleanup.8.gz %%BMAN%%man/man8/defer.8.gz %%BMAN%%man/man8/discard.8.gz %%BMAN%%man/man8/dnsblog.8.gz %%BMAN%%man/man8/error.8.gz %%BMAN%%man/man8/flush.8.gz %%BMAN%%man/man8/lmtp.8.gz %%BMAN%%man/man8/local.8.gz %%BMAN%%man/man8/master.8.gz %%BMAN%%man/man8/oqmgr.8.gz %%BMAN%%man/man8/pickup.8.gz %%BMAN%%man/man8/pipe.8.gz +%%BMAN%%man/man8/postlogd.8.gz %%BMAN%%man/man8/postscreen.8.gz %%BMAN%%man/man8/proxymap.8.gz %%BMAN%%man/man8/qmgr.8.gz %%BMAN%%man/man8/qmqpd.8.gz %%BMAN%%man/man8/scache.8.gz %%BMAN%%man/man8/showq.8.gz %%BMAN%%man/man8/smtp.8.gz %%BMAN%%man/man8/smtpd.8.gz %%BMAN%%man/man8/spawn.8.gz %%BMAN%%man/man8/tlsmgr.8.gz %%BMAN%%man/man8/tlsproxy.8.gz %%BMAN%%man/man8/trace.8.gz %%BMAN%%man/man8/trivial-rewrite.8.gz %%BMAN%%man/man8/verify.8.gz %%BMAN%%man/man8/virtual.8.gz sbin/postalias sbin/postcat sbin/postconf @(,maildrop,2755) sbin/postdrop sbin/postfix sbin/postkick sbin/postlock sbin/postlog sbin/postmap sbin/postmulti @(,maildrop,2755) sbin/postqueue sbin/postsuper sbin/posttls-finger sbin/sendmail %%DATADIR%%/mailer.conf.postfix @dir libexec/postfix/dynamicmaps.cf.d @dir libexec/postfix/postfix-files.d @dir %%PFETC%% @dir(postfix,,700) /var/db/postfix @dir(postfix,,700) /var/spool/postfix/active @dir(postfix,,700) /var/spool/postfix/bounce @dir(postfix,,700) /var/spool/postfix/corrupt @dir(postfix,,700) /var/spool/postfix/defer @dir(postfix,,700) /var/spool/postfix/deferred @dir(postfix,,700) /var/spool/postfix/flush @dir(postfix,,700) /var/spool/postfix/hold @dir(postfix,,700) /var/spool/postfix/incoming @dir(postfix,maildrop,730) /var/spool/postfix/maildrop @dir(,postfix,755) /var/spool/postfix/pid @dir(postfix,,700) /var/spool/postfix/private @dir(postfix,maildrop,710) /var/spool/postfix/public @dir(postfix,,700) /var/spool/postfix/saved @dir(postfix,,700) /var/spool/postfix/trace @dir(,,755) /var/spool/postfix