diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2012-05-09 19:47:41 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2012-05-09 19:47:41 +0000 |
| commit | 98b67bacb49bd90e57f53347b2fb8d678de510f4 (patch) | |
| tree | a3f6096e1a52e49149cd62d00f5f1f05613b3ab3 | |
| parent | - fixed the building on amd64 (diff) | |
Fix running/killing of gpg-agent. [1]
When csh is used as a shell, gpg-agent erroneously uses commands suitable
for that shell instead of the shell of the xinitrc script (sh).
Bump PORTREVISION
PR: ports/166803 [1]
Submitted by: Tijl Coosemans
Notes
Notes:
svn path=/head/; revision=296317
| -rw-r--r-- | sysutils/xfce4-utils/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/xfce4-utils/files/patch-scripts__xinitrc.in.in | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile index 91b73dfd67ca..e6b2471e24d6 100644 --- a/sysutils/xfce4-utils/Makefile +++ b/sysutils/xfce4-utils/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-utils PORTVERSION= 4.8.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/xfce-utils/${PORTVERSION:R} diff --git a/sysutils/xfce4-utils/files/patch-scripts__xinitrc.in.in b/sysutils/xfce4-utils/files/patch-scripts__xinitrc.in.in new file mode 100644 index 000000000000..55ef2b79f25e --- /dev/null +++ b/sysutils/xfce4-utils/files/patch-scripts__xinitrc.in.in @@ -0,0 +1,16 @@ +--- scripts/xinitrc.in.in.orig 2012-04-09 22:20:51.000000000 +0200 ++++ scripts/xinitrc.in.in 2012-04-09 22:21:29.000000000 +0200 +@@ -155,11 +155,11 @@ + case "$ssh_agent_type" in + gpg-agent) + if test -z "$SSH_AGENT_PID"; then +- eval `gpg-agent --daemon --enable-ssh-support --write-env-file $XDG_CACHE_HOME/gpg-agent-info` ++ eval `gpg-agent --sh --daemon --enable-ssh-support --write-env-file $XDG_CACHE_HOME/gpg-agent-info` + ssh_agent_kill_cmd="kill -INT $SSH_AGENT_PID; rm -f $XDG_CACHE_HOME/gpg-agent-info" + elif test -z "$GPG_AGENT_INFO"; then + echo "ssh-agent is already running; starting gpg-agent without ssh support" +- eval `gpg-agent --daemon --write-env-file $XDG_CACHE_HOME/gpg-agent-info` ++ eval `gpg-agent --sh --daemon --write-env-file $XDG_CACHE_HOME/gpg-agent-info` + ssh_agent_kill_cmd="pkill -INT ^gpg-agent\$; rm -f $XDG_CACHE_HOME/gpg-agent-info" + else + echo "gpg-agent is already running"
\ No newline at end of file |