From owner-svn-ports-head@freebsd.org Wed Sep 12 11:36:18 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AD9E3109040C; Wed, 12 Sep 2018 11:36:18 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 606AE7E7E9; Wed, 12 Sep 2018 11:36:18 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5579C25EF5; Wed, 12 Sep 2018 11:36:18 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8CBaIO8020371; Wed, 12 Sep 2018 11:36:18 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8CBaHjJ020367; Wed, 12 Sep 2018 11:36:17 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201809121136.w8CBaHjJ020367@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Wed, 12 Sep 2018 11:36:17 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/security: libressl libressl-devel openssl openssl-devel X-SVN-Commit-Revision: 479595 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2018 11:36:18 -0000 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