lang/rust: Update to 1.41.0

- Force rebuild all consumers to catch regressions early
- Switch to cross-compiled (from amd64) bootstraps for all
  architectures generated with the incoming lang/rust-bootstrap
- Update cargo-c to 0.5.2 to unbreak librav1e build
- Make use of regular MAKE_ENV/TEST_ENV in lang/rust
- Turn on RUST_BACKTRACE in lang/rust and USES=cargo to hopefully
  produce more useful failure logs when something panics during
  builds

Changes:	https://blog.rust-lang.org/2020/01/30/Rust-1.41.0.html
Tested by:	mikael, tobik
With hat:	rust
Differential Revision:	https://reviews.freebsd.org/D23385

12 files changed, 91 insertions, 375 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 223489ec54d7..0cf3d97c893c 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,22 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.40.0
+PORTVERSION?=	1.41.0
 PORTREVISION?=	0
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/:src \
-		https://static.rust-lang.org/dist/:bootstrap \
 		LOCAL/tobik/rust:bootstrap \
-		https://releases.llvm.org/${COMPILER_RT_VERSION}/:compiler_rt \
-		https://github.com/llvm/llvm-project/releases/download/llvmorg-${COMPILER_RT_VERSION}/:compiler_rt
+		https://static.rust-lang.org/dist/:bootstrap
 DISTNAME?=	${PORTNAME}c-${PORTVERSION}-src
 DISTFILES?=	${NIGHTLY_SUBDIR}${DISTNAME}${EXTRACT_SUFX}:src \
 		${_RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \
 		${_RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \
-		${_CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \
-		${DISTFILES_${ARCH}}
-DISTFILES_armv6=	compiler-rt-${COMPILER_RT_VERSION}.src.tar.xz:compiler_rt
-DISTFILES_armv7=	compiler-rt-${COMPILER_RT_VERSION}.src.tar.xz:compiler_rt
+		${_CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap
 DIST_SUBDIR?=	rust
 EXTRACT_ONLY?=	${DISTFILES:N*\:bootstrap:C/:.*//}
 
@@ -40,6 +35,13 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 
 USES=		pkgconfig python:3.3+,build ssl tar:xz
 
+MAKE_ENV=	LIBGIT2_SYS_USE_PKG_CONFIG=1 \
+		LIBSSH2_SYS_USE_PKG_CONFIG=1 \
+		OPENSSL_DIR="${OPENSSLBASE}" \
+		RUST_BACKTRACE=1
+TEST_ENV=	${MAKE_ENV} \
+		ALLOW_NONZERO_RLIMIT_CORE=1
+
 CONFLICTS_INSTALL?=	rust-nightly
 
 PLIST_FILES=	lib/rustlib/components \
@@ -54,10 +56,9 @@ DOCS_VARS=		_RUST_BUILD_DOCS=true
 GDB_RUN_DEPENDS=	${LOCALBASE}/bin/gdb:devel/gdb
 
 # See WRKSRC/src/stage0.txt for the date and version values.
-BOOTSTRAPS_DATE?=		2019-11-07
-RUST_BOOTSTRAP_VERSION?=	1.39.0
-CARGO_BOOTSTRAP_VERSION?=	0.40.0
-COMPILER_RT_VERSION?=		9.0.0
+BOOTSTRAPS_DATE?=		2020-01-11
+RUST_BOOTSTRAP_VERSION?=	1.40.0
+CARGO_BOOTSTRAP_VERSION?=	0.41.0
 
 BOOTSTRAPS_SUFFIX?=		${BOOTSTRAPS_SUFFIX_${ARCH}}
 BOOTSTRAPS_SUFFIX_powerpc64?=	-${PPC_ABI:tl}
@@ -68,7 +69,6 @@ CARGO_VENDOR_DIR?=		${WRKSRC}/vendor
 _RUST_ARCH_amd64=	x86_64
 _RUST_ARCH_i386=	i686
 _RUST_TARGET=		${_RUST_ARCH_${ARCH}:U${ARCH}}-unknown-${OPSYS:tl}
-_LLVM_TARGET=		${ARCH:C/armv.*/ARM/:S/aarch64/AArch64/:S/powerpc64/PowerPC/}
 
 _RUSTC_BOOTSTRAP=	${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET}
 _RUST_STD_BOOTSTRAP=	${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET}
@@ -101,12 +101,6 @@ IGNORE=	fails to run due to a bug in rtld, update to 12-STABLE r342847 or 13-CUR
 IGNORE=	fails to build with qemu-user-static
 .endif
 
-X_PY_ENV=	HOME="${WRKDIR}" \
-		LIBGIT2_SYS_USE_PKG_CONFIG=1 \
-		LIBSSH2_SYS_USE_PKG_CONFIG=1 \
-		OPENSSL_DIR="${OPENSSLBASE}"
-X_PY_CMD=	${PYTHON_CMD} ${WRKSRC}/x.py
-
 post-extract:
 	@${MKDIR} ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}
 	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${_RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX} \
@@ -115,9 +109,6 @@ post-extract:
 		${WRKSRC}/build/cache/${_RUST_STD_BOOTSTRAP}${EXTRACT_SUFX}
 	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${_CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX} \
 		${WRKSRC}/build/cache/${_CARGO_BOOTSTRAP}${EXTRACT_SUFX}
-.if ${ARCH} == armv6 || ${ARCH} == armv7
-	${LN} -sf ${WRKDIR}/compiler-rt-${COMPILER_RT_VERSION}.src ${WRKSRC}/src/llvm-project/compiler-rt
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} 's,gdb,${LOCALBASE}/bin/gdb,' ${WRKSRC}/src/etc/rust-gdb
@@ -134,7 +125,8 @@ post-patch:
 	@${ECHO_MSG} "Bootstrap date and version after patching:"
 	@${GREP} -E '^(date|rustc|cargo)' ${WRKSRC}/src/stage0.txt
 .if ${ARCH} == powerpc64
-	@${REINPLACE_CMD} -e 's,powerpc64-unknown-freebsd,powerpc64-unknown-freebsd${OSREL},' \
+# Starting with 13.0 powerpc64 is ELFv2 while 12.0 is ELFv1.  Pass the correct LLVM target triple.  
+	@${REINPLACE_CMD} 's,powerpc64-unknown-freebsd,powerpc64-unknown-freebsd${OSREL},' \
 		${WRKSRC}/src/librustc_target/spec/powerpc64_unknown_freebsd.rs
 .endif
 # Disable vendor checksums
@@ -143,7 +135,7 @@ post-patch:
 
 post-patch-SOURCES-off:
 # Mimic tools in config.toml with just src excluded
-	@${REINPLACE_CMD} -e 's/config.tools.*"src".*/false;/' \
+	@${REINPLACE_CMD} 's,config.tools.*"src".*,false;,' \
 		${WRKSRC}/src/bootstrap/install.rs
 
 do-configure:
@@ -159,7 +151,6 @@ do-configure:
 	@${ECHO_CMD} '[install]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'prefix="${PREFIX}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'sysconfdir="${PREFIX}/etc"' >> ${WRKSRC}/config.toml
-	@${ECHO_CMD} 'mandir="${MANPREFIX}/man"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} '[rust]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'channel="${PKGNAMESUFFIX:Ustable:S/^-//}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml
@@ -170,35 +161,34 @@ do-configure:
 .else
 	@${ECHO_CMD} 'ccache=false' >> ${WRKSRC}/config.toml
 .endif
-# no need to build a crosscompiler for these targets
-.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc64
-	@${ECHO_CMD} 'targets="${_LLVM_TARGET}"' >> ${WRKSRC}/config.toml
-	@${ECHO_CMD} 'experimental-targets=""' >> ${WRKSRC}/config.toml
-.endif
 	@${ECHO_CMD} '[target.${_RUST_TARGET}]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'cc="${CC}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'cxx="${CXX}"' >> ${WRKSRC}/config.toml
+.if ${ARCH} == armv6
+# fails to link with base ld.bfd: rustc_codegen_llvm.e2557spx-cgu.11:(.text._ZN89_$LT$rustc_target..abi..call..CastTarget$u20$as$u20$rustc_codegen_llvm..abi..LlvmType$GT$9llvm_type17h1296210ab461fc57E+0x54): relocation truncated to fit: R_ARM_CALL against symbol `__aeabi_uldivmod' defined in .text.__aeabi_uldivmod section in /tmp/rustcdnGbao/libcompiler_builtins-ee65b414e4115a8f.rlib(compiler_builtins-ee65b414e4115a8f.compiler_builtins.ay8p39ey-cgu.13.rcgu.o)
+	@${PRINTF} '#!/bin/sh\nexec ${CC} -fuse-ld=lld "$$@"' > ${WRKDIR}/cc-wrapper 	 
+	@${CHMOD} +x ${WRKDIR}/cc-wrapper 	 
+	@${ECHO_CMD} 'linker="${WRKDIR}/cc-wrapper"' >> ${WRKSRC}/config.toml
+.else
 	@${ECHO_CMD} 'linker="${CC}"' >> ${WRKSRC}/config.toml
+.endif
 	@${ECHO_CMD} '[dist]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'src-tarball=false' >> ${WRKSRC}/config.toml
-	@${REINPLACE_CMD} -e 's,%CC%,${CC},g' \
+	@${REINPLACE_CMD} 's,%CC%,${CC},g' \
 		${WRKSRC}/src/librustc_llvm/build.rs \
 		${WRKSRC}/src/bootstrap/native.rs
 
 do-build:
-	cd ${WRKSRC} && \
-	${SETENV} ${X_PY_ENV} \
-	${X_PY_CMD} build \
-		--config ./config.toml \
-		--jobs ${MAKE_JOBS_NUMBER}
+	@cd ${WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py build --config=config.toml \
+		--jobs=${MAKE_JOBS_NUMBER}
 
 do-install:
-	cd ${WRKSRC} && \
-	${SETENV} ${X_PY_ENV} \
-		DESTDIR=${STAGEDIR} \
-	${X_PY_CMD} 'install' \
-		--config ./config.toml \
-		--jobs ${MAKE_JOBS_NUMBER}
+# DESTDIR not in MAKE_ENV as it would cause the bundled LLVM to be
+# staged into it during do-build.
+	@cd ${WRKSRC} && \
+		${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} ${PYTHON_CMD} \
+		x.py install --config=config.toml --jobs=${MAKE_JOBS_NUMBER}
 
 # In post-install, we use the manifests generated during Rust install
 # to in turn generate the PLIST. We do that, instead of the regular
@@ -217,8 +207,8 @@ do-install:
 post-install:
 	for f in ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-*; do \
 	    ${REINPLACE_CMD} -i '' -E \
-	        -e 's|:${STAGEDIR}|:|' \
-	        -e 's|(man/man[1-9]/.*\.[0-9])|\1.gz|' \
+	        -e 's,:${STAGEDIR},:,' \
+	        -e 's,(share/man/man[1-9]/.*\.[0-9]),\1.gz,' \
 	        "$$f"; \
 	    ${ECHO_CMD} "$${f#${STAGEDIR}}" >> ${TMPPLIST}; \
 	    ${AWK} '\
@@ -230,7 +220,7 @@ post-install:
 	        /^dir:/ { \
 	            dir=$$0; \
 	            sub(/^dir:/, "", dir); \
-	            system("find ${STAGEDIR}" dir " -type f | ${SED} -E -e \"s|${STAGEDIR}||\""); \
+	            system("find ${STAGEDIR}" dir " -type f | ${SED} -E -e \"s,${STAGEDIR},,\""); \
 	        }' \
 	        "$$f" >> ${TMPPLIST}; \
 	done
@@ -240,19 +230,14 @@ post-install:
 	@${RM} \
 	    ${STAGEDIR}${PREFIX}/lib/rustlib/install.log \
 	    ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
-# FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped,
-# but they contain non-object files which make strip(1) unhappy.
 	@${FIND} ${STAGEDIR}${PREFIX}/bin -exec ${FILE} -i {} + | ${AWK} -F: \
 		'/executable|sharedlib/ { print $$1 }' | ${XARGS} ${STRIP_CMD}
 
 # Note that make test does not work when rust is already installed.
 do-test:
-	cd ${WRKSRC} && \
-	${SETENV} ${X_PY_ENV} \
-		ALLOW_NONZERO_RLIMIT_CORE=1 \
-	${X_PY_CMD} test \
-		--config ./config.toml \
-		--jobs ${MAKE_JOBS_NUMBER}
+	@cd ${WRKSRC} && \
+		${SETENV} ${TEST_ENV} ${PYTHON_CMD} x.py test --config=config.toml \
+		--jobs=${MAKE_JOBS_NUMBER}
 
 .if !defined(_RUST_MAKESUM_GUARD)
 makesum:
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index e9d52e506571..18fa867b836c 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,47 +1,45 @@
-TIMESTAMP = 1578730697
-SHA256 (rust/rustc-1.40.0-src.tar.xz) = 6e2aa3a91697f4b225c6b394cbae6b97666f061dba491f666a5281698fe2aace
-SIZE (rust/rustc-1.40.0-src.tar.xz) = 92306352
-SHA256 (rust/2019-11-07/rustc-1.39.0-aarch64-unknown-freebsd.tar.xz) = 44098962a570e05d691d3b7c3337b873b1e1f22ac49fd19c0d5d3362c0008eb5
-SIZE (rust/2019-11-07/rustc-1.39.0-aarch64-unknown-freebsd.tar.xz) = 23895952
-SHA256 (rust/2019-11-07/rust-std-1.39.0-aarch64-unknown-freebsd.tar.xz) = 21372596cda35c4acdb11bab0e6d3f62f815a8166eb717e57e223548f3afee08
-SIZE (rust/2019-11-07/rust-std-1.39.0-aarch64-unknown-freebsd.tar.xz) = 164721768
-SHA256 (rust/2019-11-07/cargo-0.40.0-aarch64-unknown-freebsd.tar.xz) = 184f64a67f05c23597f1b52ef13e31c5e12288032ccb94bddfc217f26b77c93f
-SIZE (rust/2019-11-07/cargo-0.40.0-aarch64-unknown-freebsd.tar.xz) = 3054584
-SHA256 (rust/2019-11-07/rustc-1.39.0-x86_64-unknown-freebsd.tar.xz) = 802aa5124f15002ba07b33838f6b8ecb394e3d63d2f9bd2de725c85baf8b8bf5
-SIZE (rust/2019-11-07/rustc-1.39.0-x86_64-unknown-freebsd.tar.xz) = 33790600
-SHA256 (rust/2019-11-07/rust-std-1.39.0-x86_64-unknown-freebsd.tar.xz) = 7015a0b0a991af19b0a7d0cbb1b0e2aae612a19cf2a4ab9cdb49f91f9e443201
-SIZE (rust/2019-11-07/rust-std-1.39.0-x86_64-unknown-freebsd.tar.xz) = 189611944
-SHA256 (rust/2019-11-07/cargo-0.40.0-x86_64-unknown-freebsd.tar.xz) = 762c436fa220120bc57a0a4d5256b69f6b55e8d07153744cb6c81e4d064912bf
-SIZE (rust/2019-11-07/cargo-0.40.0-x86_64-unknown-freebsd.tar.xz) = 4908636
-SHA256 (rust/2019-11-07/rustc-1.39.0-armv6-unknown-freebsd.tar.xz) = c1f014f8c4f804d413be842dba3655ab69ee70d663b25d1a0027224480e511f3
-SIZE (rust/2019-11-07/rustc-1.39.0-armv6-unknown-freebsd.tar.xz) = 25359460
-SHA256 (rust/2019-11-07/rust-std-1.39.0-armv6-unknown-freebsd.tar.xz) = 09bf68c8aaf0a4de36d7608e15001878ac048f1a9eda3bef7a66338b31bd1cd4
-SIZE (rust/2019-11-07/rust-std-1.39.0-armv6-unknown-freebsd.tar.xz) = 170165620
-SHA256 (rust/2019-11-07/cargo-0.40.0-armv6-unknown-freebsd.tar.xz) = 4c13fee359a77a73ce96f524c58198cca567971692b17e97e41ecb01fe70dc5c
-SIZE (rust/2019-11-07/cargo-0.40.0-armv6-unknown-freebsd.tar.xz) = 3183372
-SHA256 (rust/compiler-rt-9.0.0.src.tar.xz) = 56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e
-SIZE (rust/compiler-rt-9.0.0.src.tar.xz) = 1993084
-SHA256 (rust/2019-11-07/rustc-1.39.0-armv7-unknown-freebsd.tar.xz) = 5902ceb1aefbced859969a928c4ad15063a58e120d79a18cab37dc4d7384d591
-SIZE (rust/2019-11-07/rustc-1.39.0-armv7-unknown-freebsd.tar.xz) = 24862380
-SHA256 (rust/2019-11-07/rust-std-1.39.0-armv7-unknown-freebsd.tar.xz) = 5469b9c844ac9e830d77715a988c3185f287962de9a2408513b89dac9662ac34
-SIZE (rust/2019-11-07/rust-std-1.39.0-armv7-unknown-freebsd.tar.xz) = 169316140
-SHA256 (rust/2019-11-07/cargo-0.40.0-armv7-unknown-freebsd.tar.xz) = 3acfcd4b7ce2a5d1646d0b53d453140d4a3b9216fcb66c435d1d4b83381b2499
-SIZE (rust/2019-11-07/cargo-0.40.0-armv7-unknown-freebsd.tar.xz) = 3134692
-SHA256 (rust/2019-11-07/rustc-1.39.0-i686-unknown-freebsd.tar.xz) = eebab1fb8cbbfa7e348daeb319a8fdf3ab40c7439deb012fd9ceeed322518f7c
-SIZE (rust/2019-11-07/rustc-1.39.0-i686-unknown-freebsd.tar.xz) = 34660340
-SHA256 (rust/2019-11-07/rust-std-1.39.0-i686-unknown-freebsd.tar.xz) = bd19a91be5f470c838c524a86a6ff83557247e7fbe498d773c643b06a78be97f
-SIZE (rust/2019-11-07/rust-std-1.39.0-i686-unknown-freebsd.tar.xz) = 189894544
-SHA256 (rust/2019-11-07/cargo-0.40.0-i686-unknown-freebsd.tar.xz) = 9daad89cecfa45e85e191f4870613e5b0acfa92742ae8c07eb4f48a1f3f4d9be
-SIZE (rust/2019-11-07/cargo-0.40.0-i686-unknown-freebsd.tar.xz) = 4875016
-SHA256 (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 0f0b89fb869a4ff856a3c3b971fa7bd0e317b2d567f5db994159e019100d7d23
-SIZE (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 28846960
-SHA256 (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 378efabaf53ff15165bda53509b40fb347e3f88275ca4cc81f4cfb185eed981e
-SIZE (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 164834720
-SHA256 (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 707eef9bac71a44db8e1d64c70a771fbac1f81f7ca58a2e3025ec1cc4d263b18
-SIZE (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 3423776
-SHA256 (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 65a7eed0737ae94e54d60a0cf5cc67634fb8ddd978bdfb0ce4e5f46d309daa0a
-SIZE (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 24483956
-SHA256 (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 60782554de07997c25bf2aa279b44baa8009158b25cc3c5364b1496a2d40f2a4
-SIZE (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 163926244
-SHA256 (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 75ecd88d83e8f394ce33f0213b622a045cbcfc55973f4b5140403de298f73968
-SIZE (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 3268696
+TIMESTAMP = 1580240609
+SHA256 (rust/rustc-1.41.0-src.tar.xz) = 38d6742e5c4c98a835de5d6e12a209e442fb3078a03b2c01bab6ea7afb25be6f
+SIZE (rust/rustc-1.41.0-src.tar.xz) = 93763052
+SHA256 (rust/2020-01-11/rustc-1.40.0-aarch64-unknown-freebsd.tar.xz) = b73372fb30198cd9c26927f89cc96c339253038491fcb5629d88285f156f1347
+SIZE (rust/2020-01-11/rustc-1.40.0-aarch64-unknown-freebsd.tar.xz) = 26371388
+SHA256 (rust/2020-01-11/rust-std-1.40.0-aarch64-unknown-freebsd.tar.xz) = 88abe2b1e267309bc87bb0bf9ace0c7d72be21c47a0fec9858364f1ed6cd64f9
+SIZE (rust/2020-01-11/rust-std-1.40.0-aarch64-unknown-freebsd.tar.xz) = 13924444
+SHA256 (rust/2020-01-11/cargo-0.41.0-aarch64-unknown-freebsd.tar.xz) = 492827650d0cf0b796008bbc40d01fa9bbba86c542b3b84d213c6b87a4736261
+SIZE (rust/2020-01-11/cargo-0.41.0-aarch64-unknown-freebsd.tar.xz) = 3722100
+SHA256 (rust/2020-01-11/rustc-1.40.0-x86_64-unknown-freebsd.tar.xz) = e95b3c7c0fec14fb9efd23155812c61bae08e1513fb62cd15fca30fafec7cd5e
+SIZE (rust/2020-01-11/rustc-1.40.0-x86_64-unknown-freebsd.tar.xz) = 28440532
+SHA256 (rust/2020-01-11/rust-std-1.40.0-x86_64-unknown-freebsd.tar.xz) = f5aa2fddf200a701eee4fcebe43725e77333283d7714a273ae92c06de3601a9a
+SIZE (rust/2020-01-11/rust-std-1.40.0-x86_64-unknown-freebsd.tar.xz) = 14603276
+SHA256 (rust/2020-01-11/cargo-0.41.0-x86_64-unknown-freebsd.tar.xz) = 629de6db56cd659856a28679be68dfadbdb31a28a65c156d65cec769ff43a7e7
+SIZE (rust/2020-01-11/cargo-0.41.0-x86_64-unknown-freebsd.tar.xz) = 4399816
+SHA256 (rust/2020-01-11/rustc-1.40.0-armv6-unknown-freebsd.tar.xz) = 442dc33f751c79044d862d4d20e6512589d78e33712c8731b83e7b9ccded9f01
+SIZE (rust/2020-01-11/rustc-1.40.0-armv6-unknown-freebsd.tar.xz) = 27455140
+SHA256 (rust/2020-01-11/rust-std-1.40.0-armv6-unknown-freebsd.tar.xz) = bdcf05cafe9a6a5fd1d089b763cd4946d24a61049f24eff3993c1033db4af88e
+SIZE (rust/2020-01-11/rust-std-1.40.0-armv6-unknown-freebsd.tar.xz) = 13924280
+SHA256 (rust/2020-01-11/cargo-0.41.0-armv6-unknown-freebsd.tar.xz) = d04aba96a043fb798cee1f4b44a63ff83549c1c85ffaadbbda3edc28ebbb01fc
+SIZE (rust/2020-01-11/cargo-0.41.0-armv6-unknown-freebsd.tar.xz) = 3811020
+SHA256 (rust/2020-01-11/rustc-1.40.0-armv7-unknown-freebsd.tar.xz) = 9d89a89d0f441e1e074e2d0c9d255e07852971c60bd3f4e533e8d1e9fded60e0
+SIZE (rust/2020-01-11/rustc-1.40.0-armv7-unknown-freebsd.tar.xz) = 27393212
+SHA256 (rust/2020-01-11/rust-std-1.40.0-armv7-unknown-freebsd.tar.xz) = 5e4ef87f5403f273856ecfcb822d439628fc95dd7c77d2bd21ac7f33b7e4cba6
+SIZE (rust/2020-01-11/rust-std-1.40.0-armv7-unknown-freebsd.tar.xz) = 13862568
+SHA256 (rust/2020-01-11/cargo-0.41.0-armv7-unknown-freebsd.tar.xz) = a07620fe97be95523d3f915ae03c4b37fcd467fd4f141d62188670dd069e98a2
+SIZE (rust/2020-01-11/cargo-0.41.0-armv7-unknown-freebsd.tar.xz) = 3808576
+SHA256 (rust/2020-01-11/rustc-1.40.0-i686-unknown-freebsd.tar.xz) = a785bede5f78784a62e5b93557e46fed32263d0625e3abe186847f9d6bee89aa
+SIZE (rust/2020-01-11/rustc-1.40.0-i686-unknown-freebsd.tar.xz) = 29109748
+SHA256 (rust/2020-01-11/rust-std-1.40.0-i686-unknown-freebsd.tar.xz) = d44c08d8bc59eec45784c5dd53d5b5a723afa0786a33e52e23a3a169c932242d
+SIZE (rust/2020-01-11/rust-std-1.40.0-i686-unknown-freebsd.tar.xz) = 14501104
+SHA256 (rust/2020-01-11/cargo-0.41.0-i686-unknown-freebsd.tar.xz) = e4360a14e9b7bf24c273d72a0f043f276be8500974d8c00df9eb2b56abff5ae3
+SIZE (rust/2020-01-11/cargo-0.41.0-i686-unknown-freebsd.tar.xz) = 4356888
+SHA256 (rust/2020-01-11/rustc-1.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = b68ce52ccf2a04d165ac0cc69e6eb6dd1d4b69c5334c7e20e1ada9387f34d788
+SIZE (rust/2020-01-11/rustc-1.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 32015204
+SHA256 (rust/2020-01-11/rust-std-1.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 9193a9c30fe63f8d0644c99be9c253dc0e685d994812bc22a2e35c8046a64430
+SIZE (rust/2020-01-11/rust-std-1.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 13903088
+SHA256 (rust/2020-01-11/cargo-0.41.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = e434e724c635aadac3bd859b49504903133182fca862bdc1c2129659e2129cdd
+SIZE (rust/2020-01-11/cargo-0.41.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4253612
+SHA256 (rust/2020-01-11/rustc-1.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 7ef1dcdf471b5ff8fdb106573594589978d96c39931972750e21bd4ab001e856
+SIZE (rust/2020-01-11/rustc-1.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 26694028
+SHA256 (rust/2020-01-11/rust-std-1.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 8dfaff61d5d631afb04cd7a6235dfac3a803fa1fd13def934746e69b6ec35b38
+SIZE (rust/2020-01-11/rust-std-1.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 13866172
+SHA256 (rust/2020-01-11/cargo-0.41.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 10e96fb30baa14a95ffede8074867209feda189af2b49f5da1caf5457c9751b2
+SIZE (rust/2020-01-11/cargo-0.41.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 3982652
diff --git a/lang/rust/files/patch-src_bootstrap_bootstrap.py b/lang/rust/files/patch-src_bootstrap_bootstrap.py
deleted file mode 100644
index 54b6f8ef9764..000000000000
--- a/lang/rust/files/patch-src_bootstrap_bootstrap.py
+++ /dev/null
@@ -1,81 +0,0 @@
-https://github.com/rust-lang/rust/commit/8d56bcc59c92
-
---- src/bootstrap/bootstrap.py.orig	2019-11-04 15:45:21 UTC
-+++ src/bootstrap/bootstrap.py
-@@ -102,10 +102,10 @@ def verify(path, sha_path, verbose):
-     return verified
- 
- 
--def unpack(tarball, dst, verbose=False, match=None):
-+def unpack(tarball, tarball_suffix, dst, verbose=False, match=None):
-     """Unpack the given tarball file"""
-     print("extracting", tarball)
--    fname = os.path.basename(tarball).replace(".tar.gz", "")
-+    fname = os.path.basename(tarball).replace(tarball_suffix, "")
-     with contextlib.closing(tarfile.open(tarball)) as tar:
-         for member in tar.getnames():
-             if "/" not in member:
-@@ -331,6 +331,18 @@ class RustBuild(object):
-         self.use_vendored_sources = ''
-         self.verbose = False
- 
-+        def support_xz():
-+            try:
-+                with tempfile.NamedTemporaryFile(delete=False) as temp_file:
-+                    temp_path = temp_file.name
-+                with tarfile.open(temp_path, "w:xz") as tar:
-+                    pass
-+                return True
-+            except tarfile.CompressionError:
-+                return False
-+
-+        self.tarball_suffix = '.tar.xz' if support_xz() else '.tar.gz'
-+
-     def download_stage0(self):
-         """Fetch the build system for Rust, written in Rust
- 
-@@ -349,12 +361,13 @@ class RustBuild(object):
-                  self.program_out_of_date(self.rustc_stamp())):
-             if os.path.exists(self.bin_root()):
-                 shutil.rmtree(self.bin_root())
--            filename = "rust-std-{}-{}.tar.gz".format(
--                rustc_channel, self.build)
-+            filename = "rust-std-{}-{}{}".format(
-+                rustc_channel, self.build, self.tarball_suffix)
-             pattern = "rust-std-{}".format(self.build)
-             self._download_stage0_helper(filename, pattern)
- 
--            filename = "rustc-{}-{}.tar.gz".format(rustc_channel, self.build)
-+            filename = "rustc-{}-{}{}".format(rustc_channel, self.build,
-+                                              self.tarball_suffix)
-             self._download_stage0_helper(filename, "rustc")
-             self.fix_executable("{}/bin/rustc".format(self.bin_root()))
-             self.fix_executable("{}/bin/rustdoc".format(self.bin_root()))
-@@ -365,14 +378,15 @@ class RustBuild(object):
-             # libraries/binaries that are included in rust-std with
-             # the system MinGW ones.
-             if "pc-windows-gnu" in self.build:
--                filename = "rust-mingw-{}-{}.tar.gz".format(
--                    rustc_channel, self.build)
-+                filename = "rust-mingw-{}-{}{}".format(
-+                    rustc_channel, self.build, self.tarball_suffix)
-                 self._download_stage0_helper(filename, "rust-mingw")
- 
-         if self.cargo().startswith(self.bin_root()) and \
-                 (not os.path.exists(self.cargo()) or
-                  self.program_out_of_date(self.cargo_stamp())):
--            filename = "cargo-{}-{}.tar.gz".format(cargo_channel, self.build)
-+            filename = "cargo-{}-{}{}".format(cargo_channel, self.build,
-+                                              self.tarball_suffix)
-             self._download_stage0_helper(filename, "cargo")
-             self.fix_executable("{}/bin/cargo".format(self.bin_root()))
-             with output(self.cargo_stamp()) as cargo_stamp:
-@@ -388,7 +402,7 @@ class RustBuild(object):
-         tarball = os.path.join(rustc_cache, filename)
-         if not os.path.exists(tarball):
-             get("{}/{}".format(url, filename), tarball, verbose=self.verbose)
--        unpack(tarball, self.bin_root(), match=pattern, verbose=self.verbose)
-+        unpack(tarball, self.tarball_suffix, self.bin_root(), match=pattern, verbose=self.verbose)
- 
-     @staticmethod
-     def fix_executable(fname):
diff --git a/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs b/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
index 0d903af64043..33e329ba2a56 100644
--- a/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
+++ b/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
@@ -1,11 +1,16 @@
---- src/librustc_target/spec/i686_unknown_freebsd.rs.orig	2019-04-08 12:42:31 UTC
+--- src/librustc_target/spec/i686_unknown_freebsd.rs.orig	2019-12-16 15:38:05 UTC
 +++ src/librustc_target/spec/i686_unknown_freebsd.rs
-@@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, Target, TargetResult};
+@@ -2,9 +2,11 @@ use crate::spec::{LinkerFlavor, Target, TargetResult};
  
  pub fn target() -> TargetResult {
      let mut base = super::freebsd_base::opts();
 -    base.cpu = "pentium4".to_string();
 +    base.cpu = "pentiumpro".to_string();
      base.max_atomic_width = Some(64);
-     base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string());
+-    base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string());
++    let pre_link_args = base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap();
++    pre_link_args.push("-m32".to_string());
++    pre_link_args.push("-Wl,-znotext".to_string());
      base.stack_probes = true;
+ 
+     Ok(Target {
diff --git a/lang/rust/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py b/lang/rust/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py
deleted file mode 100644
index 475d9833a777..000000000000
--- a/lang/rust/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/llvm-project/llvm/utils/llvm-build/llvmbuild/main.py.orig	2019-09-20 16:14:30 UTC
-+++ src/llvm-project/llvm/utils/llvm-build/llvmbuild/main.py
-@@ -657,6 +657,8 @@ def add_magic_target_components(parser, project, opts)
-     # We handle a few special cases of target names here for historical
-     # reasons, as these are the names configure currently comes up with.
-     native_target_name = { 'x86' : 'X86',
-+                           'i386' : 'X86',
-+                           'amd64' : 'X86',
-                            'x86_64' : 'X86',
-                            'Unknown' : None }.get(opts.native_target,
-                                                   opts.native_target)
diff --git a/lang/rust/files/patch-vendor_openssl-sys_build_cfgs.rs b/lang/rust/files/patch-vendor_openssl-sys_build_cfgs.rs
deleted file mode 100644
index 1a2aa256edd4..000000000000
--- a/lang/rust/files/patch-vendor_openssl-sys_build_cfgs.rs
+++ /dev/null
@@ -1,22 +0,0 @@
---- vendor/openssl-sys/build/cfgs.rs.orig	2019-05-13 21:50:35 UTC
-+++ vendor/openssl-sys/build/cfgs.rs
-@@ -13,6 +13,9 @@ pub fn get(openssl_version: Option<u64>, libressl_vers
-         if libressl_version >= 0x2_07_00_00_0 {
-             cfgs.push("libressl270");
-         }
-+        if libressl_version >= 0x2_07_01_00_0 {
-+            cfgs.push("libressl271");
-+        }
-         if libressl_version >= 0x2_07_03_00_0 {
-             cfgs.push("libressl273");
-         }
-@@ -21,6 +24,9 @@ pub fn get(openssl_version: Option<u64>, libressl_vers
-         }
-         if libressl_version >= 0x2_08_01_00_0 {
-             cfgs.push("libressl281");
-+        }
-+        if libressl_version >= 0x2_09_01_00_0 {
-+            cfgs.push("libressl291");
-         }
-     } else {
-         let openssl_version = openssl_version.unwrap();
diff --git a/lang/rust/files/patch-vendor_openssl-sys_build_main.rs b/lang/rust/files/patch-vendor_openssl-sys_build_main.rs
deleted file mode 100644
index 0629319631dd..000000000000
--- a/lang/rust/files/patch-vendor_openssl-sys_build_main.rs
+++ /dev/null
@@ -1,59 +0,0 @@
---- vendor/openssl-sys/build/main.rs.orig	2019-11-04 17:34:46 UTC
-+++ vendor/openssl-sys/build/main.rs
-@@ -183,27 +183,32 @@ See rust-openssl README for more information:
-     if let Some(libressl_version) = libressl_version {
-         println!("cargo:libressl_version_number={:x}", libressl_version);
- 
-+        let major = (libressl_version >> 28) as u8;
-         let minor = (libressl_version >> 20) as u8;
-         let fix = (libressl_version >> 12) as u8;
--        let (minor, fix) = match (minor, fix) {
--            (5, 0) => ('5', '0'),
--            (5, 1) => ('5', '1'),
--            (5, 2) => ('5', '2'),
--            (5, _) => ('5', 'x'),
--            (6, 0) => ('6', '0'),
--            (6, 1) => ('6', '1'),
--            (6, 2) => ('6', '2'),
--            (6, _) => ('6', 'x'),
--            (7, _) => ('7', 'x'),
--            (8, 0) => ('8', '0'),
--            (8, 1) => ('8', '1'),
--            (8, _) => ('8', 'x'),
--            (9, 0) => ('9', '0'),
-+        let (major, minor, fix) = match (major, minor, fix) {
-+            (2, 5, 0) => ('2', '5', '0'),
-+            (2, 5, 1) => ('2', '5', '1'),
-+            (2, 5, 2) => ('2', '5', '2'),
-+            (2, 5, _) => ('2', '5', 'x'),
-+            (2, 6, 0) => ('2', '6', '0'),
-+            (2, 6, 1) => ('2', '6', '1'),
-+            (2, 6, 2) => ('2', '6', '2'),
-+            (2, 6, _) => ('2', '6', 'x'),
-+            (2, 7, _) => ('2', '7', 'x'),
-+            (2, 8, 0) => ('2', '8', '0'),
-+            (2, 8, 1) => ('2', '8', '1'),
-+            (2, 8, _) => ('2', '8', 'x'),
-+            (2, 9, 0) => ('2', '9', '0'),
-+            (2, 9, _) => ('2', '9', 'x'),
-+            (3, 0, 0) => ('3', '0', '0'),
-+            (3, 0, 1) => ('3', '0', '1'),
-+            (3, 0, _) => ('3', '0', 'x'),
-             _ => version_error(),
-         };
- 
-         println!("cargo:libressl=true");
--        println!("cargo:libressl_version=2{}{}", minor, fix);
-+        println!("cargo:libressl_version={}{}{}", major, minor, fix);
-         println!("cargo:version=101");
-         Version::Libressl
-     } else {
-@@ -239,7 +244,7 @@ fn version_error() -> ! {
-         "
- 
- This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
--through 2.9.0, but a different version of OpenSSL was found. The build is now aborting
-+through 3.0.x, but a different version of OpenSSL was found. The build is now aborting
- due to this version mismatch.
- 
- "
diff --git a/lang/rust/files/patch-vendor_openssl-sys_src_crypto.rs b/lang/rust/files/patch-vendor_openssl-sys_src_crypto.rs
deleted file mode 100644
index 0a4f3adbf705..000000000000
--- a/lang/rust/files/patch-vendor_openssl-sys_src_crypto.rs
+++ /dev/null
@@ -1,26 +0,0 @@
---- vendor/openssl-sys/src/crypto.rs.orig	2019-05-13 21:50:35 UTC
-+++ vendor/openssl-sys/src/crypto.rs
-@@ -15,7 +15,13 @@ cfg_if! {
-     if #[cfg(ossl110)] {
-         pub const CRYPTO_EX_INDEX_SSL: c_int = 0;
-         pub const CRYPTO_EX_INDEX_SSL_CTX: c_int = 1;
--
-+    } else if #[cfg(libressl)] {
-+        pub const CRYPTO_EX_INDEX_SSL: c_int = 1;
-+        pub const CRYPTO_EX_INDEX_SSL_CTX: c_int = 2;
-+    }
-+}
-+cfg_if! {
-+    if #[cfg(any(ossl110, libressl271))] {
-         extern "C" {
-             pub fn OpenSSL_version_num() -> c_ulong;
-             pub fn OpenSSL_version(key: c_int) -> *const c_char;
-@@ -64,7 +70,7 @@ pub type CRYPTO_EX_free = unsafe extern "C" fn(
-     argp: *mut c_void,
- );
- extern "C" {
--    #[cfg(ossl110)]
-+    #[cfg(any(ossl110, libressl))]
-     pub fn CRYPTO_get_ex_new_index(
-         class_index: c_int,
-         argl: c_long,
diff --git a/lang/rust/files/patch-vendor_openssl-sys_src_ssl.rs b/lang/rust/files/patch-vendor_openssl-sys_src_ssl.rs
deleted file mode 100644
index e54f58f9249c..000000000000
--- a/lang/rust/files/patch-vendor_openssl-sys_src_ssl.rs
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/openssl-sys/src/ssl.rs.orig	2019-11-04 17:34:46 UTC
-+++ vendor/openssl-sys/src/ssl.rs
-@@ -1057,7 +1057,7 @@ extern "C" {
- }
- 
- cfg_if! {
--    if #[cfg(ossl110)] {
-+    if #[cfg(any(ossl110, libressl291))] {
-         extern "C" {
-             pub fn TLS_method() -> *const SSL_METHOD;
- 
diff --git a/lang/rust/files/patch-vendor_openssl_build.rs b/lang/rust/files/patch-vendor_openssl_build.rs
deleted file mode 100644
index 30793f1827eb..000000000000
--- a/lang/rust/files/patch-vendor_openssl_build.rs
+++ /dev/null
@@ -1,23 +0,0 @@
---- vendor/openssl/build.rs.orig	2019-05-13 21:50:34 UTC
-+++ vendor/openssl/build.rs
-@@ -46,12 +46,20 @@ fn main() {
-             println!("cargo:rustc-cfg=libressl270");
-         }
- 
-+        if version >= 0x2_07_01_00_0 {
-+            println!("cargo:rustc-cfg=libressl271");
-+        }
-+
-         if version >= 0x2_07_03_00_0 {
-             println!("cargo:rustc-cfg=libressl273");
-         }
- 
-         if version >= 0x2_08_00_00_0 {
-             println!("cargo:rustc-cfg=libressl280");
-+        }
-+
-+        if version >= 0x2_09_01_00_0 {
-+            println!("cargo:rustc-cfg=libressl291");
-         }
-     }
- }
diff --git a/lang/rust/files/patch-vendor_openssl_src_ssl_mod.rs b/lang/rust/files/patch-vendor_openssl_src_ssl_mod.rs
deleted file mode 100644
index f0b6ac7fe6b9..000000000000
--- a/lang/rust/files/patch-vendor_openssl_src_ssl_mod.rs
+++ /dev/null
@@ -1,28 +0,0 @@
---- vendor/openssl/src/ssl/mod.rs.orig	2019-05-13 21:50:34 UTC
-+++ vendor/openssl/src/ssl/mod.rs
-@@ -3690,9 +3690,14 @@ cfg_if! {
- }
- 
- cfg_if! {
--    if #[cfg(ossl110)] {
-+    if #[cfg(any(ossl110, libressl291))] {
-         use ffi::{TLS_method, DTLS_method};
--
-+    } else {
-+        use ffi::{SSLv23_method as TLS_method, DTLSv1_method as DTLS_method};
-+    }
-+}
-+cfg_if! {
-+    if #[cfg(ossl110)] {
-         unsafe fn get_new_idx(f: ffi::CRYPTO_EX_free) -> c_int {
-             ffi::CRYPTO_get_ex_new_index(
-                 ffi::CRYPTO_EX_INDEX_SSL_CTX,
-@@ -3715,8 +3720,6 @@ cfg_if! {
-             )
-         }
-     } else {
--        use ffi::{SSLv23_method as TLS_method, DTLSv1_method as DTLS_method};
--
-         unsafe fn get_new_idx(f: ffi::CRYPTO_EX_free) -> c_int {
-             ffi::SSL_CTX_get_ex_new_index(0, ptr::null_mut(), None, None, Some(f))
-         }
diff --git a/lang/rust/files/patch-vendor_openssl_src_version.rs b/lang/rust/files/patch-vendor_openssl_src_version.rs
deleted file mode 100644
index 2d92dd6d6ab7..000000000000
--- a/lang/rust/files/patch-vendor_openssl_src_version.rs
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/openssl/src/version.rs.orig	2019-05-13 21:50:34 UTC
-+++ vendor/openssl/src/version.rs
-@@ -14,7 +14,7 @@
- use std::ffi::CStr;
- 
- cfg_if! {
--    if #[cfg(ossl110)] {
-+    if #[cfg(any(ossl110, libressl271))] {
-         use ffi::{
-             OPENSSL_VERSION, OPENSSL_CFLAGS, OPENSSL_BUILT_ON, OPENSSL_PLATFORM, OPENSSL_DIR,
-             OpenSSL_version_num, OpenSSL_version,