diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-19 04:38:13 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-19 04:38:13 +0000 |
| commit | f29c37eef239be064a88e5447073dbbc8b82e562 (patch) | |
| tree | 8f87d81b92143c9f0920e303a2df036f2549079f /debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch | |
| parent | Releasing progress-linux version 2.2.43-3~progress7.99u1. (diff) | |
| download | gnupg2-f29c37eef239be064a88e5447073dbbc8b82e562.tar.xz gnupg2-f29c37eef239be064a88e5447073dbbc8b82e562.zip | |
Merging debian version 2.2.43-4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch')
| -rw-r--r-- | debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch b/debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch index d6df59f..6cd282f 100644 --- a/debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch +++ b/debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch @@ -30,10 +30,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> 3 files changed, 35 insertions(+), 41 deletions(-) diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c -index e287194..c04a287 100644 +index 06ef22b..0238359 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c -@@ -2031,12 +2031,10 @@ static void * +@@ -2071,12 +2071,10 @@ static void * housekeeping_thread (void *arg) { static int sentinel; @@ -46,7 +46,7 @@ index e287194..c04a287 100644 if (sentinel) { log_info ("housekeeping is already going on\n"); -@@ -2050,7 +2048,6 @@ housekeeping_thread (void *arg) +@@ -2090,7 +2088,6 @@ housekeeping_thread (void *arg) dirmngr_init_default_ctrl (&ctrlbuf); dns_stuff_housekeeping (); @@ -55,10 +55,10 @@ index e287194..c04a287 100644 { network_activity_seen = 0; diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h -index fed4599..0e1fbd9 100644 +index 07f0df8..48f293c 100644 --- a/dirmngr/dirmngr.h +++ b/dirmngr/dirmngr.h -@@ -234,7 +234,6 @@ int dirmngr_use_tor (void); +@@ -250,7 +250,6 @@ int dirmngr_use_tor (void); int dirmngr_never_use_tor_p (void); /*-- Various housekeeping functions. --*/ @@ -67,7 +67,7 @@ index fed4599..0e1fbd9 100644 diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c -index 5793f07..91f1c63 100644 +index bbd5a9d..8a95291 100644 --- a/dirmngr/ks-engine-hkp.c +++ b/dirmngr/ks-engine-hkp.c @@ -218,6 +218,24 @@ host_in_pool_p (hostinfo_t hi, int tblidx) |