diff options
Diffstat (limited to '')
4 files changed, 147 insertions, 0 deletions
diff --git a/debian/patches/from-upstream/dirmngr-Fix-build-with-no-LDAP-support.patch b/debian/patches/from-upstream/dirmngr-Fix-build-with-no-LDAP-support.patch new file mode 100644 index 0000000..c21409f --- /dev/null +++ b/debian/patches/from-upstream/dirmngr-Fix-build-with-no-LDAP-support.patch @@ -0,0 +1,33 @@ +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Tue, 18 Oct 2022 10:16:11 +0900 +Subject: dirmngr: Fix build with no LDAP support. + +* dirmngr/server.c [USE_LDAP] (start_command_handler): Conditionalize. + +-- + +Cherry-pick master commit of: + 7011286ce6e1fb56c2989fdafbd11b931c489faa + +GnuPG-bug-id: 6239 +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> +(cherry picked from commit a5c3821664886ffffbe6a83aac088a6e0088a607) +--- + dirmngr/server.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dirmngr/server.c b/dirmngr/server.c +index 651f67c..87a0d77 100644 +--- a/dirmngr/server.c ++++ b/dirmngr/server.c +@@ -3135,8 +3135,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) + ctrl->refcount); + else + { ++#if USE_LDAP + ks_ldap_free_state (ctrl->ks_get_state); + ctrl->ks_get_state = NULL; ++#endif + release_ctrl_ocsp_certs (ctrl); + xfree (ctrl->server_local); + dirmngr_deinit_default_ctrl (ctrl); diff --git a/debian/patches/from-upstream/gpg-Move-NETLIBS-after-GPG_ERROR_LIBS-another.patch b/debian/patches/from-upstream/gpg-Move-NETLIBS-after-GPG_ERROR_LIBS-another.patch new file mode 100644 index 0000000..99117df --- /dev/null +++ b/debian/patches/from-upstream/gpg-Move-NETLIBS-after-GPG_ERROR_LIBS-another.patch @@ -0,0 +1,29 @@ +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Tue, 18 Oct 2022 10:24:54 +0900 +Subject: gpg: Move NETLIBS after GPG_ERROR_LIBS (another). + +* g10/Makefile.am (t_keydb_LDADD): Add NETLIBS after GPG_ERROR_LIBS. + +-- + +Fixes-commit: b26bb03ed96f380ad603f7ad902862625233c931 +GnuPG-bug-id: 6244 +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> +(cherry picked from commit 256b3c05789d8026b62f594bd592199a90b1b446) +--- + g10/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/g10/Makefile.am b/g10/Makefile.am +index d38e292..cd5307e 100644 +--- a/g10/Makefile.am ++++ b/g10/Makefile.am +@@ -200,7 +200,7 @@ module_tests = t-rmd160 t-keydb t-keydb-get-keyblock t-stutter + t_rmd160_SOURCES = t-rmd160.c rmd160.c + t_rmd160_LDADD = $(t_common_ldadd) + t_keydb_SOURCES = t-keydb.c test-stubs.c $(common_source) +-t_keydb_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ ++t_keydb_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \ + $(LIBICONV) $(t_common_ldadd) + t_keydb_get_keyblock_SOURCES = t-keydb-get-keyblock.c test-stubs.c \ + $(common_source) diff --git a/debian/patches/from-upstream/gpg-Move-NETLIBS-after-GPG_ERROR_LIBS.patch b/debian/patches/from-upstream/gpg-Move-NETLIBS-after-GPG_ERROR_LIBS.patch new file mode 100644 index 0000000..c4ad203 --- /dev/null +++ b/debian/patches/from-upstream/gpg-Move-NETLIBS-after-GPG_ERROR_LIBS.patch @@ -0,0 +1,58 @@ +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Tue, 18 Oct 2022 10:08:20 +0900 +Subject: gpg: Move NETLIBS after GPG_ERROR_LIBS. + +* g10/Makefile.am (LDADD): Remove NETLIBS. +(gpg_LDADD, gpgv_LDADD): Add NETLIBS after GPG_ERROR_LIBS. +(gpgcompose_LDADD, t_keydb_get_keyblock_LDADD): Likewise. +(t_stutter_LDADD): Likewise. + +-- + +GnuPG-bug-id: 6244 +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> +(cherry picked from commit b26bb03ed96f380ad603f7ad902862625233c931) +--- + g10/Makefile.am | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/g10/Makefile.am b/g10/Makefile.am +index f885673..d38e292 100644 +--- a/g10/Makefile.am ++++ b/g10/Makefile.am +@@ -180,18 +180,18 @@ gpgv_SOURCES = gpgv.c \ + # $(common_source) + + LDADD = $(needed_libs) ../common/libgpgrl.a \ +- $(ZLIBS) $(LIBINTL) $(CAPLIBS) $(NETLIBS) ++ $(ZLIBS) $(LIBINTL) $(CAPLIBS) + gpg_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(SQLITE3_LIBS) $(LIBREADLINE) \ +- $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ ++ $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \ + $(LIBICONV) $(gpg_robjs) $(extra_sys_libs) + gpg_LDFLAGS = $(extra_bin_ldflags) + gpgv_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \ +- $(GPG_ERROR_LIBS) \ ++ $(GPG_ERROR_LIBS) $(NETLIBS) \ + $(LIBICONV) $(gpgv_robjs) $(extra_sys_libs) + gpgv_LDFLAGS = $(extra_bin_ldflags) + + gpgcompose_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \ +- $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ ++ $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \ + $(LIBICONV) $(extra_sys_libs) + gpgcompose_LDFLAGS = $(extra_bin_ldflags) + +@@ -205,10 +205,10 @@ t_keydb_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ + t_keydb_get_keyblock_SOURCES = t-keydb-get-keyblock.c test-stubs.c \ + $(common_source) + t_keydb_get_keyblock_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ +- $(LIBICONV) $(t_common_ldadd) ++ $(NETLIBS) $(LIBICONV) $(t_common_ldadd) + t_stutter_SOURCES = t-stutter.c test-stubs.c \ + $(common_source) +-t_stutter_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ ++t_stutter_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \ + $(LIBICONV) $(t_common_ldadd) + + diff --git a/debian/patches/from-upstream/gpg-Report-an-error-for-receiving-key-from-agent.patch b/debian/patches/from-upstream/gpg-Report-an-error-for-receiving-key-from-agent.patch new file mode 100644 index 0000000..bf542d0 --- /dev/null +++ b/debian/patches/from-upstream/gpg-Report-an-error-for-receiving-key-from-agent.patch @@ -0,0 +1,27 @@ +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Thu, 26 Nov 2020 09:50:40 +0900 +Subject: gpg: Report an error for receiving key from agent. + +* g10/export.c (do_export_one_keyblock): Report an error. + +-- + +GnuPG-bug-id: 5151 +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> +(cherry picked from commit 6f0066db2c87e6362473d17c0621011ed1e1eae6) +--- + g10/export.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/g10/export.c b/g10/export.c +index e98af59..8e17df3 100644 +--- a/g10/export.c ++++ b/g10/export.c +@@ -1814,6 +1814,7 @@ do_export_one_keyblock (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid, + { + if (gpg_err_code (err) == GPG_ERR_FULLY_CANCELED) + goto leave; ++ write_status_error ("export_keys.secret", err); + skip_until_subkey = 1; + err = 0; + } |