diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile index 959195e67071..e14c0470703d 100644 --- a/mail/opensmtpd/Makefile +++ b/mail/opensmtpd/Makefile @@ -1,54 +1,53 @@ PORTNAME= opensmtpd -PORTVERSION= 7.3.0 -PORTREVISION= 3 -DISTVERSIONSUFFIX= p2 +PORTVERSION= 7.6.0 +DISTVERSIONSUFFIX= p1 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= https://www.opensmtpd.org/archives/ MAINTAINER= fluffy@FreeBSD.org COMMENT= Security- and simplicity-focused SMTP server from OpenBSD WWW= https://www.OpenSMTPD.org/ LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:devel/libevent OPTIONS_DEFINE= MAILERCONF PAM TABLE_DB OPTIONS_DEFAULT= PAM TABLE_DB MAILERCONF_DESC= Activate OpenSMTPD in mailer.conf(5) TABLE_DB_DESC= Build table-db plugin (aliases) USES= cpe groff libtool localbase ssl GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CPE_VENDOR= openbsd USE_RC_SUBR= smtpd SUB_FILES= pkg-install pkg-deinstall pkg-message CONFLICTS_INSTALL= postfix sendmail opensmtpd-devel USERS= _smtpd _smtpq GROUPS= _smtpd _smtpq OPTIONS_SUB= yes PAM_CONFIGURE_WITH= auth-pam=smtpd TABLE_DB_CONFIGURE_WITH= table-db CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/mail/ \ --with-libevent=${LOCALBASE} \ --with-path-mbox=/var/mail \ --with-user-smtpd=_smtpd \ --with-user-queue=_smtpq \ --with-group-queue=_smtpq post-install-TABLE_DB-on: @${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap .include diff --git a/mail/opensmtpd/distinfo b/mail/opensmtpd/distinfo index e5a488d70ad4..0aec9af70c89 100644 --- a/mail/opensmtpd/distinfo +++ b/mail/opensmtpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695893703 -SHA256 (opensmtpd-7.3.0p2.tar.gz) = fccdfbc5b98d150012bf9ccdef51752c18a862ed10888b56289826b83a2b5a4e -SIZE (opensmtpd-7.3.0p2.tar.gz) = 846999 +TIMESTAMP = 1735844516 +SHA256 (opensmtpd-7.6.0p1.tar.gz) = b27c806982a6653a2637f810ae7a45372b9a7ff99350ee1003746503ff0e4a97 +SIZE (opensmtpd-7.6.0p1.tar.gz) = 933649 diff --git a/mail/opensmtpd/files/patch-openbsd-compat_libtls_tls.c b/mail/opensmtpd/files/patch-openbsd-compat_libtls_tls.c index cd033b41dace..cda4e41b6150 100644 --- a/mail/opensmtpd/files/patch-openbsd-compat_libtls_tls.c +++ b/mail/opensmtpd/files/patch-openbsd-compat_libtls_tls.c @@ -1,16 +1,16 @@ ---- openbsd-compat/libtls/tls.c.orig 2023-09-16 18:11:28 UTC +--- openbsd-compat/libtls/tls.c.orig 2024-09-04 07:11:38 UTC +++ openbsd-compat/libtls/tls.c -@@ -584,10 +584,10 @@ tls_configure_ssl_verify(struct tls *ctx, SSL_CTX *ssl +@@ -635,10 +635,10 @@ tls_configure_ssl_verify(struct tls *ctx, SSL_CTX *ssl /* If no CA has been specified, attempt to load the default. */ if (ctx->config->ca_mem == NULL && ctx->config->ca_path == NULL) { - if (tls_config_load_file(&ctx->error, "CA", tls_default_ca_cert_file(), - &ca_mem, &ca_len) != 0) + if (!SSL_CTX_set_default_verify_paths(ssl_ctx)) { -+ tls_set_error(ctx, "failed to load default trust store"); ++ tls_set_error(ctx, TLS_ERROR_UNKNOWN, "failed to load default trust store"); goto err; - ca_free = ca_mem; + } } if (ca_mem != NULL) { diff --git a/mail/opensmtpd/pkg-plist b/mail/opensmtpd/pkg-plist index 1db12f84f502..e0b294c8c70a 100644 --- a/mail/opensmtpd/pkg-plist +++ b/mail/opensmtpd/pkg-plist @@ -1,29 +1,30 @@ @sample etc/mail/smtpd.conf.sample bin/smtp libexec/opensmtpd/encrypt libexec/opensmtpd/lockspool 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 @(,_smtpq,2555) sbin/smtpctl sbin/smtpd share/man/man1/lockspool.1.gz share/man/man1/smtp.1.gz share/man/man5/aliases.5.gz share/man/man5/forward.5.gz share/man/man5/smtpd.conf.5.gz share/man/man5/table.5.gz share/man/man7/smtpd-filters.7.gz +share/man/man7/smtpd-tables.7.gz share/man/man8/mail.lmtp.8.gz share/man/man8/mail.local.8.gz share/man/man8/mail.maildir.8.gz share/man/man8/mail.mboxfile.8.gz share/man/man8/mail.mda.8.gz %%TABLE_DB%%share/man/man8/makemap.8.gz %%TABLE_DB%%share/man/man8/newaliases.8.gz share/man/man8/sendmail.8.gz share/man/man8/smtpctl.8.gz share/man/man8/smtpd.8.gz