svn commit: r339709 - in head: . secure/lib/libcrypto secure/lib/libssl
Jung-uk Kim
jkim at FreeBSD.org
Thu Oct 25 18:20:28 UTC 2018
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 <bsd.own.mk>
>
> 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
Jung-uk Kim
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20181025/8c4dd877/attachment.sig>
More information about the svn-src-all
mailing list