Page MenuHomeFreeBSD
Files F150628316

D42123.id.diff
No OneTemporary
Actions

D42123.id.diff
View Options

diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile
--- a/mail/opensmtpd/Makefile
+++ b/mail/opensmtpd/Makefile
@@ -1,6 +1,6 @@
PORTNAME= opensmtpd
PORTVERSION= 7.3.0
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONSUFFIX= p2
PORTEPOCH= 1
CATEGORIES= mail
diff --git a/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in b/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in
--- a/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in
+++ b/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in
@@ -1,8 +1,8 @@
---- mk/smtpd/Makefile.in.orig 2019-10-26 11:56:36 UTC
+--- mk/smtpd/Makefile.in.orig 2023-09-16 18:13:47 UTC
+++ mk/smtpd/Makefile.in
-@@ -1404,13 +1404,7 @@ install-exec-hook: $(CONFIGFILES) $(MANPAGES)
- $(MKDIR_P) $(DESTDIR)$(bindir)
+@@ -1471,13 +1471,7 @@ install-exec-hook: $(CONFIGFILES) $(MANPAGES)
$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+ $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)7
$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
-
- @if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then \
diff --git a/mail/opensmtpd/files/patch-openbsd-compat_libtls_tls.c b/mail/opensmtpd/files/patch-openbsd-compat_libtls_tls.c
new file mode 100644
--- /dev/null
+++ b/mail/opensmtpd/files/patch-openbsd-compat_libtls_tls.c
@@ -0,0 +1,16 @@
+--- openbsd-compat/libtls/tls.c.orig 2023-09-16 18:11:28 UTC
++++ openbsd-compat/libtls/tls.c
+@@ -584,10 +584,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");
+ goto err;
+- ca_free = ca_mem;
++ }
+ }
+
+ if (ca_mem != NULL) {

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 10:45 PM (13 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30783114
Default Alt Text
D42123.id.diff (1 KB)

Event Timeline