View | Details | Raw Unified | Return to bug 213442 | Differences between
and this patch

Collapse All | Expand All

(-)mail/opensmtpd/Makefile (-27 / +26 lines)
Lines 2-35 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	opensmtpd
4
PORTNAME=	opensmtpd
5
PORTVERSION=	5.9.2p1
5
PORTVERSION=	6.4.1
6
DISTVERSIONSUFFIX=	p2
6
PORTEPOCH=	1
7
PORTEPOCH=	1
7
PORTREVISION=	6
8
PORTREVISION=	1
8
CATEGORIES=	mail
9
CATEGORIES=	mail
9
MASTER_SITES=	http://www.opensmtpd.org/archives/ \
10
MASTER_SITES=	http://www.opensmtpd.org/archives/
10
		http://distfiles.pirateparty.in/ashish/
11
11
12
MAINTAINER=	fluffy@FreeBSD.org
12
MAINTAINER=	fluffy@FreeBSD.org
13
COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
13
COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
14
14
15
LICENSE=	ISCL
15
LICENSE=	ISCL
16
LICENSE_FILE=	${WRKSRC}/LICENSE
17
16
18
BROKEN_SSL=	openssl111
17
LIB_DEPENDS=	libevent.so:devel/libevent \
19
BROKEN_SSL_REASON_openssl111=		Incompatible with Openssl 1.1.x yet
18
	libopenbsd.so:devel/libopenbsd
20
19
21
LIB_DEPENDS=	libevent.so:devel/libevent
20
OPTIONS_DEFINE=	CA_BUNDLE MAILERCONF
22
21
23
OPTIONS_DEFINE=	CA_BUNDLE LIBASRDEVEL MAILERCONF PAM TABLE_DB
22
STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:devel/libevent \
23
			${LOCALBASE}/lib/libopenbsd.a:devel/libopenbsd
24
24
25
OPTIONS_DEFAULT=	CA_BUNDLE PAM TABLE_DB
25
OPTIONS_DEFAULT=	CA_BUNDLE
26
26
27
CA_BUNDLE_DESC=	Install CA bundle for SSL
27
CA_BUNDLE_DESC=	Install CA bundle for SSL
28
LIBASRDEVEL_DESC=	Use development version of libasr
29
MAILERCONF_DESC=	Activate OpenSMTPD in mailer.conf(5)
28
MAILERCONF_DESC=	Activate OpenSMTPD in mailer.conf(5)
30
TABLE_DB_DESC=		Build table-db plugin (aliases)
31
29
32
USES=		cpe groff libtool ssl
30
USES=		cpe groff autoreconf libtool ssl
33
GNU_CONFIGURE=	yes
31
GNU_CONFIGURE=	yes
34
32
35
CPE_VENDOR=	openbsd
33
CPE_VENDOR=	openbsd
Lines 50-75 Link Here
50
LIBASRDEVEL_LIB_DEPENDS_OFF=	libasr.so:dns/libasr
48
LIBASRDEVEL_LIB_DEPENDS_OFF=	libasr.so:dns/libasr
51
LIBASRDEVEL_LIB_DEPENDS=	libasr.so:dns/libasr-devel
49
LIBASRDEVEL_LIB_DEPENDS=	libasr.so:dns/libasr-devel
52
50
53
PAM_CONFIGURE_WITH=	auth-pam=smtpd
54
TABLE_DB_CONFIGURE_WITH=	table-db
55
56
CONFIGURE_ARGS+=	--with-libasr=${LOCALBASE} \
51
CONFIGURE_ARGS+=	--with-libasr=${LOCALBASE} \
57
			--with-libevent=${LOCALBASE} \
52
			--with-libevent=${LOCALBASE} \
58
			--with-libssl=${OPENSSLBASE} \
59
			--sysconfdir=${PREFIX}/etc/mail/
53
			--sysconfdir=${PREFIX}/etc/mail/
60
54
61
.include <bsd.port.pre.mk>
55
.include <bsd.port.pre.mk>
62
56
63
.if ${OPSYS} == FreeBSD && \
57
.if ${SSL_DEFAULT:Mlibressl*}
64
    ((${OSVERSION} > 1200084 && ${SSL_DEFAULT} == "base") || \
58
CFLAGS+= -I${OPENSSLINC}
65
    (${SSL_DEFAULT} == "openssl111"))
59
CPPFLAGS+= -I${OPENSSLINC}
66
BROKEN=		Incompatible with Openssl 1.1.x yet
60
LDFLAGS+= -L${OPENSSLLIB}
67
.endif
61
.else # SSL_DEFAULT
62
BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage
63
CFLAGS+= -I${WRKDIR}/libressl/include
64
CPPFLAGS+= -I${WRKDIR}/libressl/include
65
LDFLAGS+= -L${WRKDIR}/libressl/lib
68
66
69
post-patch:
67
# Don't use COPYTREE_SHARE here as it hard links files, and the original files
70
	${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in
68
# are owned by root, which creates problems of its own.
69
pre-configure:
70
	@cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl`${PREFIX}\
71
		&& ${FIND} -E . ! -name *.so\* | ${CPIO} -dump ${WRKDIR}/libressl >/dev/null 2>&1
72
.endif # SSL_DEFAULT
71
73
72
post-install-TABLE_DB-on:
73
	@${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap
74
75
.include <bsd.port.post.mk>
74
.include <bsd.port.post.mk>
(-)mail/opensmtpd/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1463428051
1
TIMESTAMP = 1553756618
2
SHA256 (opensmtpd-5.9.2p1.tar.gz) = 3522f273c1630c781facdb2b921228e338ed4e651909316735df775d6a70a71d
2
SHA256 (opensmtpd-6.4.1p2.tar.gz) = b69b84934bcc4893ca334504411cd47f86ea04ac5e971a5746d44c473ac5f732
3
SIZE (opensmtpd-5.9.2p1.tar.gz) = 681855
3
SIZE (opensmtpd-6.4.1p2.tar.gz) = 718862
(-)mail/opensmtpd/pkg-plist (-4 lines)
Lines 1-7 Link Here
1
@sample etc/mail/smtpd.conf.sample
2
libexec/opensmtpd/encrypt
1
libexec/opensmtpd/encrypt
3
libexec/opensmtpd/mail.local
2
libexec/opensmtpd/mail.local
4
%%TABLE_DB%%libexec/opensmtpd/makemap
5
@(,,2555) sbin/smtpctl
3
@(,,2555) sbin/smtpctl
6
sbin/smtpd
4
sbin/smtpd
7
man/man5/aliases.5.gz
5
man/man5/aliases.5.gz
Lines 8-15 Link Here
8
man/man5/forward.5.gz
6
man/man5/forward.5.gz
9
man/man5/smtpd.conf.5.gz
7
man/man5/smtpd.conf.5.gz
10
man/man5/table.5.gz
8
man/man5/table.5.gz
11
%%TABLE_DB%%man/man8/makemap.8.gz
12
%%TABLE_DB%%man/man8/newaliases.8.gz
13
man/man8/sendmail.8.gz
9
man/man8/sendmail.8.gz
14
man/man8/smtpctl.8.gz
10
man/man8/smtpctl.8.gz
15
man/man8/smtpd.8.gz
11
man/man8/smtpd.8.gz

Return to bug 213442