From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH 1/3] create gpg homedir on the fly Date: Fri, 12 Dec 2014 10:26:55 -0800 Message-ID: References: <20141212094753.160a0fb5@leda.localdomain> <1418374214-8241-1-git-send-email-mail@eworm.de> Mime-Version: 1.0 Content-Type: text/plain Cc: git@vger.kernel.org To: Christian Hesse X-From: git-owner@vger.kernel.org Fri Dec 12 19:27:44 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XzUwI-0006mf-Rx for gcvg-git-2@plane.gmane.org; Fri, 12 Dec 2014 19:27:43 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965100AbaLLS1j (ORCPT ); Fri, 12 Dec 2014 13:27:39 -0500 Received: from pb-smtp1.int.icgroup.com ([208.72.237.35]:51481 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932991AbaLLS06 (ORCPT ); Fri, 12 Dec 2014 13:26:58 -0500 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id E05B025168; Fri, 12 Dec 2014 13:26:57 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=NhA+p8j57JNe/bBgN5niaBnkTaU=; b=tgR4hi pV4mQj687zpb3huFI/oCoAbT7/rlKJjsYNrBlYls89x5WjTqGDaZdtTWfMwWutSP tjnJlOUL96A6tJ0yX+sUg5dDOOT3ww9pMQBxAsIDicpDCnzey7HTaet9sIVBLrK6 N5PCEAI7Qf255n7mjxnD2cv90oebbKSqtfRsM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=lcqYyV+xv3L4xlnF8TlvptSKA0sfQPfV uzTvJP0OqDDAyK9dGLGDjX4RxRJd94c/7Kcc2LAUFEEzn8AD5WD98vCYaauO9Pvr JMaTjl0+2QQ/YTdXuuoXA6FcuXAkY2ne47KLB/fx4Az60gxMJnBHQxBF9ql3uZlL viYo7ij1p9g= Received: from pb-smtp1.int.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id D56C125165; Fri, 12 Dec 2014 13:26:57 -0500 (EST) Received: from pobox.com (unknown [72.14.226.9]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 521DA25164; Fri, 12 Dec 2014 13:26:57 -0500 (EST) In-Reply-To: <1418374214-8241-1-git-send-email-mail@eworm.de> (Christian Hesse's message of "Fri, 12 Dec 2014 09:50:12 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-Pobox-Relay-ID: 748DEFE2-822C-11E4-AC2F-42529F42C9D4-77302942!pb-smtp1.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Christian Hesse 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 > --- Thanks; will queue with s/just creat/&e/; > 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.gpg > > diff --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 > # 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 > ;; > esac > diff --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..0000000000000000000000000000000000000000 > GIT 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| zNd#}P%YpJr-H65~J^RdqA!YV9BEvh7Gw^CdXg+Hp?kj=KGW|+|&g$4?`trWWGuy$9 > zv-|;8Y4(NRHWPyJ{epd{4%FHQKk5j}?0FFDAJ;0kIItZ4y zO%+va?@`?yQnhjrP@&#yjY$YO_0yk|1ddhc8V&ru7d%ytet)mF zNmnYeFxUMu=m$K5&s=5_F&JSR#oU3Y#X{(q7HTp-VYJ)%JjihbZ@R#GeqmU{>0C4Q > zc}hUG+ighB{7XSaNw_h;=YtqacQj! zlC$%zE836|E*F*((=>O{Nn@K$taZO}!>$t>GMgsw?!=n_#(%X9Ha|$b=H@VstWYe; > zPUQ mb-6m)4=6PVqdR>h+D!{ > diff --git a/t/lib-gpg/trustdb.gpg b/t/lib-gpg/trustdb.gpg > deleted file mode 100644 > index 4879ae9a84650a93a4d15bd6560c5d1b89eb4c2f..0000000000000000000000000000000000000000 > GIT binary patch > literal 0 > HcmV?d00001 > > literal 1360 > zcmZQfFGy!*W@Ke#VqggLnYN69fq@Z-(E%eDx(E*bs5 zpr*s&;$I$y;_DG5-p>^?`;Pjx3vc@>clMq$FB`(K1CUIi|N > zsvi2g;@3gdA(S!jFkIQEWGHo6ST63C=8{BCz1HnYg`Lb06^aOjybMdTjEeXLLrOJU > RgG}yTes6vJW7bzp^8ko~DZ2mw