On 02/15/2014 01:07 PM, Dominic Hargreaves wrote: > Control: severity -1 critical > Justification: makes unrelated software on the system break [...] > On reflection, I'm upgrading the severity of this bug, since it's > blocking RC (FTBFS) bugs on multiple other packages.
I think this is the right thing to do for #735363. thanks for doing it,
Dominic.
> Could someone familiar with gnupg's internals check Daniel's patch,
> please (or Daniel do you feel confident to upload this without
> further review?)
I've been running with this patch since January 20th, and it works fine
for me. I'm attaching the debdiff here.
I'm uploading it to DELAYED/2 now, in case the package maintainers want
to try to resolve this some other way.
--dkg
diff -Nru gnupg-1.4.16/debian/changelog gnupg-1.4.16/debian/changelog --- gnupg-1.4.16/debian/changelog 2014-01-07 05:23:50.000000000 -0500 +++ gnupg-1.4.16/debian/changelog 2014-01-20 22:17:40.000000000 -0500 @@ -1,3 +1,10 @@ +gnupg (1.4.16-1.1) unstable; urgency=low + + * Non-Maintainer Upload. + * Initialize trustdb before clearing it (Closes: #735363) + + -- Daniel Kahn Gillmor <d...@fifthhorseman.net> Mon, 20 Jan 2014 22:16:55 -0500 + gnupg (1.4.16-1) unstable; urgency=medium * New upstream release. diff -Nru gnupg-1.4.16/debian/patches/init-trustdb-before-clearing.patch gnupg-1.4.16/debian/patches/init-trustdb-before-clearing.patch --- gnupg-1.4.16/debian/patches/init-trustdb-before-clearing.patch 1969-12-31 19:00:00.000000000 -0500 +++ gnupg-1.4.16/debian/patches/init-trustdb-before-clearing.patch 2014-01-20 22:16:40.000000000 -0500 @@ -0,0 +1,22 @@ +commit 0807b8afd37720681a785ee396e349e0d2d3fc23 +Author: Daniel Kahn Gillmor <d...@fifthhorseman.net> +Date: Mon Jan 20 22:12:38 2014 -0500 + + init trustdb before trying to clear it + + This avoids failure when importing with --always-trust on gpg 1.4.16, + as reported in http://bugs.debian.org/735363 + +diff --git a/g10/trustdb.c b/g10/trustdb.c +index 0bf92e4..828b90f 100644 +--- a/g10/trustdb.c ++++ b/g10/trustdb.c +@@ -927,6 +927,8 @@ clear_ownertrusts (PKT_public_key *pk) + TRUSTREC rec; + int rc; + ++ init_trustdb(); ++ + if (trustdb_args.no_trustdb && opt.trust_model == TM_ALWAYS) + return 0; + diff -Nru gnupg-1.4.16/debian/patches/series gnupg-1.4.16/debian/patches/series --- gnupg-1.4.16/debian/patches/series 2014-01-07 03:40:45.000000000 -0500 +++ gnupg-1.4.16/debian/patches/series 2014-01-20 22:16:52.000000000 -0500 @@ -0,0 +1 @@ +init-trustdb-before-clearing.patch
signature.asc
Description: OpenPGP digital signature
