Attachment 166683 Details for Bug 206989 – Update patch

[patch] Update patch

opensmtpd-5.7.3.p2.diff (text/plain), 2.63 KB, created by Andrey Fesenko on 2016-02-07 00:56:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Fesenko

Created: 2016-02-07 00:56:58 UTC

Size: 2.63 KB

patch

obsolete

>diff -ruN /usr/ports/mail/opensmtpd/Makefile ./Makefile
>--- /usr/ports/mail/opensmtpd/Makefile	2016-02-03 01:36:11.000000000 +1000
>+++ ./Makefile	2016-02-06 15:37:26.956102327 +1000
>@@ -3,12 +3,12 @@
> 
> PORTNAME=	opensmtpd
> PORTVERSION=	5.7.3
>-PORTREVISION=	1
>+PORTREVISION=	2
> PORTEPOCH=	1
> CATEGORIES=	mail
> MASTER_SITES=	http://www.opensmtpd.org/archives/ \
> 		http://distfiles.pirateparty.in/ashish/
>-DISTNAME=	${PORTNAME}-${PORTVERSION}p2
>+DISTVERSIONSUFFIX=	p2
> 
> MAINTAINER=	ashish@FreeBSD.org
> COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
>@@ -20,16 +20,23 @@
> 
> OPTIONS_DEFINE=	CA_BUNDLE LIBASRDEVEL MAILERCONF PAM TABLE_DB
> 
>-OPTIONS_DEFAULT=	CA_BUNDLE PAM TABLE_DB
>+OPTIONS_RADIO=		CRYPTO
>+OPTIONS_RADIO_CRYPTO=	LIBRESSL LIBRESSL_DEVEL OPENSSL_BASE OPENSSL_PORT
> 
>-CA_BUNDLE_DESC=	Install CA bundle for OpenSSL
>+OPTIONS_DEFAULT=	CA_BUNDLE PAM TABLE_DB OPENSSL_BASE
>+
>+CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
> LIBASRDEVEL_DESC=	Use development version of libasr
> MAILERCONF_DESC=	Activate OpenSMTPD in mailer.conf(5)
> TABLE_DB_DESC=		Build table-db plugin (aliases)
>+CRYPTO_DESC=		Choose which crypto engine to use
>+LIBRESSL_DESC=		SSL/TLS support via security/libressl
>+LIBRESSL_DEVEL_DESC=	SSL/TLS support via security/libressl-devel
>+OPENSSL_BASE_DESC=	SSL/TLS support via OpenSSL from base
>+OPENSSL_PORT_DESC=	SSL/TLS support via OpenSSL from port
> 
> USES=		cpe libtool
> USE_OPENSSL=	yes
>-WITH_OPENSSL_PORT=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/ \
> 		--with-mailwrapper --with-ssl-dir=${OPENSSLBASE}
>@@ -56,4 +63,16 @@
> 
> TABLE_DB_CONFIGURE_ON=	--enable-table-db
> 
>+.include <bsd.port.options.mk>
>+
>+.if !${PORT_OPTIONS:MOPENSSL_BASE}
>+WITH_OPENSSL_PORT=	yes
>+.endif
>+
>+.if ${PORT_OPTIONS:MLIBRESSL}
>+OPENSSL_PORT=	security/libressl
>+.elif ${PORT_OPTIONS:MLIBRESSL_DEVEL}
>+OPENSSL_PORT=	security/libressl-devel
>+.endif
>+
> .include <bsd.port.mk>
>diff -ruN /usr/ports/mail/opensmtpd/pkg-plist ./pkg-plist
>--- /usr/ports/mail/opensmtpd/pkg-plist	2015-07-16 01:53:21.000000000 +1000
>+++ ./pkg-plist	2016-02-05 01:46:48.000000000 +1000
>@@ -1,15 +1,15 @@
>-etc/mail/smtpd.conf.sample
>+@sample etc/mail/smtpd.conf.sample
> libexec/opensmtpd/encrypt
> libexec/opensmtpd/mail.local
> %%TABLE_DB%%libexec/opensmtpd/makemap
> sbin/smtpctl
> sbin/smtpd
>+man/man5/aliases.5.gz
>+man/man5/forward.5.gz
>+man/man5/smtpd.conf.5.gz
>+man/man5/table.5.gz
> %%TABLE_DB%%man/man8/makemap.8.gz
> %%TABLE_DB%%man/man8/newaliases.8.gz
> man/man8/sendmail.8.gz
>-man/man8/smtpd.8.gz
> man/man8/smtpctl.8.gz
>-man/man5/table.5.gz
>-man/man5/smtpd.conf.5.gz
>-man/man5/forward.5.gz
>-man/man5/aliases.5.gz
>+man/man8/smtpd.8.gz

Flags:

andrey: maintainer-approval? (ashish)

Actions: View | Diff

Attachments on bug 206989: 166683 | 166684 | 166685