lang/rust: Update to 1.22.1

Support for LibreSSL up-to 2.6.3 is now included, thus we can remove the
patches to the `openssl` and `openssl-sys` crates.

The renewed bootstrap for aarch64 was created on 11.0-RELEASE, instead
of 11.1-STABLE. It should allow it to run on all 11.x and thus fix the
build on 11.0-RELEASE. [1]

PR:		223009 [1]

8 files changed, 30 insertions, 227 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 2bf85361a4e3..f2f108fb5fcb 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.21.0
-PORTREVISION=	1
+PORTVERSION?=	1.22.1
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/:src \
 		LOCAL/dumbbell/rust:rust_bootstrap \
@@ -43,13 +42,13 @@ ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap compiler
 #CONFLICTS_BUILD+=	${PKGBASE}
 CONFLICTS_INSTALL?=	rust-nightly
 
-BOOTSTRAPS_DATE?=		2017-08-31
+BOOTSTRAPS_DATE?=		2017-10-12
 
-RUST_BOOTSTRAP_VERSION?=	1.20.0
+RUST_BOOTSTRAP_VERSION?=	1.21.0
 RUSTC_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz
 RUST_STD_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz
 
-CARGO_BOOTSTRAP_VERSION?=	0.21.0
+CARGO_BOOTSTRAP_VERSION?=	0.22.0
 CARGO_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}${EXTRACT_SUFX}
 
 RUST_CHANNEL=	${PKGNAMESUFFIX:Ustable:S/^-//}
@@ -132,9 +131,9 @@ pre-fetch:
 	fi
 
 RUST_STD_DIR=		${RUST_STD_BOOTSTRAP:T:R:R}
-LIBSTD_SUFFIX_aarch64=	8eed00280b051035
-LIBSTD_SUFFIX_amd64=	fdf1c4a03a15a71f
-LIBSTD_SUFFIX_i386=	aaa09cdd21ad338f
+LIBSTD_SUFFIX_aarch64=	0b5479f9b944419b
+LIBSTD_SUFFIX_amd64=	d5600fa473bb2268
+LIBSTD_SUFFIX_i386=	7c10a38de31dc096
 LIBSTD=			${RUST_STD_DIR}/rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET}/lib/libstd-${LIBSTD_SUFFIX_${ARCH}:U${LIBSTD_SUFFIX}}.rlib
 STDF=			${LIBSTD:T:R:S/lib//}.0.o
 
@@ -355,7 +354,8 @@ do-test:
 
 BOOTSTRAPS_SOURCE_PKG_FBSDVER=		10
 BOOTSTRAPS_SOURCE_PKG_FBSDVER_aarch64=	11
-BOOTSTRAPS_SOURCE_PKG_URL=	http://pkg.freebsd.org/FreeBSD:${BOOTSTRAPS_SOURCE_PKG_FBSDVER_${ARCH}:U${BOOTSTRAPS_SOURCE_PKG_FBSDVER}}:${ARCH}/latest/All/rust-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}.txz
+BOOTSTRAPS_SOURCE_PKG_REV=		_1
+BOOTSTRAPS_SOURCE_PKG_URL=	http://pkg.freebsd.org/FreeBSD:${BOOTSTRAPS_SOURCE_PKG_FBSDVER_${ARCH}:U${BOOTSTRAPS_SOURCE_PKG_FBSDVER}}:${ARCH}/latest/All/rust-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}${BOOTSTRAPS_SOURCE_PKG_REV}.txz
 BOOTSTRAPS_SOURCE_PKG=		${_DISTDIR}/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${ARCH}.txz
 
 package-to-bootstraps: ${BOOTSTRAPS_SOURCE_PKG}
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 99050e08d7bf..3b80caaceac4 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,21 +1,21 @@
-TIMESTAMP = 1508970863
-SHA256 (rust/rustc-1.21.0-src.tar.gz) = 1707c142244b5bd909993559c6116c81987c1de21d6207c05d3ecbe5bba548fa
-SIZE (rust/rustc-1.21.0-src.tar.gz) = 52555346
-SHA256 (rust/2017-08-31/rustc-1.20.0-aarch64-unknown-freebsd.tar.gz) = 6703e3205c5d7075ea49acb5a0a2bf4fb1dfe3a10daf160a67a1c4376e37e530
-SIZE (rust/2017-08-31/rustc-1.20.0-aarch64-unknown-freebsd.tar.gz) = 42731935
-SHA256 (rust/2017-08-31/rust-std-1.20.0-aarch64-unknown-freebsd.tar.gz) = 9da54867a9b65e708f7e31c615f7a31bfacad2d9fe5459e570575118f29a122c
-SIZE (rust/2017-08-31/rust-std-1.20.0-aarch64-unknown-freebsd.tar.gz) = 59365419
-SHA256 (rust/2017-08-31/cargo-0.21.0-aarch64-unknown-freebsd.tar.gz) = 9d556e11ea2f391bfa382f08818185c5d05bf94966ff35ae24e53a510f7ae5da
-SIZE (rust/2017-08-31/cargo-0.21.0-aarch64-unknown-freebsd.tar.gz) = 2915815
-SHA256 (rust/2017-08-31/rustc-1.20.0-i686-unknown-freebsd.tar.gz) = 58c8c4f73c9170cd0e81071147cd0772fc5e8512f4fcfb6fd08ad2c60b69177d
-SIZE (rust/2017-08-31/rustc-1.20.0-i686-unknown-freebsd.tar.gz) = 44170684
-SHA256 (rust/2017-08-31/rust-std-1.20.0-i686-unknown-freebsd.tar.gz) = 3426262d596ab8bf41b818965f995588256ae7008c162a39f83eed93ce3c42f8
-SIZE (rust/2017-08-31/rust-std-1.20.0-i686-unknown-freebsd.tar.gz) = 60720005
-SHA256 (rust/2017-08-31/cargo-0.21.0-i686-unknown-freebsd.tar.gz) = cad85e8beb87eeacfa80944b63653ed00a60b9d6f7e423ea0c58a83db8a2ea4a
-SIZE (rust/2017-08-31/cargo-0.21.0-i686-unknown-freebsd.tar.gz) = 5134986
-SHA256 (rust/2017-08-31/rustc-1.20.0-x86_64-unknown-freebsd.tar.gz) = d7f06662a29023043e21f598d24803d6c2f0d801635016abb32636b55ca14535
-SIZE (rust/2017-08-31/rustc-1.20.0-x86_64-unknown-freebsd.tar.gz) = 43348607
-SHA256 (rust/2017-08-31/rust-std-1.20.0-x86_64-unknown-freebsd.tar.gz) = aa1773ec1049247ef0730195eb83a7a73f22df556fe759029679aabe0235a3d3
-SIZE (rust/2017-08-31/rust-std-1.20.0-x86_64-unknown-freebsd.tar.gz) = 60215051
-SHA256 (rust/2017-08-31/cargo-0.21.0-x86_64-unknown-freebsd.tar.gz) = 522592cdee824d8d7b7c3472f29ded39d10f1fb3d07f3b3ea0673b8edf6d5b66
-SIZE (rust/2017-08-31/cargo-0.21.0-x86_64-unknown-freebsd.tar.gz) = 5183277
+TIMESTAMP = 1511741686
+SHA256 (rust/rustc-1.22.1-src.tar.gz) = 8b7a42bdd6eb205a8c533eb41b5c42389a88158d060aed1e0f461f68c1fd3fd3
+SIZE (rust/rustc-1.22.1-src.tar.gz) = 54935620
+SHA256 (rust/2017-10-12/rustc-1.21.0-aarch64-unknown-freebsd.tar.gz) = 6302769f6ec103bcfe4c41134c1e76747371261288059195dc9ff8a44e67601f
+SIZE (rust/2017-10-12/rustc-1.21.0-aarch64-unknown-freebsd.tar.gz) = 44419411
+SHA256 (rust/2017-10-12/rust-std-1.21.0-aarch64-unknown-freebsd.tar.gz) = 92bc37314a1bc044ce25df95ffa4f5222a96017da968e0e4256de02efa83e2a4
+SIZE (rust/2017-10-12/rust-std-1.21.0-aarch64-unknown-freebsd.tar.gz) = 59227300
+SHA256 (rust/2017-10-12/cargo-0.22.0-aarch64-unknown-freebsd.tar.gz) = df4127117966f55146624c4c198394754bdbe17a3ca6575b3f64d45b87929506
+SIZE (rust/2017-10-12/cargo-0.22.0-aarch64-unknown-freebsd.tar.gz) = 3072402
+SHA256 (rust/2017-10-12/rustc-1.21.0-i686-unknown-freebsd.tar.gz) = 166f977785da34b06d683d9c1b7a3618dd608832e862e9f8ea31c3362026e365
+SIZE (rust/2017-10-12/rustc-1.21.0-i686-unknown-freebsd.tar.gz) = 44398731
+SHA256 (rust/2017-10-12/rust-std-1.21.0-i686-unknown-freebsd.tar.gz) = db47d7f9f6f36d23c7cdc0369f1ca10335f9460e71552043a8c8753bb30733e4
+SIZE (rust/2017-10-12/rust-std-1.21.0-i686-unknown-freebsd.tar.gz) = 59018318
+SHA256 (rust/2017-10-12/cargo-0.22.0-i686-unknown-freebsd.tar.gz) = b2a27147d3ca741cb740f73a7651b9d816d583d7d89be189cae3b7eecff9104e
+SIZE (rust/2017-10-12/cargo-0.22.0-i686-unknown-freebsd.tar.gz) = 5314447
+SHA256 (rust/2017-10-12/rustc-1.21.0-x86_64-unknown-freebsd.tar.gz) = 39324408009725e4e8c3c4baeece26063d461d1c946d448351ce60add591d328
+SIZE (rust/2017-10-12/rustc-1.21.0-x86_64-unknown-freebsd.tar.gz) = 43542981
+SHA256 (rust/2017-10-12/rust-std-1.21.0-x86_64-unknown-freebsd.tar.gz) = f76b49330c15cbcfa14865e38a05de672501688b913d0ae7ded0be2937e1b795
+SIZE (rust/2017-10-12/rust-std-1.21.0-x86_64-unknown-freebsd.tar.gz) = 58481493
+SHA256 (rust/2017-10-12/cargo-0.22.0-x86_64-unknown-freebsd.tar.gz) = 8b1d824ca94d7737f526ad4e73f482dfae40c1346fdbdf83d5c23f03657fe01d
+SIZE (rust/2017-10-12/cargo-0.22.0-x86_64-unknown-freebsd.tar.gz) = 5378813
diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_build.rs b/lang/rust/files/patch-src_vendor_openssl-sys_build.rs
deleted file mode 100644
index 6a3f335e4bb0..000000000000
--- a/lang/rust/files/patch-src_vendor_openssl-sys_build.rs
+++ /dev/null
@@ -1,89 +0,0 @@
---- src/vendor/openssl-sys/build.rs.orig	2017-10-09 21:52:49 UTC
-+++ src/vendor/openssl-sys/build.rs
-@@ -307,8 +307,14 @@ fn validate_headers(include_dirs: &[PathBuf]) -> Versi
- #include <openssl/opensslv.h>
- #include <openssl/opensslconf.h>
- 
--#if LIBRESSL_VERSION_NUMBER >= 0x20601000
-+#if LIBRESSL_VERSION_NUMBER >= 0x20604000
- RUST_LIBRESSL_NEW
-+#elif LIBRESSL_VERSION_NUMBER >= 0x20603000
-+RUST_LIBRESSL_263
-+#elif LIBRESSL_VERSION_NUMBER >= 0x20602000
-+RUST_LIBRESSL_262
-+#elif LIBRESSL_VERSION_NUMBER >= 0x20601000
-+RUST_LIBRESSL_261
- #elif LIBRESSL_VERSION_NUMBER >= 0x20600000
- RUST_LIBRESSL_260
- #elif LIBRESSL_VERSION_NUMBER >= 0x20506000
-@@ -403,42 +409,70 @@ See rust-openssl README for more information:
-         println!("cargo:rustc-cfg=libressl");
-         println!("cargo:rustc-cfg=libressl250");
-         println!("cargo:libressl=true");
-+        println!("cargo:libressl_version=250");
-         println!("cargo:version=101");
-         Version::Libressl
-     } else if expanded.contains("RUST_LIBRESSL_251") {
-         println!("cargo:rustc-cfg=libressl");
-         println!("cargo:rustc-cfg=libressl251");
-         println!("cargo:libressl=true");
-+        println!("cargo:libressl_version=251");
-         println!("cargo:version=101");
-         Version::Libressl
-     } else if expanded.contains("RUST_LIBRESSL_252") {
-         println!("cargo:rustc-cfg=libressl");
-         println!("cargo:rustc-cfg=libressl252");
-         println!("cargo:libressl=true");
-+        println!("cargo:libressl_version=252");
-         println!("cargo:version=101");
-         Version::Libressl
-     } else if expanded.contains("RUST_LIBRESSL_253") {
-         println!("cargo:rustc-cfg=libressl");
-         println!("cargo:rustc-cfg=libressl253");
-         println!("cargo:libressl=true");
-+        println!("cargo:libressl_version=253");
-         println!("cargo:version=101");
-         Version::Libressl
-     } else if expanded.contains("RUST_LIBRESSL_254") {
-         println!("cargo:rustc-cfg=libressl");
-         println!("cargo:rustc-cfg=libressl254");
-         println!("cargo:libressl=true");
-+        println!("cargo:libressl_version=254");
-         println!("cargo:version=101");
-         Version::Libressl
-     } else if expanded.contains("RUST_LIBRESSL_255") {
-         println!("cargo:rustc-cfg=libressl");
-         println!("cargo:rustc-cfg=libressl255");
-         println!("cargo:libressl=true");
-+        println!("cargo:libressl_version=255");
-         println!("cargo:version=101");
-         Version::Libressl
-     } else if expanded.contains("RUST_LIBRESSL_260") {
-         println!("cargo:rustc-cfg=libressl");
-         println!("cargo:rustc-cfg=libressl260");
-         println!("cargo:libressl=true");
-+        println!("cargo:libressl_version=260");
-+        println!("cargo:version=101");
-+        Version::Libressl
-+    } else if expanded.contains("RUST_LIBRESSL_261") {
-+        println!("cargo:rustc-cfg=libressl");
-+        println!("cargo:rustc-cfg=libressl261");
-+        println!("cargo:libressl=true");
-+        println!("cargo:libressl_version=261");
-+        println!("cargo:version=101");
-+        Version::Libressl
-+    } else if expanded.contains("RUST_LIBRESSL_262") {
-+        println!("cargo:rustc-cfg=libressl");
-+        println!("cargo:rustc-cfg=libressl262");
-+        println!("cargo:libressl=true");
-+        println!("cargo:libressl_version=262");
-+        println!("cargo:version=101");
-+        Version::Libressl
-+    } else if expanded.contains("RUST_LIBRESSL_263") {
-+        println!("cargo:rustc-cfg=libressl");
-+        println!("cargo:rustc-cfg=libressl263");
-+        println!("cargo:libressl=true");
-+        println!("cargo:libressl_version=263");
-         println!("cargo:version=101");
-         Version::Libressl
-     } else if expanded.contains("RUST_OPENSSL_110F") {
diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_lib.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_lib.rs
deleted file mode 100644
index 8746fc3b846c..000000000000
--- a/lang/rust/files/patch-src_vendor_openssl-sys_src_lib.rs
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/vendor/openssl-sys/src/lib.rs.orig	2017-10-09 21:52:49 UTC
-+++ src/vendor/openssl-sys/src/lib.rs
-@@ -1225,10 +1225,15 @@ pub const SSL_VERIFY_NONE: c_int = 0;
- pub const SSL_VERIFY_PEER: c_int = 1;
- pub const SSL_VERIFY_FAIL_IF_NO_PEER_CERT: c_int = 2;
- 
--#[cfg(not(ossl101))]
-+#[cfg(not(any(libressl261, libressl262, libressl263, ossl101)))]
- pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x00000010;
-+#[cfg(any(libressl261, libressl262, libressl263))]
-+pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x0;
- pub const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: c_ulong = 0x00000800;
-+#[cfg(not(any(libressl261, libressl262, libressl263)))]
- pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x80000000;
-+#[cfg(any(libressl261, libressl262, libressl263))]
-+pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x0;
- pub const SSL_OP_LEGACY_SERVER_CONNECT: c_ulong = 0x00000004;
- #[cfg(not(libressl))]
- pub const SSL_OP_SAFARI_ECDHE_ECDSA_BUG: c_ulong = 0x00000040;
diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_mod.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_mod.rs
deleted file mode 100644
index 5ef6a0b54d56..000000000000
--- a/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_mod.rs
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/vendor/openssl-sys/src/libressl/mod.rs.orig	2017-10-09 21:52:49 UTC
-+++ src/vendor/openssl-sys/src/libressl/mod.rs
-@@ -345,6 +345,9 @@ pub const SSL_CTRL_OPTIONS: c_int = 32;
- pub const SSL_CTRL_CLEAR_OPTIONS: c_int = 77;
- pub const SSL_CTRL_SET_ECDH_AUTO: c_int = 94;
- 
-+#[cfg(any(libressl261, libressl262, libressl263))]
-+pub const SSL_OP_ALL: c_ulong = 0x4;
-+#[cfg(not(any(libressl261, libressl262, libressl263)))]
- pub const SSL_OP_ALL: c_ulong = 0x80000014;
- pub const SSL_OP_CISCO_ANYCONNECT: c_ulong = 0x0;
- pub const SSL_OP_NO_COMPRESSION: c_ulong = 0x0;
-@@ -357,6 +360,9 @@ pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong =
- pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x0;
- pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x0;
- pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x0;
-+#[cfg(any(libressl261, libressl262, libressl263))]
-+pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x0;
-+#[cfg(not(any(libressl261, libressl262, libressl263)))]
- pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00080000;
- pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00100000;
- pub const SSL_OP_NO_SSLv2: c_ulong = 0x0;
diff --git a/lang/rust/files/patch-src_vendor_openssl_build.rs b/lang/rust/files/patch-src_vendor_openssl_build.rs
deleted file mode 100644
index 18f8446dccd5..000000000000
--- a/lang/rust/files/patch-src_vendor_openssl_build.rs
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/vendor/openssl/build.rs.orig	2017-10-10 20:21:28 UTC
-+++ src/vendor/openssl/build.rs
-@@ -20,6 +20,10 @@ fn main() {
-         println!("cargo:rustc-cfg=libressl");
-     }
- 
-+    if let Ok(v) = env::var("DEP_OPENSSL_LIBRESSL_VERSION") {
-+        println!("cargo:rustc-cfg=libressl{}", v);
-+    }
-+
-     if let Ok(vars) = env::var("DEP_OPENSSL_CONF") {
-         for var in vars.split(",") {
-             println!("cargo:rustc-cfg=osslconf=\"{}\"", var);
diff --git a/lang/rust/files/patch-src_vendor_openssl_src_ssl_mod.rs b/lang/rust/files/patch-src_vendor_openssl_src_ssl_mod.rs
deleted file mode 100644
index 9f354c4b1dd6..000000000000
--- a/lang/rust/files/patch-src_vendor_openssl_src_ssl_mod.rs
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/vendor/openssl/src/ssl/mod.rs.orig	2017-10-09 21:52:52 UTC
-+++ src/vendor/openssl/src/ssl/mod.rs
-@@ -652,6 +652,7 @@ impl SslContextBuilder {
- 
-     /// Set the protocols to be used during Next Protocol Negotiation (the protocols
-     /// supported by the application).
-+    #[cfg(not(any(libressl261, libressl262, libressl263)))]
-     pub fn set_npn_protocols(&mut self, protocols: &[&[u8]]) -> Result<(), ErrorStack> {
-         // Firstly, convert the list of protocols to a byte-array that can be passed to OpenSSL
-         // APIs -- a list of length-prefixed strings.
-@@ -1310,6 +1311,7 @@ impl SslRef {
-     ///
-     /// The protocol's name is returned is an opaque sequence of bytes. It is up to the client
-     /// to interpret it.
-+    #[cfg(not(any(libressl261, libressl262, libressl263)))]
-     pub fn selected_npn_protocol(&self) -> Option<&[u8]> {
-         unsafe {
-             let mut data: *const c_uchar = ptr::null();
diff --git a/lang/rust/files/patch-src_vendor_openssl_src_ssl_tests_mod.rs b/lang/rust/files/patch-src_vendor_openssl_src_ssl_tests_mod.rs
deleted file mode 100644
index 17aa81f74f5a..000000000000
--- a/lang/rust/files/patch-src_vendor_openssl_src_ssl_tests_mod.rs
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/vendor/openssl/src/ssl/tests/mod.rs.orig	2017-10-09 23:52:52.000000000 +0200
-+++ src/vendor/openssl/src/ssl/tests/mod.rs	2017-11-09 13:42:46.721625000 +0100
-@@ -503,6 +503,7 @@
- /// Tests that connecting with the client using NPN, but the server not does not
- /// break the existing connection behavior.
- #[test]
-+#[cfg(not(any(libressl261, libressl262, libressl263)))]
- fn test_connect_with_unilateral_npn() {
-     let (_s, stream) = Server::new();
-     let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();
-@@ -615,6 +616,7 @@
- /// Tests that when the `SslStream` is created as a server stream, the protocols
- /// are correctly advertised to the client.
- #[test]
-+#[cfg(not(any(libressl261, libressl262, libressl263)))]
- fn test_npn_server_advertise_multiple() {
-     let listener = TcpListener::bind("127.0.0.1:0").unwrap();
-     let localhost = listener.local_addr().unwrap();
-@@ -1239,7 +1241,7 @@
- }
- 
- #[test]
--#[cfg(any(all(feature = "v101", ossl101), all(feature = "v102", ossl102)))]
-+#[cfg(any(all(feature = "v101", ossl101, not(any(libressl261, libressl262, libressl263))), all(feature = "v102", ossl102)))]
- fn tmp_ecdh_callback() {
-     use ec::EcKey;
-     use nid;
-@@ -1306,7 +1308,7 @@
- }
- 
- #[test]
--#[cfg(any(all(feature = "v101", ossl101), all(feature = "v102", ossl102)))]
-+#[cfg(any(all(feature = "v101", ossl101, not(any(libressl261, libressl262, libressl263))), all(feature = "v102", ossl102)))]
- fn tmp_ecdh_callback_ssl() {
-     use ec::EcKey;
-     use nid;