Attachment 242841 Details for Bug 272047 – opensmtpd-7.3.0p0 patch

[patch] opensmtpd-7.3.0p0 patch

diff (text/plain), 2.88 KB, created by Omar Polo on 2023-06-17 17:42:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Omar Polo

Created: 2023-06-17 17:42:44 UTC

Size: 2.88 KB

patch

obsolete

>diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile
>index a603380b9d71..cfe81cf44318 100644
>--- a/mail/opensmtpd/Makefile
>+++ b/mail/opensmtpd/Makefile
>@@ -1,9 +1,9 @@
> PORTNAME=	opensmtpd
>-PORTVERSION=	6.8.0
>-DISTVERSIONSUFFIX=	p2
>+PORTVERSION=	7.3.0
>+DISTVERSIONSUFFIX=	p0
> PORTEPOCH=	1
> CATEGORIES=	mail
>-MASTER_SITES=	http://www.opensmtpd.org/archives/
>+MASTER_SITES=	https://www.opensmtpd.org/archives/
> 
> MAINTAINER=	fluffy@FreeBSD.org
> COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
>@@ -14,16 +14,15 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> LIB_DEPENDS=	libevent.so:devel/libevent
> 
>-OPTIONS_DEFINE=	CA_BUNDLE LIBASRDEVEL MAILERCONF PAM TABLE_DB
>+OPTIONS_DEFINE=	CA_BUNDLE MAILERCONF PAM TABLE_DB
> 
> OPTIONS_DEFAULT=	CA_BUNDLE PAM TABLE_DB
> 
> 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)
> 
>-USES=		bison cpe groff libtool localbase ssl
>+USES=		cpe groff libtool localbase ssl
> GNU_CONFIGURE=	yes
> 
> CPE_VENDOR=	openbsd
>@@ -41,9 +40,6 @@ OPTIONS_SUB=	yes
> CA_BUNDLE_CONFIGURE_WITH=	path-CAfile=${LOCALBASE}/share/certs/ca-root-nss.crt
> CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
> 
>-LIBASRDEVEL_LIB_DEPENDS_OFF=	libasr.so:dns/libasr
>-LIBASRDEVEL_LIB_DEPENDS=	libasr.so:dns/libasr-devel
>-
> PAM_CONFIGURE_WITH=	auth-pam=smtpd
> TABLE_DB_CONFIGURE_WITH=	table-db
> 
>@@ -54,6 +50,12 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/mail/ \
> 			--with-user-queue=_smtpq \
> 			--with-group-queue=_smtpq
> 
>+# avoids troubles with libretls and OpenSSL 3
>+CONFIGURE_ARGS+=	--with-bundled-libtls
>+
>+# misdetected
>+CONFIGURE_ARGS+=	ac_cv_func_recallocarray=no
>+
> post-install-TABLE_DB-on:
> 	@${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap
> 
>diff --git a/mail/opensmtpd/distinfo b/mail/opensmtpd/distinfo
>index 04894f81839e..e3f2b664352f 100644
>--- a/mail/opensmtpd/distinfo
>+++ b/mail/opensmtpd/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1608827327
>-SHA256 (opensmtpd-6.8.0p2.tar.gz) = 51bf05312fe56764748faab9e63170bfbb7c7d84a37c4117b62b2681eb3a4d17
>-SIZE (opensmtpd-6.8.0p2.tar.gz) = 860189
>+TIMESTAMP = 1686998662
>+SHA256 (opensmtpd-7.3.0p0.tar.gz) = 2dd7a5a8ca127be7eb491540405684acb3dd04d93ad23d7709accd2b0450cae6
>+SIZE (opensmtpd-7.3.0p0.tar.gz) = 849880
>diff --git a/mail/opensmtpd/files/patch-usr.sbin_smtpd_makemap.c b/mail/opensmtpd/files/patch-usr.sbin_smtpd_makemap.c
>new file mode 100644
>index 000000000000..fa9fc278d083
>--- /dev/null
>+++ b/mail/opensmtpd/files/patch-usr.sbin_smtpd_makemap.c
>@@ -0,0 +1,10 @@
>+--- usr.sbin/smtpd/makemap.c.orig	2023-06-17 17:19:58 UTC
>++++ usr.sbin/smtpd/makemap.c
>+@@ -36,6 +36,7 @@
>+ #include <err.h>
>+ #include <errno.h>
>+ #include <fcntl.h>
>++#include <stdio.h>
>+ #include <stdlib.h>
>+ #include <string.h>
>+ #include <syslog.h>

Actions: View | Diff

Attachments on bug 272047: 242841 | 243174 | 244853 | 245301