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
This commit is contained in:
Tobias Kortkamp 2019-05-15 03:12:15 +00:00
parent 5a6f5c2772
commit 6bd3ed2a9b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=501679
62 changed files with 197 additions and 34 deletions

View File

@ -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)

View File

@ -3,7 +3,7 @@
PORTNAME= spotifyd
DISTVERSIONPREFIX= v
DISTVERSION= 0.2.8
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio
MAINTAINER= tobik@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= hyperfine
DISTVERSIONPREFIX= v
DISTVERSION= 1.5.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= benchmarks
MAINTAINER= pizzamig@FreeBSD.org

View File

@ -2,7 +2,7 @@
PORTNAME= puppetdb-cli
PORTVERSION= 1.2.5
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= databases
MAINTAINER= puppet@FreeBSD.org

View File

@ -2,6 +2,7 @@
PORTNAME= bingrep
PORTVERSION= 0.6.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= CRATESIO
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}

View File

@ -2,7 +2,7 @@
PORTNAME= git-absorb
DISTVERSION= 0.3.0
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= devel
MAINTAINER= greg@unrelenting.technology

View File

@ -2,6 +2,7 @@
PORTNAME= interactive_rebase_tool
DISTVERSION= 1.0.0
PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= petteri.valkonen@iki.fi

View File

@ -3,6 +3,7 @@
PORTNAME= pijul
PORTVERSION= 0.12.0
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://pijul.org/releases/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}

View File

@ -4,6 +4,7 @@
PORTNAME= racer
DISTVERSIONPREFIX= v
DISTVERSION= 2.1.21
PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= beyert@cs.ucr.edu

View File

@ -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

View File

@ -2,7 +2,7 @@
PORTNAME= bindgen
DISTVERSION= 0.49.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= CRATESIO
PKGNAMEPREFIX= rust-

View File

@ -2,6 +2,7 @@
PORTNAME= cbindgen
DISTVERSION= 0.8.7
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= CRATESIO
PKGNAMEPREFIX= rust-

View File

@ -2,7 +2,7 @@
PORTNAME= sccache
DISTVERSION= 0.2.8
PORTREVISION= 0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel

View File

@ -3,7 +3,7 @@
PORTNAME= tokei
DISTVERSIONPREFIX= v
DISTVERSION= 9.1.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MAINTAINER= tobik@FreeBSD.org

View File

@ -3,6 +3,7 @@
PORTNAME= doh-proxy
DISTVERSION= 0.1.14
PORTREVISION= 1
CATEGORIES= dns
MAINTAINER= mat@FreeBSD.org

View File

@ -3,6 +3,7 @@
PORTNAME= kak-lsp
DISTVERSIONPREFIX= v
DISTVERSION= 6.2.0
PORTREVISION= 1
CATEGORIES= editors
MAINTAINER= tobik@FreeBSD.org

View File

@ -3,6 +3,7 @@
PORTNAME= parinfer-rust
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.1
PORTREVISION= 1
CATEGORIES= editors
MAINTAINER= tobik@FreeBSD.org

View File

@ -2,6 +2,7 @@
PORTNAME= xi-core
DISTVERSION= g20190420
PORTREVISION= 1
CATEGORIES= editors
MAINTAINER= ed.arrakis@gmail.com

View File

@ -2,6 +2,7 @@
PORTNAME= xi-term
DISTVERSION= g20190328
PORTREVISION= 1
CATEGORIES= editors
MAINTAINER= ed.arrakis@gmail.com

View File

@ -2,6 +2,7 @@
PORTNAME= genact
DISTVERSION= 0.7.0
PORTREVISION= 1
CATEGORIES= games
MAINTAINER= 0mp@FreeBSD.org

View File

@ -4,7 +4,7 @@
PORTNAME= ja2
DISTVERSIONPREFIX= v
DISTVERSION= 0.16.1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= games
MAINTAINER= tobik@FreeBSD.org

View File

@ -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

View File

@ -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 \

View File

@ -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

View File

@ -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();

View File

@ -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.
"

View File

@ -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,

View File

@ -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;

View File

@ -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");
}
}
}

View File

@ -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))
}

View File

@ -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,

View File

@ -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

View File

@ -2,6 +2,7 @@
PORTNAME= rav1e
PORTVERSION= s20190510
PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= jbeich@FreeBSD.org

View File

@ -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}/

View File

@ -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/

View File

@ -2,7 +2,7 @@
PORTNAME= rabbiteer
DISTVERSION= 1.4.1
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= net
MAINTAINER= dch@FreeBSD.org

View File

@ -3,6 +3,7 @@
PORTNAME= routinator
PORTVERSION= 0.3.3
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= net
MAINTAINER= jaap@NLnetLabs.nl

View File

@ -3,7 +3,7 @@
PORTNAME= cargo-audit
DISTVERSIONPREFIX= v
DISTVERSION= 0.6.1
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= security
MAINTAINER= tobik@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= kr
PORTVERSION= 2.3.1
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= security
MAINTAINER= feld@FreeBSD.org

View File

@ -3,6 +3,7 @@
PORTNAME= suricata
DISTVERSION= 4.1.4
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= https://www.openinfosecfoundation.org/download/

View File

@ -2,7 +2,7 @@
PORTNAME= ion
DISTVERSION= 1.0.5-900
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= shells
PKGNAMESUFFIX= -shell

View File

@ -3,7 +3,7 @@
PORTNAME= exa
DISTVERSIONPREFIX= v
DISTVERSION= 0.8.0
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= sysutils
MAINTAINER= tobik@FreeBSD.org

View File

@ -4,7 +4,7 @@
PORTNAME= fd
DISTVERSIONPREFIX= v
DISTVERSION= 7.3.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= sysutils
PKGNAMESUFFIX= -find

View File

@ -3,7 +3,7 @@
PORTNAME= flowgger
DISTVERSION= 0.2.6-28
DISTVERSIONSUFFIX= -gab572a0
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= sysutils
MAINTAINER= ports@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= sandboxfs
DISTVERSIONPREFIX= sandboxfs-
DISTVERSION= 0.1.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= sysutils
PKGNAMEPREFIX= fusefs-

View File

@ -3,6 +3,7 @@
PORTNAME= hexyl
DISTVERSIONPREFIX= v
DISTVERSION= 0.5.0
PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= tobik@FreeBSD.org

View File

@ -2,7 +2,7 @@
PORTNAME= potnet
DISTVERSION= 0.1.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils
MAINTAINER= pizzamig@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= bat
DISTVERSIONPREFIX= v
DISTVERSION= 0.10.0
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= textproc
MAINTAINER= pizzamig@FreeBSD.org

View File

@ -5,6 +5,7 @@
PORTNAME= ripgrep
DISTVERSION= 11.0.1
PORTREVISION= 1
CATEGORIES= textproc
MAINTAINER= petteri.valkonen@iki.fi

View File

@ -3,7 +3,7 @@
PORTNAME= sd
DISTVERSIONPREFIX= sd-
DISTVERSION= 0.5.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= textproc
MAINTAINER= tobik@FreeBSD.org

View File

@ -3,6 +3,7 @@
PORTNAME= sonic
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.0
PORTREVISION= 1
CATEGORIES= textproc
MAINTAINER= tobik@FreeBSD.org

View File

@ -2,7 +2,7 @@
PORTNAME= xsv
DISTVERSION= 0.13.0
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= textproc
PKGNAMESUFFIX= -rs

View File

@ -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

View File

@ -3,6 +3,7 @@
PORTNAME= ffsend
DISTVERSIONPREFIX= v
DISTVERSION= 0.2.45
PORTREVISION= 1
CATEGORIES= www
MAINTAINER= 0mp@FreeBSD.org

View File

@ -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 \

View File

@ -3,6 +3,7 @@
PORTNAME= firefox
DISTVERSION= 67.0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

View File

@ -3,7 +3,7 @@
PORTNAME= geckodriver
DISTVERSIONPREFIX= v
DISTVERSION= 0.23.0
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= www
MAINTAINER= daniel@blodan.se

View File

@ -3,6 +3,7 @@
PORTNAME= miniserve
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.1
PORTREVISION= 1
CATEGORIES= www
MAINTAINER= tobik@FreeBSD.org

View File

@ -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}

View File

@ -4,7 +4,7 @@
PORTNAME= websocat
DISTVERSIONPREFIX= v
DISTVERSION= 1.4.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MAINTAINER= osa@FreeBSD.org

View File

@ -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

View File

@ -3,6 +3,7 @@
PORTNAME= alacritty
PORTVERSION= 0.3.2
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= tobik@FreeBSD.org