diff -pruN 4.4.4+dfsg-2/debian/changelog 4.4.4+dfsg-2ubuntu1/debian/changelog --- 4.4.4+dfsg-2/debian/changelog 2021-02-07 15:44:18.000000000 +0000 +++ 4.4.4+dfsg-2ubuntu1/debian/changelog 2021-08-19 14:15:04.000000000 +0000 @@ -1,3 +1,10 @@ +request-tracker4 (4.4.4+dfsg-2ubuntu1) impish; urgency=medium + + * d/p/rt_test_gnupg_disable_wkd.diff: Backport patch from Debian to disable + using WKD on GnuPG tests that might attempt to use the network (LP: #1932076). + + -- Lucas Kanashiro Thu, 19 Aug 2021 11:15:04 -0300 + request-tracker4 (4.4.4+dfsg-2) unstable; urgency=medium * Downgrade Depends on rsyslog | system-log-daemon to Recommends diff -pruN 4.4.4+dfsg-2/debian/control 4.4.4+dfsg-2ubuntu1/debian/control --- 4.4.4+dfsg-2/debian/control 2021-02-07 14:12:48.000000000 +0000 +++ 4.4.4+dfsg-2ubuntu1/debian/control 2021-08-19 14:15:04.000000000 +0000 @@ -1,5 +1,6 @@ Source: request-tracker4 -Maintainer: Debian Request Tracker Group +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Request Tracker Group Uploaders: Niko Tyni , Andrew Ruthven , Dominic Hargreaves diff -pruN 4.4.4+dfsg-2/debian/patches/rt_test_gnupg_disable_wkd.diff 4.4.4+dfsg-2ubuntu1/debian/patches/rt_test_gnupg_disable_wkd.diff --- 4.4.4+dfsg-2/debian/patches/rt_test_gnupg_disable_wkd.diff 1970-01-01 00:00:00.000000000 +0000 +++ 4.4.4+dfsg-2ubuntu1/debian/patches/rt_test_gnupg_disable_wkd.diff 2021-08-19 14:14:17.000000000 +0000 @@ -0,0 +1,84 @@ +From 4c41bc9777df840d28cc18e006b5146d3085ec7c Mon Sep 17 00:00:00 2001 +From: Andrew Ruthven +Date: Fri, 21 May 2021 23:44:56 +1200 +Subject: [PATCH] Disable using WKD on GnuPG tests that might attempt to use + the network. + +If GnuPG isn't able to use the network (DNS and HTTPS) then the error +message returned from a failed WKD lookup is different than one which +fails due to the key not existing. + +Given it is a Debian policy requirement[0] to during build no remote +network access is allowed, we'll disable WKD usage. + +[0] https://www.debian.org/doc/debian-policy/ch-source.html#main-building-script-debian-rules + +Bug: https://rt.bestpractical.com/Ticket/Display.html?id=37159 +Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988905 +Patch-Name: rt_test_gnupg_disable_wkd.diff +--- + t/mail/crypt-gnupg.t | 10 ++++++++-- + t/web/crypt-gnupg.t | 5 +++-- + 2 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/t/mail/crypt-gnupg.t b/t/mail/crypt-gnupg.t +index 70c74478..61067700 100644 +--- a/t/mail/crypt-gnupg.t ++++ b/t/mail/crypt-gnupg.t +@@ -9,7 +9,13 @@ BEGIN { + RT::Test::get_abs_relocatable_dir( File::Spec->updir(), qw/data gnupg keyrings/ ) ); + } + +-use RT::Test::GnuPG tests => undef, gnupg_options => { homedir => $homedir, quiet => 1 }; ++use RT::Test::GnuPG ++ tests => undef, ++ gnupg_options => { ++ homedir => $homedir, ++ quiet => 1, ++ extra_args => [ '--no-auto-key-locate' ], ++ }; + use Test::Warn; + + my $gnupg_version = RT::Test::GnuPG::gnupg_version; +@@ -168,7 +174,7 @@ diag 'encryption only, bad recipient'; + Entity => $entity, + Sign => 0, + ); +- } qr/public key not found|error retrieving 'keyless\@example.com' via WKD: No data/; ++ } qr/No public key|public key not found|error retrieving 'keyless\@example.com' via WKD: No data/; + + ok( $res{'exit_code'}, 'no way to encrypt without keys of recipients'); + ok( $res{'logger'}, "errors are in logger" ); +diff --git a/t/web/crypt-gnupg.t b/t/web/crypt-gnupg.t +index 827d06d2..d97add8c 100644 +--- a/t/web/crypt-gnupg.t ++++ b/t/web/crypt-gnupg.t +@@ -6,6 +6,7 @@ use RT::Test::GnuPG + gnupg_options => { + passphrase => 'recipient', + 'trust-model' => 'always', ++ extra_args => [ '--no-auto-key-locate' ], + }; + use Test::Warn; + use MIME::Head; +@@ -355,7 +356,7 @@ warning_like { + $tick->Create(Subject => 'owner lacks pubkey', Queue => 'general', + Owner => $nokey); + } [ +- qr/nokey\@example.com: skipped: public key not found|error retrieving 'nokey\@example.com' via WKD: No data/, ++ qr/nokey\@example.com: skipped: (No public key|public key not found)|error retrieving 'nokey\@example.com' via WKD: No data/, + qr/Recipient 'nokey\@example.com' is unusable/, + ]; + ok(my $id = $tick->id, 'created ticket for owner-without-pubkey'); +@@ -377,7 +378,7 @@ my $status; + warning_like { + ($status, $id) = RT::Test->send_via_mailgate($mail); + } [ +- qr/nokey\@example.com: skipped: public key not found|error retrieving 'nokey\@example.com' via WKD: No data/, ++ qr/nokey\@example.com: skipped: (No public key|public key not found)|error retrieving 'nokey\@example.com' via WKD: No data/, + qr/Recipient 'nokey\@example.com' is unusable/, + ]; + +-- +GitLab + diff -pruN 4.4.4+dfsg-2/debian/patches/series 4.4.4+dfsg-2ubuntu1/debian/patches/series --- 4.4.4+dfsg-2/debian/patches/series 2021-02-02 00:04:05.000000000 +0000 +++ 4.4.4+dfsg-2ubuntu1/debian/patches/series 2021-08-19 14:14:52.000000000 +0000 @@ -29,3 +29,4 @@ upstream_4.4-trunk_gpg:_move_signed_styl upstream_4.4-trunk_gpg:_always_use_temp_gpg_homedir.diff upstream_4.4-trunk_gpg:_add_extra_ignored_keywords.diff upstream_4.4-trunk_gpg:_default_cert-digest_algo_SHA256.diff +rt_test_gnupg_disable_wkd.diff