summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Kortkamp <tobik@FreeBSD.org>2019-05-15 03:12:15 +0000
committerTobias Kortkamp <tobik@FreeBSD.org>2019-05-15 03:12:15 +0000
commit6bd3ed2a9bf56ab90c71eda62a771bd4c4b858fc (patch)
tree9ab55dc8485b2f1240d32da5f9dfb2f24f336c5c
parentAdd recent lang/rust security advisory (diff)
lang/rust: Update to 1.34.2
- While here add patches from [1] for LibreSSL 2.9.1 support [1] https://github.com/sfackler/rust-openssl/pull/1097 Changes: https://blog.rust-lang.org/2019/05/13/Security-advisory.html Changes: https://blog.rust-lang.org/2019/05/14/Rust-1.34.2.html PR: 237495 [1] Security: 37528379-76a8-11e9-a4fd-00012e582166
Notes
Notes: svn path=/head/; revision=501679
-rw-r--r--Mk/Uses/cargo.mk2
-rw-r--r--audio/spotifyd/Makefile2
-rw-r--r--benchmarks/hyperfine/Makefile2
-rw-r--r--databases/puppetdb-cli/Makefile2
-rw-r--r--devel/bingrep/Makefile1
-rw-r--r--devel/git-absorb/Makefile2
-rw-r--r--devel/interactive_rebase_tool/Makefile1
-rw-r--r--devel/pijul/Makefile1
-rw-r--r--devel/racer/Makefile1
-rw-r--r--devel/racerd/Makefile2
-rw-r--r--devel/rust-bindgen/Makefile2
-rw-r--r--devel/rust-cbindgen/Makefile1
-rw-r--r--devel/sccache/Makefile2
-rw-r--r--devel/tokei/Makefile2
-rw-r--r--dns/doh-proxy/Makefile1
-rw-r--r--editors/kak-lsp/Makefile1
-rw-r--r--editors/parinfer-rust/Makefile1
-rw-r--r--editors/xi-core/Makefile1
-rw-r--r--editors/xi-term/Makefile1
-rw-r--r--games/genact/Makefile1
-rw-r--r--games/jaggedalliance2/Makefile2
-rw-r--r--graphics/librsvg2-rust/Makefile2
-rw-r--r--lang/rust/Makefile2
-rw-r--r--lang/rust/distinfo6
-rw-r--r--lang/rust/files/patch-vendor_openssl-sys_build_cfgs.rs22
-rw-r--r--lang/rust/files/patch-vendor_openssl-sys_build_main.rs19
-rw-r--r--lang/rust/files/patch-vendor_openssl-sys_src_crypto.rs26
-rw-r--r--lang/rust/files/patch-vendor_openssl-sys_src_ssl.rs11
-rw-r--r--lang/rust/files/patch-vendor_openssl_build.rs23
-rw-r--r--lang/rust/files/patch-vendor_openssl_src_ssl_mod.rs28
-rw-r--r--lang/rust/files/patch-vendor_openssl_src_version.rs11
-rw-r--r--mail/thunderbird/Makefile2
-rw-r--r--multimedia/rav1e/Makefile1
-rw-r--r--net-im/fractal/Makefile2
-rw-r--r--net/boringtun/Makefile1
-rw-r--r--net/rabbiteer/Makefile2
-rw-r--r--net/routinator/Makefile1
-rw-r--r--security/cargo-audit/Makefile2
-rw-r--r--security/kr/Makefile2
-rw-r--r--security/suricata/Makefile1
-rw-r--r--shells/ion/Makefile2
-rw-r--r--sysutils/exa/Makefile2
-rw-r--r--sysutils/fd/Makefile2
-rw-r--r--sysutils/flowgger/Makefile2
-rw-r--r--sysutils/fusefs-sandboxfs/Makefile2
-rw-r--r--sysutils/hexyl/Makefile1
-rw-r--r--sysutils/potnet/Makefile2
-rw-r--r--textproc/bat/Makefile2
-rw-r--r--textproc/ripgrep/Makefile1
-rw-r--r--textproc/sd/Makefile2
-rw-r--r--textproc/sonic/Makefile1
-rw-r--r--textproc/xsv-rs/Makefile2
-rw-r--r--www/cliqz/Makefile2
-rw-r--r--www/ffsend/Makefile1
-rw-r--r--www/firefox-esr/Makefile1
-rw-r--r--www/firefox/Makefile1
-rw-r--r--www/geckodriver/Makefile2
-rw-r--r--www/miniserve/Makefile1
-rw-r--r--www/newsboat/Makefile2
-rw-r--r--www/websocat/Makefile2
-rw-r--r--x11/admiral/Makefile2
-rw-r--r--x11/alacritty/Makefile1
62 files changed, 197 insertions, 34 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index 54437bfaeaf2..1c6afc27f3b7 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -43,7 +43,7 @@ DISTFILES+= ${CARGO_DIST_SUBDIR}/${_crate}.tar.gz:cargo_${_crate:S/-//g:S/.//g}
CARGO_BUILDDEP?= yes
.if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.34.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.34.2:lang/${RUST_DEFAULT}
.endif
# Location of cargo binary (default to lang/rust's Cargo binary)
diff --git a/audio/spotifyd/Makefile b/audio/spotifyd/Makefile
index ce75ceed7f6f..1f9b53270cad 100644
--- a/audio/spotifyd/Makefile
+++ b/audio/spotifyd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= spotifyd
DISTVERSIONPREFIX= v
DISTVERSION= 0.2.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MAINTAINER= tobik@FreeBSD.org
diff --git a/benchmarks/hyperfine/Makefile b/benchmarks/hyperfine/Makefile
index 0ed53c90cfe4..84384f14c76b 100644
--- a/benchmarks/hyperfine/Makefile
+++ b/benchmarks/hyperfine/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hyperfine
DISTVERSIONPREFIX= v
DISTVERSION= 1.5.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= benchmarks
MAINTAINER= pizzamig@FreeBSD.org
diff --git a/databases/puppetdb-cli/Makefile b/databases/puppetdb-cli/Makefile
index cda0a331626c..2d7edbdd2b8b 100644
--- a/databases/puppetdb-cli/Makefile
+++ b/databases/puppetdb-cli/Makefile
@@ -2,7 +2,7 @@
PORTNAME= puppetdb-cli
PORTVERSION= 1.2.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= databases
MAINTAINER= puppet@FreeBSD.org
diff --git a/devel/bingrep/Makefile b/devel/bingrep/Makefile
index 0fe2ba2e04bf..3e38534ab374 100644
--- a/devel/bingrep/Makefile
+++ b/devel/bingrep/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bingrep
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= CRATESIO
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/devel/git-absorb/Makefile b/devel/git-absorb/Makefile
index 3286e240a559..5fdffa43e012 100644
--- a/devel/git-absorb/Makefile
+++ b/devel/git-absorb/Makefile
@@ -2,7 +2,7 @@
PORTNAME= git-absorb
DISTVERSION= 0.3.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MAINTAINER= greg@unrelenting.technology
diff --git a/devel/interactive_rebase_tool/Makefile b/devel/interactive_rebase_tool/Makefile
index 08697de7cef2..df49614d28c7 100644
--- a/devel/interactive_rebase_tool/Makefile
+++ b/devel/interactive_rebase_tool/Makefile
@@ -2,6 +2,7 @@
PORTNAME= interactive_rebase_tool
DISTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= petteri.valkonen@iki.fi
diff --git a/devel/pijul/Makefile b/devel/pijul/Makefile
index 6b579a77c45f..89ff7068aa8c 100644
--- a/devel/pijul/Makefile
+++ b/devel/pijul/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pijul
PORTVERSION= 0.12.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://pijul.org/releases/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/devel/racer/Makefile b/devel/racer/Makefile
index 0ab4efd6008b..23487f6043f4 100644
--- a/devel/racer/Makefile
+++ b/devel/racer/Makefile
@@ -4,6 +4,7 @@
PORTNAME= racer
DISTVERSIONPREFIX= v
DISTVERSION= 2.1.21
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= beyert@cs.ucr.edu
diff --git a/devel/racerd/Makefile b/devel/racerd/Makefile
index 4cfc1ec34518..80b417f5f4f1 100644
--- a/devel/racerd/Makefile
+++ b/devel/racerd/Makefile
@@ -5,7 +5,7 @@ PORTNAME= racerd
DISTVERSIONPREFIX= v
DISTVERSION= 0.1.1-56
DISTVERSIONSUFFIX= -g29cd4c6
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel
MAINTAINER= ultima@FreeBSD.org
diff --git a/devel/rust-bindgen/Makefile b/devel/rust-bindgen/Makefile
index 32fe87d3f69d..d0756e8898bf 100644
--- a/devel/rust-bindgen/Makefile
+++ b/devel/rust-bindgen/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bindgen
DISTVERSION= 0.49.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= CRATESIO
PKGNAMEPREFIX= rust-
diff --git a/devel/rust-cbindgen/Makefile b/devel/rust-cbindgen/Makefile
index fca6f9e1ee11..18c0b51e786d 100644
--- a/devel/rust-cbindgen/Makefile
+++ b/devel/rust-cbindgen/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cbindgen
DISTVERSION= 0.8.7
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= CRATESIO
PKGNAMEPREFIX= rust-
diff --git a/devel/sccache/Makefile b/devel/sccache/Makefile
index 02a1599f8efe..469e09a429d6 100644
--- a/devel/sccache/Makefile
+++ b/devel/sccache/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sccache
DISTVERSION= 0.2.8
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
diff --git a/devel/tokei/Makefile b/devel/tokei/Makefile
index 34275386076d..a478f25e8b4d 100644
--- a/devel/tokei/Makefile
+++ b/devel/tokei/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tokei
DISTVERSIONPREFIX= v
DISTVERSION= 9.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MAINTAINER= tobik@FreeBSD.org
diff --git a/dns/doh-proxy/Makefile b/dns/doh-proxy/Makefile
index 5ccacbe8d058..97945ea64be0 100644
--- a/dns/doh-proxy/Makefile
+++ b/dns/doh-proxy/Makefile
@@ -3,6 +3,7 @@
PORTNAME= doh-proxy
DISTVERSION= 0.1.14
+PORTREVISION= 1
CATEGORIES= dns
MAINTAINER= mat@FreeBSD.org
diff --git a/editors/kak-lsp/Makefile b/editors/kak-lsp/Makefile
index f5b9ddb4ae60..58989d0429c6 100644
--- a/editors/kak-lsp/Makefile
+++ b/editors/kak-lsp/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kak-lsp
DISTVERSIONPREFIX= v
DISTVERSION= 6.2.0
+PORTREVISION= 1
CATEGORIES= editors
MAINTAINER= tobik@FreeBSD.org
diff --git a/editors/parinfer-rust/Makefile b/editors/parinfer-rust/Makefile
index f8d402c4b01e..e697013e626f 100644
--- a/editors/parinfer-rust/Makefile
+++ b/editors/parinfer-rust/Makefile
@@ -3,6 +3,7 @@
PORTNAME= parinfer-rust
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= editors
MAINTAINER= tobik@FreeBSD.org
diff --git a/editors/xi-core/Makefile b/editors/xi-core/Makefile
index 798752468bdd..08e204d6b7df 100644
--- a/editors/xi-core/Makefile
+++ b/editors/xi-core/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xi-core
DISTVERSION= g20190420
+PORTREVISION= 1
CATEGORIES= editors
MAINTAINER= ed.arrakis@gmail.com
diff --git a/editors/xi-term/Makefile b/editors/xi-term/Makefile
index 48a306fc3de4..9450a4fc0d3a 100644
--- a/editors/xi-term/Makefile
+++ b/editors/xi-term/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xi-term
DISTVERSION= g20190328
+PORTREVISION= 1
CATEGORIES= editors
MAINTAINER= ed.arrakis@gmail.com
diff --git a/games/genact/Makefile b/games/genact/Makefile
index e38dd793d6b2..e959c712f611 100644
--- a/games/genact/Makefile
+++ b/games/genact/Makefile
@@ -2,6 +2,7 @@
PORTNAME= genact
DISTVERSION= 0.7.0
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= 0mp@FreeBSD.org
diff --git a/games/jaggedalliance2/Makefile b/games/jaggedalliance2/Makefile
index 59124f79ab85..fb5d62658c66 100644
--- a/games/jaggedalliance2/Makefile
+++ b/games/jaggedalliance2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= ja2
DISTVERSIONPREFIX= v
DISTVERSION= 0.16.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MAINTAINER= tobik@FreeBSD.org
diff --git a/graphics/librsvg2-rust/Makefile b/graphics/librsvg2-rust/Makefile
index f6924896f605..5027374ee9c2 100644
--- a/graphics/librsvg2-rust/Makefile
+++ b/graphics/librsvg2-rust/Makefile
@@ -3,7 +3,7 @@
PORTNAME= librsvg
PORTVERSION= 2.45.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics gnome
MASTER_SITES= GNOME \
CRATESIO/libc/0.2.49:libc
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index cee2fd287416..a5df8d00c761 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rust
-PORTVERSION?= 1.34.1
+PORTVERSION?= 1.34.2
PORTREVISION?= 0
CATEGORIES= lang
MASTER_SITES= http://static.rust-lang.org/dist/:src \
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 0414dcc1bbba..5cf9f3523d7f 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1556213482
-SHA256 (rust/rustc-1.34.1-src.tar.xz) = e0efb1e6aba0d4900de57bd2db64e32e7c5b440a95a675d5303839c9a2c3328f
-SIZE (rust/rustc-1.34.1-src.tar.xz) = 95048260
+TIMESTAMP = 1557852472
+SHA256 (rust/rustc-1.34.2-src.tar.xz) = 2b3b3a5462aa31d07f39721af73ef394803ceae3472e2470f28b7ee0b12e38ef
+SIZE (rust/rustc-1.34.2-src.tar.xz) = 95048792
SHA256 (rust/2019-02-28/rustc-1.33.0-aarch64-unknown-freebsd.tar.gz) = 142c3419b0df1bacf97bf6ed6d2d3bcb37a6439b5bf11f258178edac6e3053b3
SIZE (rust/2019-02-28/rustc-1.33.0-aarch64-unknown-freebsd.tar.gz) = 64575877
SHA256 (rust/2019-02-28/rust-std-1.33.0-aarch64-unknown-freebsd.tar.gz) = bbb2ec53d4fcade7002665d4c9c64740ddc14a07d3726555c7a2ffe01b07fd9e
diff --git a/lang/rust/files/patch-vendor_openssl-sys_build_cfgs.rs b/lang/rust/files/patch-vendor_openssl-sys_build_cfgs.rs
new file mode 100644
index 000000000000..1a2aa256edd4
--- /dev/null
+++ b/lang/rust/files/patch-vendor_openssl-sys_build_cfgs.rs
@@ -0,0 +1,22 @@
+--- 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
new file mode 100644
index 000000000000..d9aeddc25910
--- /dev/null
+++ b/lang/rust/files/patch-vendor_openssl-sys_build_main.rs
@@ -0,0 +1,19 @@
+--- vendor/openssl-sys/build/main.rs.orig 2019-05-13 21:50:35 UTC
++++ vendor/openssl-sys/build/main.rs
+@@ -505,6 +505,7 @@ See rust-openssl README for more information:
+ (8, 1) => ('8', '1'),
+ (8, _) => ('8', 'x'),
+ (9, 0) => ('9', '0'),
++ (9, _) => ('9', 'x'),
+ _ => version_error(),
+ };
+
+@@ -545,7 +546,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 2.9.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
new file mode 100644
index 000000000000..0a4f3adbf705
--- /dev/null
+++ b/lang/rust/files/patch-vendor_openssl-sys_src_crypto.rs
@@ -0,0 +1,26 @@
+--- 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
new file mode 100644
index 000000000000..f412c3c469f7
--- /dev/null
+++ b/lang/rust/files/patch-vendor_openssl-sys_src_ssl.rs
@@ -0,0 +1,11 @@
+--- vendor/openssl-sys/src/ssl.rs.orig 2019-05-13 21:50:35 UTC
++++ vendor/openssl-sys/src/ssl.rs
+@@ -1032,7 +1032,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
new file mode 100644
index 000000000000..30793f1827eb
--- /dev/null
+++ b/lang/rust/files/patch-vendor_openssl_build.rs
@@ -0,0 +1,23 @@
+--- 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
new file mode 100644
index 000000000000..f0b6ac7fe6b9
--- /dev/null
+++ b/lang/rust/files/patch-vendor_openssl_src_ssl_mod.rs
@@ -0,0 +1,28 @@
+--- 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
new file mode 100644
index 000000000000..2d92dd6d6ab7
--- /dev/null
+++ b/lang/rust/files/patch-vendor_openssl_src_version.rs
@@ -0,0 +1,11 @@
+--- 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,
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 0d4d34fda6be..617513d52244 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,7 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 60.6.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
diff --git a/multimedia/rav1e/Makefile b/multimedia/rav1e/Makefile
index 06305020a92a..0846ac396348 100644
--- a/multimedia/rav1e/Makefile
+++ b/multimedia/rav1e/Makefile
@@ -2,6 +2,7 @@
PORTNAME= rav1e
PORTVERSION= s20190510
+PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= jbeich@FreeBSD.org
diff --git a/net-im/fractal/Makefile b/net-im/fractal/Makefile
index 8c9bca9dce03..facef7125380 100644
--- a/net-im/fractal/Makefile
+++ b/net-im/fractal/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fractal
DISTVERSION= 4.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= https://gitlab.gnome.org/World/fractal/uploads/${GL_HASH}/
diff --git a/net/boringtun/Makefile b/net/boringtun/Makefile
index f8a26da61ab9..e22f0f7ddfd9 100644
--- a/net/boringtun/Makefile
+++ b/net/boringtun/Makefile
@@ -3,6 +3,7 @@
PORTNAME= boringtun
DISTVERSIONPREFIX= v
DISTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= net
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/net/rabbiteer/Makefile b/net/rabbiteer/Makefile
index 847fe54a5f92..4083600610ac 100644
--- a/net/rabbiteer/Makefile
+++ b/net/rabbiteer/Makefile
@@ -2,7 +2,7 @@
PORTNAME= rabbiteer
DISTVERSION= 1.4.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
MAINTAINER= dch@FreeBSD.org
diff --git a/net/routinator/Makefile b/net/routinator/Makefile
index bb20408e2cf2..b0ee06f66439 100644
--- a/net/routinator/Makefile
+++ b/net/routinator/Makefile
@@ -3,6 +3,7 @@
PORTNAME= routinator
PORTVERSION= 0.3.3
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= jaap@NLnetLabs.nl
diff --git a/security/cargo-audit/Makefile b/security/cargo-audit/Makefile
index 9d345f9f5c76..b22104804a99 100644
--- a/security/cargo-audit/Makefile
+++ b/security/cargo-audit/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cargo-audit
DISTVERSIONPREFIX= v
DISTVERSION= 0.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security
MAINTAINER= tobik@FreeBSD.org
diff --git a/security/kr/Makefile b/security/kr/Makefile
index 71997871c3b3..cdfdc2e0c596 100644
--- a/security/kr/Makefile
+++ b/security/kr/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kr
PORTVERSION= 2.3.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security
MAINTAINER= feld@FreeBSD.org
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index 5b06505c08fe..4c80c429582e 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -3,6 +3,7 @@
PORTNAME= suricata
DISTVERSION= 4.1.4
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= https://www.openinfosecfoundation.org/download/
diff --git a/shells/ion/Makefile b/shells/ion/Makefile
index b17ed00f7347..36f179137432 100644
--- a/shells/ion/Makefile
+++ b/shells/ion/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ion
DISTVERSION= 1.0.5-900
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= shells
PKGNAMESUFFIX= -shell
diff --git a/sysutils/exa/Makefile b/sysutils/exa/Makefile
index 40427791f110..fb4b765088b5 100644
--- a/sysutils/exa/Makefile
+++ b/sysutils/exa/Makefile
@@ -3,7 +3,7 @@
PORTNAME= exa
DISTVERSIONPREFIX= v
DISTVERSION= 0.8.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= sysutils
MAINTAINER= tobik@FreeBSD.org
diff --git a/sysutils/fd/Makefile b/sysutils/fd/Makefile
index ab217beb6b93..e897478ccf4c 100644
--- a/sysutils/fd/Makefile
+++ b/sysutils/fd/Makefile
@@ -4,7 +4,7 @@
PORTNAME= fd
DISTVERSIONPREFIX= v
DISTVERSION= 7.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
PKGNAMESUFFIX= -find
diff --git a/sysutils/flowgger/Makefile b/sysutils/flowgger/Makefile
index 7c4b4a750b73..b10f526ba853 100644
--- a/sysutils/flowgger/Makefile
+++ b/sysutils/flowgger/Makefile
@@ -3,7 +3,7 @@
PORTNAME= flowgger
DISTVERSION= 0.2.6-28
DISTVERSIONSUFFIX= -gab572a0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= sysutils
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/fusefs-sandboxfs/Makefile b/sysutils/fusefs-sandboxfs/Makefile
index cbc0e994423d..2a4834aefe58 100644
--- a/sysutils/fusefs-sandboxfs/Makefile
+++ b/sysutils/fusefs-sandboxfs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sandboxfs
DISTVERSIONPREFIX= sandboxfs-
DISTVERSION= 0.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
PKGNAMEPREFIX= fusefs-
diff --git a/sysutils/hexyl/Makefile b/sysutils/hexyl/Makefile
index 9fb91b349e8f..3885a2521d0c 100644
--- a/sysutils/hexyl/Makefile
+++ b/sysutils/hexyl/Makefile
@@ -3,6 +3,7 @@
PORTNAME= hexyl
DISTVERSIONPREFIX= v
DISTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= tobik@FreeBSD.org
diff --git a/sysutils/potnet/Makefile b/sysutils/potnet/Makefile
index 20b8341e731c..c75329d42a44 100644
--- a/sysutils/potnet/Makefile
+++ b/sysutils/potnet/Makefile
@@ -2,7 +2,7 @@
PORTNAME= potnet
DISTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MAINTAINER= pizzamig@FreeBSD.org
diff --git a/textproc/bat/Makefile b/textproc/bat/Makefile
index afd2870b878d..4d2d8c6cc311 100644
--- a/textproc/bat/Makefile
+++ b/textproc/bat/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bat
DISTVERSIONPREFIX= v
DISTVERSION= 0.10.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MAINTAINER= pizzamig@FreeBSD.org
diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile
index 960e5eb01114..055450dfb9c3 100644
--- a/textproc/ripgrep/Makefile
+++ b/textproc/ripgrep/Makefile
@@ -5,6 +5,7 @@
PORTNAME= ripgrep
DISTVERSION= 11.0.1
+PORTREVISION= 1
CATEGORIES= textproc
MAINTAINER= petteri.valkonen@iki.fi
diff --git a/textproc/sd/Makefile b/textproc/sd/Makefile
index be6565051da7..4376e2bf588d 100644
--- a/textproc/sd/Makefile
+++ b/textproc/sd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sd
DISTVERSIONPREFIX= sd-
DISTVERSION= 0.5.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MAINTAINER= tobik@FreeBSD.org
diff --git a/textproc/sonic/Makefile b/textproc/sonic/Makefile
index 7d651e150b19..6038b6cd3a50 100644
--- a/textproc/sonic/Makefile
+++ b/textproc/sonic/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sonic
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= textproc
MAINTAINER= tobik@FreeBSD.org
diff --git a/textproc/xsv-rs/Makefile b/textproc/xsv-rs/Makefile
index 0f34451c9464..28a6250e7a76 100644
--- a/textproc/xsv-rs/Makefile
+++ b/textproc/xsv-rs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xsv
DISTVERSION= 0.13.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= textproc
PKGNAMESUFFIX= -rs
diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile
index 29d6f935c0e5..61afb3c23dd5 100644
--- a/www/cliqz/Makefile
+++ b/www/cliqz/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cliqz
DISTVERSION= 1.26.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \
http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz
diff --git a/www/ffsend/Makefile b/www/ffsend/Makefile
index 0ba9e9864746..f278f495a938 100644
--- a/www/ffsend/Makefile
+++ b/www/ffsend/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ffsend
DISTVERSIONPREFIX= v
DISTVERSION= 0.2.45
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= 0mp@FreeBSD.org
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index c4117cda7736..258ce258a30e 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -3,6 +3,7 @@
PORTNAME= firefox
DISTVERSION= 60.6.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index e584c9cb9602..912b19f1b73f 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -3,6 +3,7 @@
PORTNAME= firefox
DISTVERSION= 67.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
diff --git a/www/geckodriver/Makefile b/www/geckodriver/Makefile
index 7ca7a85bd672..2244b0c68bba 100644
--- a/www/geckodriver/Makefile
+++ b/www/geckodriver/Makefile
@@ -3,7 +3,7 @@
PORTNAME= geckodriver
DISTVERSIONPREFIX= v
DISTVERSION= 0.23.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www
MAINTAINER= daniel@blodan.se
diff --git a/www/miniserve/Makefile b/www/miniserve/Makefile
index 1df9cd4994d5..3bfbeef6dd57 100644
--- a/www/miniserve/Makefile
+++ b/www/miniserve/Makefile
@@ -3,6 +3,7 @@
PORTNAME= miniserve
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= tobik@FreeBSD.org
diff --git a/www/newsboat/Makefile b/www/newsboat/Makefile
index f8171b0fe3ad..6418da452a16 100644
--- a/www/newsboat/Makefile
+++ b/www/newsboat/Makefile
@@ -3,7 +3,7 @@
PORTNAME= newsboat
PORTVERSION= 2.15
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= https://newsboat.org/releases/${PORTVERSION}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/websocat/Makefile b/www/websocat/Makefile
index 42eea03a0951..f8bb4cc77a01 100644
--- a/www/websocat/Makefile
+++ b/www/websocat/Makefile
@@ -4,7 +4,7 @@
PORTNAME= websocat
DISTVERSIONPREFIX= v
DISTVERSION= 1.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MAINTAINER= osa@FreeBSD.org
diff --git a/x11/admiral/Makefile b/x11/admiral/Makefile
index e9e16bf97f34..18043524f0c5 100644
--- a/x11/admiral/Makefile
+++ b/x11/admiral/Makefile
@@ -4,7 +4,7 @@ PORTNAME= admiral
DISTVERSIONPREFIX= v
DISTVERSION= 1.0.0-7
DISTVERSIONSUFFIX= -g5a9f33b
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11
MAINTAINER= rigoletto@FreeBSD.org
diff --git a/x11/alacritty/Makefile b/x11/alacritty/Makefile
index 2868b6065723..f2617ae89a43 100644
--- a/x11/alacritty/Makefile
+++ b/x11/alacritty/Makefile
@@ -3,6 +3,7 @@
PORTNAME= alacritty
PORTVERSION= 0.3.2
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= tobik@FreeBSD.org