This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit ab21c687d8a80fcb57f6fe20125f05688d6d38b9 Author: Daniel Kahn Gillmor <[email protected]> Date: Wed Nov 18 16:01:20 2015 -0500 debuild: pass through DBUS_SESSION_BUS_ADDRESS pinentry-gnome3 depends on D-Bus to get the prompt to display. But is in some cases, gpg-agent doesn't know which dbus session to tell the pinentry to talk to by default. GnuPG will tell gpg-agent which D-Bus session to use, but only if it has access to the DBUS_SESSION_BUS_ADDRESS environment variable. So debuild should avoid stripping that environment variable, in the same way that it doesn't strip GPG_TTY and GPG_AGENT_INFO, etc. Signed-off-by: James McCoy <[email protected]> --- debian/changelog | 5 +++++ scripts/debuild.1 | 2 +- scripts/debuild.pl | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8511743..61cbcb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -82,6 +82,11 @@ devscripts (2.15.10) UNRELEASED; urgency=medium * debuild: + Use _all as the .changes arch for -A builds. (Closes: #806262) + [ Daniel Kahn Gillmor ] + * debuild: + + pass through DBUS_SESSION_BUS_ADDRESS so that gpg-agent can make + pinentry-gnome3 work (Closes: #805501) + -- Osamu Aoki <[email protected]> Wed, 07 Oct 2015 21:46:20 +0900 devscripts (2.15.9) unstable; urgency=medium diff --git a/scripts/debuild.1 b/scripts/debuild.1 index 60f7431..da1566b 100644 --- a/scripts/debuild.1 +++ b/scripts/debuild.1 @@ -87,7 +87,7 @@ PACKAGE-version. As environment variables can affect the building of a package, often unintentionally, \fBdebuild\fR sanitises the environment by removing all environment variables except for \fBTERM\fR, \fBHOME\fR, \fBLOGNAME\fR, \fBGNUPGHOME\fR, -\fBPGPPATH\fR, \fBGPG_AGENT_INFO\fR, \fBFAKEROOTKEY\fR, \fBDEB_\fI*\fR, the +\fBPGPPATH\fR, \fBGPG_AGENT_INFO\fR, \fBDBUS_SESSION_BUS_ADDRESS\fR, \fBFAKEROOTKEY\fR, \fBDEB_\fI*\fR, the (\fBC\fR, \fBCPP\fR, \fBCXX\fR, \fBLD\fR and \fBF\fR)\fBFLAGS\fR variables and their \fB_APPEND\fR counterparts and the locale variables \fBLANG\fR and \fBLC_\fI*\fR. \fBTERM\fR is set to `dumb' if it is unset, and \fBPATH\fR is set to "/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11". diff --git a/scripts/debuild.pl b/scripts/debuild.pl index 7b1b9c0..5776198 100755 --- a/scripts/debuild.pl +++ b/scripts/debuild.pl @@ -397,7 +397,7 @@ foreach (@dpkg_extra_opts) { # Check @ARGV for debuild options. my @preserve_vars = qw(TERM HOME LOGNAME PGPPATH GNUPGHOME GPG_AGENT_INFO - GPG_TTY FAKEROOTKEY LANG DEBEMAIL); + DBUS_SESSION_BUS_ADDRESS GPG_TTY FAKEROOTKEY LANG DEBEMAIL); @save_vars{@preserve_vars} = (1) x scalar @preserve_vars; { no locale; @@ -607,7 +607,7 @@ $ENV{'TERM'}='dumb' unless exists $ENV{'TERM'}; # Store a few variables for safe keeping. my %store_vars; -foreach my $var (('DISPLAY', 'GNOME_KEYRING_SOCKET', 'GPG_AGENT_INFO', 'SSH_AUTH_SOCK', 'XAUTHORITY')) { +foreach my $var (('DBUS_SESSION_BUS_ADDRESS', 'DISPLAY', 'GNOME_KEYRING_SOCKET', 'GPG_AGENT_INFO', 'SSH_AUTH_SOCK', 'XAUTHORITY')) { $store_vars{$var} = $ENV{$var} if defined $ENV{$var}; } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
