[gentoo-commits] repo/gentoo:master commit in: app-crypt/sequoia-chameleon-gnupg/files/, app-crypt/sequoia-chameleon-gnupg/

2023-07-25 Thread Sam James 
commit: 5157dbad0f6791d6165d027931b5187953c8e511
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 26 04:39:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 26 04:39:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5157dbad

app-crypt/sequoia-chameleon-gnupg: drop 0.2.0-r1

Signed-off-by: Sam James  gentoo.org>

 app-crypt/sequoia-chameleon-gnupg/Manifest |  82 -
 .../sequoia-chameleon-gnupg-0.2.0-sec-fixes.patch  | 104 --
 .../sequoia-chameleon-gnupg-0.2.0-tests.patch  |  45 ---
 .../sequoia-chameleon-gnupg-0.2.0-r1.ebuild| 347 -
 4 files changed, 578 deletions(-)

diff --git a/app-crypt/sequoia-chameleon-gnupg/Manifest 
b/app-crypt/sequoia-chameleon-gnupg/Manifest
index 41d66ae39839..e66c8cabdc63 100644
--- a/app-crypt/sequoia-chameleon-gnupg/Manifest
+++ b/app-crypt/sequoia-chameleon-gnupg/Manifest
@@ -5,17 +5,14 @@ DIST ahash-0.8.3.crate 42416 BLAKE2B 
84836a4e33451012ff32c1a1a90500d87eb7ce649b6
 DIST aho-corasick-0.7.20.crate 111440 BLAKE2B 
3f5d54fea2793ce1c2c4d5b3049b910f45a5721e7538cb2557df63dc3069ab3f6b66aceb5e9a48f21c43ae29778fd045428ea103b2a6de81659e605e30e64ca6
 SHA512 
ad31f3d1b3fe41e593d4ca7e721bbad62936f2e6a17fd1e0997353edb6fc906d1bef2b79f0ac7c7676abe637bbabb23ff22059947be379a2441011f8178983c5
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 
86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e
 SHA512 
b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST anyhow-1.0.66.crate 43770 BLAKE2B 
8d74397c47bd64c00f015cf7ee279fa020ea39191440208d77e4a5fdb35fca531e8bb9b765be223b24050d0fd1db76fa5b516146f450937f84a5c113c9eca997
 SHA512 
7b4078906df2805d491dc2f29c4eec85a9f43078c0dcd9c05261c2706ed655953b693c4f59fda62547681b29cda9ac7a0789f1359bb18110403cfe34e9fb0dc3
-DIST anyhow-1.0.68.crate 43882 BLAKE2B 
0ccd8fcb746344dfa85674fa7c95aa648aed8d40134b8c1c1c0852f6c7d22f5622ca1704ec65c254fc20946b1733299e1517364d74f726952d5a951ef89a2fe5
 SHA512 
b8cfc132ebeac823edf18cba7e335d1939fcbb095ed4ea859f4dc4cde5b1ff35fd68f0743577c69085f74f019768a3359936bf6dc1b2aceb7e2b28ace7f74a0f
 DIST ascii-canvas-3.0.0.crate 10575 BLAKE2B 
fc40c40551e3e1b2bec6ae5a85ee8b0a1ab1ef3425cdd19ec6dd47d849205004781a2c8f51470417fe7556cf8524cc63b84a532532c5081604adbcd92d286b44
 SHA512 
216056640604f5faba6d46e2c94ff75234fec83d3bc2dc7cf34dd279706362874e3a513c717b23bc591da07cc3088458913c4e9aa5f280550c93d261095c8703
 DIST async-trait-0.1.63.crate 28382 BLAKE2B 
9aca952f46b3bb029317e781643f80c1e6a0d3d87c2cb3a4c64f4ef91a3132a9a6e3aa67a920d512df3471118b9129f7adf51bbc314a8455f50791f94c2ad7b9
 SHA512 
4ba5d0d0021dbac82d3f4f0c56c94b4363d6fae3609f13f7f406acae53f848d86f84d0602dc6350397a4dc178a7d7faf770b5cbe15e42ff8dad664d97f15a6e5
-DIST async-trait-0.1.64.crate 29196 BLAKE2B 
8cd25de53df989d7d5b79181e0ed5b6bd7cad71a2dee24b56eca9c7c9d6024f4fcce89764fda830168c093dc5e447455443b319491097171ef4c049eeb7199b2
 SHA512 
0487a688cddae7529def0645f6ef4440916eaa757b14e8e414f910b55e17e2c1fe3fe18c216c3a1916a21909c32cba7add8e461adeefaa4be5deaa3c7085fad7
 DIST atty-0.2.14.crate 5470 BLAKE2B 
2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab
 SHA512 
d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 
7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203
 SHA512 
df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST backtrace-0.3.67.crate 78564 BLAKE2B 
8c77d3d182c7e1ec3840fd6c7f4214322e473ba79a71b2d11d98696f8ae4440350f3c84a891b2ec79fffde107fb2ebb99fffca202d6ed235d3abd68215a1089b
 SHA512 
8603a3b63f4f08be315176908134243680bf1a4b0e6cb26ed81f5fc1060279126ca0ef28f209a10289e1a85214b35db6b496affd71ad21524094f3ee3acd31b6
 DIST base64-0.13.1.crate 61002 BLAKE2B 
3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91
 SHA512 
1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
 DIST base64-0.21.0.crate 72180 BLAKE2B 
c7aeaf671bdeac67703f9c4ee1be003eb8d6f46fbaa0adf61a4da304458742938db04291d5f626115e3fcc901eb3abb3f9baf8247f6344b4d49f60a200fc6fd2
 SHA512 
60bcc157c6449a2160e083611e6d53e07bbff7db8cd550d9056cb804e99e990d4a20092ba4347306a3c6b6c42474a06d92cb3895125c50cef9b74cd3cbd83a2f
 DIST bindgen-0.57.0.crate 199132 BLAKE2B 
ed5d73da72116acca0124770f6f8e162c161c3375980505a704d3fc73ad20fc8cd81ce59680deb4922def8737914027c1c1e2c9fb4b181ddf114a08522657b62
 SHA512

[gentoo-commits] repo/gentoo:master commit in: app-crypt/sequoia-chameleon-gnupg/files/, app-crypt/sequoia-chameleon-gnupg/

2023-05-19 Thread Sam James 
commit: 1fd5803705bc3bc5ede5559d08b6e4c57a201fbf
Author: Sam James  gentoo  org>
AuthorDate: Sat May 20 03:48:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 20 03:48:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fd58037

app-crypt/sequoia-chameleon-gnupg: patch vulnerabilities (see bug), use 
llvm.eclass

- Patch various vulnerabilities by upgrading crates (sequoia-openpgp and 
buffered-reader)
- Use llvm.eclass for the Clang dep, as we need it for bindgen

Bug: https://bugs.gentoo.org/906799
Signed-off-by: Sam James  gentoo.org>

 app-crypt/sequoia-chameleon-gnupg/Manifest |   5 +
 .../sequoia-chameleon-gnupg-0.2.0-sec-fixes.patch  | 104 ++
 .../sequoia-chameleon-gnupg-0.2.0-r1.ebuild| 347 +
 3 files changed, 456 insertions(+)

diff --git a/app-crypt/sequoia-chameleon-gnupg/Manifest 
b/app-crypt/sequoia-chameleon-gnupg/Manifest
index a1365fd43578..d255edb5fe31 100644
--- a/app-crypt/sequoia-chameleon-gnupg/Manifest
+++ b/app-crypt/sequoia-chameleon-gnupg/Manifest
@@ -9,11 +9,13 @@ DIST atty-0.2.14.crate 5470 BLAKE2B 
2db856a9e898a430258f059aeaf7c844a153293e8856
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 
7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203
 SHA512 
df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST backtrace-0.3.67.crate 78564 BLAKE2B 
8c77d3d182c7e1ec3840fd6c7f4214322e473ba79a71b2d11d98696f8ae4440350f3c84a891b2ec79fffde107fb2ebb99fffca202d6ed235d3abd68215a1089b
 SHA512 
8603a3b63f4f08be315176908134243680bf1a4b0e6cb26ed81f5fc1060279126ca0ef28f209a10289e1a85214b35db6b496affd71ad21524094f3ee3acd31b6
 DIST base64-0.13.1.crate 61002 BLAKE2B 
3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91
 SHA512 
1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
+DIST base64-0.21.0.crate 72180 BLAKE2B 
c7aeaf671bdeac67703f9c4ee1be003eb8d6f46fbaa0adf61a4da304458742938db04291d5f626115e3fcc901eb3abb3f9baf8247f6344b4d49f60a200fc6fd2
 SHA512 
60bcc157c6449a2160e083611e6d53e07bbff7db8cd550d9056cb804e99e990d4a20092ba4347306a3c6b6c42474a06d92cb3895125c50cef9b74cd3cbd83a2f
 DIST bindgen-0.63.0.crate 201856 BLAKE2B 
a99470e5878c90d0ff4cdcba5d16177eb765822041203c7224f9baf1fda23f83d92c3b9cd83759ed9ca779f9d3961509b4d7e038b716b9d68bf6563743ca8141
 SHA512 
43ac3067b3635c968c3a4bf6d665d633b9b80ff4eec36aad353019fc16e25c2338ea3f00a7fb077ae0dc055d10ea3ed6c304055a18dcf0c31bf980c26b110796
 DIST bit-set-0.5.3.crate 14470 BLAKE2B 
f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e
 SHA512 
c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
 DIST bit-vec-0.6.3.crate 19927 BLAKE2B 
f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910
 SHA512 
b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
 DIST bitflags-1.3.2.crate 23021 BLAKE2B 
eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda
 SHA512 
3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST buffered-reader-1.1.4.crate 61347 BLAKE2B 
ff722a8346bb4b644c0b463168337620c82e28763c2251afe7bb14ddbb981217b83495d18b5f6389beb7e268045d6a3daa9f9ad5703e2eac9fb90075a235ee15
 SHA512 
1d5cffd9c02f0f4cdb550764c75cd22df44012264710530fb36a9c77a5d64d803c14ce7a4f1244511b3895147e2f70f9dd8e7ad705222712f9846459ff36b746
+DIST buffered-reader-1.2.0.crate 62127 BLAKE2B 
8ca2e10f69121a08169e082b34e2412502673f24f2c373c66c49e24160b340e9078fe16b9dccc4f1cc51f3f0867d9e605c04bb002abb61b8891618b95f79e8e3
 SHA512 
4e7f9d75720b10a04577220ead4ca96e0c34a573469f80a50288e156d7aa99a1820850aa69c3f2db0505d0204bbd3aa6bd4b5823925481f0358d13936ad54770
 DIST bumpalo-3.12.0.crate 81604 BLAKE2B 
2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7
 SHA512 
37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4
 DIST bytes-1.4.0.crate 58080 BLAKE2B 
99a9d343424e04649bd209bf2a6c3a089a6cc9fdb799968f8c3a711189328e4499df2e09cc6a2a8ce05d2cc668149b364cf30cb3b09e96e21d50a39519c2f49f
 SHA512 
502c63b9fdcd36ed28ede55a63cd359dc7b28658ecd43020511d17d48d7c34e45aa8ff7e4b17770f12197451040c2b724fe68d2aa3ab4f81c9171d052f2aa000
 DIST bzip2-0.4.4.crate 34197 BLAKE2B

[gentoo-commits] repo/gentoo:master commit in: app-crypt/sequoia-chameleon-gnupg/files/, app-crypt/sequoia-chameleon-gnupg/

2023-02-10 Thread Sam James 
commit: 2088d3ed01d8b162836ba055c2ad03f87f7502e4
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 11 02:20:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 11 02:21:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2088d3ed

app-crypt/sequoia-chameleon-gnupg: backport test fix

... but it doesn't get them passing yet. Ideas welcome! They don't pass
for me outside of Portage either, but way more _do_ pass outside of Portage
for me, as opposed to none right now inside.

Signed-off-by: Sam James  gentoo.org>

 .../sequoia-chameleon-gnupg-0.2.0-tests.patch  | 45 ++
 .../sequoia-chameleon-gnupg-0.2.0.ebuild   |  9 -
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git 
a/app-crypt/sequoia-chameleon-gnupg/files/sequoia-chameleon-gnupg-0.2.0-tests.patch
 
b/app-crypt/sequoia-chameleon-gnupg/files/sequoia-chameleon-gnupg-0.2.0-tests.patch
new file mode 100644
index ..8ebd4cf4da25
--- /dev/null
+++ 
b/app-crypt/sequoia-chameleon-gnupg/files/sequoia-chameleon-gnupg-0.2.0-tests.patch
@@ -0,0 +1,45 @@
+https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/commit/447e4747089731f322589299d3ff6fd54e56aefb
+
+From 447e4747089731f322589299d3ff6fd54e56aefb Mon Sep 17 00:00:00 2001
+From: Justus Winter 
+Date: Thu, 9 Feb 2023 10:44:26 +0100
+Subject: [PATCH] tests: Normalize underlines.
+
+  - GnuPG emits a header with underlines in key listings that changes
+with the length of GNUPGHOME.  Now, since the state directories
+are created within TMPDIR, the length of both GNUPGHOME and the
+underline changes.  Previously, we normalized GNUPGHOME, but we
+failed to normalize the underline.
+
+  - Fixes #8.
+--- a/tests/gpg.rs
 b/tests/gpg.rs
+@@ -243,12 +243,24 @@ impl Output {
+ }
+ 
+ /// Canonicalizes the paths in the output.
++///
++/// This replaces `homedir` with `"/HOMEDIR"` and `experiment`
++/// with `"/EXPERIMENT"` in stdout and stderr, and normalizes the
++/// underline decorating `homedir` in key listings in stdout.
+ fn canonicalize(mut self, homedir: , experiment: ) -> Self {
++const DASHES:  =
++"\n";
++let d = regex::bytes::Regex::new(
++[..DASHES.len().min(homedir.to_str().unwrap().len() + 1)])
++.unwrap();
+ let h = regex::bytes::Regex::new(homedir.to_str().unwrap()).unwrap();
+ let e = 
regex::bytes::Regex::new(experiment.to_str().unwrap()).unwrap();
+ self.stdout =
+-e.replace_all(_all(, "/HOMEDIR"[..]),
+-  "/EXPERIMENT"[..])
++e.replace_all(
++_all(
++_all(, "\n"[..]),
++"/HOMEDIR"[..]),
++"/EXPERIMENT"[..])
+ .into();
+ self.stderr =
+ e.replace_all(_all(, "/HOMEDIR"[..]),
+-- 
+GitLab

diff --git 
a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.2.0.ebuild 
b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.2.0.ebuild
index 10afa858dad2..5b7c38538af6 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.2.0.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.2.0.ebuild
@@ -307,7 +307,10 @@ LICENSE+="
 "
 SLOT="0"
 KEYWORDS="~amd64"
-# https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/issues/8
+# See e.g. https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/issues/8
+# Even though that's fixed as of >0.2.0, tests still completely fail inside
+# Portage. Not yet sure why/how. They do better outside, although some fail
+# still then.
 RESTRICT="test"
 
 DEPEND="
@@ -320,6 +323,10 @@ BDEPEND="sys-devel/clang"
 
 QA_FLAGS_IGNORED="usr/bin/gpg-sq usr/bin/gpgv-sq"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-tests.patch
+)
+
 src_test() {
export GNUPGHOME="${T}"/.gnupg
export REAL_GPG_BIN="${BROOT}"/usr/bin/gpg