From e453844dafb9a98d7591adecdc28c0af03365ac8 Mon Sep 17 00:00:00 2001 From: Franz Hemmer Date: Wed, 11 Nov 2026 08:33:54 -0500 Subject: [PATCH 1/3] fix: update rustix for xattr unsoundness advisory --- Cargo.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index af4be3c..6d373b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -222,7 +222,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -233,7 +233,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1649,7 +1649,7 @@ dependencies = [ "libc", "option-ext", "redox_users 0.5.3", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1874,7 +1874,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4593,7 +4593,7 @@ dependencies = [ "once_cell", "png 0.18.1", "thiserror 2.0.21", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -5854,7 +5854,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6389,15 +6389,15 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d" +checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" dependencies = [ "bitflags 2.13.2", "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6938,7 +6938,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -7242,7 +7242,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -7607,7 +7607,7 @@ dependencies = [ "once_cell", "png 0.18.1", "thiserror 2.0.21", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -7650,7 +7650,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset", "tempfile", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -8577,7 +8577,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]] @@ -9202,7 +9202,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d6f32a0ff4a9f6f01231eb2059cc85479330739333e0e58cadf03b6af2cca10" dependencies = [ "cfg-if", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] From 1bf5dd12acde3fd82f1a8f74dfa977a1bb233e28 Mon Sep 17 00:00:00 2001 From: Franz Hemmer Date: Wed, 11 Nov 2026 09:40:25 -0500 Subject: [PATCH 2/3] ci: use Canonical mirrors for Linux dependencies --- .github/workflows/ci.yml | 8 ++++++++ .github/workflows/package.yml | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 990197e..da39f84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,6 +75,10 @@ jobs: - name: Install Linux build dependencies if: runner.os == 'Linux' run: | + # Keep the image's Canonical mirrors when the preferred Azure mirror cannot resolve (#335). + if [ -f /etc/apt/apt-mirrors.txt ]; then + sudo sed -i '\|azure\.archive\.ubuntu\.com|d' /etc/apt/apt-mirrors.txt + fi sudo apt-get update sudo apt-get install -y --no-install-recommends \ libxkbcommon-dev libxkbcommon-x11-dev libwayland-dev libfontconfig-dev libfreetype-dev libxcb1-dev libx11-xcb-dev @@ -143,6 +147,10 @@ jobs: - name: Install Linux build dependencies run: | + # Keep the image's Canonical mirrors when the preferred Azure mirror cannot resolve (#335). + if [ -f /etc/apt/apt-mirrors.txt ]; then + sudo sed -i '\|azure\.archive\.ubuntu\.com|d' /etc/apt/apt-mirrors.txt + fi sudo apt-get update sudo apt-get install -y --no-install-recommends \ libxkbcommon-dev libxkbcommon-x11-dev libwayland-dev libfontconfig-dev libfreetype-dev libxcb1-dev libx11-xcb-dev diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 459a5fb..f72a6b1 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -99,6 +99,10 @@ jobs: - name: Install Linux build dependencies run: | + # Keep the image's Canonical mirrors when the preferred Azure mirror cannot resolve (#335). + if [ -f /etc/apt/apt-mirrors.txt ]; then + sudo sed -i '\|azure\.archive\.ubuntu\.com|d' /etc/apt/apt-mirrors.txt + fi sudo apt-get update sudo apt-get install -y --no-install-recommends \ libxkbcommon-dev libxkbcommon-x11-dev libwayland-dev libfontconfig-dev libfreetype-dev libxcb1-dev libx11-xcb-dev \ From f5ba4b0a3d193c36505dc4509c900f292c926d55 Mon Sep 17 00:00:00 2001 From: Franz Hemmer Date: Wed, 11 Nov 2026 10:08:09 -0500 Subject: [PATCH 3/3] Revert "ci: use Canonical mirrors for Linux dependencies" This reverts commit 1bf5dd12acde3fd82f1a8f74dfa977a1bb233e28. --- .github/workflows/ci.yml | 8 -------- .github/workflows/package.yml | 4 ---- 2 files changed, 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da39f84..990197e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,10 +75,6 @@ jobs: - name: Install Linux build dependencies if: runner.os == 'Linux' run: | - # Keep the image's Canonical mirrors when the preferred Azure mirror cannot resolve (#335). - if [ -f /etc/apt/apt-mirrors.txt ]; then - sudo sed -i '\|azure\.archive\.ubuntu\.com|d' /etc/apt/apt-mirrors.txt - fi sudo apt-get update sudo apt-get install -y --no-install-recommends \ libxkbcommon-dev libxkbcommon-x11-dev libwayland-dev libfontconfig-dev libfreetype-dev libxcb1-dev libx11-xcb-dev @@ -147,10 +143,6 @@ jobs: - name: Install Linux build dependencies run: | - # Keep the image's Canonical mirrors when the preferred Azure mirror cannot resolve (#335). - if [ -f /etc/apt/apt-mirrors.txt ]; then - sudo sed -i '\|azure\.archive\.ubuntu\.com|d' /etc/apt/apt-mirrors.txt - fi sudo apt-get update sudo apt-get install -y --no-install-recommends \ libxkbcommon-dev libxkbcommon-x11-dev libwayland-dev libfontconfig-dev libfreetype-dev libxcb1-dev libx11-xcb-dev diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index f72a6b1..459a5fb 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -99,10 +99,6 @@ jobs: - name: Install Linux build dependencies run: | - # Keep the image's Canonical mirrors when the preferred Azure mirror cannot resolve (#335). - if [ -f /etc/apt/apt-mirrors.txt ]; then - sudo sed -i '\|azure\.archive\.ubuntu\.com|d' /etc/apt/apt-mirrors.txt - fi sudo apt-get update sudo apt-get install -y --no-install-recommends \ libxkbcommon-dev libxkbcommon-x11-dev libwayland-dev libfontconfig-dev libfreetype-dev libxcb1-dev libx11-xcb-dev \