summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-01-24 00:57:03 +0000
committerSam James <sam@gentoo.org>2023-01-24 00:57:09 +0000
commitc9f7e2dd57318fa635cdd21c20da0ecf1acfd7e4 (patch)
tree6ad09e3bdf3ebc1c046112c45682c54c54dba308
parentsec-keys/openpgp-keys-valgrind: new package, add 20230124 (diff)
downloadgentoo-c9f7e2dd57318fa635cdd21c20da0ecf1acfd7e4.tar.gz
gentoo-c9f7e2dd57318fa635cdd21c20da0ecf1acfd7e4.tar.bz2
gentoo-c9f7e2dd57318fa635cdd21c20da0ecf1acfd7e4.zip
dev-util/valgrind: add verify-sig, update live
Drop a musl patch merged upstream from live. Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--dev-util/valgrind/Manifest1
-rw-r--r--dev-util/valgrind/valgrind-3.20.0-r2.ebuild6
-rw-r--r--dev-util/valgrind/valgrind-9999.ebuild7
3 files changed, 13 insertions, 1 deletions
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 7c252f97206..c7f5d50fd00 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,2 +1,3 @@
DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a33a083505b42adaa94ee3af659cbe073e516bc98163ef56233e6cd9de2125839b71ee443fbc0db6557dcb35a6c05280 SHA512 f720a89dc4c4989cc5714bff9efe97529f71990bcfad7a92b889ce099c4326d6da07fa4d5fbab2e9125e20f352354f6178471e49e419b613a3c82c2a1c667ab2
DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b
+DIST valgrind-3.20.0.tar.bz2.asc 488 BLAKE2B 12642e4f85c7b17bdb892221f74d80ce919554ffde3cdfa79ca27f4c5f8b48dac699084b8296b5cea285b5af660a0bc51c42b108a725be60002b14f0fda7eac7 SHA512 70dd20f15b159ffbf016c118046ee42160dd867415f1c565a92995952b1720ec36fc48557f6b523d28e6f675d62df10a4022e900fa4a104626b9e6ed6fe9ad6d
diff --git a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
index 0268876b106..007e802df57 100644
--- a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
@@ -11,7 +11,10 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
inherit git-r3
else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/valgrind.gpg
+ inherit verify-sig
SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
+ SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${P}.tar.bz2.asc )"
KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
fi
@@ -21,6 +24,9 @@ IUSE="mpi"
DEPEND="mpi? ( virtual/mpi )"
RDEPEND="${DEPEND}"
+if [[ ${PV} != 9999 ]] ; then
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-valgrind )"
+fi
PATCHES=(
# Respect CFLAGS, LDFLAGS
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index b690f11f122..f9e4a6d3a45 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -11,7 +11,10 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
inherit git-r3
else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/valgrind.gpg
+ inherit verify-sig
SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
+ SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${P}.tar.bz2.asc )"
KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
fi
@@ -21,6 +24,9 @@ IUSE="mpi"
DEPEND="mpi? ( virtual/mpi )"
RDEPEND="${DEPEND}"
+if [[ ${PV} != 9999 ]] ; then
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-valgrind )"
+fi
PATCHES=(
# Respect CFLAGS, LDFLAGS
@@ -38,7 +44,6 @@ src_prepare() {
if use elibc_musl ; then
PATCHES+=(
"${FILESDIR}"/${PN}-3.13.0-malloc.patch
- "${FILESDIR}"/${PN}-3.20.0-musl-interpose.patch
)
fi