Date: Thu, 25 Oct 2018 14:47:49 -0400 From: Jung-uk Kim <jkim@FreeBSD.org> To: Konstantin Belousov <kostikbel@gmail.com> 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: <704d0027-e5fc-8190-6fa4-629e8cd2683a@FreeBSD.org> In-Reply-To: <20181025183745.GS5335@kib.kiev.ua> References: <201810251337.w9PDbwTR016242@repo.freebsd.org> <baacb72a-2701-8395-ab1f-9ffffb60ad95@FreeBSD.org> <20181025183745.GS5335@kib.kiev.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <jkim@FreeBSD.org> To: Konstantin Belousov <kostikbel@gmail.com> 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> <baacb72a-2701-8395-ab1f-9ffffb60ad95@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 <bsd.own.mk> >>> =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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?704d0027-e5fc-8190-6fa4-629e8cd2683a>