summaryrefslogtreecommitdiffstats
path: root/testing/source/rust
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-08-04 20:17:36 +0000
committer Eric Hameleers <alien@slackware.com>2023-08-04 23:53:29 +0200
commit31c55fc7339635f9bca2fa05d79497867daca422 (patch)
tree3fe754f49405c87bb82801cdc8cee3890a89052b /testing/source/rust
parent3413e723444bfff153b98ae8998b9acd5d0fcb8c (diff)
downloadcurrent-31c55fc7339635f9bca2fa05d79497867daca422.tar.gz
current-31c55fc7339635f9bca2fa05d79497867daca422.tar.xz
Fri Aug 4 20:17:36 UTC 202320230804201736
a/hwdata-0.373-noarch-1.txz: Upgraded. a/kernel-firmware-20230731_253cc17-noarch-1.txz: Upgraded. a/kernel-generic-6.1.43-x86_64-1.txz: Upgraded. a/kernel-huge-6.1.43-x86_64-1.txz: Upgraded. a/kernel-modules-6.1.43-x86_64-1.txz: Upgraded. a/sysklogd-2.5.1-x86_64-1.txz: Upgraded. a/xz-5.4.4-x86_64-1.txz: Upgraded. ap/man-pages-6.05.01-noarch-1.txz: Upgraded. d/kernel-headers-6.1.43-x86-1.txz: Upgraded. k/kernel-source-6.1.43-noarch-1.txz: Upgraded. kde/ktextaddons-1.4.0-x86_64-1.txz: Upgraded. l/SDL2-2.28.2-x86_64-1.txz: Upgraded. l/harfbuzz-8.1.1-x86_64-1.txz: Upgraded. l/mozjs102-102.14.0esr-x86_64-1.txz: Upgraded. l/netpbm-11.03.01-x86_64-1.txz: Upgraded. l/openexr-3.1.10-x86_64-1.txz: Upgraded. l/pipewire-0.3.77-x86_64-1.txz: Upgraded. l/poppler-23.08.0-x86_64-1.txz: Upgraded. xap/mozilla-firefox-115.1.0esr-x86_64-1.txz: Upgraded. This update contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/firefox/115.1.0esr/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2023-31/ https://www.cve.org/CVERecord?id=CVE-2023-4045 https://www.cve.org/CVERecord?id=CVE-2023-4046 https://www.cve.org/CVERecord?id=CVE-2023-4047 https://www.cve.org/CVERecord?id=CVE-2023-4048 https://www.cve.org/CVERecord?id=CVE-2023-4049 https://www.cve.org/CVERecord?id=CVE-2023-4050 https://www.cve.org/CVERecord?id=CVE-2023-4052 https://www.cve.org/CVERecord?id=CVE-2023-4054 https://www.cve.org/CVERecord?id=CVE-2023-4055 https://www.cve.org/CVERecord?id=CVE-2023-4056 https://www.cve.org/CVERecord?id=CVE-2023-4057 (* Security fix *) xap/mozilla-thunderbird-115.1.0-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/thunderbird/115.1.0/releasenotes/ isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/rust-1.71.1-x86_64-1.txz: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'testing/source/rust')
-rw-r--r--testing/source/rust/67b5990472e3cac643d8cf90f45fe42201ddec3c.patch45
-rwxr-xr-xtesting/source/rust/rust.SlackBuild4
-rw-r--r--testing/source/rust/rust.url2
3 files changed, 2 insertions, 49 deletions
diff --git a/testing/source/rust/67b5990472e3cac643d8cf90f45fe42201ddec3c.patch b/testing/source/rust/67b5990472e3cac643d8cf90f45fe42201ddec3c.patch
deleted file mode 100644
index e36e17275..000000000
--- a/testing/source/rust/67b5990472e3cac643d8cf90f45fe42201ddec3c.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 67b5990472e3cac643d8cf90f45fe42201ddec3c Mon Sep 17 00:00:00 2001
-From: jyn <github@jyn.dev>
-Date: Mon, 10 Jul 2023 15:59:30 -0500
-Subject: [PATCH] Revert "Fix `x test lint-docs` when download-rustc is
- enabled"
-
-This was not the correct fix. The problem was two-fold:
-- `download-rustc` didn't respect `llvm.assertions`
-- `rust-dev` was missing a bump to `download-ci-llvm-stamp`
-
-The first is fixed in this PR and the latter was fixed a while ago. Revert this change to avoid breaking `rpath = false`.
----
- src/tools/lint-docs/src/groups.rs | 1 -
- src/tools/lint-docs/src/lib.rs | 6 ------
- 2 files changed, 7 deletions(-)
-
-diff --git a/src/tools/lint-docs/src/groups.rs b/src/tools/lint-docs/src/groups.rs
-index b11fb287cf4dd..5be8ef7996bb2 100644
---- a/src/tools/lint-docs/src/groups.rs
-+++ b/src/tools/lint-docs/src/groups.rs
-@@ -39,7 +39,6 @@ impl<'a> LintExtractor<'a> {
- fn collect_groups(&self) -> Result<LintGroups, Box<dyn Error>> {
- let mut result = BTreeMap::new();
- let mut cmd = Command::new(self.rustc_path);
-- cmd.env_remove("LD_LIBRARY_PATH");
- cmd.arg("-Whelp");
- let output = cmd.output().map_err(|e| format!("failed to run command {:?}\n{}", cmd, e))?;
- if !output.status.success() {
-diff --git a/src/tools/lint-docs/src/lib.rs b/src/tools/lint-docs/src/lib.rs
-index fe29b9abda39a..b7c8b9ed2e318 100644
---- a/src/tools/lint-docs/src/lib.rs
-+++ b/src/tools/lint-docs/src/lib.rs
-@@ -403,12 +403,6 @@ impl<'a> LintExtractor<'a> {
- fs::write(&tempfile, source)
- .map_err(|e| format!("failed to write {}: {}", tempfile.display(), e))?;
- let mut cmd = Command::new(self.rustc_path);
-- // NOTE: bootstrap sets `LD_LIBRARY_PATH` for building lint-docs itself.
-- // Unfortunately, lint-docs is a bootstrap tool while rustc is built from source,
-- // and sometimes the paths conflict. In particular, when using `download-rustc`,
-- // the LLVM versions can differ between `ci-llvm` and `ci-rustc-sysroot`.
-- // Unset LD_LIBRARY_PATH here so it doesn't interfere with running the compiler.
-- cmd.env_remove("LD_LIBRARY_PATH");
- if options.contains(&"edition2015") {
- cmd.arg("--edition=2015");
- } else {
diff --git a/testing/source/rust/rust.SlackBuild b/testing/source/rust/rust.SlackBuild
index 315525b89..2056ba50c 100755
--- a/testing/source/rust/rust.SlackBuild
+++ b/testing/source/rust/rust.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=rust
SRCNAM="${PKGNAM}c"
-VERSION=${VERSION:-1.71.0}
+VERSION=${VERSION:-1.71.1}
BUILD=${BUILD:-1}
# Set this to YES to build with the system LLVM, or NO to use the bundled LLVM.
@@ -138,8 +138,6 @@ echo "Extracting $CWD/$SRCNAM-$VERSION-src.tar.?z..."
tar xf $CWD/$SRCNAM-$VERSION-src.tar.?z || exit 1
cd $SRCNAM-$VERSION-src || exit 1
-cat $CWD/67b5990472e3cac643d8cf90f45fe42201ddec3c.patch | patch -p1 --verbose || exit 1
-
# Link with -lffi in case of using system LLVM:
if [ "${SYSTEM_LLVM}" = "YES" ]; then
zcat $CWD/link_libffi.diff.gz | patch -p1 --verbose || exit 1
diff --git a/testing/source/rust/rust.url b/testing/source/rust/rust.url
index f9c7f63ba..bfb97ee2e 100644
--- a/testing/source/rust/rust.url
+++ b/testing/source/rust/rust.url
@@ -1,5 +1,5 @@
# Source code (repacked to .tar.lz):
-VERSION=1.71.0
+VERSION=1.71.1
rm -f rustc-${VERSION}-src.tar.*
lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz
lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz.asc