commit: bcfde367abadc6c154d2452ba916cae2bf73f194
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 3 23:55:42 2025 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Wed Jun 4 00:06:47 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcfde367
dev-lang/rust: fix verify-sig
When the patch tarballs were added the ebuilds were not updated to
ensure that only upstream-signed files are verified.
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
dev-lang/rust/rust-1.74.1-r101.ebuild | 9 +++++++++
dev-lang/rust/rust-1.75.0-r101.ebuild | 9 +++++++++
dev-lang/rust/rust-1.76.0-r101.ebuild | 9 +++++++++
dev-lang/rust/rust-1.77.1-r101.ebuild | 9 +++++++++
dev-lang/rust/rust-1.78.0-r101.ebuild | 9 +++++++++
dev-lang/rust/rust-1.79.0-r101.ebuild | 9 +++++++++
dev-lang/rust/rust-1.80.1-r101.ebuild | 9 +++++++++
dev-lang/rust/rust-1.81.0-r101.ebuild | 9 +++++++++
dev-lang/rust/rust-1.82.0-r103.ebuild | 9 +++++++++
dev-lang/rust/rust-1.83.0-r3.ebuild | 9 +++++++++
dev-lang/rust/rust-1.84.0-r2.ebuild | 9 +++++++++
dev-lang/rust/rust-1.84.1-r2.ebuild | 9 +++++++++
dev-lang/rust/rust-1.85.0-r2.ebuild | 5 ++++-
dev-lang/rust/rust-1.85.1-r1.ebuild | 5 ++++-
dev-lang/rust/rust-1.86.0-r2.ebuild | 5 ++++-
dev-lang/rust/rust-1.87.0-r1.ebuild | 5 ++++-
dev-lang/rust/rust-1.88.0_beta20250526.ebuild | 5 ++++-
dev-lang/rust/rust-9999.ebuild | 5 ++++-
18 files changed, 132 insertions(+), 6 deletions(-)
diff --git a/dev-lang/rust/rust-1.74.1-r101.ebuild
b/dev-lang/rust/rust-1.74.1-r101.ebuild
index 27ed209e742c..abdf7f5ecc95 100644
--- a/dev-lang/rust/rust-1.74.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.74.1-r101.ebuild
@@ -253,6 +253,15 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ else
+ default
+ fi
+}
+
src_prepare() {
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
diff --git a/dev-lang/rust/rust-1.75.0-r101.ebuild
b/dev-lang/rust/rust-1.75.0-r101.ebuild
index 0d0075b47848..26405e53fed7 100644
--- a/dev-lang/rust/rust-1.75.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.75.0-r101.ebuild
@@ -232,6 +232,15 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ else
+ default
+ fi
+}
+
src_prepare() {
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
diff --git a/dev-lang/rust/rust-1.76.0-r101.ebuild
b/dev-lang/rust/rust-1.76.0-r101.ebuild
index 72a0e61a2d59..8b54d6c710ab 100644
--- a/dev-lang/rust/rust-1.76.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.76.0-r101.ebuild
@@ -232,6 +232,15 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ else
+ default
+ fi
+}
+
src_prepare() {
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
diff --git a/dev-lang/rust/rust-1.77.1-r101.ebuild
b/dev-lang/rust/rust-1.77.1-r101.ebuild
index a1f9080cf9b9..acb8052bd019 100644
--- a/dev-lang/rust/rust-1.77.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.77.1-r101.ebuild
@@ -232,6 +232,15 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ else
+ default
+ fi
+}
+
src_prepare() {
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
diff --git a/dev-lang/rust/rust-1.78.0-r101.ebuild
b/dev-lang/rust/rust-1.78.0-r101.ebuild
index 87fbc066a0de..c00dc2197433 100644
--- a/dev-lang/rust/rust-1.78.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.78.0-r101.ebuild
@@ -232,6 +232,15 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ else
+ default
+ fi
+}
+
src_prepare() {
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
diff --git a/dev-lang/rust/rust-1.79.0-r101.ebuild
b/dev-lang/rust/rust-1.79.0-r101.ebuild
index 3a89f27df62a..e0bfc9029822 100644
--- a/dev-lang/rust/rust-1.79.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.79.0-r101.ebuild
@@ -232,6 +232,15 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ else
+ default
+ fi
+}
+
src_prepare() {
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
diff --git a/dev-lang/rust/rust-1.80.1-r101.ebuild
b/dev-lang/rust/rust-1.80.1-r101.ebuild
index 8a64fee8f135..3b705ff6d682 100644
--- a/dev-lang/rust/rust-1.80.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.80.1-r101.ebuild
@@ -232,6 +232,15 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ else
+ default
+ fi
+}
+
src_prepare() {
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
diff --git a/dev-lang/rust/rust-1.81.0-r101.ebuild
b/dev-lang/rust/rust-1.81.0-r101.ebuild
index f06477da8264..1ad21ab60453 100644
--- a/dev-lang/rust/rust-1.81.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.81.0-r101.ebuild
@@ -233,6 +233,15 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ else
+ default
+ fi
+}
+
src_prepare() {
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
diff --git a/dev-lang/rust/rust-1.82.0-r103.ebuild
b/dev-lang/rust/rust-1.82.0-r103.ebuild
index a208895039ef..e6d6b82f4393 100644
--- a/dev-lang/rust/rust-1.82.0-r103.ebuild
+++ b/dev-lang/rust/rust-1.82.0-r103.ebuild
@@ -232,6 +232,15 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ else
+ default
+ fi
+}
+
src_prepare() {
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
diff --git a/dev-lang/rust/rust-1.83.0-r3.ebuild
b/dev-lang/rust/rust-1.83.0-r3.ebuild
index 81d588de77fe..943430d9e492 100644
--- a/dev-lang/rust/rust-1.83.0-r3.ebuild
+++ b/dev-lang/rust/rust-1.83.0-r3.ebuild
@@ -232,6 +232,15 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ else
+ default
+ fi
+}
+
src_prepare() {
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
diff --git a/dev-lang/rust/rust-1.84.0-r2.ebuild
b/dev-lang/rust/rust-1.84.0-r2.ebuild
index 61296808c0cc..84dbe3dcaca1 100644
--- a/dev-lang/rust/rust-1.84.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.84.0-r2.ebuild
@@ -238,6 +238,15 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ else
+ default
+ fi
+}
+
src_prepare() {
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
diff --git a/dev-lang/rust/rust-1.84.1-r2.ebuild
b/dev-lang/rust/rust-1.84.1-r2.ebuild
index 688d74e1f8ce..24b11fadae0c 100644
--- a/dev-lang/rust/rust-1.84.1-r2.ebuild
+++ b/dev-lang/rust/rust-1.84.1-r2.ebuild
@@ -238,6 +238,15 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ else
+ default
+ fi
+}
+
src_prepare() {
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
diff --git a/dev-lang/rust/rust-1.85.0-r2.ebuild
b/dev-lang/rust/rust-1.85.0-r2.ebuild
index 8fe23fe29f9e..e5c063cb1b2c 100644
--- a/dev-lang/rust/rust-1.85.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.85.0-r2.ebuild
@@ -219,8 +219,11 @@ src_unpack() {
[source.vendored-sources]
directory = "vendor"
_EOF_
+ elif use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
else
- verify-sig_src_unpack
+ default
fi
}
diff --git a/dev-lang/rust/rust-1.85.1-r1.ebuild
b/dev-lang/rust/rust-1.85.1-r1.ebuild
index 816bc67bcd2c..6c827a53b625 100644
--- a/dev-lang/rust/rust-1.85.1-r1.ebuild
+++ b/dev-lang/rust/rust-1.85.1-r1.ebuild
@@ -219,8 +219,11 @@ src_unpack() {
[source.vendored-sources]
directory = "vendor"
_EOF_
+ elif use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
else
- verify-sig_src_unpack
+ default
fi
}
diff --git a/dev-lang/rust/rust-1.86.0-r2.ebuild
b/dev-lang/rust/rust-1.86.0-r2.ebuild
index 430e115e4021..44ad501524ac 100644
--- a/dev-lang/rust/rust-1.86.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.86.0-r2.ebuild
@@ -220,8 +220,11 @@ src_unpack() {
[source.vendored-sources]
directory = "vendor"
_EOF_
+ elif use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
else
- verify-sig_src_unpack
+ default
fi
}
diff --git a/dev-lang/rust/rust-1.87.0-r1.ebuild
b/dev-lang/rust/rust-1.87.0-r1.ebuild
index 17e729ec6f19..cb439e94b235 100644
--- a/dev-lang/rust/rust-1.87.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.87.0-r1.ebuild
@@ -221,8 +221,11 @@ src_unpack() {
[source.vendored-sources]
directory = "vendor"
_EOF_
+ elif use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
else
- verify-sig_src_unpack
+ default
fi
}
diff --git a/dev-lang/rust/rust-1.88.0_beta20250526.ebuild
b/dev-lang/rust/rust-1.88.0_beta20250526.ebuild
index 8ff3541cc20c..c1aa7b039b94 100644
--- a/dev-lang/rust/rust-1.88.0_beta20250526.ebuild
+++ b/dev-lang/rust/rust-1.88.0_beta20250526.ebuild
@@ -233,8 +233,11 @@ src_unpack() {
[source.vendored-sources]
directory = "vendor"
_EOF_
+ elif use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
else
- verify-sig_src_unpack
+ default
fi
}
diff --git a/dev-lang/rust/rust-9999.ebuild b/dev-lang/rust/rust-9999.ebuild
index 8ff3541cc20c..c1aa7b039b94 100644
--- a/dev-lang/rust/rust-9999.ebuild
+++ b/dev-lang/rust/rust-9999.ebuild
@@ -233,8 +233,11 @@ src_unpack() {
[source.vendored-sources]
directory = "vendor"
_EOF_
+ elif use verify-sig ; then
+ # Patch tarballs are not signed (but we trust Gentoo infra)
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
else
- verify-sig_src_unpack
+ default
fi
}
