Re: [PATCH 1/3] create gpg homedir on the fly
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:03:17
Christian Hesse [off-list ref] writes:
GnuPG 2.1 homedir looks different, so just creat it on the fly by importing needed private and public keys and ownertrust. This solves an issue with gnupg 2.1 running interactive pinentry when old secret key is present. Signed-off-by: Christian Hesse <redacted> ---
Thanks; will queue with s/just creat/&e/;
quoted hunk
t/lib-gpg.sh | 10 +++++++--- t/lib-gpg/ownertrust | 4 ++++ t/lib-gpg/random_seed | Bin 600 -> 0 bytes t/lib-gpg/trustdb.gpg | Bin 1360 -> 0 bytes 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 t/lib-gpg/ownertrust delete mode 100644 t/lib-gpg/random_seed delete mode 100644 t/lib-gpg/trustdb.gpgdiff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index cd2baef..4e57942 100755 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh@@ -16,11 +16,15 @@ else # Type DSA and Elgamal, size 2048 bits, no expiration date. # Name and email: C O Mitter <committer@example.com> # No password given, to enable non-interactive operation. - cp -R "$TEST_DIRECTORY"/lib-gpg ./gpghome - chmod 0700 gpghome - chmod 0600 gpghome/* + mkdir ./gpghome + chmod 0700 ./gpghome GNUPGHOME="$(pwd)/gpghome" export GNUPGHOME + gpg --homedir "${GNUPGHOME}" --import \ + "$TEST_DIRECTORY"/lib-gpg/pubring.gpg \ + "$TEST_DIRECTORY"/lib-gpg/secring.gpg + gpg --homedir "${GNUPGHOME}" --import-ownertrust \ + "$TEST_DIRECTORY"/lib-gpg/ownertrust test_set_prereq GPG ;; esacdiff --git a/t/lib-gpg/ownertrust b/t/lib-gpg/ownertrust new file mode 100644 index 0000000..b3e3c4f --- /dev/null +++ b/t/lib-gpg/ownertrust@@ -0,0 +1,4 @@ +# List of assigned trustvalues, created Thu 11 Dec 2014 01:26:28 PM CET +# (Use "gpg --import-ownertrust" to restore them) +73D758744BE721698EC54E8713B6F51ECDDE430D:6: +D4BE22311AD3131E5EDA29A461092E85B7227189:3:diff --git a/t/lib-gpg/random_seed b/t/lib-gpg/random_seed deleted file mode 100644 index 95d249f15fce980f0e8c1a8a18b085b3885708aa..0000000000000000000000000000000000000000GIT binary patch literal 0 HcmV?d00001 literal 600 zcmV-e0;m1ccZd+x>>TST*Lrq1x^ggx^+ymwieO!6X=U~ZH@{avIgxdn#ai{)Ou@Qw za}Z!boffEq^fn)n?c=IEnDpt59Lnc)aR*;8Z;k>gh_NW;ka;7Mt@v#sG(!Y9SSXWv zQxd3WlyBr#4ltW6uKOoa6(r3df1VX$cG4`Om6hD-ckaX+Hb_yI?{f`hJQY&k!1cM- zoGeY~(Z7aYn$W06djh?W|CMs>W=k@jgf=P2D1UA1T%vz0oE|<O<lIacG0xioPtS&U zNd#}P%YpJr-H65~J^RdqA!YV9BEvh7Gw^CdXg+Hp?kj=KGW|+|&g$4?`trWWGuy$9 zv-|;8Y4(NRHWPyJ{epd{4%FHQKk5j}?0FFDAJ;0kIItZ4y<JS?DIG4~0!#x~;X`!P zO%+va?@`?yQnhjrP@&#yjY$YO_0yk|1ddhc8V&ru7d%ytet)mF<ZIUbPB3bvhHQ41 zNmnYeFxUMu=m$K5&s=5_F&JSR#oU3Y#X{(q7HTp-VYJ)%JjihbZ@R#GeqmU{>0C4Q zc}hUG+ighB{7XSaNw_h;=YtqacQ<B(Cg$e)^NTDD-oMD+T`O#-^|-ib>j!<pxHg+( zlC$%zE836|E*F*((=>O{Nn@K$taZO}!>$t>GMgsw?!=n_#(%X9Ha|$b=H@VstWYe; zPUQ<L$$#9HTcOLoyEd6*A4TOEe3}c}GiW*^P1Lt{nHYUEAB`Qx7*wizaEyM$?AjVN mb-6m)4=6PVqdR>h+D!{<c#q1!T9b(}OW7hrrT@nJcBO(OGA4lldiff --git a/t/lib-gpg/trustdb.gpg b/t/lib-gpg/trustdb.gpg deleted file mode 100644 index 4879ae9a84650a93a4d15bd6560c5d1b89eb4c2f..0000000000000000000000000000000000000000GIT binary patch literal 0 HcmV?d00001 literal 1360 zcmZQfFGy!*W@Ke#VqggLnYN69fq@Z-(E%eDx(E*bs5<NcGvvcX4&tvN?+<A7410el zpr*s&;$I$y;_DG5-p>^?`;Pjx3vc@>clMq$FB`<O@(4fkGH5;5W#Id_>(K1CUIi|N zsvi2g;@3gdA(S!jFkIQEWGHo6ST63C=8{BCz1HnYg`Lb06^aOjybMdTjEeXLLrOJU RgG}yTes6vJW7bzp^8ko~DZ2mw