Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Sep 2018 11:36:17 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r479595 - in head/security: libressl libressl-devel openssl openssl-devel
Message-ID:  <201809121136.w8CBaHjJ020367@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Wed Sep 12 11:36:17 2018
New Revision: 479595
URL: https://svnweb.freebsd.org/changeset/ports/479595

Log:
  Chase CONFLICTS after addition of security/openssl111
  
   - While here mark OpenSSL 1.1.0 deprecated
     see: https://www.openssl.org/policies/releasestrat.html

Modified:
  head/security/libressl-devel/Makefile
  head/security/libressl/Makefile
  head/security/openssl-devel/Makefile
  head/security/openssl/Makefile

Modified: head/security/libressl-devel/Makefile
==============================================================================
--- head/security/libressl-devel/Makefile	Wed Sep 12 11:26:48 2018	(r479594)
+++ head/security/libressl-devel/Makefile	Wed Sep 12 11:36:17 2018	(r479595)
@@ -22,7 +22,8 @@ NC_DESC=	Install TLS-enabled netcat
 
 CONFLICTS_INSTALL=	libressl-[0-9]* \
 			openssl-[0-9]* \
-			openssl-devel-[0-9]*
+			openssl-devel-[0-9]* \
+			openssl111-[0-9]*
 
 NC_CONFIGURE_ENABLE=	nc
 

Modified: head/security/libressl/Makefile
==============================================================================
--- head/security/libressl/Makefile	Wed Sep 12 11:26:48 2018	(r479594)
+++ head/security/libressl/Makefile	Wed Sep 12 11:36:17 2018	(r479595)
@@ -21,7 +21,8 @@ NC_DESC=	Install TLS-enabled netcat
 
 CONFLICTS_INSTALL=	libressl-devel-[0-9]* \
 			openssl-[0-9]* \
-			openssl-devel-[0-9]*
+			openssl-devel-[0-9]* \
+			openssl111-[0-9]*
 
 NC_CONFIGURE_ENABLE=	nc
 

Modified: head/security/openssl-devel/Makefile
==============================================================================
--- head/security/openssl-devel/Makefile	Wed Sep 12 11:26:48 2018	(r479594)
+++ head/security/openssl-devel/Makefile	Wed Sep 12 11:36:17 2018	(r479595)
@@ -16,7 +16,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=	libressl-[0-9]* \
 			libressl-devel-[0-9]* \
-			openssl-[0-9]*
+			openssl-[0-9]* \
+			openssl111-[0-9]*
+
+DEPRECATED=		Upstream support ends 2019-09-11
+EXPIRATION_DATE=	2019-09-11
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config

Modified: head/security/openssl/Makefile
==============================================================================
--- head/security/openssl/Makefile	Wed Sep 12 11:26:48 2018	(r479594)
+++ head/security/openssl/Makefile	Wed Sep 12 11:36:17 2018	(r479595)
@@ -18,7 +18,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=	libressl-[0-9]* \
 			libressl-devel-[0-9]* \
-			openssl-devel-[0-9]*
+			openssl-devel-[0-9]* \
+			openssl111-[0-9]*
 
 OPTIONS_DEFINE=		DOCS MAN3 PADLOCK RFC3779 SHARED THREADS ZLIB
 OPTIONS_DEFAULT=	ASM MD2 MAN3 SCTP SHARED SSE2 SSL2 SSL3 THREADS



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809121136.w8CBaHjJ020367>