Author: kib
Date: Thu Oct 25 15:49:59 2018
New Revision: 339732
URL: https://svnweb.freebsd.org/changeset/base/339732
Log:
MFC r339709:
Bump base OpenSSL libraries versions to avoid conflict with port's libraries.
Approved by: re (gjb)
Modified:
stable/12/ObsoleteFiles.inc
stable/12/secure/lib/libcrypto/Makefile
stable/12/secure/lib/libssl/Makefile
stable/12/sys/sys/param.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/ObsoleteFiles.inc
==============================================================================
--- stable/12/ObsoleteFiles.inc Thu Oct 25 15:43:21 2018 (r339731)
+++ stable/12/ObsoleteFiles.inc Thu Oct 25 15:49:59 2018 (r339732)
@@ -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
# 20181015: Stale libcasper(3) files following r329452
OLD_LIBS+=lib/casper/libcap_sysctl.so.0
OLD_LIBS+=lib/casper/libcap_grp.so.0
Modified: stable/12/secure/lib/libcrypto/Makefile
==============================================================================
--- stable/12/secure/lib/libcrypto/Makefile Thu Oct 25 15:43:21 2018
(r339731)
+++ stable/12/secure/lib/libcrypto/Makefile Thu Oct 25 15:49:59 2018
(r339732)
@@ -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: stable/12/secure/lib/libssl/Makefile
==============================================================================
--- stable/12/secure/lib/libssl/Makefile Thu Oct 25 15:43:21 2018
(r339731)
+++ stable/12/secure/lib/libssl/Makefile Thu Oct 25 15:49:59 2018
(r339732)
@@ -1,7 +1,7 @@
# $FreeBSD$
LIB= ssl
-SHLIB_MAJOR= 9
+SHLIB_MAJOR= 111
VERSION_MAP= ${.CURDIR}/Version.map
NO_LINT=
Modified: stable/12/sys/sys/param.h
==============================================================================
--- stable/12/sys/sys/param.h Thu Oct 25 15:43:21 2018 (r339731)
+++ stable/12/sys/sys/param.h Thu Oct 25 15:49:59 2018 (r339732)
@@ -60,7 +60,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1200085 /* Master, propagated to newvers */
+#define __FreeBSD_version 1200086 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
