Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Jun 2020 17:10:54 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r538112 - in head/lang/rust-nightly: . files
Message-ID:  <202006061710.056HAsCV036837@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Sat Jun  6 17:10:54 2020
New Revision: 538112
URL: https://svnweb.freebsd.org/changeset/ports/538112

Log:
  lang/rust-nightly: Update to 1.46.0.20200606
  
  Changes:	https://github.com/rust-lang/rust/compare/4bd32c9804...826cb062a6

Added:
  head/lang/rust-nightly/files/patch-vendor_openssl-sys_build_main.rs
     - copied unchanged from r538091, head/lang/rust/files/patch-vendor_openssl-sys_build_main.rs
Modified:
  head/lang/rust-nightly/Makefile
  head/lang/rust-nightly/distinfo

Modified: head/lang/rust-nightly/Makefile
==============================================================================
--- head/lang/rust-nightly/Makefile	Sat Jun  6 16:47:58 2020	(r538111)
+++ head/lang/rust-nightly/Makefile	Sat Jun  6 17:10:54 2020	(r538112)
@@ -1,7 +1,7 @@
 # Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
 # $FreeBSD$
 
-PORTVERSION=	1.45.0.${NIGHTLY_DATE:C,-,,g}
+PORTVERSION=	1.46.0.${NIGHTLY_DATE:C,-,,g}
 # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust
 PORTREVISION=	0
 PKGNAMESUFFIX=	-nightly
@@ -18,10 +18,10 @@ DISTINFO_FILE=	${.CURDIR}/distinfo
 
 # Get latest from top level 'date' key in
 # https://static.rust-lang.org/dist/channel-rust-nightly.toml
-NIGHTLY_DATE=	2020-05-30
+NIGHTLY_DATE=	2020-06-06
 
 # See WRKSRC/src/stage0.txt for this date
-BOOTSTRAPS_DATE=		2020-04-22
+BOOTSTRAPS_DATE=		2020-06-03
 RUST_BOOTSTRAP_VERSION=		beta
 CARGO_BOOTSTRAP_VERSION=	beta
 

Modified: head/lang/rust-nightly/distinfo
==============================================================================
--- head/lang/rust-nightly/distinfo	Sat Jun  6 16:47:58 2020	(r538111)
+++ head/lang/rust-nightly/distinfo	Sat Jun  6 17:10:54 2020	(r538112)
@@ -1,15 +1,15 @@
-TIMESTAMP = 1590800791
-SHA256 (rust/2020-05-30/rustc-nightly-src.tar.xz) = 82b8cf5892c66444c9967340571c1d5b3917d33f0e8d8d1923f9c774858e8ede
-SIZE (rust/2020-05-30/rustc-nightly-src.tar.xz) = 98643276
-SHA256 (rust/2020-04-22/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 502b41362ba46e37dbf7c890b76e8b420d156f998bbf96f545e0ce68ce5a5ad6
-SIZE (rust/2020-04-22/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 36152976
-SHA256 (rust/2020-04-22/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 3919d86ce0f932d22f69670e3e353a9b5cc9463ed586ea52406b311fb270941e
-SIZE (rust/2020-04-22/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 16831712
-SHA256 (rust/2020-04-22/cargo-beta-x86_64-unknown-freebsd.tar.xz) = a4ee911bb71966d3fed1bd90acea2fb94c8eb3e1fbc5cf9ee184d00b0457f7a6
-SIZE (rust/2020-04-22/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 5164600
-SHA256 (rust/2020-04-22/rustc-beta-i686-unknown-freebsd.tar.xz) = 28dcbdcd9e88d90165546627ee3da776b40d18cb943ebc3515bd07f23ef3326b
-SIZE (rust/2020-04-22/rustc-beta-i686-unknown-freebsd.tar.xz) = 36949752
-SHA256 (rust/2020-04-22/rust-std-beta-i686-unknown-freebsd.tar.xz) = 8e3399f685264c73a71e19bf432a9f93fa78d3882d1f5b4fd54c4f6b47cdbe1f
-SIZE (rust/2020-04-22/rust-std-beta-i686-unknown-freebsd.tar.xz) = 16749016
-SHA256 (rust/2020-04-22/cargo-beta-i686-unknown-freebsd.tar.xz) = da9ccc0dbfc69714083280168890fe15f2b490f159f548dc0393fde9fefeb292
-SIZE (rust/2020-04-22/cargo-beta-i686-unknown-freebsd.tar.xz) = 5034732
+TIMESTAMP = 1591453542
+SHA256 (rust/2020-06-06/rustc-nightly-src.tar.xz) = 68932b2a8c5e97988a1ec725e65abe103775ebd08e1a38db5c9a935a9ba2a103
+SIZE (rust/2020-06-06/rustc-nightly-src.tar.xz) = 98690188
+SHA256 (rust/2020-06-03/rustc-beta-x86_64-unknown-freebsd.tar.xz) = a3b29f2cbc8c4eb62391feb45ff4abe49ca25b2499b2c380db04d203059a97cd
+SIZE (rust/2020-06-03/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 40647540
+SHA256 (rust/2020-06-03/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = f7b590c2b175fdb7c7d33f22edf49ce049b2cabfe8c907bb15226bfcdbbe716f
+SIZE (rust/2020-06-03/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 14996924
+SHA256 (rust/2020-06-03/cargo-beta-x86_64-unknown-freebsd.tar.xz) = a7515e7e9bb99c8f6a43bcf7902c1bbb53da2d1b524ae23839bd90f21dbd025b
+SIZE (rust/2020-06-03/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 5220704
+SHA256 (rust/2020-06-03/rustc-beta-i686-unknown-freebsd.tar.xz) = eee84188da2f2a28139d06c0d4ead7ec3dab30136cc65ef78f6f595dfcf959a3
+SIZE (rust/2020-06-03/rustc-beta-i686-unknown-freebsd.tar.xz) = 41491712
+SHA256 (rust/2020-06-03/rust-std-beta-i686-unknown-freebsd.tar.xz) = 62187fe6f274ef5d1f006cdfd29373a425629d774d02f35a96d1f2b62fc68c9a
+SIZE (rust/2020-06-03/rust-std-beta-i686-unknown-freebsd.tar.xz) = 14912184
+SHA256 (rust/2020-06-03/cargo-beta-i686-unknown-freebsd.tar.xz) = 000dccd55eda35fa8a9f96d301349bb590a5744914c4c35368959175d67cc943
+SIZE (rust/2020-06-03/cargo-beta-i686-unknown-freebsd.tar.xz) = 5105828

Copied: head/lang/rust-nightly/files/patch-vendor_openssl-sys_build_main.rs (from r538091, head/lang/rust/files/patch-vendor_openssl-sys_build_main.rs)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/rust-nightly/files/patch-vendor_openssl-sys_build_main.rs	Sat Jun  6 17:10:54 2020	(r538112, copy of r538091, head/lang/rust/files/patch-vendor_openssl-sys_build_main.rs)
@@ -0,0 +1,21 @@
+--- vendor/openssl-sys/build/main.rs.orig	2020-06-01 17:45:25 UTC
++++ vendor/openssl-sys/build/main.rs
+@@ -204,6 +204,9 @@ See rust-openssl README for more information:
+             (3, 0, 0) => ('3', '0', '0'),
+             (3, 0, 1) => ('3', '0', '1'),
+             (3, 0, _) => ('3', '0', 'x'),
++            (3, 1, 0) => ('3', '1', '0'),
++            (3, 1, _) => ('3', '1', 'x'),
++            (3, 2, 0) => ('3', '2', '0'),
+             _ => version_error(),
+         };
+ 
+@@ -244,7 +247,7 @@ fn version_error() -> ! {
+         "
+ 
+ This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
+-through 3.0.x, but a different version of OpenSSL was found. The build is now aborting
++through 3.2.0, but a different version of OpenSSL was found. The build is now aborting
+ due to this version mismatch.
+ 
+ "



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006061710.056HAsCV036837>