diff -Nru gnupg2-2.1.15/debian/changelog gnupg2-2.1.15/debian/changelog --- gnupg2-2.1.15/debian/changelog 2016-09-17 12:02:46.000000000 +0000 +++ gnupg2-2.1.15/debian/changelog 2016-09-21 01:25:50.000000000 +0000 @@ -1,3 +1,12 @@ +gnupg2 (2.1.15-1ubuntu4) yakkety; urgency=medium + + * Honor http_proxy= environment variables by default, in the newly + generated dirmngr.conf files. Existing users behing proxies should set + honor-http-proxy in $GNUPGHOME/dirmngr.conf, see + /usr/share/gnupg/dirmngr-conf.skel. LP: #1625848 + + -- Dimitri John Ledkov Wed, 21 Sep 2016 02:23:54 +0100 + gnupg2 (2.1.15-1ubuntu3) yakkety; urgency=medium * No-change rebuild for readline soname change. diff -Nru gnupg2-2.1.15/debian/patches/dirmngr-honor-http-proxy.patch gnupg2-2.1.15/debian/patches/dirmngr-honor-http-proxy.patch --- gnupg2-2.1.15/debian/patches/dirmngr-honor-http-proxy.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnupg2-2.1.15/debian/patches/dirmngr-honor-http-proxy.patch 2016-09-21 01:28:33.000000000 +0000 @@ -0,0 +1,22 @@ +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 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1625848 + +--- a/g10/dirmngr-conf.skel ++++ b/g10/dirmngr-conf.skel +@@ -67,3 +67,12 @@ + # more root certificates. Tilde expansion is supported. + + #hkp-cacert /path/to/CA/sks-keyservers.netCA.pem ++ ++# --honor-http-proxy ++# ++# Upstream default is to ignore http_proxy= environment variable when ++# accessing the keyserver, unless this key is set. On Ubuntu, this ++# behaviour is enabled by default and http_proxy environment variable ++# is honored. ++ ++honor-http-proxy diff -Nru gnupg2-2.1.15/debian/patches/series gnupg2-2.1.15/debian/patches/series --- gnupg2-2.1.15/debian/patches/series 2016-08-30 17:19:23.000000000 +0000 +++ gnupg2-2.1.15/debian/patches/series 2016-09-21 01:26:33.000000000 +0000 @@ -2,3 +2,4 @@ 0002-Avoid-simple-memory-dumps-via-ptrace.patch 0003-avoid-regenerating-defsincdate-use-shipped-file.patch 0004-spelling-s-achived-achieved-and-s-alternativly-alter.patch +dirmngr-honor-http-proxy.patch