From owner-svn-src-all@freebsd.org Thu Oct 25 13:37:59 2018 Return-Path: Delivered-To: svn-src-all@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 518F610767C0; Thu, 25 Oct 2018 13:37:59 +0000 (UTC) (envelope-from kib@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 03B9E82B44; Thu, 25 Oct 2018 13:37:59 +0000 (UTC) (envelope-from kib@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 D905012813; Thu, 25 Oct 2018 13:37:58 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9PDbw6M016245; Thu, 25 Oct 2018 13:37:58 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9PDbwTR016242; Thu, 25 Oct 2018 13:37:58 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201810251337.w9PDbwTR016242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 25 Oct 2018 13:37:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339709 - in head: . secure/lib/libcrypto secure/lib/libssl X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head: . secure/lib/libcrypto secure/lib/libssl X-SVN-Commit-Revision: 339709 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Oct 2018 13:37:59 -0000 Author: kib Date: Thu Oct 25 13:37:57 2018 New Revision: 339709 URL: https://svnweb.freebsd.org/changeset/base/339709 Log: Bump base OpenSSL libraries versions to avoid conflict with port's libraries. Reported by: many Reviewed by: gjb Sponsored by: The FreeBSD Foundation MFC after: 3 hours Modified: head/ObsoleteFiles.inc head/secure/lib/libcrypto/Makefile head/secure/lib/libssl/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Thu Oct 25 12:27:16 2018 (r339708) +++ head/ObsoleteFiles.inc Thu Oct 25 13:37:57 2018 (r339709) @@ -38,6 +38,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20181025: OpenSSL libraries version bump to avoid conflict with ports +OLD_LIBS+=lib/libcrypto.so.9 +OLD_LIBS+=usr/lib/libssl.so.9 +OLD_LIBS+=usr/lib32/libcrypto.so.9 +OLD_LIBS+=usr/lib32/libssl.so.9 # 20181021: mse(4) removal OLD_FILES+=usr/share/man/man4/mse.4.gz # 20181021: joy(4) removal Modified: head/secure/lib/libcrypto/Makefile ============================================================================== --- head/secure/lib/libcrypto/Makefile Thu Oct 25 12:27:16 2018 (r339708) +++ head/secure/lib/libcrypto/Makefile Thu Oct 25 13:37:57 2018 (r339709) @@ -6,7 +6,7 @@ SUBDIR= engines .include LIB= crypto -SHLIB_MAJOR= 9 +SHLIB_MAJOR= 111 VERSION_MAP= ${.CURDIR}/Version.map NO_LINT= Modified: head/secure/lib/libssl/Makefile ============================================================================== --- head/secure/lib/libssl/Makefile Thu Oct 25 12:27:16 2018 (r339708) +++ head/secure/lib/libssl/Makefile Thu Oct 25 13:37:57 2018 (r339709) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= ssl -SHLIB_MAJOR= 9 +SHLIB_MAJOR= 111 VERSION_MAP= ${.CURDIR}/Version.map NO_LINT=