Attachment 153939 Details for Bug 198375 – patch

[patch] patch

opensmtpd.patch (text/plain), 1.48 KB, created by Adam Weinberger on 2015-03-06 22:35:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Weinberger

Created: 2015-03-06 22:35:47 UTC

Size: 1.48 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 380625)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	opensmtpd
> PORTVERSION=	5.4.4
>-PORTREVISION=	1
>+PORTREVISION=	2
> PORTEPOCH=	1
> CATEGORIES=	mail
> MASTER_SITES=	http://www.opensmtpd.org/archives/ \
>@@ -11,18 +11,20 @@
> DISTNAME=	${PORTNAME}-${PORTVERSION}p1
> 
> MAINTAINER=	ashish@FreeBSD.org
>-COMMENT=	OpenSMTPD is a free MTA
>+COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
> 
> LICENSE=	ISCL
> 
> LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
> 
>-OPTIONS_DEFINE=	CA_BUNDLE PAM SQLITE MYSQL PGSQL LDAP REDIS LIBASRDEVEL
>+OPTIONS_DEFINE=	CA_BUNDLE PAM SQLITE MYSQL PGSQL LDAP REDIS LIBASRDEVEL \
>+		REPLACE_MAILERCONF
> 
>-OPTIONS_DEFAULT=	CA_BUNDLE PAM
>+OPTIONS_DEFAULT=	CA_BUNDLE PAM REPLACE_MAILERCONF
> 
> CA_BUNDLE_DESC=	Install CA bundle for OpenSSL
> LIBASRDEVEL_DESC=	Use development version of libasr
>+REPLACE_MAILERCONF=	Activate OpenSMTPD in /etc/mailer.conf
> 
> USES=		libtool
> USE_OPENSSL=	yes
>Index: files/pkg-install.in
>===================================================================
>--- files/pkg-install.in	(revision 380625)
>+++ files/pkg-install.in	(working copy)
>@@ -3,7 +3,7 @@
> PKGNAME=$1
> TARGET=$2
> 
>-if [ "$TARGET" = POST-INSTALL ]; then
>+if [ "$TARGET" = POST-INSTALL -a -z "%%REPLACE_MAILERCONF%%" ]; then
> 	sed -e '/^[^#]/s/^/### smtpd: /g' -i '' /etc/mail/mailer.conf
> 	cat >>/etc/mail/mailer.conf <<EOF
> sendmail        %%PREFIX%%/sbin/smtpctl

Actions: View | Diff

Attachments on bug 198375: 153939