From owner-svn-src-all@freebsd.org Thu Oct 25 18:47:50 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 64F591089B53; Thu, 25 Oct 2018 18:47:50 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0BC136D36D; Thu, 25 Oct 2018 18:47:50 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from freefall.freebsd.org (static-71-168-218-4.cmdnnj.fios.verizon.net [71.168.218.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jkim/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id D382E1688F; Thu, 25 Oct 2018 18:47:49 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Subject: Re: svn commit: r339709 - in head: . secure/lib/libcrypto secure/lib/libssl To: Konstantin Belousov Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201810251337.w9PDbwTR016242@repo.freebsd.org> <20181025183745.GS5335@kib.kiev.ua> From: Jung-uk Kim Openpgp: preference=signencrypt Autocrypt: addr=jkim@FreeBSD.org; prefer-encrypt=mutual; keydata= xsBNBFJBztUBCAChqNyGqmFuNo0U7MBzsD+q/G6Cv0l7LGVrOAsgh34M8wIWhD+tztDWMVfn AhxNDd0ceCj2bYOe67sTQxAScEcbt2FfvPOLp9MEXb9qohZj172Gwkk7dnhOhZZKhVGVZKM4 NcsuBDUzgf4f3Vdzj4wg6WlqplnTZo8lPE4hZWvZHoFIyunPTJWenybeV1xnxK7JkUdSvQR0 fA59RfTTECMwTrSEfYGUnxIDBraxJ7Ecs/0hGQ7sljIj8WBvlRDU5fU1xfF35aw56T8POQRq F4E6RVJW3YGuTpSwgtGZOTfygcLRhAiq3dFC3JNLaTVTpM8PjOinJyt9AU6RoITGOKwDABEB AAHNHkp1bmctdWsgS2ltIDxqa2ltQEZyZWVCU0Qub3JnPsLAfQQTAQoAJwUCUkHO1QIbAwUJ E0/POwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRB8n5Ym/NvxRqyzB/wL7QtsIpeGfGIA ZPMtgXMucM3NWzomyQMln2j2efUkDKthzh9jBxgF53TjOr7imwIt0PT2k1bqctPrq5IRqnu9 mGroqaCLE3LG2/E3jEaao4k9PO6efwlioyivUo5NrqIQOQ4k3EAXw7d2y0Dk1VpTgdMrnUAB hj7lGlLqS4ydcrf24DdbCRGdEQwqd9DBeBgbWynxAJMgbZBhYVEyIHuQKkJ8qY0ibIPXXuF0 KYDeH0qUHtWV2K3srNyPtymUkBQD84Pl1GWRYx05XdUHDmnX0JV3lg0BfYJZgZv0ehPQrMfY Fd9abTkf9FHQYz1JtsC8wUuRgqElRd6+YAGf8Tt9zsBNBFJBztUBCADLtSrP44El2VoJmH14 OFrlOgxzZnbn+Y/Gf1k12mJBiR+A+pBeRLD50p7AiTrjHRxO3cHcl9Dh0uf1VSbXgp8Or0ye iP/86fZPd4k5HXNmDTLL0HecPE08SCqGZ0W8vllQrokB1QxxRUB+fFMPJyMCjDAZ7P9fFTOS dTw1bJSTtOD8Sx8MpZUa9ti06bXFlVYDlaqSdgk181SSx+ZbSKkQR8CIMARlHwiLsa3Z9q9O EJr20HPyxe0AlTvwvFndH61hg7ds63eRvglwRnNON28VXO/lvKXq7Br/CiiyhFdKfINIx2Z5 htYq22tgGTW7mBURbIKoECFBTX9Lv6BXz6w9ABEBAAHCwGUEGAEKAA8FAlJBztUCGwwFCRNP zzsACgkQfJ+WJvzb8UZcJQf+IsTCxUEqY7W/pT84sMg5/QD3s6ufTRncvq14fEOxCNq1Rf4Q 9P+tOFa8GZfKDGB2BFGIrW7uT5mlmKdK1vO6ZIA930y5kUsnCmBUEBJkE2ciSQk01aB/1o62 Q3Gk/F6BwtNY9OXiqF7AcAo+K/BMIaqb26QKeh+IIgK1NN9dQiq3ByTbl4zpGZa6MmsnnRTu mzGKt2nkz7vBzH6+hZp1OzGZikgjjhYWVFoJo1dvf/rv4obs0ZJEqFPQs/1Qa1dbkKBv6odB XJpPH0ssOluTY24d1XxTiKTwmWvHeQkOKRAIfD7VTtF4TesoZYkf7hsh3e3VwXhptSLFnEOi WwYofg== Message-ID: <704d0027-e5fc-8190-6fa4-629e8cd2683a@FreeBSD.org> Date: Thu, 25 Oct 2018 14:47:49 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <20181025183745.GS5335@kib.kiev.ua> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="houE0lTUYi8FgDsmlyv6HTcqPIP2nxP9L" 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 18:47:50 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --houE0lTUYi8FgDsmlyv6HTcqPIP2nxP9L Content-Type: multipart/mixed; boundary="FHt3xEL9h4tBxd3szEsgm0urIV8O9LXEu"; protected-headers="v1" From: Jung-uk Kim To: Konstantin Belousov Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <704d0027-e5fc-8190-6fa4-629e8cd2683a@FreeBSD.org> Subject: Re: svn commit: r339709 - in head: . secure/lib/libcrypto secure/lib/libssl References: <201810251337.w9PDbwTR016242@repo.freebsd.org> <20181025183745.GS5335@kib.kiev.ua> In-Reply-To: <20181025183745.GS5335@kib.kiev.ua> --FHt3xEL9h4tBxd3szEsgm0urIV8O9LXEu Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 18. 10. 25., Konstantin Belousov wrote: > 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. >>> =20 >>> 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 >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- 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 >>> =20 >>> +# 20181025: OpenSSL libraries version bump to avoid conflict with po= rts >>> +OLD_LIBS+=3Dlib/libcrypto.so.9 >>> +OLD_LIBS+=3Dusr/lib/libssl.so.9 >>> +OLD_LIBS+=3Dusr/lib32/libcrypto.so.9 >>> +OLD_LIBS+=3Dusr/lib32/libssl.so.9 >>> # 20181021: mse(4) removal >>> OLD_FILES+=3Dusr/share/man/man4/mse.4.gz >>> # 20181021: joy(4) removal >>> >>> Modified: head/secure/lib/libcrypto/Makefile >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- head/secure/lib/libcrypto/Makefile Thu Oct 25 12:27:16 2018 (r339= 708) >>> +++ head/secure/lib/libcrypto/Makefile Thu Oct 25 13:37:57 2018 (r339= 709) >>> @@ -6,7 +6,7 @@ SUBDIR=3D engines >>> .include >>> =20 >>> LIB=3D crypto >>> -SHLIB_MAJOR=3D 9 >>> +SHLIB_MAJOR=3D 111 >>> VERSION_MAP=3D ${.CURDIR}/Version.map >>> =20 >>> NO_LINT=3D >>> >>> Modified: head/secure/lib/libssl/Makefile >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- 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$ >>> =20 >>> LIB=3D ssl >>> -SHLIB_MAJOR=3D 9 >>> +SHLIB_MAJOR=3D 111 >>> VERSION_MAP=3D ${.CURDIR}/Version.map >>> =20 >>> NO_LINT=3D >> >> You forgot to update SHLIB_VERSION_NUMBER. >> >> https://svnweb.freebsd.org/base/head/crypto/openssl/include/openssl/op= ensslv.h?revision=3D339270&view=3Dmarkup#l95 >> >=20 > Would the following be enough ? >=20 > 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 c= urrent. > */ > # define SHLIB_VERSION_HISTORY "" > -# define SHLIB_VERSION_NUMBER "9" > +# define SHLIB_VERSION_NUMBER "111" > =20 > =20 > #ifdef __cplusplus Yes. Jung-uk Kim --FHt3xEL9h4tBxd3szEsgm0urIV8O9LXEu-- --houE0lTUYi8FgDsmlyv6HTcqPIP2nxP9L Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEl1bqgKaRyqfWXu/CfJ+WJvzb8UYFAlvSD9UACgkQfJ+WJvzb 8UZjZAf/RlwewwsGvLxcLQbm/HtqaSph/rN6Qmlw5g26dpX5i25EpXLYT9HZ0tP3 2XDUarOpBL6yAf4+HJxys2aqftlPpQYmsEo9zXG7p3lN1eaaT/9RFqIPT1afA2mv S/yaVTwmxESMAbIsMIqXL0cKrdF5AapfUEy/g+04xmIY950Y2qIvkkU+9BSEsNkV Jc3NE5m1wJDMKF5o8C/N29pei48eIBKPlTNh5hBZDKNPeGyfIjFVBSfp7AiCEnJy fdGZLS4Y00H8yNem5t8n2hNs4PYSrKt1k6krXhrij7pIAb/IxbSFRAhmBlchY+i/ wiS0/rKP9yHMMJWGx0ohW/aMeOb4QQ== =WrCj -----END PGP SIGNATURE----- --houE0lTUYi8FgDsmlyv6HTcqPIP2nxP9L--