svn commit: r484281 - in branches/2018Q4/mail: opensmtpd opensmtpd-devel

[Dima Panov]

Author: fluffy
Date: Tue Nov  6 07:49:38 2018
New Revision: 484281
URL: https://svnweb.freebsd.org/changeset/ports/484281

Log:
  MFH: r484257
  
  - While major 6.4 update still cooking (authors dropped openssl support at all
    in favor of libressl), mark OpenSMTPd as BROKEN with openssl 1.1.x api
  - Use https in pkg-descr url
  
  Approved by:	ports-secteam (miwi)

Modified:
  branches/2018Q4/mail/opensmtpd-devel/Makefile
  branches/2018Q4/mail/opensmtpd-devel/pkg-descr
  branches/2018Q4/mail/opensmtpd/Makefile
Directory Properties:
  branches/2018Q4/   (props changed)

Modified: branches/2018Q4/mail/opensmtpd-devel/Makefile
==============================================================================
--- branches/2018Q4/mail/opensmtpd-devel/Makefile	Tue Nov  6 07:45:09 2018	(r484280)
+++ branches/2018Q4/mail/opensmtpd-devel/Makefile	Tue Nov  6 07:49:38 2018	(r484281)
@@ -17,6 +17,9 @@ COMMENT=	Security- and simplicity-focused SMTP server 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=		Incompatible with Openssl 1.1.x yet
+
 LIB_DEPENDS=	libevent.so:devel/libevent
 
 OPTIONS_DEFINE=		CA_BUNDLE LIBASR MAILERCONF PAM TABLE_DB
@@ -57,6 +60,12 @@ CONFIGURE_ARGS+=	--with-libasr=${LOCALBASE} \
 			--with-libssl=${OPENSSLBASE} \
 			--sysconfdir=${PREFIX}/etc/mail/
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200084
+BROKEN=		Incompatible with Openssl 1.1.x yet
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in
 	# https://github.com/OpenSMTPD/OpenSMTPD/issues/700
@@ -67,4 +76,4 @@ post-patch:
 post-install-TABLE_DB-on:
 	@${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: branches/2018Q4/mail/opensmtpd-devel/pkg-descr
==============================================================================
--- branches/2018Q4/mail/opensmtpd-devel/pkg-descr	Tue Nov  6 07:45:09 2018	(r484280)
+++ branches/2018Q4/mail/opensmtpd-devel/pkg-descr	Tue Nov  6 07:49:38 2018	(r484281)
@@ -5,4 +5,4 @@ speaking the SMTP protocol.
 
 This port packages the development snapshots released by OpenSMTPD team.
 
-WWW: http://www.OpenSMTPD.org/
+WWW: https://www.OpenSMTPD.org/

Modified: branches/2018Q4/mail/opensmtpd/Makefile
==============================================================================
--- branches/2018Q4/mail/opensmtpd/Makefile	Tue Nov  6 07:45:09 2018	(r484280)
+++ branches/2018Q4/mail/opensmtpd/Makefile	Tue Nov  6 07:49:38 2018	(r484281)
@@ -15,6 +15,9 @@ COMMENT=	Security- and simplicity-focused SMTP server 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=		Incompatible with Openssl 1.1.x yet
+
 LIB_DEPENDS=	libevent.so:devel/libevent
 
 OPTIONS_DEFINE=	CA_BUNDLE LIBASRDEVEL MAILERCONF PAM TABLE_DB
@@ -55,10 +58,16 @@ CONFIGURE_ARGS+=	--with-libasr=${LOCALBASE} \
 			--with-libssl=${OPENSSLBASE} \
 			--sysconfdir=${PREFIX}/etc/mail/
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200084
+BROKEN=		Incompatible with Openssl 1.1.x yet
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in
 
 post-install-TABLE_DB-on:
 	@${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>