diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-11-07 18:07:20 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-11-07 18:07:20 +0000 |
| commit | 2fe55654450880a88824c4b2e80a8ac8a01328ba (patch) | |
| tree | 55fb50daedc99c7102724bdfdf388473217d78b0 | |
| parent | effc3afacccfa5991d7ab0d3ce31d522a89e33ae (diff) | |
| download | freebsd-ports-2fe55654450880a88824c4b2e80a8ac8a01328ba.zip | |
lang/rust: Update to 1.39.0
- Force rebuild all consumers to catch regressions early
- Partially apply D20792 in preparation for PPC_ABI support
- Add LibreSSL 3.0.x support [1]
Thanks to Mikaël Urankar for providing updated bootstraps for
aarch64, armv6, armv7, powerpc64.
Changes: https://blog.rust-lang.org/2019/11/07/Rust-1.39.0.html
PR: 241411 [1]
Tested by: mikael.urankar@gmail.com, tobik
With hat: rust
Differential Revision: https://reviews.freebsd.org/D22240
77 files changed, 978 insertions, 162 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index 18c8630c529d..b91f9da36c70 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -43,7 +43,7 @@ DISTFILES+= ${CARGO_DIST_SUBDIR}/${_crate}.tar.gz:cargo_${_crate:C/[^a-zA-Z0-9_] CARGO_BUILDDEP?= yes .if ${CARGO_BUILDDEP:tl} == "yes" -BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.38.0:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.39.0: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 45c34b3c4e8a..852d50bfdf5a 100644 --- a/audio/spotifyd/Makefile +++ b/audio/spotifyd/Makefile @@ -3,6 +3,7 @@ PORTNAME= spotifyd DISTVERSIONPREFIX= v DISTVERSION= 0.2.20 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= tobik@FreeBSD.org diff --git a/benchmarks/hyperfine/Makefile b/benchmarks/hyperfine/Makefile index 80a417738873..f177f28a2835 100644 --- a/benchmarks/hyperfine/Makefile +++ b/benchmarks/hyperfine/Makefile @@ -3,7 +3,7 @@ PORTNAME= hyperfine DISTVERSIONPREFIX= v DISTVERSION= 1.8.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= benchmarks MAINTAINER= pizzamig@FreeBSD.org diff --git a/devel/bingrep/Makefile b/devel/bingrep/Makefile index 683284bf4852..e03edb25a5eb 100644 --- a/devel/bingrep/Makefile +++ b/devel/bingrep/Makefile @@ -2,6 +2,7 @@ PORTNAME= bingrep PORTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/devel/cargo-tree/Makefile b/devel/cargo-tree/Makefile index dbdc143549bc..4d64fc29f645 100644 --- a/devel/cargo-tree/Makefile +++ b/devel/cargo-tree/Makefile @@ -2,7 +2,7 @@ PORTNAME= cargo-tree DISTVERSION= 0.26.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/devel/git-absorb/Makefile b/devel/git-absorb/Makefile index 646418be7b00..f21d01ffa031 100644 --- a/devel/git-absorb/Makefile +++ b/devel/git-absorb/Makefile @@ -2,7 +2,7 @@ PORTNAME= git-absorb DISTVERSION= 0.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= greg@unrelenting.technology diff --git a/devel/interactive_rebase_tool/Makefile b/devel/interactive_rebase_tool/Makefile index 3cd5bf0c0e56..cba61b43572e 100644 --- a/devel/interactive_rebase_tool/Makefile +++ b/devel/interactive_rebase_tool/Makefile @@ -2,7 +2,7 @@ PORTNAME= interactive_rebase_tool DISTVERSION= 1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= petteri.valkonen@iki.fi diff --git a/devel/pijul/Makefile b/devel/pijul/Makefile index c8af442ad8f4..fbc9d6da09f0 100644 --- a/devel/pijul/Makefile +++ b/devel/pijul/Makefile @@ -3,7 +3,7 @@ PORTNAME= pijul PORTVERSION= 0.12.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel MASTER_SITES= https://pijul.org/releases/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/devel/racer/Makefile b/devel/racer/Makefile index 6933074b2ba9..ce3a813c3d91 100644 --- a/devel/racer/Makefile +++ b/devel/racer/Makefile @@ -4,6 +4,7 @@ PORTNAME= racer DISTVERSIONPREFIX= v DISTVERSION= 2.1.27 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= beyert@cs.ucr.edu diff --git a/devel/racerd/Makefile b/devel/racerd/Makefile index 31402749d863..44bb71da9a4d 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= 14 +PORTREVISION= 15 CATEGORIES= devel MAINTAINER= ultima@FreeBSD.org diff --git a/devel/rust-bindgen/Makefile b/devel/rust-bindgen/Makefile index 3dc1244e1c0c..a25b5c7c1054 100644 --- a/devel/rust-bindgen/Makefile +++ b/devel/rust-bindgen/Makefile @@ -2,6 +2,7 @@ PORTNAME= bindgen DISTVERSION= 0.51.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CRATESIO PKGNAMEPREFIX= rust- diff --git a/devel/rust-cbindgen/Makefile b/devel/rust-cbindgen/Makefile index 930519e3cbab..7ad54e670621 100644 --- a/devel/rust-cbindgen/Makefile +++ b/devel/rust-cbindgen/Makefile @@ -2,7 +2,7 @@ PORTNAME= cbindgen DISTVERSION= 0.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= CRATESIO PKGNAMEPREFIX= rust- diff --git a/devel/sccache/Makefile b/devel/sccache/Makefile index 4f32f0127d06..3c77fb94a03d 100644 --- a/devel/sccache/Makefile +++ b/devel/sccache/Makefile @@ -2,7 +2,7 @@ PORTNAME= sccache DISTVERSION= 0.2.12 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel diff --git a/devel/tokei/Makefile b/devel/tokei/Makefile index 400facb674bf..307f502395ad 100644 --- a/devel/tokei/Makefile +++ b/devel/tokei/Makefile @@ -3,7 +3,7 @@ PORTNAME= tokei DISTVERSIONPREFIX= v DISTVERSION= 10.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= tobik@FreeBSD.org diff --git a/dns/doh-proxy/Makefile b/dns/doh-proxy/Makefile index 55a3b0c75db7..01ce988925f6 100644 --- a/dns/doh-proxy/Makefile +++ b/dns/doh-proxy/Makefile @@ -3,6 +3,7 @@ PORTNAME= doh-proxy DISTVERSION= 0.1.21 +PORTREVISION= 1 CATEGORIES= dns MAINTAINER= mat@FreeBSD.org diff --git a/editors/kak-lsp/Makefile b/editors/kak-lsp/Makefile index 96f9ecf7831b..15032fca4fba 100644 --- a/editors/kak-lsp/Makefile +++ b/editors/kak-lsp/Makefile @@ -3,7 +3,7 @@ PORTNAME= kak-lsp DISTVERSIONPREFIX= v DISTVERSION= 6.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors MAINTAINER= tobik@FreeBSD.org diff --git a/editors/parinfer-rust/Makefile b/editors/parinfer-rust/Makefile index a744f7c467c0..e7a76de8e9bc 100644 --- a/editors/parinfer-rust/Makefile +++ b/editors/parinfer-rust/Makefile @@ -3,7 +3,7 @@ PORTNAME= parinfer-rust DISTVERSIONPREFIX= v DISTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MAINTAINER= tobik@FreeBSD.org diff --git a/editors/xi-core/Makefile b/editors/xi-core/Makefile index b5021c7d5376..df411e3c05e0 100644 --- a/editors/xi-core/Makefile +++ b/editors/xi-core/Makefile @@ -2,7 +2,7 @@ PORTNAME= xi-core DISTVERSION= g20190420 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors MAINTAINER= ed.arrakis@gmail.com diff --git a/editors/xi-term/Makefile b/editors/xi-term/Makefile index b5338b53fc52..00c5bc127b8f 100644 --- a/editors/xi-term/Makefile +++ b/editors/xi-term/Makefile @@ -2,7 +2,7 @@ PORTNAME= xi-term DISTVERSION= g20190328 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors MAINTAINER= ed.arrakis@gmail.com diff --git a/games/genact/Makefile b/games/genact/Makefile index 2d98b7e7278d..41b0f80a8161 100644 --- a/games/genact/Makefile +++ b/games/genact/Makefile @@ -2,7 +2,7 @@ PORTNAME= genact DISTVERSION= 0.7.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MAINTAINER= 0mp@FreeBSD.org diff --git a/games/jaggedalliance2/Makefile b/games/jaggedalliance2/Makefile index 6b8f34bce319..cc788c58effb 100644 --- a/games/jaggedalliance2/Makefile +++ b/games/jaggedalliance2/Makefile @@ -4,7 +4,7 @@ PORTNAME= ja2 DISTVERSIONPREFIX= v DISTVERSION= 0.16.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MAINTAINER= tobik@FreeBSD.org diff --git a/graphics/librsvg2-rust/Makefile b/graphics/librsvg2-rust/Makefile index ea652edad2ab..e95cb282424e 100644 --- a/graphics/librsvg2-rust/Makefile +++ b/graphics/librsvg2-rust/Makefile @@ -3,6 +3,7 @@ PORTNAME= librsvg PORTVERSION= 2.46.3 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 2-rust diff --git a/graphics/svgbob/Makefile b/graphics/svgbob/Makefile index 2f57a9e00250..8134a588ea21 100644 --- a/graphics/svgbob/Makefile +++ b/graphics/svgbob/Makefile @@ -2,7 +2,7 @@ PORTNAME= svgbob DISTVERSION= g20190412 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= tobik@FreeBSD.org diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 989af50a55e3..7e16c9701bad 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.38.0 +PORTVERSION?= 1.39.0 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:src \ @@ -41,14 +41,10 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libssh2.so:security/libssh2 -USES= libedit pkgconfig python:build ssl tar:xz +USES= pkgconfig python:build ssl tar:xz CONFLICTS_INSTALL?= rust-nightly -EXTRA_PATCHES+= ${EXTRA_PATCHES_${ARCH}} -EXTRA_PATCHES_armv6= ${PATCHDIR}/extra-patch-arm-compiler-rt -EXTRA_PATCHES_armv7= ${PATCHDIR}/extra-patch-arm-compiler-rt - PLIST_FILES= lib/rustlib/components \ lib/rustlib/rust-installer-version @@ -61,9 +57,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-08-15 -RUST_BOOTSTRAP_VERSION?= 1.37.0 -CARGO_BOOTSTRAP_VERSION?= 0.38.0 +BOOTSTRAPS_DATE?= 2019-09-26 +RUST_BOOTSTRAP_VERSION?= 1.38.0 +CARGO_BOOTSTRAP_VERSION?= 0.39.0 COMPILER_RT_VERSION?= 9.0.0 BOOTSTRAPS_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}} @@ -83,6 +79,10 @@ _CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_B .include <bsd.port.pre.mk> +.if exists(${PATCHDIR}/${ARCH}${BOOTSTRAPS_SUFFIX}) +EXTRA_PATCHES+= ${PATCHDIR}/${ARCH}${BOOTSTRAPS_SUFFIX} +.endif + .if ${ARCH} == powerpc64 # The bootstrap is hardcoded to use gcc9 # but we can build with a newer or older compiler as provided by USE_GCC=yes @@ -90,9 +90,7 @@ BUILD_DEPENDS+= gcc9:lang/gcc9 USE_GCC= yes .endif -.if ${OPSYS} == FreeBSD && ${ARCH} == aarch64 && \ - (${OSVERSION} < 1200502 || \ - (${OSVERSION} > 1300000 && ${OSVERSION} < 1300006)) +.if ${ARCH} == aarch64 && ${OSVERSION} < 1200502 IGNORE= fails to run due to a bug in rtld, update to 12-STABLE r342847 or 13-CURRENT r342113 .endif @@ -131,6 +129,10 @@ post-patch: ${WRKSRC}/src/stage0.txt @${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},' \ + ${WRKSRC}/src/librustc_target/spec/powerpc64_unknown_freebsd.rs +.endif # Disable vendor checksums @${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \ ${CARGO_VENDOR_DIR}/*/.cargo-checksum.json diff --git a/lang/rust/distinfo b/lang/rust/distinfo index 675691860200..be9f9a2538cb 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,47 +1,47 @@ -TIMESTAMP = 1569482113 -SHA256 (rust/rustc-1.38.0-src.tar.xz) = 3a7991aa4cb44ef941d71636e45a95468b520dc6fc7cf725364925bd3e3d3a34 -SIZE (rust/rustc-1.38.0-src.tar.xz) = 96163304 -SHA256 (rust/2019-08-15/rustc-1.37.0-aarch64-unknown-freebsd.tar.gz) = ebdd6e51cc8d3b73de59bcf609b6b0fd9f255d6c0b4c982c5d9609775b0269ff -SIZE (rust/2019-08-15/rustc-1.37.0-aarch64-unknown-freebsd.tar.gz) = 56866730 -SHA256 (rust/2019-08-15/rust-std-1.37.0-aarch64-unknown-freebsd.tar.gz) = 2c6181d3dca8c70623625f9c0784e992128c00b1abbfad29f70791856d308eed -SIZE (rust/2019-08-15/rust-std-1.37.0-aarch64-unknown-freebsd.tar.gz) = 68907067 -SHA256 (rust/2019-08-15/cargo-0.38.0-aarch64-unknown-freebsd.tar.gz) = 387b571a741d5e6162876ecae136366646b22d870511a47140301a1b0604a7b5 -SIZE (rust/2019-08-15/cargo-0.38.0-aarch64-unknown-freebsd.tar.gz) = 5422359 -SHA256 (rust/2019-08-15/rustc-1.37.0-x86_64-unknown-freebsd.tar.gz) = a4dd357a0b39abf1ebbe8a0f64973c3b0c5bc527e374c12afe51266279fc1ca6 -SIZE (rust/2019-08-15/rustc-1.37.0-x86_64-unknown-freebsd.tar.gz) = 70318740 -SHA256 (rust/2019-08-15/rust-std-1.37.0-x86_64-unknown-freebsd.tar.gz) = 8783a667ea9c46f27027d494098c51563faa734c5ddb23c6b9b3eda804eb9742 -SIZE (rust/2019-08-15/rust-std-1.37.0-x86_64-unknown-freebsd.tar.gz) = 87956779 -SHA256 (rust/2019-08-15/cargo-0.38.0-x86_64-unknown-freebsd.tar.gz) = ec5051df58aeff6720f386067c05de21bbc0f6532d74d2646f7b7bc36d341629 -SIZE (rust/2019-08-15/cargo-0.38.0-x86_64-unknown-freebsd.tar.gz) = 6712004 -SHA256 (rust/2019-08-15/rustc-1.37.0-armv6-unknown-freebsd.tar.gz) = d0b6c3422892764ebff9b3224265c47f62241d82b5974d715c0aabf845bbf586 -SIZE (rust/2019-08-15/rustc-1.37.0-armv6-unknown-freebsd.tar.gz) = 59085607 -SHA256 (rust/2019-08-15/rust-std-1.37.0-armv6-unknown-freebsd.tar.gz) = ce2b3f002457d7086870a2743e121aedc4dfb800fd9a65e6190d50f1b2e061a7 -SIZE (rust/2019-08-15/rust-std-1.37.0-armv6-unknown-freebsd.tar.gz) = 70261468 -SHA256 (rust/2019-08-15/cargo-0.38.0-armv6-unknown-freebsd.tar.gz) = 643497ec41d40168c99f327ee31cbcc0b73ea9bbb6bab523bfef2b915d13d186 -SIZE (rust/2019-08-15/cargo-0.38.0-armv6-unknown-freebsd.tar.gz) = 5716966 +TIMESTAMP = 1573135953 +SHA256 (rust/rustc-1.39.0-src.tar.xz) = 4b0dbb356070687a606034f71dc032b783bbf8b5d3f9fff39f2c1fbc4f171c29 +SIZE (rust/rustc-1.39.0-src.tar.xz) = 96495140 +SHA256 (rust/2019-09-26/rustc-1.38.0-aarch64-unknown-freebsd.tar.gz) = 07a769da1a47e8f507e87d723b7de115b1ea916f34339b0fe5bc583a75e0f3ea +SIZE (rust/2019-09-26/rustc-1.38.0-aarch64-unknown-freebsd.tar.gz) = 37145293 +SHA256 (rust/2019-09-26/rust-std-1.38.0-aarch64-unknown-freebsd.tar.gz) = 18b84f46c767071e282fe9a5813317294b0cb7959f6ab30abd0a949531eb2817 +SIZE (rust/2019-09-26/rust-std-1.38.0-aarch64-unknown-freebsd.tar.gz) = 191199264 +SHA256 (rust/2019-09-26/cargo-0.39.0-aarch64-unknown-freebsd.tar.gz) = 2b97bda932259c10b41583226539bcd637d0efa6253a3eb390f622e6f7f6d27d +SIZE (rust/2019-09-26/cargo-0.39.0-aarch64-unknown-freebsd.tar.gz) = 4556329 +SHA256 (rust/2019-09-26/rustc-1.38.0-x86_64-unknown-freebsd.tar.gz) = 1d99318bbdc947c6dc375215f0eddcd767348c309811cd141e5d18e17d5aaaa4 +SIZE (rust/2019-09-26/rustc-1.38.0-x86_64-unknown-freebsd.tar.gz) = 49746736 +SHA256 (rust/2019-09-26/rust-std-1.38.0-x86_64-unknown-freebsd.tar.gz) = 9f1d88449ef56c31ebc514873ba4d5889fa12697c4c2ea1071f15127f301ac4d +SIZE (rust/2019-09-26/rust-std-1.38.0-x86_64-unknown-freebsd.tar.gz) = 218121173 +SHA256 (rust/2019-09-26/cargo-0.39.0-x86_64-unknown-freebsd.tar.gz) = 4ef06348157836fd6a144acc13578653d77ff05d0b1a220437b8cde0492c8dd2 +SIZE (rust/2019-09-26/cargo-0.39.0-x86_64-unknown-freebsd.tar.gz) = 6793022 +SHA256 (rust/2019-09-26/rustc-1.38.0-armv6-unknown-freebsd.tar.gz) = 33e0d04dd94c5a0c6c546cf9c1aefb79d7141b1612635f88d02cd0e693c50e1d +SIZE (rust/2019-09-26/rustc-1.38.0-armv6-unknown-freebsd.tar.gz) = 39977103 +SHA256 (rust/2019-09-26/rust-std-1.38.0-armv6-unknown-freebsd.tar.gz) = 35648a4c90b9f9a5c92bcefc9bf493f446fa53da746eec84fa0b7112b5bd4245 +SIZE (rust/2019-09-26/rust-std-1.38.0-armv6-unknown-freebsd.tar.gz) = 198873440 +SHA256 (rust/2019-09-26/cargo-0.39.0-armv6-unknown-freebsd.tar.gz) = d4b88144a7aae90ea3174bff8cfe0142b1a761e5ad50adfd24d39fa713682712 +SIZE (rust/2019-09-26/cargo-0.39.0-armv6-unknown-freebsd.tar.gz) = 5583543 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-08-15/rustc-1.37.0-armv7-unknown-freebsd.tar.gz) = b957e13bdb899f42c1c4b3cd91d18f7d4f6ab08b2492f9acf85e447f53640121 -SIZE (rust/2019-08-15/rustc-1.37.0-armv7-unknown-freebsd.tar.gz) = 58107583 -SHA256 (rust/2019-08-15/rust-std-1.37.0-armv7-unknown-freebsd.tar.gz) = c380d455923065b5067a43ec796c043dfb4241392e068a187d6d93909f1cbafb -SIZE (rust/2019-08-15/rust-std-1.37.0-armv7-unknown-freebsd.tar.gz) = 69710688 -SHA256 (rust/2019-08-15/cargo-0.38.0-armv7-unknown-freebsd.tar.gz) = 80641006fcb23de4780ac8576b9f0b235be1cb95e3d632a0976bfdd6117ee502 -SIZE (rust/2019-08-15/cargo-0.38.0-armv7-unknown-freebsd.tar.gz) = 4742625 -SHA256 (rust/2019-08-15/rustc-1.37.0-i686-unknown-freebsd.tar.gz) = 0d3a5bc51f138bfe3f7ccd4b9ccaa5aeec0d881118b7264f5e59ae8e1ce9f78a -SIZE (rust/2019-08-15/rustc-1.37.0-i686-unknown-freebsd.tar.gz) = 70857405 -SHA256 (rust/2019-08-15/rust-std-1.37.0-i686-unknown-freebsd.tar.gz) = 21fbe36d9580f68fcd65d4248ffb05a40f787a38d87792545c7946b273e91beb -SIZE (rust/2019-08-15/rust-std-1.37.0-i686-unknown-freebsd.tar.gz) = 88558002 -SHA256 (rust/2019-08-15/cargo-0.38.0-i686-unknown-freebsd.tar.gz) = e54e8e072ae5fba11ce36935cb813793ad6871b1fe1b3dfdb02a0a18e920ddda -SIZE (rust/2019-08-15/cargo-0.38.0-i686-unknown-freebsd.tar.gz) = 6593950 -SHA256 (rust/2019-08-15/rustc-1.37.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = aa4c7295731a92258c9378e24697f90a546c6a403da6fa9ff4a688878fbcced7 -SIZE (rust/2019-08-15/rustc-1.37.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 67717247 -SHA256 (rust/2019-08-15/rust-std-1.37.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = e6043fda28f881c9c7cb50cb1cd31b29552285d1e27a6e46d1c1abf707115be1 -SIZE (rust/2019-08-15/rust-std-1.37.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 72780079 -SHA256 (rust/2019-08-15/cargo-0.38.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 335216cbd2f460b337e02c1f3ef235178943194d9a41700f98d6d063d34668e7 -SIZE (rust/2019-08-15/cargo-0.38.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 5587878 -SHA256 (rust/2019-08-15/rustc-1.37.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = f0e1eca1713b14e4dad034a96c2bdfe0493afe390b5dd33bf16139691412e91b -SIZE (rust/2019-08-15/rustc-1.37.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 59832229 -SHA256 (rust/2019-08-15/rust-std-1.37.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 2c6802162b807ad2e332a4872943f9a694aa925f553ef2e61fac9def9ad73d8e -SIZE (rust/2019-08-15/rust-std-1.37.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 71174548 -SHA256 (rust/2019-08-15/cargo-0.38.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = db19655601cecbf18b9bca3d2db2545301b9d31fa353c78582eb378af6dc3966 -SIZE (rust/2019-08-15/cargo-0.38.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 4983791 +SHA256 (rust/2019-09-26/rustc-1.38.0-armv7-unknown-freebsd.tar.gz) = 95e33dda5c68ff0a8452472079f852e449bbcdbaf60ef0aca8068bd23d81f4d2 +SIZE (rust/2019-09-26/rustc-1.38.0-armv7-unknown-freebsd.tar.gz) = 38588675 +SHA256 (rust/2019-09-26/rust-std-1.38.0-armv7-unknown-freebsd.tar.gz) = d7e7671fe7c0aa53c6df4ca60547e6518416bd8497fc1f75c92366468f607d1b +SIZE (rust/2019-09-26/rust-std-1.38.0-armv7-unknown-freebsd.tar.gz) = 197638533 +SHA256 (rust/2019-09-26/cargo-0.39.0-armv7-unknown-freebsd.tar.gz) = c49fef9d921ff02b700bb302147dd1c9b32d2afdfc92beedf574d075a27e36cb +SIZE (rust/2019-09-26/cargo-0.39.0-armv7-unknown-freebsd.tar.gz) = 4835740 +SHA256 (rust/2019-09-26/rustc-1.38.0-i686-unknown-freebsd.tar.gz) = 1e4c148ffb38fdf8f3de3e6355ea418056e40749c4a29af1a447019b04891817 +SIZE (rust/2019-09-26/rustc-1.38.0-i686-unknown-freebsd.tar.gz) = 50284685 +SHA256 (rust/2019-09-26/rust-std-1.38.0-i686-unknown-freebsd.tar.gz) = 7eb02bd86f78dc0748d45a41748c0dfa145aab33d552a14dae2fce22f9d0f9b6 +SIZE (rust/2019-09-26/rust-std-1.38.0-i686-unknown-freebsd.tar.gz) = 218440878 +SHA256 (rust/2019-09-26/cargo-0.39.0-i686-unknown-freebsd.tar.gz) = 57179ee4f61be55a978aff61cea7475fe31dcac4d763e735637219a661a812fa +SIZE (rust/2019-09-26/cargo-0.39.0-i686-unknown-freebsd.tar.gz) = 6669103 +SHA256 (rust/2019-09-26/rustc-1.38.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = d6654031b77b9e90b0a3b2d2e5d702ea6f52b50b6589606043036e1780192da9 +SIZE (rust/2019-09-26/rustc-1.38.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 48397197 +SHA256 (rust/2019-09-26/rust-std-1.38.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 4a7a1cbfd4aa169528e4aad4c46a1690db4d5477c73e2e857bce9d3735f8b76f +SIZE (rust/2019-09-26/rust-std-1.38.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 196472426 +SHA256 (rust/2019-09-26/cargo-0.39.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 1b23312ae307293c5e53282d799bf7688269d9ed3946729cf8886710581284b0 +SIZE (rust/2019-09-26/cargo-0.39.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 5676205 +SHA256 (rust/2019-09-26/rustc-1.38.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 8d877ef738ee01548b1be69a7bf6f4619a0909a7a4db12ab414441b32763b9af +SIZE (rust/2019-09-26/rustc-1.38.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 39853681 +SHA256 (rust/2019-09-26/rust-std-1.38.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 2c5da67f44b5bc8cf4c5f58d11e7200ef5d64a66416d9cdf6b5bc4f55774b8ba +SIZE (rust/2019-09-26/rust-std-1.38.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 193639233 +SHA256 (rust/2019-09-26/cargo-0.39.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 4a91b5db28538504992462ea65945419d28fe6ee5fa3a48b23055b4a2f3edc91 +SIZE (rust/2019-09-26/cargo-0.39.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 4604255 diff --git a/lang/rust/files/extra-patch-arm-compiler-rt b/lang/rust/files/armv6/patch-src_llvm-project_compiler-rt_lib_builtins_atomic.c index 48a112abcd57..48a112abcd57 100644 --- a/lang/rust/files/extra-patch-arm-compiler-rt +++ b/lang/rust/files/armv6/patch-src_llvm-project_compiler-rt_lib_builtins_atomic.c diff --git a/lang/rust/files/armv7/patch-src_llvm-project_compiler-rt_lib_builtins_atomic.c b/lang/rust/files/armv7/patch-src_llvm-project_compiler-rt_lib_builtins_atomic.c new file mode 100644 index 000000000000..48a112abcd57 --- /dev/null +++ b/lang/rust/files/armv7/patch-src_llvm-project_compiler-rt_lib_builtins_atomic.c @@ -0,0 +1,43 @@ +https://reviews.llvm.org/D68045 + +--- src/llvm-project/compiler-rt/lib/builtins/atomic.c.orig 2019-09-09 18:30:53 UTC ++++ src/llvm-project/compiler-rt/lib/builtins/atomic.c +@@ -51,9 +51,11 @@ static const long SPINLOCK_MASK = SPINLOCK_COUNT - 1; + //////////////////////////////////////////////////////////////////////////////// + #ifdef __FreeBSD__ + #include <errno.h> +-#include <machine/atomic.h> ++// clang-format off + #include <sys/types.h> ++#include <machine/atomic.h> + #include <sys/umtx.h> ++// clang-format on + typedef struct _usem Lock; + __inline static void unlock(Lock *l) { + __c11_atomic_store((_Atomic(uint32_t) *)&l->_count, 1, __ATOMIC_RELEASE); +--- src/llvm-project/compiler-rt/lib/builtins/clear_cache.c.orig 2019-09-09 18:30:53 UTC ++++ src/llvm-project/compiler-rt/lib/builtins/clear_cache.c +@@ -23,8 +23,10 @@ uintptr_t GetCurrentProcess(void); + #endif + + #if defined(__FreeBSD__) && defined(__arm__) +-#include <machine/sysarch.h> ++// clang-format off + #include <sys/types.h> ++#include <machine/sysarch.h> ++// clang-format on + #endif + + #if defined(__NetBSD__) && defined(__arm__) +@@ -32,8 +34,10 @@ uintptr_t GetCurrentProcess(void); + #endif + + #if defined(__OpenBSD__) && defined(__mips__) +-#include <machine/sysarch.h> ++// clang-format off + #include <sys/types.h> ++#include <machine/sysarch.h> ++// clang-format on + #endif + + #if defined(__linux__) && defined(__mips__) diff --git a/lang/rust/files/patch-src_bootstrap_native.rs b/lang/rust/files/patch-src_bootstrap_native.rs deleted file mode 100644 index ed2de6528b74..000000000000 --- a/lang/rust/files/patch-src_bootstrap_native.rs +++ /dev/null @@ -1,48 +0,0 @@ -Avoid unnecessarily restarting the LLVM build and installing it -into STAGEDIR during the install phase. - -https://github.com/rust-lang/rust/issues/61206 - ---- src/bootstrap/native.rs.orig 2019-05-22 05:39:52 UTC -+++ src/bootstrap/native.rs -@@ -92,17 +92,9 @@ impl Step for Llvm { - .join(exe("llvm-config", &*builder.config.build)); - let done_stamp = out_dir.join("llvm-finished-building"); - -- if let Some(llvm_commit) = llvm_info.sha() { - if done_stamp.exists() { -- let done_contents = t!(fs::read(&done_stamp)); -- -- // If LLVM was already built previously and the submodule's commit didn't change -- // from the previous build, then no action is required. -- if done_contents == llvm_commit.as_bytes() { -- return build_llvm_config -- } -+ return build_llvm_config - } -- } - - let _folder = builder.fold_output(|| "llvm"); - let descriptor = if emscripten { "Emscripten " } else { "" }; -@@ -218,6 +210,10 @@ impl Step for Llvm { - } - } - -+ if target == "powerpc64-unknown-freebsd" { -+ cfg.define("CMAKE_EXE_LINKER_FLAGS", "-Wl,-rpath=/usr/local/lib/%CC% -L/usr/local/lib/%CC%"); -+ } -+ - // http://llvm.org/docs/HowToCrossCompileLLVM.html - if target != builder.config.build && !emscripten { - builder.ensure(Llvm { -@@ -283,9 +279,7 @@ impl Step for Llvm { - - cfg.build(); - -- if let Some(llvm_commit) = llvm_info.sha() { -- t!(fs::write(&done_stamp, llvm_commit)); -- } -+ t!(fs::write(&done_stamp, "done building LLVM")); - - build_llvm_config - } 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 index 0b485dbd572f..475d9833a777 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/llvm-project/llvm/utils/llvm-build/llvmbuild/main.py.orig 2018-12-13 15:33:50 UTC +--- 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 -@@ -659,6 +659,8 @@ def add_magic_target_components(parser, project, opts) +@@ -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', diff --git a/lang/rust/files/patch-vendor_libgit2-sys_lib.rs b/lang/rust/files/patch-vendor_libgit2-sys_lib.rs index 3f342b41b922..880de9d35d0e 100644 --- a/lang/rust/files/patch-vendor_libgit2-sys_lib.rs +++ b/lang/rust/files/patch-vendor_libgit2-sys_lib.rs @@ -1,6 +1,6 @@ Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458 ---- vendor/libgit2-sys/lib.rs.orig 2019-08-16 20:27:18 UTC +--- vendor/libgit2-sys/lib.rs.orig 2019-11-04 17:34:46 UTC +++ vendor/libgit2-sys/lib.rs @@ -331,7 +331,6 @@ pub struct git_remote_callbacks { pub push_negotiation: Option<git_push_negotiation>, @@ -19,7 +19,7 @@ Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458 #[repr(C)] pub struct git_push_update { -@@ -2233,7 +2230,7 @@ extern "C" { +@@ -2280,7 +2277,7 @@ extern "C" { source: *const git_tree, ) -> c_int; pub fn git_treebuilder_clear(bld: *mut git_treebuilder); diff --git a/lang/rust/files/patch-vendor_openssl-sys_build_main.rs b/lang/rust/files/patch-vendor_openssl-sys_build_main.rs index d9aeddc25910..0629319631dd 100644 --- a/lang/rust/files/patch-vendor_openssl-sys_build_main.rs +++ b/lang/rust/files/patch-vendor_openssl-sys_build_main.rs @@ -1,19 +1,59 @@ ---- vendor/openssl-sys/build/main.rs.orig 2019-05-13 21:50:35 UTC +--- vendor/openssl-sys/build/main.rs.orig 2019-11-04 17:34:46 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'), +@@ -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(), }; -@@ -545,7 +546,7 @@ fn 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 2.9.x, 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_ssl.rs b/lang/rust/files/patch-vendor_openssl-sys_src_ssl.rs index f412c3c469f7..e54f58f9249c 100644 --- a/lang/rust/files/patch-vendor_openssl-sys_src_ssl.rs +++ b/lang/rust/files/patch-vendor_openssl-sys_src_ssl.rs @@ -1,6 +1,6 @@ ---- vendor/openssl-sys/src/ssl.rs.orig 2019-05-13 21:50:35 UTC +--- vendor/openssl-sys/src/ssl.rs.orig 2019-11-04 17:34:46 UTC +++ vendor/openssl-sys/src/ssl.rs -@@ -1032,7 +1032,7 @@ extern "C" { +@@ -1057,7 +1057,7 @@ extern "C" { } cfg_if! { diff --git a/lang/rust/files/powerpc64-elfv1/patch-src_bootstrap_native.rs b/lang/rust/files/powerpc64-elfv1/patch-src_bootstrap_native.rs new file mode 100644 index 000000000000..854b992fcffe --- /dev/null +++ b/lang/rust/files/powerpc64-elfv1/patch-src_bootstrap_native.rs @@ -0,0 +1,13 @@ +--- src/bootstrap/native.rs.orig 2019-11-04 15:45:21 UTC ++++ src/bootstrap/native.rs +@@ -241,6 +241,10 @@ impl Step for Llvm { + } + } + ++ if target == "powerpc64-unknown-freebsd" { ++ cfg.define("CMAKE_EXE_LINKER_FLAGS", "-Wl,-rpath=/usr/local/lib/%CC% -L/usr/local/lib/%CC%"); ++ } ++ + // http://llvm.org/docs/HowToCrossCompileLLVM.html + if target != builder.config.build && !emscripten { + builder.ensure(Llvm { diff --git a/lang/rust/files/patch-src_librustc__llvm_build.rs b/lang/rust/files/powerpc64-elfv1/patch-src_librustc__llvm_build.rs index fa2064382f55..db32de43d8c5 100644 --- a/lang/rust/files/patch-src_librustc__llvm_build.rs +++ b/lang/rust/files/powerpc64-elfv1/patch-src_librustc__llvm_build.rs @@ -1,6 +1,6 @@ ---- src/librustc_llvm/build.rs.orig 2019-04-08 12:42:31 UTC +--- src/librustc_llvm/build.rs.orig 2019-11-04 15:45:21 UTC +++ src/librustc_llvm/build.rs -@@ -254,7 +254,10 @@ fn main() { +@@ -273,7 +273,10 @@ fn main() { }; // C++ runtime library diff --git a/lang/rust/files/powerpc64-elfv2/patch-src_librustc__target_abi_call_powerpc64.rs b/lang/rust/files/powerpc64-elfv2/patch-src_librustc__target_abi_call_powerpc64.rs new file mode 100644 index 000000000000..bc48318fa83e --- /dev/null +++ b/lang/rust/files/powerpc64-elfv2/patch-src_librustc__target_abi_call_powerpc64.rs @@ -0,0 +1,11 @@ +--- src/librustc_target/abi/call/powerpc64.rs.orig 2019-09-23 21:15:52 UTC ++++ src/librustc_target/abi/call/powerpc64.rs +@@ -128,7 +128,7 @@ pub fn compute_abi_info<'a, Ty, C>(cx: &C, fty: &mut F + ELFv2 + } else { + match cx.data_layout().endian { +- Endian::Big => ELFv1, ++ Endian::Big => ELFv2, + Endian::Little => ELFv2 + } + }; diff --git a/lang/rust/files/powerpc64-elfv2/patch-src_llvm-project_clang_lib_Basic_Targets_PPC.h b/lang/rust/files/powerpc64-elfv2/patch-src_llvm-project_clang_lib_Basic_Targets_PPC.h new file mode 100644 index 000000000000..43e85603791d --- /dev/null +++ b/lang/rust/files/powerpc64-elfv2/patch-src_llvm-project_clang_lib_Basic_Targets_PPC.h @@ -0,0 +1,34 @@ +--- src/llvm-project/clang/lib/Basic/Targets/PPC.h.orig 2019-09-20 16:14:30 UTC ++++ src/llvm-project/clang/lib/Basic/Targets/PPC.h +@@ -374,12 +374,29 @@ class LLVM_LIBRARY_VISIBILITY PPC64TargetInfo : public + IntMaxType = SignedLong; + Int64Type = SignedLong; + ++ if (Triple.getEnvironment() != llvm::Triple::UnknownEnvironment) { ++ switch (Triple.getEnvironment()){ ++ case llvm::Triple::ELFv1: ++ ABI = "elfv1"; ++ break; ++ default: ++ ABI = "elfv2"; ++ break; ++ } ++ } else { ++ if ((Triple.getOS() == llvm::Triple::FreeBSD) && ++ (Triple.getOSMajorVersion() < 13)) { ++ ABI = "elfv1"; ++ } else { ++ ABI = "elfv2"; ++ } ++ } ++ ++ + if ((Triple.getArch() == llvm::Triple::ppc64le)) { + resetDataLayout("e-m:e-i64:64-n32:64"); +- ABI = "elfv2"; + } else { + resetDataLayout("E-m:e-i64:64-n32:64"); +- ABI = Triple.getEnvironment() == llvm::Triple::ELFv2 ? "elfv2" : "elfv1"; + } + + if (Triple.getOS() == llvm::Triple::AIX) diff --git a/lang/rust/files/powerpc64-elfv2/patch-src_llvm-project_llvm_lib_Target_PowerPC_PPCTargetMachine.cpp b/lang/rust/files/powerpc64-elfv2/patch-src_llvm-project_llvm_lib_Target_PowerPC_PPCTargetMachine.cpp new file mode 100644 index 000000000000..87fff59c8b28 --- /dev/null +++ b/lang/rust/files/powerpc64-elfv2/patch-src_llvm-project_llvm_lib_Target_PowerPC_PPCTargetMachine.cpp @@ -0,0 +1,23 @@ +--- src/llvm-project/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp.orig 2019-09-20 16:14:30 UTC ++++ src/llvm-project/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp +@@ -209,6 +209,20 @@ static PPCTargetMachine::PPCABI computeTargetABI(const + if (TT.isMacOSX()) + return PPCTargetMachine::PPC_ABI_UNKNOWN; + ++ if (TT.isOSFreeBSD()) { ++ switch (TT.getArch()) { ++ case Triple::ppc64le: ++ case Triple::ppc64: ++ if (TT.getOSMajorVersion() >= 13) ++ return PPCTargetMachine::PPC_ABI_ELFv2; ++ else ++ return PPCTargetMachine::PPC_ABI_ELFv1; ++ case Triple::ppc: ++ default: ++ return PPCTargetMachine::PPC_ABI_UNKNOWN; ++ } ++ } ++ + switch (TT.getArch()) { + case Triple::ppc64le: + return PPCTargetMachine::PPC_ABI_ELFv2; diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 62ac1db3facf..c724c4151bdd 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 68.2.2 +PORTREVISION= 1 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source diff --git a/mail/thunderbird/files/patch-bindgen-rust1390 b/mail/thunderbird/files/patch-bindgen-rust1390 new file mode 100644 index 000000000000..dad6182544ec --- /dev/null +++ b/mail/thunderbird/files/patch-bindgen-rust1390 @@ -0,0 +1,170 @@ +From 9696bc1795c75b1b527e2b70d9baf3ced9e3c154 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io> +Date: Mon, 23 Sep 2019 17:54:37 +0200 +Subject: [PATCH] ir: Make Ord and PartialOrd implementations agree. + +See https://github.com/rust-lang/rust/issues/64710. + +Bogus implementations were introduced in 230545e7c, d3e39dc62, and 379bb1663. + +--- third_party/rust/bindgen/.cargo-checksum.json.orig 2019-11-05 18:32:47 UTC ++++ third_party/rust/bindgen/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"} +\ No newline at end of file ++{"files":{},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"} +--- third_party/rust/bindgen/src/ir/analysis/has_vtable.rs.orig 2019-10-30 17:36:44 UTC ++++ third_party/rust/bindgen/src/ir/analysis/has_vtable.rs +@@ -9,37 +9,22 @@ use std::ops; + use {HashMap, Entry}; + + /// The result of the `HasVtableAnalysis` for an individual item. +-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] ++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] + pub enum HasVtableResult { +- /// The item has a vtable, but the actual vtable pointer is in a base +- /// member. +- BaseHasVtable, ++ /// The item does not have a vtable pointer. ++ No, + + /// The item has a vtable and the actual vtable pointer is within this item. + SelfHasVtable, + +- /// The item does not have a vtable pointer. +- No ++ /// The item has a vtable, but the actual vtable pointer is in a base ++ /// member. ++ BaseHasVtable, + } + + impl Default for HasVtableResult { + fn default() -> Self { + HasVtableResult::No +- } +-} +- +-impl cmp::PartialOrd for HasVtableResult { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::HasVtableResult::*; +- +- match (*self, *rhs) { +- (x, y) if x == y => Some(cmp::Ordering::Equal), +- (BaseHasVtable, _) => Some(cmp::Ordering::Greater), +- (_, BaseHasVtable) => Some(cmp::Ordering::Less), +- (SelfHasVtable, _) => Some(cmp::Ordering::Greater), +- (_, SelfHasVtable) => Some(cmp::Ordering::Less), +- _ => unreachable!(), +- } + } + } + +--- third_party/rust/bindgen/src/ir/analysis/sizedness.rs.orig 2019-10-30 17:36:21 UTC ++++ third_party/rust/bindgen/src/ir/analysis/sizedness.rs +@@ -22,13 +22,14 @@ use {HashMap, Entry}; + /// + /// We initially assume that all types are `ZeroSized` and then update our + /// understanding as we learn more about each type. +-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] ++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] + pub enum SizednessResult { +- /// Has some size that is known to be greater than zero. That doesn't mean +- /// it has a static size, but it is not zero sized for sure. In other words, +- /// it might contain an incomplete array or some other dynamically sized +- /// type. +- NonZeroSized, ++ /// The type is zero-sized. ++ /// ++ /// This means that if it is a C++ type, and is not being used as a base ++ /// member, then we must add an `_address` byte to enforce the ++ /// unique-address-per-distinct-object-instance rule. ++ ZeroSized, + + /// Whether this type is zero-sized or not depends on whether a type + /// parameter is zero-sized or not. +@@ -52,32 +53,16 @@ pub enum SizednessResult { + /// https://github.com/rust-lang/rust-bindgen/issues/586 + DependsOnTypeParam, + +- /// The type is zero-sized. +- /// +- /// This means that if it is a C++ type, and is not being used as a base +- /// member, then we must add an `_address` byte to enforce the +- /// unique-address-per-distinct-object-instance rule. +- ZeroSized, ++ /// Has some size that is known to be greater than zero. That doesn't mean ++ /// it has a static size, but it is not zero sized for sure. In other words, ++ /// it might contain an incomplete array or some other dynamically sized ++ /// type. ++ NonZeroSized, + } + + impl Default for SizednessResult { + fn default() -> Self { + SizednessResult::ZeroSized +- } +-} +- +-impl cmp::PartialOrd for SizednessResult { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::SizednessResult::*; +- +- match (*self, *rhs) { +- (x, y) if x == y => Some(cmp::Ordering::Equal), +- (NonZeroSized, _) => Some(cmp::Ordering::Greater), +- (_, NonZeroSized) => Some(cmp::Ordering::Less), +- (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater), +- (_, DependsOnTypeParam) => Some(cmp::Ordering::Less), +- _ => unreachable!(), +- } + } + } + +--- third_party/rust/bindgen/src/ir/derive.rs.orig 2019-10-30 17:36:44 UTC ++++ third_party/rust/bindgen/src/ir/derive.rs +@@ -92,10 +92,10 @@ pub trait CanDeriveOrd { + /// + /// Initially we assume that we can derive trait for all types and then + /// update our understanding as we learn more about each type. +-#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)] ++#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] + pub enum CanDerive { +- /// No, we cannot. +- No, ++ /// Yes, we can derive automatically. ++ Yes, + + /// The only thing that stops us from automatically deriving is that + /// array with more than maximum number of elements is used. +@@ -103,29 +103,13 @@ pub enum CanDerive { + /// This means we probably can "manually" implement such trait. + Manually, + +- /// Yes, we can derive automatically. +- Yes, ++ /// No, we cannot. ++ No, + } + + impl Default for CanDerive { + fn default() -> CanDerive { + CanDerive::Yes +- } +-} +- +-impl cmp::PartialOrd for CanDerive { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::CanDerive::*; +- +- let ordering = match (*self, *rhs) { +- (x, y) if x == y => cmp::Ordering::Equal, +- (No, _) => cmp::Ordering::Greater, +- (_, No) => cmp::Ordering::Less, +- (Manually, _) => cmp::Ordering::Greater, +- (_, Manually) => cmp::Ordering::Less, +- _ => unreachable!() +- }; +- Some(ordering) + } + } + diff --git a/multimedia/rav1e/Makefile b/multimedia/rav1e/Makefile index aed72d053438..bc651edf6875 100644 --- a/multimedia/rav1e/Makefile +++ b/multimedia/rav1e/Makefile @@ -2,6 +2,7 @@ PORTNAME= rav1e PORTVERSION= s20191104 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/termplay/Makefile b/multimedia/termplay/Makefile index 1f362882d7a9..31bd4280ceb9 100644 --- a/multimedia/termplay/Makefile +++ b/multimedia/termplay/Makefile @@ -2,7 +2,7 @@ PORTNAME= termplay DISTVERSION= 2.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/net-im/fractal/Makefile b/net-im/fractal/Makefile index 1d2e7c2aebbe..251ffd73517d 100644 --- a/net-im/fractal/Makefile +++ b/net-im/fractal/Makefile @@ -2,7 +2,7 @@ PORTNAME= fractal DISTVERSION= 4.0.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-im MASTER_SITES= https://gitlab.gnome.org/World/fractal/uploads/${GL_HASH}/ diff --git a/net/rabbiteer/Makefile b/net/rabbiteer/Makefile index 86d62465b50a..1af859e1751f 100644 --- a/net/rabbiteer/Makefile +++ b/net/rabbiteer/Makefile @@ -2,7 +2,7 @@ PORTNAME= rabbiteer DISTVERSION= 1.4.1 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= net MAINTAINER= dch@FreeBSD.org diff --git a/net/routinator/Makefile b/net/routinator/Makefile index 8a08f7b7c357..936a84028427 100644 --- a/net/routinator/Makefile +++ b/net/routinator/Makefile @@ -3,7 +3,7 @@ PORTNAME= routinator PORTVERSION= 0.5.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MAINTAINER= jaap@NLnetLabs.nl diff --git a/security/acmed/Makefile b/security/acmed/Makefile index 2db01c51ae6c..9d670d6bb6e2 100644 --- a/security/acmed/Makefile +++ b/security/acmed/Makefile @@ -3,7 +3,7 @@ PORTNAME= acmed DISTVERSIONPREFIX= v DISTVERSION= 0.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MAINTAINER= greg@unrelenting.technology diff --git a/security/cargo-audit/Makefile b/security/cargo-audit/Makefile index 64d5aea91dc9..630dfe13069c 100644 --- a/security/cargo-audit/Makefile +++ b/security/cargo-audit/Makefile @@ -3,6 +3,7 @@ PORTNAME= cargo-audit DISTVERSIONPREFIX= v DISTVERSION= 0.10.0 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org diff --git a/security/cloak/Makefile b/security/cloak/Makefile index 295559cf06f0..8485b3d8eb1b 100644 --- a/security/cloak/Makefile +++ b/security/cloak/Makefile @@ -3,7 +3,7 @@ PORTNAME= cloak DISTVERSIONPREFIX= v DISTVERSION= 0.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org diff --git a/security/suricata/Makefile b/security/suricata/Makefile index 91480175b235..ad85224fb085 100644 --- a/security/suricata/Makefile +++ b/security/suricata/Makefile @@ -3,6 +3,7 @@ PORTNAME= suricata DISTVERSION= 5.0.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://www.openinfosecfoundation.org/download/ diff --git a/security/suricata5/Makefile b/security/suricata5/Makefile index 2f5ac6d14145..e2971b580ecd 100644 --- a/security/suricata5/Makefile +++ b/security/suricata5/Makefile @@ -3,6 +3,7 @@ PORTNAME= suricata DISTVERSION= 5.0.0-rc1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://www.openinfosecfoundation.org/download/ PKGNAMESUFFIX= 5 diff --git a/shells/ion/Makefile b/shells/ion/Makefile index ffe98f7f7613..1c4b59d8ec93 100644 --- a/shells/ion/Makefile +++ b/shells/ion/Makefile @@ -2,7 +2,7 @@ PORTNAME= ion DISTVERSION= 1.0.5-1355 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= shells PKGNAMESUFFIX= -shell diff --git a/shells/starship/Makefile b/shells/starship/Makefile index 971a68efb9e0..2364fa9c764a 100644 --- a/shells/starship/Makefile +++ b/shells/starship/Makefile @@ -2,7 +2,7 @@ PORTNAME= starship DISTVERSION= 0.13.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= shells MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/sysutils/exa/Makefile b/sysutils/exa/Makefile index ab3e8ded9b99..80611fd6c35a 100644 --- a/sysutils/exa/Makefile +++ b/sysutils/exa/Makefile @@ -3,7 +3,7 @@ PORTNAME= exa DISTVERSIONPREFIX= v DISTVERSION= 0.9.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org diff --git a/sysutils/fd/Makefile b/sysutils/fd/Makefile index ded9c9075427..a463f6ac1cae 100644 --- a/sysutils/fd/Makefile +++ b/sysutils/fd/Makefile @@ -4,7 +4,7 @@ PORTNAME= fd DISTVERSIONPREFIX= v DISTVERSION= 7.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMESUFFIX= -find diff --git a/sysutils/flowgger/Makefile b/sysutils/flowgger/Makefile index ec0b3e6940e4..51feb7490dc6 100644 --- a/sysutils/flowgger/Makefile +++ b/sysutils/flowgger/Makefile @@ -3,7 +3,7 @@ PORTNAME= flowgger DISTVERSION= 0.2.6-28 DISTVERSIONSUFFIX= -gab572a0 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= sysutils MAINTAINER= ports@FreeBSD.org diff --git a/sysutils/fusefs-sandboxfs/Makefile b/sysutils/fusefs-sandboxfs/Makefile index 589db4e37542..1fb227cd8d81 100644 --- a/sysutils/fusefs-sandboxfs/Makefile +++ b/sysutils/fusefs-sandboxfs/Makefile @@ -3,6 +3,7 @@ PORTNAME= sandboxfs DISTVERSIONPREFIX= sandboxfs- DISTVERSION= 0.1.1 +PORTREVISION= 1 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- diff --git a/sysutils/hexyl/Makefile b/sysutils/hexyl/Makefile index 4434186c2215..8a99624c0ac0 100644 --- a/sysutils/hexyl/Makefile +++ b/sysutils/hexyl/Makefile @@ -3,6 +3,7 @@ PORTNAME= hexyl DISTVERSIONPREFIX= v DISTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org diff --git a/sysutils/potnet/Makefile b/sysutils/potnet/Makefile index fa138c45c783..5c57e35d7c7e 100644 --- a/sysutils/potnet/Makefile +++ b/sysutils/potnet/Makefile @@ -2,7 +2,7 @@ PORTNAME= potnet DISTVERSION= 0.4.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= pizzamig@FreeBSD.org diff --git a/textproc/bat/Makefile b/textproc/bat/Makefile index 8f744ffba830..43561e696bac 100644 --- a/textproc/bat/Makefile +++ b/textproc/bat/Makefile @@ -3,7 +3,7 @@ PORTNAME= bat DISTVERSIONPREFIX= v DISTVERSION= 0.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= pizzamig@FreeBSD.org diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile index a27ccd1cd318..0383842c7224 100644 --- a/textproc/ripgrep/Makefile +++ b/textproc/ripgrep/Makefile @@ -5,7 +5,7 @@ PORTNAME= ripgrep DISTVERSION= 11.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi diff --git a/textproc/sd/Makefile b/textproc/sd/Makefile index cf7d3034b706..47c91ad0905a 100644 --- a/textproc/sd/Makefile +++ b/textproc/sd/Makefile @@ -2,7 +2,7 @@ PORTNAME= sd DISTVERSION= 0.6.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MAINTAINER= tobik@FreeBSD.org diff --git a/textproc/sonic/Makefile b/textproc/sonic/Makefile index 936360dc4e7d..2419acf2ecce 100644 --- a/textproc/sonic/Makefile +++ b/textproc/sonic/Makefile @@ -3,6 +3,7 @@ PORTNAME= sonic DISTVERSIONPREFIX= v DISTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= tobik@FreeBSD.org diff --git a/textproc/xsv-rs/Makefile b/textproc/xsv-rs/Makefile index 285157326522..cd307ff3e4c0 100644 --- a/textproc/xsv-rs/Makefile +++ b/textproc/xsv-rs/Makefile @@ -2,7 +2,7 @@ PORTNAME= xsv DISTVERSION= 0.13.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= textproc PKGNAMESUFFIX= -rs diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile index bffac5bd717d..cadbeb742dd5 100644 --- a/www/cliqz/Makefile +++ b/www/cliqz/Makefile @@ -2,6 +2,7 @@ PORTNAME= cliqz DISTVERSION= 1.29.3 +PORTREVISION= 1 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/cliqz/files/patch-bindgen-rust1390 b/www/cliqz/files/patch-bindgen-rust1390 new file mode 100644 index 000000000000..e7da42f402be --- /dev/null +++ b/www/cliqz/files/patch-bindgen-rust1390 @@ -0,0 +1,170 @@ +From 9696bc1795c75b1b527e2b70d9baf3ced9e3c154 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io> +Date: Mon, 23 Sep 2019 17:54:37 +0200 +Subject: [PATCH] ir: Make Ord and PartialOrd implementations agree. + +See https://github.com/rust-lang/rust/issues/64710. + +Bogus implementations were introduced in 230545e7c, d3e39dc62, and 379bb1663. + +--- mozilla-release/third_party/rust/bindgen/.cargo-checksum.json.orig 2019-11-05 18:32:47 UTC ++++ mozilla-release/third_party/rust/bindgen/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"7bd5f5264fe47e6bcf50e68017053799b39b8cddaaef5c4690193cb25d70d413","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"87be2d7f7774327a1608c2c4d64df869e17fb34b7efdacb4030b6794d98e40f3","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"aa0daff2061c6de31acfbd113190889e0f7ca2d2b8d4f46740bfd5832c33e4d2","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"9fb48eb14ef1f97e313fe13cfbc1ca96d74262f7a229f1f94011b52079d3df5b","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"82511f1bb8cbd04d98f57b000903b0264237962af93a72a58220437213eba1ef","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"b73865b6689d4f3546edd91909a47c329c4ae630ea97715d29bc683ae1dc17ad","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"498dc771461f9f30db712dd5596fc959133ec5583e2ba6b75036b9afe9d28dcd","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"7658cf68c00b1732dfa599c2d6b6a93a82de8401142591c3afe5fcb27d901a66","src/ir/function.rs":"c2feb2e26d47aa96a74af9912ada26be077e2b0c36d46fa10167da7109590500","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"4ca6c5dd71ecac737b4710b4bc65435be11889375be564e9a080879387211247","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"8c96cd2a051e3f09b1b87b75cd9ed77e82e889c8309ebd3e4bc782960cf63e58","src/options.rs":"5b309b225cc51e665bd42ed3e7965a7cd73d984e4455a2d76987fc42ab271ff8","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6cdac0c63ff3380328d5c427ba4ac8bca04cdd9d3a0379c6e56a43c82a364014"} +\ No newline at end of file ++{"files":{},"package":"6cdac0c63ff3380328d5c427ba4ac8bca04cdd9d3a0379c6e56a43c82a364014"} +--- mozilla-release/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs.orig 2019-10-30 17:36:44 UTC ++++ mozilla-release/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs +@@ -9,37 +9,22 @@ use std::ops; + use {HashMap, Entry}; + + /// The result of the `HasVtableAnalysis` for an individual item. +-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] ++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] + pub enum HasVtableResult { +- /// The item has a vtable, but the actual vtable pointer is in a base +- /// member. +- BaseHasVtable, ++ /// The item does not have a vtable pointer. ++ No, + + /// The item has a vtable and the actual vtable pointer is within this item. + SelfHasVtable, + +- /// The item does not have a vtable pointer. +- No ++ /// The item has a vtable, but the actual vtable pointer is in a base ++ /// member. ++ BaseHasVtable, + } + + impl Default for HasVtableResult { + fn default() -> Self { + HasVtableResult::No +- } +-} +- +-impl cmp::PartialOrd for HasVtableResult { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::HasVtableResult::*; +- +- match (*self, *rhs) { +- (x, y) if x == y => Some(cmp::Ordering::Equal), +- (BaseHasVtable, _) => Some(cmp::Ordering::Greater), +- (_, BaseHasVtable) => Some(cmp::Ordering::Less), +- (SelfHasVtable, _) => Some(cmp::Ordering::Greater), +- (_, SelfHasVtable) => Some(cmp::Ordering::Less), +- _ => unreachable!(), +- } + } + } + +--- mozilla-release/third_party/rust/bindgen/src/ir/analysis/sizedness.rs.orig 2019-10-30 17:36:21 UTC ++++ mozilla-release/third_party/rust/bindgen/src/ir/analysis/sizedness.rs +@@ -22,13 +22,14 @@ use {HashMap, Entry}; + /// + /// We initially assume that all types are `ZeroSized` and then update our + /// understanding as we learn more about each type. +-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] ++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] + pub enum SizednessResult { +- /// Has some size that is known to be greater than zero. That doesn't mean +- /// it has a static size, but it is not zero sized for sure. In other words, +- /// it might contain an incomplete array or some other dynamically sized +- /// type. +- NonZeroSized, ++ /// The type is zero-sized. ++ /// ++ /// This means that if it is a C++ type, and is not being used as a base ++ /// member, then we must add an `_address` byte to enforce the ++ /// unique-address-per-distinct-object-instance rule. ++ ZeroSized, + + /// Whether this type is zero-sized or not depends on whether a type + /// parameter is zero-sized or not. +@@ -52,32 +53,16 @@ pub enum SizednessResult { + /// https://github.com/rust-lang/rust-bindgen/issues/586 + DependsOnTypeParam, + +- /// The type is zero-sized. +- /// +- /// This means that if it is a C++ type, and is not being used as a base +- /// member, then we must add an `_address` byte to enforce the +- /// unique-address-per-distinct-object-instance rule. +- ZeroSized, ++ /// Has some size that is known to be greater than zero. That doesn't mean ++ /// it has a static size, but it is not zero sized for sure. In other words, ++ /// it might contain an incomplete array or some other dynamically sized ++ /// type. ++ NonZeroSized, + } + + impl Default for SizednessResult { + fn default() -> Self { + SizednessResult::ZeroSized +- } +-} +- +-impl cmp::PartialOrd for SizednessResult { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::SizednessResult::*; +- +- match (*self, *rhs) { +- (x, y) if x == y => Some(cmp::Ordering::Equal), +- (NonZeroSized, _) => Some(cmp::Ordering::Greater), +- (_, NonZeroSized) => Some(cmp::Ordering::Less), +- (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater), +- (_, DependsOnTypeParam) => Some(cmp::Ordering::Less), +- _ => unreachable!(), +- } + } + } + +--- mozilla-release/third_party/rust/bindgen/src/ir/derive.rs.orig 2019-10-30 17:36:44 UTC ++++ mozilla-release/third_party/rust/bindgen/src/ir/derive.rs +@@ -92,10 +92,10 @@ pub trait CanDeriveOrd { + /// + /// Initially we assume that we can derive trait for all types and then + /// update our understanding as we learn more about each type. +-#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)] ++#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] + pub enum CanDerive { +- /// No, we cannot. +- No, ++ /// Yes, we can derive automatically. ++ Yes, + + /// The only thing that stops us from automatically deriving is that + /// array with more than maximum number of elements is used. +@@ -103,29 +103,13 @@ pub enum CanDerive { + /// This means we probably can "manually" implement such trait. + Manually, + +- /// Yes, we can derive automatically. +- Yes, ++ /// No, we cannot. ++ No, + } + + impl Default for CanDerive { + fn default() -> CanDerive { + CanDerive::Yes +- } +-} +- +-impl cmp::PartialOrd for CanDerive { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::CanDerive::*; +- +- let ordering = match (*self, *rhs) { +- (x, y) if x == y => cmp::Ordering::Equal, +- (No, _) => cmp::Ordering::Greater, +- (_, No) => cmp::Ordering::Less, +- (Manually, _) => cmp::Ordering::Greater, +- (_, Manually) => cmp::Ordering::Less, +- _ => unreachable!() +- }; +- Some(ordering) + } + } + diff --git a/www/ffsend/Makefile b/www/ffsend/Makefile index 0402a4179e91..ea0b0f8943af 100644 --- a/www/ffsend/Makefile +++ b/www/ffsend/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffsend DISTVERSIONPREFIX= v DISTVERSION= 0.2.46 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MAINTAINER= 0mp@FreeBSD.org diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 94ac7f42620c..245cab1791b4 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 68.2.0 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox-esr/files/patch-bindgen-rust1390 b/www/firefox-esr/files/patch-bindgen-rust1390 new file mode 100644 index 000000000000..dad6182544ec --- /dev/null +++ b/www/firefox-esr/files/patch-bindgen-rust1390 @@ -0,0 +1,170 @@ +From 9696bc1795c75b1b527e2b70d9baf3ced9e3c154 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io> +Date: Mon, 23 Sep 2019 17:54:37 +0200 +Subject: [PATCH] ir: Make Ord and PartialOrd implementations agree. + +See https://github.com/rust-lang/rust/issues/64710. + +Bogus implementations were introduced in 230545e7c, d3e39dc62, and 379bb1663. + +--- third_party/rust/bindgen/.cargo-checksum.json.orig 2019-11-05 18:32:47 UTC ++++ third_party/rust/bindgen/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"} +\ No newline at end of file ++{"files":{},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"} +--- third_party/rust/bindgen/src/ir/analysis/has_vtable.rs.orig 2019-10-30 17:36:44 UTC ++++ third_party/rust/bindgen/src/ir/analysis/has_vtable.rs +@@ -9,37 +9,22 @@ use std::ops; + use {HashMap, Entry}; + + /// The result of the `HasVtableAnalysis` for an individual item. +-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] ++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] + pub enum HasVtableResult { +- /// The item has a vtable, but the actual vtable pointer is in a base +- /// member. +- BaseHasVtable, ++ /// The item does not have a vtable pointer. ++ No, + + /// The item has a vtable and the actual vtable pointer is within this item. + SelfHasVtable, + +- /// The item does not have a vtable pointer. +- No ++ /// The item has a vtable, but the actual vtable pointer is in a base ++ /// member. ++ BaseHasVtable, + } + + impl Default for HasVtableResult { + fn default() -> Self { + HasVtableResult::No +- } +-} +- +-impl cmp::PartialOrd for HasVtableResult { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::HasVtableResult::*; +- +- match (*self, *rhs) { +- (x, y) if x == y => Some(cmp::Ordering::Equal), +- (BaseHasVtable, _) => Some(cmp::Ordering::Greater), +- (_, BaseHasVtable) => Some(cmp::Ordering::Less), +- (SelfHasVtable, _) => Some(cmp::Ordering::Greater), +- (_, SelfHasVtable) => Some(cmp::Ordering::Less), +- _ => unreachable!(), +- } + } + } + +--- third_party/rust/bindgen/src/ir/analysis/sizedness.rs.orig 2019-10-30 17:36:21 UTC ++++ third_party/rust/bindgen/src/ir/analysis/sizedness.rs +@@ -22,13 +22,14 @@ use {HashMap, Entry}; + /// + /// We initially assume that all types are `ZeroSized` and then update our + /// understanding as we learn more about each type. +-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] ++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] + pub enum SizednessResult { +- /// Has some size that is known to be greater than zero. That doesn't mean +- /// it has a static size, but it is not zero sized for sure. In other words, +- /// it might contain an incomplete array or some other dynamically sized +- /// type. +- NonZeroSized, ++ /// The type is zero-sized. ++ /// ++ /// This means that if it is a C++ type, and is not being used as a base ++ /// member, then we must add an `_address` byte to enforce the ++ /// unique-address-per-distinct-object-instance rule. ++ ZeroSized, + + /// Whether this type is zero-sized or not depends on whether a type + /// parameter is zero-sized or not. +@@ -52,32 +53,16 @@ pub enum SizednessResult { + /// https://github.com/rust-lang/rust-bindgen/issues/586 + DependsOnTypeParam, + +- /// The type is zero-sized. +- /// +- /// This means that if it is a C++ type, and is not being used as a base +- /// member, then we must add an `_address` byte to enforce the +- /// unique-address-per-distinct-object-instance rule. +- ZeroSized, ++ /// Has some size that is known to be greater than zero. That doesn't mean ++ /// it has a static size, but it is not zero sized for sure. In other words, ++ /// it might contain an incomplete array or some other dynamically sized ++ /// type. ++ NonZeroSized, + } + + impl Default for SizednessResult { + fn default() -> Self { + SizednessResult::ZeroSized +- } +-} +- +-impl cmp::PartialOrd for SizednessResult { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::SizednessResult::*; +- +- match (*self, *rhs) { +- (x, y) if x == y => Some(cmp::Ordering::Equal), +- (NonZeroSized, _) => Some(cmp::Ordering::Greater), +- (_, NonZeroSized) => Some(cmp::Ordering::Less), +- (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater), +- (_, DependsOnTypeParam) => Some(cmp::Ordering::Less), +- _ => unreachable!(), +- } + } + } + +--- third_party/rust/bindgen/src/ir/derive.rs.orig 2019-10-30 17:36:44 UTC ++++ third_party/rust/bindgen/src/ir/derive.rs +@@ -92,10 +92,10 @@ pub trait CanDeriveOrd { + /// + /// Initially we assume that we can derive trait for all types and then + /// update our understanding as we learn more about each type. +-#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)] ++#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] + pub enum CanDerive { +- /// No, we cannot. +- No, ++ /// Yes, we can derive automatically. ++ Yes, + + /// The only thing that stops us from automatically deriving is that + /// array with more than maximum number of elements is used. +@@ -103,29 +103,13 @@ pub enum CanDerive { + /// This means we probably can "manually" implement such trait. + Manually, + +- /// Yes, we can derive automatically. +- Yes, ++ /// No, we cannot. ++ No, + } + + impl Default for CanDerive { + fn default() -> CanDerive { + CanDerive::Yes +- } +-} +- +-impl cmp::PartialOrd for CanDerive { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::CanDerive::*; +- +- let ordering = match (*self, *rhs) { +- (x, y) if x == y => cmp::Ordering::Equal, +- (No, _) => cmp::Ordering::Greater, +- (_, No) => cmp::Ordering::Less, +- (Manually, _) => cmp::Ordering::Greater, +- (_, Manually) => cmp::Ordering::Less, +- _ => unreachable!() +- }; +- Some(ordering) + } + } + diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 553639f22eaf..1f466a7410e9 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 70.0.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/firefox/files/patch-bindgen-rust1390 b/www/firefox/files/patch-bindgen-rust1390 new file mode 100644 index 000000000000..2d430dce59c0 --- /dev/null +++ b/www/firefox/files/patch-bindgen-rust1390 @@ -0,0 +1,170 @@ +From 9696bc1795c75b1b527e2b70d9baf3ced9e3c154 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io> +Date: Mon, 23 Sep 2019 17:54:37 +0200 +Subject: [PATCH] ir: Make Ord and PartialOrd implementations agree. + +See https://github.com/rust-lang/rust/issues/64710. + +Bogus implementations were introduced in 230545e7c, d3e39dc62, and 379bb1663. + +--- third_party/rust/bindgen/.cargo-checksum.json.orig 2019-11-05 18:32:47 UTC ++++ third_party/rust/bindgen/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"a970d1a9e47f029fe3e3ce43ae4292054ad60c4490e035b86b669fcf32015624","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","csmith-fuzzing/README.md":"7107b70fedb0c0a0cadb3c439a49c1bd0119a6d38dc63b1aecc74d1942256ef2","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"0009b8b6e3f6c33ec2776ec4cb8de2625ae8be22c9f0433c39b06bdd9fc7db4d","src/codegen/bitfield_unit.rs":"87be2d7f7774327a1608c2c4d64df869e17fb34b7efdacb4030b6794d98e40f3","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"aa0daff2061c6de31acfbd113190889e0f7ca2d2b8d4f46740bfd5832c33e4d2","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"ad116e2af755219bd556e8ee00ca48562f64a161d0b2c94846ae01297446ea0d","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"82511f1bb8cbd04d98f57b000903b0264237962af93a72a58220437213eba1ef","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"b73865b6689d4f3546edd91909a47c329c4ae630ea97715d29bc683ae1dc17ad","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"78e245835efcd22b5cc878a8a7031171116c708408bdb48b0c9284a067041e56","src/ir/context.rs":"8fd64654343295e0e4a43efe5db6f64315dcd50a5015c3d86e90aae992e2fa9f","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"7658cf68c00b1732dfa599c2d6b6a93a82de8401142591c3afe5fcb27d901a66","src/ir/function.rs":"c2feb2e26d47aa96a74af9912ada26be077e2b0c36d46fa10167da7109590500","src/ir/int.rs":"5b8d5bcedb04f39dc2d7e571bc04114b1f1e09cf294afe944c2e7879451c4378","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"e6771c8102b9f01b0c4b664bf1151b4773b599634a83895376ce122ca9f74f8b","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"a07ef7a3d099493555ae5a58b7b4bf9106a978e38a23b5ff445a83b92727ab62","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"8c96cd2a051e3f09b1b87b75cd9ed77e82e889c8309ebd3e4bc782960cf63e58","src/options.rs":"5b309b225cc51e665bd42ed3e7965a7cd73d984e4455a2d76987fc42ab271ff8","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"18270cdd7065ec045a6bb4bdcd5144d14a78b3aedb3bc5111e688773ac8b9ad0"} +\ No newline at end of file ++{"files":{},"package":"18270cdd7065ec045a6bb4bdcd5144d14a78b3aedb3bc5111e688773ac8b9ad0"} +--- third_party/rust/bindgen/src/ir/analysis/has_vtable.rs.orig 2019-10-30 17:36:44 UTC ++++ third_party/rust/bindgen/src/ir/analysis/has_vtable.rs +@@ -9,37 +9,22 @@ use std::ops; + use {HashMap, Entry}; + + /// The result of the `HasVtableAnalysis` for an individual item. +-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] ++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] + pub enum HasVtableResult { +- /// The item has a vtable, but the actual vtable pointer is in a base +- /// member. +- BaseHasVtable, ++ /// The item does not have a vtable pointer. ++ No, + + /// The item has a vtable and the actual vtable pointer is within this item. + SelfHasVtable, + +- /// The item does not have a vtable pointer. +- No ++ /// The item has a vtable, but the actual vtable pointer is in a base ++ /// member. ++ BaseHasVtable, + } + + impl Default for HasVtableResult { + fn default() -> Self { + HasVtableResult::No +- } +-} +- +-impl cmp::PartialOrd for HasVtableResult { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::HasVtableResult::*; +- +- match (*self, *rhs) { +- (x, y) if x == y => Some(cmp::Ordering::Equal), +- (BaseHasVtable, _) => Some(cmp::Ordering::Greater), +- (_, BaseHasVtable) => Some(cmp::Ordering::Less), +- (SelfHasVtable, _) => Some(cmp::Ordering::Greater), +- (_, SelfHasVtable) => Some(cmp::Ordering::Less), +- _ => unreachable!(), +- } + } + } + +--- third_party/rust/bindgen/src/ir/analysis/sizedness.rs.orig 2019-10-30 17:36:21 UTC ++++ third_party/rust/bindgen/src/ir/analysis/sizedness.rs +@@ -22,13 +22,14 @@ use {HashMap, Entry}; + /// + /// We initially assume that all types are `ZeroSized` and then update our + /// understanding as we learn more about each type. +-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] ++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] + pub enum SizednessResult { +- /// Has some size that is known to be greater than zero. That doesn't mean +- /// it has a static size, but it is not zero sized for sure. In other words, +- /// it might contain an incomplete array or some other dynamically sized +- /// type. +- NonZeroSized, ++ /// The type is zero-sized. ++ /// ++ /// This means that if it is a C++ type, and is not being used as a base ++ /// member, then we must add an `_address` byte to enforce the ++ /// unique-address-per-distinct-object-instance rule. ++ ZeroSized, + + /// Whether this type is zero-sized or not depends on whether a type + /// parameter is zero-sized or not. +@@ -52,32 +53,16 @@ pub enum SizednessResult { + /// https://github.com/rust-lang/rust-bindgen/issues/586 + DependsOnTypeParam, + +- /// The type is zero-sized. +- /// +- /// This means that if it is a C++ type, and is not being used as a base +- /// member, then we must add an `_address` byte to enforce the +- /// unique-address-per-distinct-object-instance rule. +- ZeroSized, ++ /// Has some size that is known to be greater than zero. That doesn't mean ++ /// it has a static size, but it is not zero sized for sure. In other words, ++ /// it might contain an incomplete array or some other dynamically sized ++ /// type. ++ NonZeroSized, + } + + impl Default for SizednessResult { + fn default() -> Self { + SizednessResult::ZeroSized +- } +-} +- +-impl cmp::PartialOrd for SizednessResult { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::SizednessResult::*; +- +- match (*self, *rhs) { +- (x, y) if x == y => Some(cmp::Ordering::Equal), +- (NonZeroSized, _) => Some(cmp::Ordering::Greater), +- (_, NonZeroSized) => Some(cmp::Ordering::Less), +- (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater), +- (_, DependsOnTypeParam) => Some(cmp::Ordering::Less), +- _ => unreachable!(), +- } + } + } + +--- third_party/rust/bindgen/src/ir/derive.rs.orig 2019-10-30 17:36:44 UTC ++++ third_party/rust/bindgen/src/ir/derive.rs +@@ -92,10 +92,10 @@ pub trait CanDeriveOrd { + /// + /// Initially we assume that we can derive trait for all types and then + /// update our understanding as we learn more about each type. +-#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)] ++#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] + pub enum CanDerive { +- /// No, we cannot. +- No, ++ /// Yes, we can derive automatically. ++ Yes, + + /// The only thing that stops us from automatically deriving is that + /// array with more than maximum number of elements is used. +@@ -103,29 +103,13 @@ pub enum CanDerive { + /// This means we probably can "manually" implement such trait. + Manually, + +- /// Yes, we can derive automatically. +- Yes, ++ /// No, we cannot. ++ No, + } + + impl Default for CanDerive { + fn default() -> CanDerive { + CanDerive::Yes +- } +-} +- +-impl cmp::PartialOrd for CanDerive { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::CanDerive::*; +- +- let ordering = match (*self, *rhs) { +- (x, y) if x == y => cmp::Ordering::Equal, +- (No, _) => cmp::Ordering::Greater, +- (_, No) => cmp::Ordering::Less, +- (Manually, _) => cmp::Ordering::Greater, +- (_, Manually) => cmp::Ordering::Less, +- _ => unreachable!() +- }; +- Some(ordering) + } + } + diff --git a/www/geckodriver/Makefile b/www/geckodriver/Makefile index ddbe462afbc0..134848b488be 100644 --- a/www/geckodriver/Makefile +++ b/www/geckodriver/Makefile @@ -3,7 +3,7 @@ PORTNAME= geckodriver DISTVERSIONPREFIX= v DISTVERSION= 0.24.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MAINTAINER= daniel@blodan.se diff --git a/www/jwt-cli/Makefile b/www/jwt-cli/Makefile index 6f413f20453e..946ffcf0dbb0 100644 --- a/www/jwt-cli/Makefile +++ b/www/jwt-cli/Makefile @@ -3,6 +3,7 @@ PORTNAME= jwt-cli PORTVERSION= 2.5.1 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= osa@FreeBSD.org diff --git a/www/miniserve/Makefile b/www/miniserve/Makefile index 39d404b7f7e6..9cbc88369cd6 100644 --- a/www/miniserve/Makefile +++ b/www/miniserve/Makefile @@ -3,7 +3,7 @@ PORTNAME= miniserve DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MAINTAINER= tobik@FreeBSD.org diff --git a/www/newsboat/Makefile b/www/newsboat/Makefile index 0842b69e23f9..77f3cf581730 100644 --- a/www/newsboat/Makefile +++ b/www/newsboat/Makefile @@ -3,6 +3,7 @@ PORTNAME= newsboat PORTVERSION= 2.17.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://newsboat.org/releases/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/www/websocat/Makefile b/www/websocat/Makefile index 054ee7b39930..558de7f9210d 100644 --- a/www/websocat/Makefile +++ b/www/websocat/Makefile @@ -4,7 +4,7 @@ PORTNAME= websocat DISTVERSIONPREFIX= v DISTVERSION= 1.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= osa@FreeBSD.org diff --git a/www/zola/Makefile b/www/zola/Makefile index c50dfc71aee2..86cbe0340b69 100644 --- a/www/zola/Makefile +++ b/www/zola/Makefile @@ -3,6 +3,7 @@ PORTNAME= zola DISTVERSIONPREFIX= v DISTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= tobik@FreeBSD.org diff --git a/x11/admiral/Makefile b/x11/admiral/Makefile index 58d014e259f9..657e54f12713 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= 13 +PORTREVISION= 14 CATEGORIES= x11 MAINTAINER= rigoletto@FreeBSD.org diff --git a/x11/alacritty/Makefile b/x11/alacritty/Makefile index aeb933408c42..c57939ea4040 100644 --- a/x11/alacritty/Makefile +++ b/x11/alacritty/Makefile @@ -3,7 +3,7 @@ PORTNAME= alacritty DISTVERSIONPREFIX= v DISTVERSION= 0.3.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= tobik@FreeBSD.org |