Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: gnupg2

gnupg2 (2.2.20-1ubuntu2) hirsute; urgency=medium * d/p/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch: - Fix IPv6 connectivity for dirmngr (LP: #1910432) -- Heitor Alves de Siqueira <halves@canonical.com> Sat, 16 Jan 2021 14:53:14 +0000 gnupg2 (2.2.20-1ubuntu1) groovy; urgency=low * Merge from Debian unstable. Remaining changes: - Drop the gpgv-win32 test - Honor http_proxy= environment variables by default in the systemd user session dirmngr service. (debian/patches/dirmngr-honor-http-proxy.patch) - Export GPG_AGENT_INFO in the systemd-environment-generator too. - Don't declare diffutils as a test dependency, this package is essential so always installed; and the dependency declaration breaks cross-arch testing. -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 01 May 2020 14:58:28 -0700

Modifications :
  1. Download patch debian/systemd-environment-generator/90gpg-agent

    --- 2.2.20-1/debian/systemd-environment-generator/90gpg-agent 2020-03-23 19:04:11.000000000 +0000 +++ 2.2.20-1ubuntu2/debian/systemd-environment-generator/90gpg-agent 2021-01-16 14:53:14.000000000 +0000 @@ -7,6 +7,9 @@ # rufo <rufo@rufoa.com> # Daniel Kahn Gillmor <dkg@fifthhorseman.net> +agent_sock=$(gpgconf --list-dirs agent-socket) +export GPG_AGENT_INFO=${agent_sock}:0:1 + # See https://bugs.debian.org/855868 # see gpgconf(1): $5 is the "okay" field.
  2. Download patch debian/tests/control

    --- 2.2.20-1/debian/tests/control 2020-03-23 18:45:14.000000000 +0000 +++ 2.2.20-1ubuntu2/debian/tests/control 2021-01-16 14:53:14.000000000 +0000 @@ -1,11 +1,7 @@ -Tests: gpgv-win32 -Depends: gpgv-win32, gnupg2, gpgv2, wine32, diffutils -Restrictions: allow-stderr, skip-not-installable - Tests: simple-tests Depends: gnupg2, gpgv2 Restrictions: allow-stderr Tests: migration -Depends: gpg, gnupg1, gnupg-utils, debian-archive-keyring, diffutils +Depends: gpg, gnupg1, gnupg-utils, debian-archive-keyring Restrictions: allow-stderr
  3. Download patch debian/patches/dirmngr-honor-http-proxy.patch

    --- 2.2.20-1/debian/patches/dirmngr-honor-http-proxy.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.20-1ubuntu2/debian/patches/dirmngr-honor-http-proxy.patch 2021-01-16 14:53:14.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Honor http_proxy= environment variables by default + In the newly generated dirmngr.conf files only. Existing users behing + proxies should set honor-http-proxy in $GNUPGHOME/dirmngr.conf, + see /usr/share/gnupg/dirmngr-conf.skel. +Author: Dimitri John Ledkov <xnox@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1625848 + +Index: gnupg2-2.2.4/doc/examples/systemd-user/dirmngr.service +=================================================================== +--- gnupg2-2.2.4.orig/doc/examples/systemd-user/dirmngr.service ++++ gnupg2-2.2.4/doc/examples/systemd-user/dirmngr.service +@@ -4,5 +4,5 @@ Documentation=man:dirmngr(8) + Requires=dirmngr.socket + + [Service] +-ExecStart=/usr/bin/dirmngr --supervised ++ExecStart=/usr/bin/dirmngr --supervised --honor-http-proxy + ExecReload=/usr/bin/gpgconf --reload dirmngr
  4. Download patch debian/control

    --- 2.2.20-1/debian/control 2020-03-23 19:04:11.000000000 +0000 +++ 2.2.20-1ubuntu2/debian/control 2021-01-16 14:53:14.000000000 +0000 @@ -1,7 +1,8 @@ Source: gnupg2 Section: utils Priority: optional -Maintainer: Debian GnuPG Maintainers <pkg-gnupg-maint@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian GnuPG Maintainers <pkg-gnupg-maint@lists.alioth.debian.org> Uploaders: Eric Dorland <eric@debian.org>, Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
  5. Download patch debian/patches/series

    --- 2.2.20-1/debian/patches/series 2020-03-23 19:04:16.000000000 +0000 +++ 2.2.20-1ubuntu2/debian/patches/series 2021-01-16 14:53:14.000000000 +0000 @@ -19,3 +19,5 @@ dirmngr-Only-use-SKS-pool-CA-for-SKS-poo Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch Make-gpg-zip-use-tar-from-PATH.patch gpg-drop-import-clean-from-default-keyserver-import-optio.patch +dirmngr-honor-http-proxy.patch +dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch
  6. Download patch debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch

    --- 2.2.20-1/debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.20-1ubuntu2/debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch 2021-01-16 14:53:14.000000000 +0000 @@ -0,0 +1,38 @@ +From ca937cf390662b830d4fc5d295e69b24b1778050 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Mon, 13 Jul 2020 10:00:58 +0900 +Subject: [PATCH] dirmngr: Handle EAFNOSUPPORT at connect_server. + +* dirmngr/http.c (connect_server): Skip server with EAFNOSUPPORT. + +-- + +GnuPG-bug-id: 4977 +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> + +Origin: backport, https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=109d16e8f644 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1910432 +--- + dirmngr/http.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +Index: gnupg2/dirmngr/http.c +=================================================================== +--- gnupg2.orig/dirmngr/http.c ++++ gnupg2/dirmngr/http.c +@@ -3005,6 +3005,15 @@ connect_server (const char *server, unsi + sock = my_sock_new_for_addr (ai->addr, ai->socktype, ai->protocol); + if (sock == ASSUAN_INVALID_FD) + { ++ if (errno == EAFNOSUPPORT) ++ { ++ if (ai->family == AF_INET) ++ v4_valid = 0; ++ if (ai->family == AF_INET6) ++ v6_valid = 0; ++ continue; ++ } ++ + err = gpg_err_make (default_errsource, + gpg_err_code_from_syserror ()); + log_error ("error creating socket: %s\n", gpg_strerror (err));
  1. gnupg2