diff options
| author | brnrd <brnrd@FreeBSD.org> | 2018-09-12 19:36:17 +0800 |
|---|---|---|
| committer | brnrd <brnrd@FreeBSD.org> | 2018-09-12 19:36:17 +0800 |
| commit | ff171313078fe4294bedd64d11b52806a70ea1f3 (patch) | |
| tree | 85cec5881d1b81fd5fa971f3d679fe02862b5859 /security | |
| parent | 3d116f0e97541fd6194276da571d6443667457de (diff) | |
| download | freebsd-ports-gnome-ff171313078fe4294bedd64d11b52806a70ea1f3.tar.gz freebsd-ports-gnome-ff171313078fe4294bedd64d11b52806a70ea1f3.tar.zst freebsd-ports-gnome-ff171313078fe4294bedd64d11b52806a70ea1f3.zip | |
Chase CONFLICTS after addition of security/openssl111
- While here mark OpenSSL 1.1.0 deprecated
see: https://www.openssl.org/policies/releasestrat.html
Diffstat (limited to 'security')
| -rw-r--r-- | security/libressl-devel/Makefile | 3 | ||||
| -rw-r--r-- | security/libressl/Makefile | 3 | ||||
| -rw-r--r-- | security/openssl-devel/Makefile | 6 | ||||
| -rw-r--r-- | security/openssl/Makefile | 3 |
4 files changed, 11 insertions, 4 deletions
diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile index 279d2f916a6e..e42689066d60 100644 --- a/security/libressl-devel/Makefile +++ b/security/libressl-devel/Makefile @@ -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 diff --git a/security/libressl/Makefile b/security/libressl/Makefile index 3a63390cb4f2..6967707677a5 100644 --- a/security/libressl/Makefile +++ b/security/libressl/Makefile @@ -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 diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile index e0fbfb0efaa3..66ccb8277ba5 100644 --- a/security/openssl-devel/Makefile +++ b/security/openssl-devel/Makefile @@ -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 diff --git a/security/openssl/Makefile b/security/openssl/Makefile index d00e133e18c3..3230f7ccbef3 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -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 |