← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnupg2/oneiric-updates

« back to all changes in this revision

Viewing changes to debian/gnupg-agent.xsession

  • Committer: Bazaar Package Importer
  • Author(s): Thomas Viehmann
  • Date: 2008-10-04 10:25:53 UTC
  • mfrom: (5.1.15 intrepid)
  • Revision ID: james.westby@ubuntu.com-20081004102553-fv62pp8dsitxli47
Tags: 2.0.9-3.1
http://bugs.debian.org/499569
* Non-maintainer upload.
* agent/gpg-agent.c: Deinit the threading library before exec'ing
  the command to run in --daemon mode. And because that still doesn't
  restore the sigprocmask, do that manually. Closes: #499569

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/gnupg-agent.xsession
3
3
GPGAGENT=/usr/bin/gpg-agent
4
4
PID_FILE="$GNUPGHOME/gpg-agent-info-$(hostname)"
5
5
 
6
 
if grep -qs '^use-agent' "$GNUPGHOME/gpg.conf" "$GNUPGHOME/options" &&
 
6
if grep -qs '^[[:space:]]*use-agent' "$GNUPGHOME/gpg.conf" "$GNUPGHOME/options" &&
7
7
   test -x $GPGAGENT &&
8
8
   { test -z "$GPG_AGENT_INFO" || ! $GPGAGENT 2>/dev/null; }; then
9
9
 
14
14
   # Invoking gpg-agent with no arguments exits successfully if the agent
15
15
   # is already running as pointed by $GPG_AGENT_INFO
16
16
   if ! $GPGAGENT 2>/dev/null; then
17
 
       $GPGAGENT --daemon --sh >"$PID_FILE"
18
 
       . "$PID_FILE"
 
17
       STARTUP="$GPGAGENT --daemon --sh --write-env-file=$PID_FILE $STARTUP"
19
18
   fi
20
19
fi