diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 44a00f61a627..bb3c62b34ede 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -1,381 +1,377 @@ # Created by: Torsten Blum PORTNAME= postfix -DISTVERSION= 3.6-20210422 +DISTVERSION= 3.7-20210424 PORTREVISION?= 0 PORTEPOCH= 6 CATEGORIES= mail MASTER_SITES= http://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|$|experimental/|} #MASTER_SITES:= ${MASTER_SITES:S|$|official/|} PKGNAMESUFFIX?= -current DIST_SUBDIR= ${PORTNAME} MAINTAINER= ohauer@FreeBSD.org COMMENT= Experimental Postfix version 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 CONFLICTS_INSTALL?= courier-0.* opensmtpd-[0-9]* sendmail-8.* sendmail+*-8.* \ - postfix-3.* postfix-base-3.* postfix-sasl-3.* + postfix35-* postfix-3.* postfix-base-3.* postfix-sasl-3.* USERS= postfix GROUPS= mail maildrop postfix USES= shebangfix cpe ssl 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?= BLACKLISTD 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 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 postlogd 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 ${SSL_DEFAULT} == base BROKEN_FreeBSD_11= error: OpenSSL-1.1.1 is the minimum supported version .endif .if ${PORT_OPTIONS:MINST_BASE} -.if defined(SASL_SLAVE) -PKGNAMESUFFIX= -current-base-sasl2 -.else PKGNAMESUFFIX= -current-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} -i '' -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 diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index 26e77d23edb7..640b68262078 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619131050 -SHA256 (postfix/postfix-3.6-20210422.tar.gz) = 00f022dc4df7f72edd35443d0a704bc77de7f94e073f5ef41a7ae8489e4b77d4 -SIZE (postfix/postfix-3.6-20210422.tar.gz) = 4737710 +TIMESTAMP = 1619310933 +SHA256 (postfix/postfix-3.7-20210424.tar.gz) = c59177e9a7deaf8bc3303d22dd9161ffd8846081d23727217053306a4ea5e74b +SIZE (postfix/postfix-3.7-20210424.tar.gz) = 4738620 diff --git a/mail/postfix-current/files/extra-patch-blacklistd b/mail/postfix-current/files/extra-patch-blacklistd index a4102e3ab129..2b2bc712e667 100644 --- a/mail/postfix-current/files/extra-patch-blacklistd +++ b/mail/postfix-current/files/extra-patch-blacklistd @@ -1,69 +1,69 @@ # PR 225664: support blacklistd on FreeBSD >= 11.0 # ---- src/smtpd/Makefile.in.orig 2019-01-27 22:17:15 UTC +--- src/smtpd/Makefile.in.orig 2021-04-18 20:45:05 UTC +++ src/smtpd/Makefile.in @@ -2,14 +2,14 @@ SHELL = /bin/sh SRCS = smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \ smtpd_peer.c smtpd_sasl_proto.c smtpd_sasl_glue.c smtpd_proxy.c \ smtpd_xforward.c smtpd_dsn_fix.c smtpd_milter.c smtpd_resolve.c \ - smtpd_expand.c smtpd_haproxy.c + smtpd_expand.c smtpd_haproxy.c pfilter.c OBJS = smtpd.o smtpd_token.o smtpd_check.o smtpd_chat.o smtpd_state.o \ smtpd_peer.o smtpd_sasl_proto.o smtpd_sasl_glue.o smtpd_proxy.o \ smtpd_xforward.o smtpd_dsn_fix.o smtpd_milter.o smtpd_resolve.o \ - smtpd_expand.o smtpd_haproxy.o + smtpd_expand.o smtpd_haproxy.o pfilter.o HDRS = smtpd_token.h smtpd_check.h smtpd_chat.h smtpd_sasl_proto.h \ smtpd_sasl_glue.h smtpd_proxy.h smtpd_dsn_fix.h smtpd_milter.h \ - smtpd_resolve.h smtpd_expand.h + smtpd_resolve.h smtpd_expand.h pfilter.h TESTSRC = smtpd_token_test.c DEFS = -I. -I$(INC_DIR) -D$(SYSTYPE) CFLAGS = $(DEBUG) $(OPT) $(DEFS) ---- src/smtpd/smtpd_sasl_glue.c.orig 2018-08-26 18:48:45 UTC +--- src/smtpd/smtpd_sasl_glue.c.orig 2020-08-30 21:03:46 UTC +++ src/smtpd/smtpd_sasl_glue.c -@@ -147,6 +147,7 @@ +@@ -149,6 +149,7 @@ #include "smtpd.h" #include "smtpd_sasl_glue.h" #include "smtpd_chat.h" +#include "pfilter.h" /* for blacklistd(8) */ #ifdef USE_SASL_AUTH -@@ -331,6 +332,10 @@ int smtpd_sasl_authenticate(SMTPD_ST +@@ -350,6 +351,10 @@ int smtpd_sasl_authenticate(SMTPD_STATE *state, else smtpd_chat_reply(state, "535 5.7.8 Error: authentication failed: %s", STR(state->sasl_reply)); + + + /* notify blacklistd of SASL authentication failure */ + pfilter_notify(1, vstream_fileno(state->client)); return (-1); } /* RFC 4954 Section 6. */ ---- src/smtpd/pfilter.h.orig 2018-02-04 15:36:49 UTC +--- src/smtpd/pfilter.h.orig 2021-05-06 19:00:00 UTC +++ src/smtpd/pfilter.h @@ -0,0 +1 @@ +void pfilter_notify(int, int); ---- src/smtpd/pfilter.c.orig 2018-02-04 15:36:49 UTC +--- src/smtpd/pfilter.c.orig 2021-05-06 19:00:00 UTC +++ src/smtpd/pfilter.c @@ -0,0 +1,19 @@ +#include "pfilter.h" +#include /* for NULL */ +#include + +static struct blacklist *blstate; + +void +pfilter_notify(int a, int fd) +{ + if (blstate == NULL) + blstate = blacklist_open(); + if (blstate == NULL) + return; + (void)blacklist_r(blstate, a, fd, "smtpd"); + if (a == 0) { + blacklist_close(blstate); + blstate = NULL; + } +} diff --git a/mail/postfix-current/files/patch-makedefs b/mail/postfix-current/files/patch-makedefs index f231b352c65f..bc2fcbf36c3b 100644 --- a/mail/postfix-current/files/patch-makedefs +++ b/mail/postfix-current/files/patch-makedefs @@ -1,27 +1,27 @@ ---- makedefs.orig 2020-09-30 21:22:49 UTC +--- makedefs.orig 2021-04-24 20:49:37 UTC +++ makedefs @@ -309,6 +309,24 @@ case "$SYSTEM.$RELEASE" in : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} : ${PLUGIN_LD="${CC} -shared"} ;; -+ FreeBSD.13*) SYSTYPE=FREEBSD13 ++ 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"} + ;; -+ FreeBSD.14*) SYSTYPE=FREEBSD14 ++ FreeBSD.14*) SYSTYPE=FREEBSD14 + : ${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 diff --git a/mail/postfix-current/files/patch-src_tls_tls__server.c b/mail/postfix-current/files/patch-src_tls_tls__server.c index 52ee2db78b95..e2e95a3c7d98 100644 --- a/mail/postfix-current/files/patch-src_tls_tls__server.c +++ b/mail/postfix-current/files/patch-src_tls_tls__server.c @@ -1,12 +1,12 @@ ---- src/tls/tls_server.c.orig 2018-12-26 19:21:49 UTC +--- src/tls/tls_server.c.orig 2020-07-25 23:49:16 UTC +++ src/tls/tls_server.c -@@ -518,7 +518,9 @@ TLS_APPL_STATE *tls_server_init(const TL +@@ -502,7 +502,9 @@ TLS_APPL_STATE *tls_server_init(const TLS_SERVER_INIT_ * 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) diff --git a/mail/postfix-current/files/patch-src_util_sys__defs.h b/mail/postfix-current/files/patch-src_util_sys__defs.h index 4e0ff2f2c077..96beb47184f3 100644 --- a/mail/postfix-current/files/patch-src_util_sys__defs.h +++ b/mail/postfix-current/files/patch-src_util_sys__defs.h @@ -1,12 +1,12 @@ ---- src/util/sys_defs.h.orig 2020-05-21 13:34:23 UTC +--- src/util/sys_defs.h.orig 2020-05-21 18:34:23 UTC +++ src/util/sys_defs.h @@ -30,7 +30,8 @@ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \ - || defined(FREEBSD11) || defined(FREEBSD12) \ + || defined(FREEBSD11) || defined(FREEBSD12) || defined(FREEBSD13) \ + || defined(FREEBSD14) \ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ || defined(OPENBSD5) || defined(OPENBSD6) \ diff --git a/mail/postfix-current/files/pkg-message.in b/mail/postfix-current/files/pkg-message.in index 737a9f367698..57bf7b01a678 100644 --- a/mail/postfix-current/files/pkg-message.in +++ b/mail/postfix-current/files/pkg-message.in @@ -1,60 +1,60 @@ [ { + type: install message: <