summaryrefslogtreecommitdiffstats
path: root/debian/patches/import-merge-without-userid
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-19 04:37:58 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-19 04:37:58 +0000
commit44ef93a6da85ef81a4c4d6ccf2d7c10d6eb96069 (patch)
tree829996489f2c2ae3776fb30735544d0e724f27e3 /debian/patches/import-merge-without-userid
parentAdding debian version 2.2.43-3. (diff)
downloadgnupg2-44ef93a6da85ef81a4c4d6ccf2d7c10d6eb96069.tar.xz
gnupg2-44ef93a6da85ef81a4c4d6ccf2d7c10d6eb96069.zip
Adding debian version 2.2.43-4.debian/2.2.43-4
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/import-merge-without-userid')
-rw-r--r--debian/patches/import-merge-without-userid/gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/import-merge-without-userid/gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch b/debian/patches/import-merge-without-userid/gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
index e23ffe6..d0fbbb3 100644
--- a/debian/patches/import-merge-without-userid/gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
+++ b/debian/patches/import-merge-without-userid/gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
@@ -19,10 +19,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
1 file changed, 1 insertion(+)
diff --git a/g10/import.c b/g10/import.c
-index 078a78c..c070399 100644
+index 59c83f7..abea0f2 100644
--- a/g10/import.c
+++ b/g10/import.c
-@@ -3677,6 +3677,7 @@ chk_self_sigs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid, int *non_self)
+@@ -3702,6 +3702,7 @@ chk_self_sigs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid, int *non_self)
/* It's valid, so is it newer? */
if (sig->timestamp >= rsdate)
{