From ff3b814028dc082b519c9337103727ace8641cad Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 19 Dec 2019 23:02:54 +0000 Subject: Thu Dec 19 23:02:54 UTC 2019 d/cmake-3.16.2-x86_64-1.txz: Upgraded. d/rust-1.40.0-x86_64-1.txz: Upgraded. Package debloating patches are no longer needed. No build regressions noted with Firefox, Seamonkey, or Thunderbird. l/glib2-2.62.4-x86_64-1.txz: Upgraded. l/imagemagick-7.0.9_9-x86_64-1.txz: Upgraded. l/wavpack-5.2.0-x86_64-1.txz: Upgraded. Fixed denial-of-service and other potential security issues. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-19840 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-19841 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10536 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10537 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10538 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10539 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10540 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7254 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7253 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6767 (* Security fix *) n/bind-9.14.9-x86_64-1.txz: Upgraded. This is a bugfix release: Fixed a bug that caused named to leak memory on reconfiguration when any GeoIP2 database was in use. [GL #1445] Fixed several possible race conditions discovered by Thread Sanitizer. n/mutt-1.13.2-x86_64-1.txz: Upgraded. n/php-7.4.1-x86_64-1.txz: Upgraded. This update fixes bugs and security issues: Bcmath: Buffer underflow in bc_shift_addsub. Core: link() silently truncates after a null byte on Windows. Core: DirectoryIterator class silently truncates after a null byte. Core: mail() may release string with refcount==1 twice. EXIF: Use-after-free in exif parsing under memory sanitizer. EXIF: Heap-buffer-overflow READ in exif. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11046 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11044 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11045 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11049 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11050 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11047 (* Security fix *) x/intel-vaapi-driver-2.4.0-x86_64-1.txz: Upgraded. x/vulkan-sdk-1.1.126.0-x86_64-2.txz: Rebuilt. Install SPIRV headers in two places to fix building shaderc. Thanks to orbea. xfce/exo-0.12.11-x86_64-1.txz: Upgraded. --- .../0001-WIP-minimize-the-rust-std-component.patch | 55 ---------------------- source/d/rust/hack.diff | 29 ------------ source/d/rust/rust.SlackBuild | 12 ++--- source/d/rust/rust.url | 14 +++--- 4 files changed, 11 insertions(+), 99 deletions(-) delete mode 100644 source/d/rust/0001-WIP-minimize-the-rust-std-component.patch delete mode 100644 source/d/rust/hack.diff (limited to 'source/d/rust') diff --git a/source/d/rust/0001-WIP-minimize-the-rust-std-component.patch b/source/d/rust/0001-WIP-minimize-the-rust-std-component.patch deleted file mode 100644 index e46a7265c..000000000 --- a/source/d/rust/0001-WIP-minimize-the-rust-std-component.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- ./src/bootstrap/dist.rs.orig 2019-11-07 16:25:16.099477103 -0600 -+++ ./src/bootstrap/dist.rs 2019-11-07 16:31:36.510445625 -0600 -@@ -675,36 +675,28 @@ - return distdir(builder).join(format!("{}-{}.tar.gz", name, target)); - } - -- // We want to package up as many target libraries as possible -- // for the `rust-std` package, so if this is a host target we -- // depend on librustc and otherwise we just depend on libtest. -- if builder.hosts.iter().any(|t| t == target) { -- builder.ensure(compile::Rustc { compiler, target }); -- } else { -- builder.ensure(compile::Std { compiler, target }); -- } -+ builder.ensure(compile::Std { compiler, target }); -+ builder.ensure(compile::Rustc { compiler, target }); - - let image = tmpdir(builder).join(format!("{}-{}-image", name, target)); - let _ = fs::remove_dir_all(&image); - -- let dst = image.join("lib/rustlib").join(target); -+ let dst = image.join("lib/rustlib").join(target).join("lib"); - t!(fs::create_dir_all(&dst)); -- let mut src = builder.sysroot_libdir(compiler, target).to_path_buf(); -- src.pop(); // Remove the trailing /lib folder from the sysroot_libdir -- builder.cp_filtered(&src, &dst, &|path| { -- if let Some(name) = path.file_name().and_then(|s| s.to_str()) { -- if name == builder.config.rust_codegen_backends_dir.as_str() { -- return false -- } -- if name == "bin" { -- return false -- } -- if name.contains("LLVM") { -- return false -- } -+ -+ let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target); -+ let stamp = dbg!(compile::libstd_stamp(builder, compiler_to_use, target)); -+ for (path, host) in builder.read_stamp_file(&stamp) { -+ if !host { -+ builder.copy(&path, &dst.join(path.file_name().unwrap())); - } -- true -- }); -+ } -+ let stamp = dbg!(compile::librustc_stamp(builder, compiler_to_use, target)); -+ for (path, host) in builder.read_stamp_file(&stamp) { -+ if !host { -+ builder.copy(&path, &dst.join(path.file_name().unwrap())); -+ } -+ } - - let mut cmd = rust_installer(builder); - cmd.arg("generate") diff --git a/source/d/rust/hack.diff b/source/d/rust/hack.diff deleted file mode 100644 index c5031fb01..000000000 --- a/source/d/rust/hack.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- ./src/bootstrap/dist.rs.orig 2019-11-07 18:12:33.835944390 -0600 -+++ ./src/bootstrap/dist.rs 2019-11-07 22:05:17.991788876 -0600 -@@ -676,7 +676,6 @@ - } - - builder.ensure(compile::Std { compiler, target }); -- builder.ensure(compile::Rustc { compiler, target }); - - let image = tmpdir(builder).join(format!("{}-{}-image", name, target)); - let _ = fs::remove_dir_all(&image); -@@ -691,12 +690,12 @@ - builder.copy(&path, &dst.join(path.file_name().unwrap())); - } - } -- let stamp = dbg!(compile::librustc_stamp(builder, compiler_to_use, target)); -- for (path, host) in builder.read_stamp_file(&stamp) { -- if !host { -- builder.copy(&path, &dst.join(path.file_name().unwrap())); -- } -- } -+ // let stamp = dbg!(compile::librustc_stamp(builder, compiler_to_use, target)); -+ // for (path, host) in builder.read_stamp_file(&stamp) { -+ // if !host { -+ // builder.copy(&path, &dst.join(path.file_name().unwrap())); -+ // } -+ // } - - let mut cmd = rust_installer(builder); - cmd.arg("generate") diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 2dee9b218..3c261906f 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.39.0} +VERSION=${VERSION:-1.40.0} BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. @@ -34,9 +34,9 @@ BUILD=${BUILD:-1} SYSTEM_LLVM=${SYSTEM_LLVM:-YES} # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.38.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2019-09-26} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.39.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.39.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2019-11-07} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.40.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} # Automatically determine the architecture we're building on: @@ -148,10 +148,6 @@ if [ "${SYSTEM_LLVM}" = "YES" ]; then zcat $CWD/link_libffi.diff.gz | patch -p1 --verbose || exit 1 fi -# Try to debloat the build: -zcat $CWD/0001-WIP-minimize-the-rust-std-component.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/hack.diff.gz | patch -p1 --verbose || exit 1 - if [ "$LOCAL_BOOTSTRAP" != "yes" ] ; then # rust requires bootstrapping with the previous rust version. # versions are defined in src/stage0.txt. diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index a6838aff4..0b18f23d9 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.xz): -lftpget https://static.rust-lang.org/dist/rustc-1.39.0-src.tar.gz +lftpget https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.gz gzip -d rustc-*tar.gz plzip -9 -v rustc-*tar @@ -12,12 +12,12 @@ plzip -9 -v rustc-*tar exit 0 # i686 bootstrap: -lftpget https://static.rust-lang.org/dist/2019-09-26/cargo-0.39.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-09-26/rust-std-1.38.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-09-26/rustc-1.38.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-11-07/cargo-0.40.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-11-07/rust-std-1.39.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-11-07/rustc-1.39.0-i686-unknown-linux-gnu.tar.gz # x86_64 bootstrap: -lftpget https://static.rust-lang.org/dist/2019-09-26/cargo-0.39.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-09-26/rust-std-1.38.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-09-26/rustc-1.38.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-11-07/cargo-0.40.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-11-07/rust-std-1.39.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-11-07/rustc-1.39.0-x86_64-unknown-linux-gnu.tar.gz -- cgit v1.2.3