| 1 |
swift 12/10/31 18:44:41 |
| 2 |
|
| 3 |
Modified: gnupg-user.xml |
| 4 |
Log: |
| 5 |
Fix bug #433792 - Update instructions for KDE4, with thanks to Chris Reffett for the patch |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.51 xml/htdocs/doc/en/gnupg-user.xml |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/gnupg-user.xml?rev=1.51&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/gnupg-user.xml?rev=1.51&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/gnupg-user.xml?r1=1.50&r2=1.51 |
| 13 |
|
| 14 |
Index: gnupg-user.xml |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/gnupg-user.xml,v |
| 17 |
retrieving revision 1.50 |
| 18 |
retrieving revision 1.51 |
| 19 |
diff -u -r1.50 -r1.51 |
| 20 |
--- gnupg-user.xml 9 Jul 2012 04:34:16 -0000 1.50 |
| 21 |
+++ gnupg-user.xml 31 Oct 2012 18:44:41 -0000 1.51 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
<?xml version='1.0' encoding="UTF-8"?> |
| 24 |
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> |
| 25 |
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/gnupg-user.xml,v 1.50 2012/07/09 04:34:16 nightmorph Exp $ --> |
| 26 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/gnupg-user.xml,v 1.51 2012/10/31 18:44:41 swift Exp $ --> |
| 27 |
|
| 28 |
<guide> |
| 29 |
<title>GnuPG Gentoo User Guide</title> |
| 30 |
@@ -24,8 +24,8 @@ |
| 31 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
| 32 |
<license/> |
| 33 |
|
| 34 |
-<version>2</version> |
| 35 |
-<date>2012-07-08</date> |
| 36 |
+<version>3</version> |
| 37 |
+<date>2012-10-31</date> |
| 38 |
|
| 39 |
<chapter> |
| 40 |
<title>Introduction</title> |
| 41 |
@@ -61,8 +61,7 @@ |
| 42 |
is probably a good idea. If you wish to have an email client capable of using |
| 43 |
gnupg you can use pine (<c>emerge pinepgp</c>), mutt (<c>emerge mutt</c>), |
| 44 |
Mozilla Thunderbird (<c>emerge thunderbird</c>), evolution (evolution is |
| 45 |
-a GNOME Microsoft Outlook work alike) and KDE's own KMail (KMail is part of the |
| 46 |
-kdepim package). |
| 47 |
+a GNOME Microsoft Outlook work alike) and KDE's own KMail. |
| 48 |
</p> |
| 49 |
|
| 50 |
<p> |
| 51 |
@@ -507,9 +506,9 @@ |
| 52 |
|
| 53 |
<p> |
| 54 |
If you use KDE as graphical environment, edit |
| 55 |
-<path>/usr/kde/3.x/env/agent-startup.sh</path> (system-wide) or |
| 56 |
-<path>~/.kde/env/gpgagent.sh</path> (local user) and add the following command |
| 57 |
-to it to have KDE automatically starting the GPG agent: |
| 58 |
+<path>/etc/kde/startup/agent-startup.sh</path> and uncomment the following |
| 59 |
+(system-wide) or <path>~/.kde4/env/gpg-agent.sh</path> (local user) and add |
| 60 |
+the following command to it to have KDE automatically starting the GPG agent: |
| 61 |
</p> |
| 62 |
|
| 63 |
<pre caption="Make KDE automatically start the GPG agent"> |
| 64 |
@@ -517,6 +516,18 @@ |
| 65 |
</pre> |
| 66 |
|
| 67 |
<p> |
| 68 |
+Additionally, uncomment the following in |
| 69 |
+<path>/etc/kde/shutdown/agent-shutdown.conf</path> (system-wide) or add it to |
| 70 |
+<path>~/.kde4/shutdown/gpg-agent.sh</path> (local user): |
| 71 |
+</p> |
| 72 |
+ |
| 73 |
+<pre caption="Make KDE shut down the GPG agent"> |
| 74 |
+if [ -n "${GPG_AGENT_INFO}" ]; then |
| 75 |
+ kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1 |
| 76 |
+fi |
| 77 |
+</pre> |
| 78 |
+ |
| 79 |
+<p> |
| 80 |
If you use a different graphical environment, put that line (the same one as |
| 81 |
mentioned above) in <path>~/.xinitrc</path> (if you use <c>startx</c>) or |
| 82 |
<path>~/.xsession</path> (if you use XDM/GDM/KDM/...). |
Archives