Date: Sat, 26 Oct 2019 16:24:47 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r515714 - in head/mail: opensmtpd opensmtpd-extras opensmtpd-extras-filter-clamav opensmtpd-extras-filter-dkim opensmtpd-extras-filter-dnsbl opensmtpd-extras-filter-lua opensmtpd-extras... Message-ID: <201910261624.x9QGOl7W016127@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Sat Oct 26 16:24:47 2019 New Revision: 515714 URL: https://svnweb.freebsd.org/changeset/ports/515714 Log: - Update OpenSMTPd to 6.6.0 portable release This release builds with LibreSSL > 3.0.2 or OpenSSL > 1.1.0. FreeBSD 11.x users should update to 12.x/13.x or switch system-wide default ssl library to openssl111/libressl - Update -extras to 6.4.0 release Filters still missing, corresponded ports temporary markes as IGNORED PR: 213442,228937 MFH: 2019Q4 Deleted: head/mail/opensmtpd/files/patch-smtpd-rfc2822.c head/mail/opensmtpd/files/patch-smtpd-smtp_session.c head/mail/opensmtpd/files/patch-src_mda.c Modified: head/mail/opensmtpd-extras-filter-clamav/Makefile head/mail/opensmtpd-extras-filter-dkim/Makefile head/mail/opensmtpd-extras-filter-dnsbl/Makefile head/mail/opensmtpd-extras-filter-lua/Makefile head/mail/opensmtpd-extras-filter-monkey/Makefile head/mail/opensmtpd-extras-filter-pause/Makefile head/mail/opensmtpd-extras-filter-perl/Makefile head/mail/opensmtpd-extras-filter-python/Makefile head/mail/opensmtpd-extras-filter-regex/Makefile head/mail/opensmtpd-extras-filter-spamassassin/Makefile head/mail/opensmtpd-extras-queue-python/Makefile head/mail/opensmtpd-extras-queue-ram/Makefile head/mail/opensmtpd-extras-scheduler-python/Makefile head/mail/opensmtpd-extras-scheduler-ram/Makefile head/mail/opensmtpd-extras-table-ldap/Makefile head/mail/opensmtpd-extras-table-mysql/Makefile head/mail/opensmtpd-extras-table-passwd/Makefile head/mail/opensmtpd-extras-table-postgresql/Makefile head/mail/opensmtpd-extras-table-python/Makefile head/mail/opensmtpd-extras-table-redis/Makefile head/mail/opensmtpd-extras-table-socketmap/Makefile head/mail/opensmtpd-extras-table-sqlite/Makefile head/mail/opensmtpd-extras-tool-stats/Makefile head/mail/opensmtpd-extras/Makefile head/mail/opensmtpd-extras/distinfo head/mail/opensmtpd/Makefile head/mail/opensmtpd/distinfo head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in head/mail/opensmtpd/files/pkg-message.in head/mail/opensmtpd/pkg-plist Modified: head/mail/opensmtpd-extras-filter-clamav/Makefile ============================================================================== --- head/mail/opensmtpd-extras-filter-clamav/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-filter-clamav/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,9 +2,11 @@ # $FreeBSD$ PKGNAMESUFFIX= -filter-clamav -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= Check messages with ClamAV in OpenSMTPD + +IGNORE= temporary unavailable RUN_DEPENDS= clamscan:security/clamav Modified: head/mail/opensmtpd-extras-filter-dkim/Makefile ============================================================================== --- head/mail/opensmtpd-extras-filter-dkim/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-filter-dkim/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,9 +2,11 @@ # $FreeBSD$ PKGNAMESUFFIX= -filter-dkim -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= DKIM-signing filter for OpenSMTPD + +IGNORE= temporary unavailable PLIST_FILES= libexec/opensmtpd/filter-dkim-signer \ man/man8/filter-dkim-signer.8.gz Modified: head/mail/opensmtpd-extras-filter-dnsbl/Makefile ============================================================================== --- head/mail/opensmtpd-extras-filter-dnsbl/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-filter-dnsbl/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,9 +2,11 @@ # $FreeBSD$ PKGNAMESUFFIX= -filter-dnsbl -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= DNSBL-checking filter for OpenSMTPD + +IGNORE= temporary unavailable PLIST_FILES= libexec/opensmtpd/filter-dnsbl \ man/man8/filter-dnsbl.8.gz Modified: head/mail/opensmtpd-extras-filter-lua/Makefile ============================================================================== --- head/mail/opensmtpd-extras-filter-lua/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-filter-lua/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,9 +2,11 @@ # $FreeBSD$ PKGNAMESUFFIX= -filter-lua -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= LUA-script filter support for OpenSMTPD + +IGNORE= temporary unavailable PLIST_FILES= libexec/opensmtpd/filter-lua Modified: head/mail/opensmtpd-extras-filter-monkey/Makefile ============================================================================== --- head/mail/opensmtpd-extras-filter-monkey/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-filter-monkey/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,11 +2,13 @@ # $FreeBSD$ PKGNAMESUFFIX= -filter-monkey -PORTREVISION= 2 +PORTVERSION= 201703132115 +PORTREVISION= 0 +PORTREPOCH= 0 COMMENT= Arbitrary delay or reject filter for OpenSMTPD -CONFIGURE_ARGS+= --with-experimental-filter-monkey +CONFIGURE_ARGS+= --with-filter-monkey PLIST= ${.CURDIR}/pkg-plist MASTERDIR= ${.CURDIR}/../opensmtpd-extras Modified: head/mail/opensmtpd-extras-filter-pause/Makefile ============================================================================== --- head/mail/opensmtpd-extras-filter-pause/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-filter-pause/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,9 +2,11 @@ # $FreeBSD$ PKGNAMESUFFIX= -filter-pause -PORTREVISION= 2 +PORTREVISION= -0 COMMENT= Pause incoming OpenSMTPD messages to reduce spam + +IGNORE= temporary unavailable PLIST_FILES= libexec/opensmtpd/filter-pause \ man/man8/filter-pause.8.gz Modified: head/mail/opensmtpd-extras-filter-perl/Makefile ============================================================================== --- head/mail/opensmtpd-extras-filter-perl/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-filter-perl/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,9 +2,11 @@ # $FreeBSD$ PKGNAMESUFFIX= -filter-perl -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= Perl-script filter support for OpenSMTPD + +IGNORE= temporary unavailable PLIST_FILES= libexec/opensmtpd/filter-perl Modified: head/mail/opensmtpd-extras-filter-python/Makefile ============================================================================== --- head/mail/opensmtpd-extras-filter-python/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-filter-python/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,9 +2,11 @@ # $FreeBSD$ PKGNAMESUFFIX= -filter-python -PORTREVISION= 3 +PORTREVISION= 0 COMMENT= Python-script filter support for OpenSMTPD + +IGNORE= temporary unavailable PLIST_FILES= libexec/opensmtpd/filter-python Modified: head/mail/opensmtpd-extras-filter-regex/Makefile ============================================================================== --- head/mail/opensmtpd-extras-filter-regex/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-filter-regex/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,9 +2,11 @@ # $FreeBSD$ PKGNAMESUFFIX= -filter-regex -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= Regular expression filter for OpenSMTPD + +IGNORE= temporary unavailable CONFIGURE_ARGS+= --with-experimental-filter-regex Modified: head/mail/opensmtpd-extras-filter-spamassassin/Makefile ============================================================================== --- head/mail/opensmtpd-extras-filter-spamassassin/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-filter-spamassassin/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,9 +2,11 @@ # $FreeBSD$ PKGNAMESUFFIX= -filter-spamassassin -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= Spamassassin filter addon for OpenSMTPD + +IGNORE= temporary unavailable PLIST_FILES= libexec/opensmtpd/filter-spamassassin \ man/man8/filter-spamassassin.8.gz Modified: head/mail/opensmtpd-extras-queue-python/Makefile ============================================================================== --- head/mail/opensmtpd-extras-queue-python/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-queue-python/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -queue-python -PORTREVISION= 3 +PORTREVISION= 0 COMMENT= Python queue support for OpenSMTPD Modified: head/mail/opensmtpd-extras-queue-ram/Makefile ============================================================================== --- head/mail/opensmtpd-extras-queue-ram/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-queue-ram/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -queue-ram -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= RAM queue support for OpenSMTPD Modified: head/mail/opensmtpd-extras-scheduler-python/Makefile ============================================================================== --- head/mail/opensmtpd-extras-scheduler-python/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-scheduler-python/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -scheduler-python -PORTREVISION= 3 +PORTREVISION= 0 COMMENT= Python scheduler support for OpenSMTPD Modified: head/mail/opensmtpd-extras-scheduler-ram/Makefile ============================================================================== --- head/mail/opensmtpd-extras-scheduler-ram/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-scheduler-ram/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -scheduler-ram -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= RAM scheduler support for OpenSMTPD Modified: head/mail/opensmtpd-extras-table-ldap/Makefile ============================================================================== --- head/mail/opensmtpd-extras-table-ldap/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-table-ldap/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-ldap -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= LDAP table support for OpenSMTPD Modified: head/mail/opensmtpd-extras-table-mysql/Makefile ============================================================================== --- head/mail/opensmtpd-extras-table-mysql/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-table-mysql/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-mysql -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= MySQL table support for OpenSMTPD Modified: head/mail/opensmtpd-extras-table-passwd/Makefile ============================================================================== --- head/mail/opensmtpd-extras-table-passwd/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-table-passwd/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-passwd -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= passwd(5) table support for OpenSMTPD Modified: head/mail/opensmtpd-extras-table-postgresql/Makefile ============================================================================== --- head/mail/opensmtpd-extras-table-postgresql/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-table-postgresql/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-postgresql -PORTREVISION= 4 +PORTREVISION= 0 COMMENT= PostgreSQL table support for OpenSMTPD Modified: head/mail/opensmtpd-extras-table-python/Makefile ============================================================================== --- head/mail/opensmtpd-extras-table-python/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-table-python/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-python -PORTREVISION= 3 +PORTREVISION= 0 COMMENT= Python table support for OpenSMTPD Modified: head/mail/opensmtpd-extras-table-redis/Makefile ============================================================================== --- head/mail/opensmtpd-extras-table-redis/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-table-redis/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-redis -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= Redis table support for OpenSMTPD Modified: head/mail/opensmtpd-extras-table-socketmap/Makefile ============================================================================== --- head/mail/opensmtpd-extras-table-socketmap/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-table-socketmap/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-socketmap -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= Socketmap table support for OpenSMTPD Modified: head/mail/opensmtpd-extras-table-sqlite/Makefile ============================================================================== --- head/mail/opensmtpd-extras-table-sqlite/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-table-sqlite/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-sqlite -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= SQLite table support for OpenSMTPD Modified: head/mail/opensmtpd-extras-tool-stats/Makefile ============================================================================== --- head/mail/opensmtpd-extras-tool-stats/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras-tool-stats/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,7 +2,9 @@ # $FreeBSD$ PKGNAMESUFFIX= -tool-stats -PORTREVISION= 2 +PORTVERSION= 201703132115 +PORTREVISION= 0 +PORTEPOCH= 0 COMMENT= Statistics tool for OpenSMTPD Modified: head/mail/opensmtpd-extras/Makefile ============================================================================== --- head/mail/opensmtpd-extras/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,8 +2,9 @@ # $FreeBSD$ PORTNAME= opensmtpd-extras -PORTVERSION= 201606230001 -PORTREVISION?= 5 +PORTVERSION?= 6.4.0 +PORTREVISION?= 0 +PORTEPOCH?= 1 CATEGORIES+= mail MASTER_SITES= http://www.opensmtpd.org/archives/ @@ -35,23 +36,27 @@ NO_OPTIONS_SORT= yes # # Pass OpenSMTPD branch selection to all extras # -OPTIONS_DEFINE= OPENSMTP_DEVEL +#OPTIONS_DEFINE= OPENSMTP_DEVEL -OPENSMTP_DEVEL_DESC= Depend on opensmtpd-devel (opensmtpd if off) -OPENSMTP_DEVEL_BUILD_DEPENDS_OFF= smtpctl:mail/opensmtpd -OPENSMTP_DEVEL_RUN_DEPENDS_OFF= smtpctl:mail/opensmtpd -OPENSMTP_DEVEL_BUILD_DEPENDS= smtpctl:mail/opensmtpd-devel -OPENSMTP_DEVEL_RUN_DEPENDS= smtpctl:mail/opensmtpd-devel +#OPENSMTP_DEVEL_DESC= Depend on opensmtpd-devel (opensmtpd if off) +#OPENSMTP_DEVEL_BUILD_DEPENDS_OFF= smtpctl:mail/opensmtpd +#OPENSMTP_DEVEL_RUN_DEPENDS_OFF= smtpctl:mail/opensmtpd +#OPENSMTP_DEVEL_BUILD_DEPENDS= smtpctl:mail/opensmtpd-devel +#OPENSMTP_DEVEL_RUN_DEPENDS= smtpctl:mail/opensmtpd-devel +BUILD_DEPENDS= smtpctl:mail/opensmtpd +RUN_DEPENDS= smtpctl:mail/opensmtpd + .if empty(SLAVE_PORT) -OPTIONS_GROUP= TOOLS TABLE FILTER FILTER_EXP QUEUE SCHEDULER -OPTIONS_GROUP_FILTER= FILTER_CLAMAV FILTER_DKIM FILTER_DNSBL FILTER_MONKEY FILTER_PAUSE FILTER_REGEX FILTER_SPAMASSASSIN -OPTIONS_GROUP_FILTER_EXP= FILTER_LUA FILTER_PERL FILTER_PYTHON +OPTIONS_GROUP= FILTER TOOLS TABLE QUEUE SCHEDULER +OPTIONS_GROUP_FILTER= FILTER_MONKEY +#OPTIONS_GROUP_FILTER= FILTER_CLAMAV FILTER_DKIM FILTER_DNSBL FILTER_MONKEY FILTER_PAUSE FILTER_REGEX FILTER_SPAMASSASSIN +#OPTIONS_GROUP_FILTER_EXP= FILTER_LUA FILTER_PERL FILTER_PYTHON OPTIONS_GROUP_QUEUE= QUEUE_PYTHON QUEUE_RAM OPTIONS_GROUP_SCHEDULER= SCHEDULER_PYTHON SCHEDULER_RAM OPTIONS_GROUP_TABLE= TABLE_LDAP TABLE_MYSQL TABLE_PASSWD TABLE_PGSQL TABLE_PYTHON TABLE_REDIS TABLE_SOCKETMAP TABLE_SQLITE OPTIONS_GROUP_TOOLS= TOOL_STATS -OPTIONS_DEFAULT= ${OPTIONS_GROUP_FILTER} ${OPTIONS_GROUP_TABLE} ${OPTIONS_GROUP_TOOLS} +OPTIONS_DEFAULT= ${OPTIONS_GROUP_TABLE} ${OPTIONS_GROUP_TOOLS} # Groups FILTER_DESC= BASE FILTERS @@ -94,7 +99,7 @@ TABLE_SQLITE_DESC= SQLite table support # Tools TOOL_STATS_DESC= Stats tool for OpenSMTPD -PLIST_FILES= man/man3/filter_api.3.gz +#PLIST_FILES= man/man3/filter_api.3.gz INSTALL_DIR= ${LOCALBASE}/libexec/opensmtpd NO_ARCH= yes @@ -134,11 +139,9 @@ TOOL_STATS_RUN_DEPENDS= tool-stats:mail/opensmtpd-ex .else # Only install this for the opensmtpd-extras master port -pre-patch: - @${REINPLACE_CMD} -e '/man_MANS.*filter_api.3/s/^/#/' \ - ${WRKSRC}/extras/filters/Makefile.am -# While filters still experimental feature, suppress extra call warnings from logs - ${REINPLACE_CMD} -e '/is EXPERIMENTAL/d' ${WRKSRC}/api/filter_api.c +#pre-patch: +# @${REINPLACE_CMD} -e '/man_MANS.*filter_api.3/s/^/#/' \ +# ${WRKSRC}/extras/filters/Makefile.am .endif Modified: head/mail/opensmtpd-extras/distinfo ============================================================================== --- head/mail/opensmtpd-extras/distinfo Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd-extras/distinfo Sat Oct 26 16:24:47 2019 (r515714) @@ -1,3 +1,5 @@ -TIMESTAMP = 1466658022 -SHA256 (opensmtpd-extras-201606230001.tar.gz) = 4675ed506cd6dc277a6b784cdbf5abeb5710b8ee56b44faeec71c1cfec48174d -SIZE (opensmtpd-extras-201606230001.tar.gz) = 630831 +TIMESTAMP = 1541745103 +SHA256 (opensmtpd-extras-6.4.0.tar.gz) = cb66986b7c0d0113210f4fb9ca1447b7f50ca088165e6ca61b9015ff0f2d6226 +SIZE (opensmtpd-extras-6.4.0.tar.gz) = 522988 +SHA256 (opensmtpd-extras-201703132115.tar.gz) = 4672afdd756ef279c0adcfcbf8151d6d8a370d5a628a705967373a1c83ee0ef5 +SIZE (opensmtpd-extras-201703132115.tar.gz) = 564165 Modified: head/mail/opensmtpd/Makefile ============================================================================== --- head/mail/opensmtpd/Makefile Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd/Makefile Sat Oct 26 16:24:47 2019 (r515714) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= opensmtpd -PORTVERSION= 5.9.2p1 +PORTVERSION= 6.6.0 +DISTVERSIONSUFFIX= p1 PORTEPOCH= 1 -PORTREVISION= 7 +PORTREVISION= 0 CATEGORIES= mail -MASTER_SITES= http://www.opensmtpd.org/archives/ \ - http://distfiles.pirateparty.in/ashish/ +MASTER_SITES= http://www.opensmtpd.org/archives/ MAINTAINER= fluffy@FreeBSD.org COMMENT= Security- and simplicity-focused SMTP server from OpenBSD @@ -15,8 +15,8 @@ COMMENT= Security- and simplicity-focused SMTP server LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_SSL= openssl111 -BROKEN_SSL_REASON_openssl111= Incompatible with Openssl 1.1.x yet +BROKEN_SSL= openssl +BROKEN_SSL_REASON_openssl= Openssl 1.0 API is EoL, upgrade to FreeBSD 12.x/13.x or add DEFAULT_VERSIONS+=ssl=[openssl111|libressl*] to /etc/make.conf LIB_DEPENDS= libevent.so:devel/libevent @@ -24,7 +24,7 @@ OPTIONS_DEFINE= CA_BUNDLE LIBASRDEVEL MAILERCONF PAM T OPTIONS_DEFAULT= CA_BUNDLE PAM TABLE_DB -CA_BUNDLE_DESC= Install CA bundle for SSL +CA_BUNDLE_DESC= Use NSS CA bundle for SSL instead of /etc/ssl/cert.pem LIBASRDEVEL_DESC= Use development version of libasr MAILERCONF_DESC= Activate OpenSMTPD in mailer.conf(5) TABLE_DB_DESC= Build table-db plugin (aliases) @@ -55,19 +55,15 @@ TABLE_DB_CONFIGURE_WITH= table-db CONFIGURE_ARGS+= --with-libasr=${LOCALBASE} \ --with-libevent=${LOCALBASE} \ - --with-libssl=${OPENSSLBASE} \ --sysconfdir=${PREFIX}/etc/mail/ .include <bsd.port.pre.mk> .if ${OPSYS} == FreeBSD && \ - ((${OSVERSION} > 1200084 && ${SSL_DEFAULT} == "base") || \ - (${SSL_DEFAULT} == "openssl111")) -BROKEN= Incompatible with Openssl 1.1.x yet + ((${OSVERSION} < 1200084 && ${SSL_DEFAULT} == "base") || \ + (${SSL_DEFAULT} == "openssl")) +BROKEN= Openssl 1.0 API is EoL, upgrade to FreeBSD 12.x/13.x or add DEFAULT_VERSIONS+=ssl=[openssl111|libressl*] to /etc/make.conf .endif - -post-patch: - ${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in post-install-TABLE_DB-on: @${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap Modified: head/mail/opensmtpd/distinfo ============================================================================== --- head/mail/opensmtpd/distinfo Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd/distinfo Sat Oct 26 16:24:47 2019 (r515714) @@ -1,3 +1,3 @@ -TIMESTAMP = 1463428051 -SHA256 (opensmtpd-5.9.2p1.tar.gz) = 3522f273c1630c781facdb2b921228e338ed4e651909316735df775d6a70a71d -SIZE (opensmtpd-5.9.2p1.tar.gz) = 681855 +TIMESTAMP = 1572104052 +SHA256 (opensmtpd-6.6.0p1.tar.gz) = 75a420941963a672b21fe6c820c51de07f1ac94a0d6d4aa4f7364124d85efce9 +SIZE (opensmtpd-6.6.0p1.tar.gz) = 771510 Modified: head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in ============================================================================== --- head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in Sat Oct 26 16:24:47 2019 (r515714) @@ -1,6 +1,6 @@ ---- mk/smtpd/Makefile.in.orig 2016-02-02 20:40:51 UTC +--- mk/smtpd/Makefile.in.orig 2019-10-26 11:56:36 UTC +++ mk/smtpd/Makefile.in -@@ -1365,13 +1365,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP +@@ -1404,13 +1404,7 @@ install-exec-hook: $(CONFIGFILES) $(MANPAGES) $(MKDIR_P) $(DESTDIR)$(bindir) $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 Modified: head/mail/opensmtpd/files/pkg-message.in ============================================================================== --- head/mail/opensmtpd/files/pkg-message.in Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd/files/pkg-message.in Sat Oct 26 16:24:47 2019 (r515714) @@ -1,13 +1,13 @@ [ { type: install message: <<EOM -If you are upgrading from OpenSMTPD version 5.7.3 or earlier, please +If you are upgrading from OpenSMTPD version 5.7.3/201303011853 or earlier, please follow the procedure below to update the permissions on the OpenSMTPD spool directories: 1. Stop 'smtpd' service: - # %%PREFIX%%/sbin/smtpctl stop + # service smtpd stop 2. Update permissions: Modified: head/mail/opensmtpd/pkg-plist ============================================================================== --- head/mail/opensmtpd/pkg-plist Sat Oct 26 16:16:41 2019 (r515713) +++ head/mail/opensmtpd/pkg-plist Sat Oct 26 16:24:47 2019 (r515714) @@ -1,9 +1,15 @@ @sample etc/mail/smtpd.conf.sample +bin/smtp libexec/opensmtpd/encrypt +libexec/opensmtpd/mail.lmtp libexec/opensmtpd/mail.local +libexec/opensmtpd/mail.maildir +libexec/opensmtpd/mail.mboxfile +libexec/opensmtpd/mail.mda %%TABLE_DB%%libexec/opensmtpd/makemap @(,,2555) sbin/smtpctl sbin/smtpd +man/man1/smtp.1.gz man/man5/aliases.5.gz man/man5/forward.5.gz man/man5/smtpd.conf.5.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910261624.x9QGOl7W016127>