Date: Thu, 25 Oct 2018 14:20:15 -0400 From: Jung-uk Kim <jkim@FreeBSD.org> To: Konstantin Belousov <kib@FreeBSD.org>, 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: <baacb72a-2701-8395-ab1f-9ffffb60ad95@FreeBSD.org> In-Reply-To: <201810251337.w9PDbwTR016242@repo.freebsd.org> References: <201810251337.w9PDbwTR016242@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --djOJnPwy149di6Pypz1rLCS5ljF2J8F4J Content-Type: multipart/mixed; boundary="wQ9puUW10SJEMnwusuzvutrpvH30970k5"; protected-headers="v1" From: Jung-uk Kim <jkim@FreeBSD.org> To: Konstantin Belousov <kib@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <baacb72a-2701-8395-ab1f-9ffffb60ad95@FreeBSD.org> Subject: Re: svn commit: r339709 - in head: . secure/lib/libcrypto secure/lib/libssl References: <201810251337.w9PDbwTR016242@repo.freebsd.org> In-Reply-To: <201810251337.w9PDbwTR016242@repo.freebsd.org> --wQ9puUW10SJEMnwusuzvutrpvH30970k5 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > Bump base OpenSSL libraries versions to avoid conflict with port's li= braries. > =20 > Reported by: many > Reviewed by: gjb > Sponsored by: The FreeBSD Foundation > MFC after: 3 hours >=20 > Modified: > head/ObsoleteFiles.inc > head/secure/lib/libcrypto/Makefile > head/secure/lib/libssl/Makefile >=20 > 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 port= s > +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 >=20 > 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 (r33970= 8) > +++ head/secure/lib/libcrypto/Makefile Thu Oct 25 13:37:57 2018 (r33970= 9) > @@ -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 >=20 > 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/opens= slv.h?revision=3D339270&view=3Dmarkup#l95 Jung-uk Kim --wQ9puUW10SJEMnwusuzvutrpvH30970k5-- --djOJnPwy149di6Pypz1rLCS5ljF2J8F4J Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEl1bqgKaRyqfWXu/CfJ+WJvzb8UYFAlvSCWoACgkQfJ+WJvzb 8Ubc4AgAhah434mRPVfprl7VPz7IGHZei4lHBBiM3G+u93aXZVmn1rn8ls3s9D1r vNFKot9pJKOvA8M1m65YZnWg5jVNcFDQE9sy3mC0HKBqQ4n74Q3nV8Zl2UTmDo+u L1pldpSojHdOjE9lE/PXuoAJwm1xSKmQXQz17MCx6CyXGsebvfOf8izx+2bIfmsZ takEoZPuMUTM6e6IJtmj89q3DgHKB9tFlS6dCn5IEgdai9lrwAxnmGejvXOiTs82 broRrguo6g31VUAF0AeSg+fkuITia8Hi7IDqPdiZlLmrQVB0svV9R319R3IGYS3W FX/9Bl7tk5bnHGY7K+VS09zKrW5TgA== =JAxe -----END PGP SIGNATURE----- --djOJnPwy149di6Pypz1rLCS5ljF2J8F4J--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?baacb72a-2701-8395-ab1f-9ffffb60ad95>