From owner-svn-src-head@freebsd.org Thu Oct 25 18:37:56 2018 Return-Path: Delivered-To: svn-src-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 ACBC61089419; Thu, 25 Oct 2018 18:37:56 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2F5A26CC08; Thu, 25 Oct 2018 18:37:55 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id w9PIbj6J082543 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 25 Oct 2018 21:37:48 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua w9PIbj6J082543 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id w9PIbjiX082542; Thu, 25 Oct 2018 21:37:45 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 25 Oct 2018 21:37:45 +0300 From: Konstantin Belousov To: Jung-uk Kim Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r339709 - in head: . secure/lib/libcrypto secure/lib/libssl Message-ID: <20181025183745.GS5335@kib.kiev.ua> References: <201810251337.w9PDbwTR016242@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on tom.home X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Oct 2018 18:37:56 -0000 On Thu, Oct 25, 2018 at 02:20:15PM -0400, Jung-uk Kim wrote: > On 18. 10. 25., Konstantin Belousov wrote: > > 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= > > You forgot to update SHLIB_VERSION_NUMBER. > > https://svnweb.freebsd.org/base/head/crypto/openssl/include/openssl/opensslv.h?revision=339270&view=markup#l95 > Would the following be enough ? diff --git a/crypto/openssl/include/openssl/opensslv.h b/crypto/openssl/include/openssl/opensslv.h index d23d73f90ce..363359d9ef4 100644 --- a/crypto/openssl/include/openssl/opensslv.h +++ b/crypto/openssl/include/openssl/opensslv.h @@ -92,7 +92,7 @@ extern "C" { * should only keep the versions that are binary compatible with the current. */ # define SHLIB_VERSION_HISTORY "" -# define SHLIB_VERSION_NUMBER "9" +# define SHLIB_VERSION_NUMBER "111" #ifdef __cplusplus