Attachment 29825 Details for Bug 48697 – Patch for proj/en/keychain.xml

[patch] Patch for proj/en/keychain.xml

keychain.xml.patch (text/plain), 5.87 KB, created by Aron Griffis (RETIRED) on 2004-04-22 09:38:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aron Griffis (RETIRED)

Created: 2004-04-22 09:38:57 UTC

Size: 5.87 KB

patch

obsolete

>Index: keychain.xml
>===================================================================
>RCS file: /home/cvsroot/gentoo/xml/htdocs/proj/en/keychain.xml,v
>retrieving revision 1.10
>diff -u -b -B -r1.10 keychain.xml
>--- keychain.xml	26 Jan 2004 17:29:37 -0000	1.10
>+++ keychain.xml	22 Apr 2004 16:35:59 -0000
>@@ -6,16 +6,15 @@
> <guide type="project" link="/projects/keychain.html">
> <title>Keychain</title>
> <author title="Author"><mail link="drobbins@gentoo.org">Daniel Robbins</mail></author>
>-<author title="Maintainer"><mail link="pvdabeel@gentoo.org">Pieter van den Abele</mail></author>
>-<author title="RPM Maintainer"><mail link="rajiv@gentoo.org">Rajiv Manglani</mail></author>
>+<author title="Maintainer"><mail link="agriffis@gentoo.org">Aron Griffis</mail></author>
> 
> <abstract>
>-This page contains information about Keychain, an OpenSSH and commercial SSH2-compatible RSA/DSA key management
>-application.
>+This page contains information about Keychain, an OpenSSH and
>+commercial SSH2-compatible RSA/DSA key management application.
> </abstract>
> 
>-<version>2.1.1</version>
>-<date>7 Nov 2003</date>
>+<version>2.2.0</version>
>+<date>21 Apr 2004</date>
> 
> <chapter>
> <title>Keychain Intro</title>
>@@ -66,40 +65,29 @@
> <section>
> <title>Gentoo Linux</title>
> <body>
>-<p>To install <c>keychain</c> on Gentoo, just type <c>emerge keychain</c> as root. Then as a user, <c>keychain --help</c> for setup instructions.</p>
>+<p>To install <c>keychain</c> on Gentoo, just type <c>emerge keychain</c> as root. Finally, as a normal user, <c>keychain --help</c> for setup instructions.</p>
> </body>
> </section>
> 
> <section>
> <title>RedHat and other RPM-based distributions</title>
> <body>
>-<p>Download <uri link="http://dev.gentoo.org/~rajiv/keychain/keychain-2.0.2-1.noarch.rpm">keychain-2.0.2-1.noarch.rpm</uri>. After downloading, follow execute these commands (as root) to install the public GPG used to sign the RPM, then verify the RPM and install it:</p>
>+<p>Download the noarch.rpm from 
>+<uri link="http://dev.gentoo.org/~agriffis/keychain/">here</uri>. After
>+downloading, follow execute these commands (as root) to install the
>+public GPG used to sign the RPM, then verify the RPM and install it:
>+</p>
> 
> <pre caption="Keychain RPM installation">
>-gpg --keyserver pgp.mit.edu --recv-key 302A3876   <codenote>Installs the public key used to sign the RPM.</codenote>
>-rpm -K keychain-2.0.2-1.noarch.rpm                <codenote>Both md5 and gpg should be "OK".</codenote>
>-rpm -Uvh keychain-2.0.2-1.noarch.rpm              <codenote>Installs the RPM.</codenote>
>+gpg --keyserver pgp.mit.edu --recv-key 20104eb0   <codenote>Installs the public key used to sign the 2.2.0-1 rpm</codenote>
>+rpm -K keychain-2.2.0-1.noarch.rpm                <codenote>Both md5 and gpg should be "OK".</codenote>
>+rpm -Uvh keychain-2.2.0-1.noarch.rpm              <codenote>Installs the RPM.</codenote>
> </pre>
> 
>-<note>If your firewall blocks gpg connections to the keyserver, you can install the GPG key manually by running<br /><c>wget -O - http://dev.gentoo.org/~rajiv/rajivmanglani-pubkey.asc | gpg --import</c></note>
>-
>-<p>Then as a user, run <c>keychain --help</c> for setup instructions.</p>
>+<note>If your firewall blocks gpg connections to the keyserver, you can install the GPG key manually by running<br />
>+<c>wget -O - http://gentoo.org/~agriffis/gpg-pubkey-20104eb0.asc | gpg --import</c></note>
> 
>-<table>
>-	<tr>
>-		<th>File</th>
>-		<th>Description</th>
>-	</tr>
>-	<tr>
>-		<ti><uri link="http://dev.gentoo.org/~rajiv/keychain/keychain-2.0.2-1.noarch.rpm">keychain-2.0.2-1.noarch.rpm</uri></ti> <ti>Keychain RPM</ti>
>-	</tr>
>-	<tr>
>-		<ti><uri link="http://dev.gentoo.org/~rajiv/keychain/keychain-2.0.2-1.src.rpm">keychain-2.0.2-1.src.rpm</uri></ti> <ti>Keychain source RPM</ti>
>-	</tr>
>-	<tr>
>-		<ti><uri link="http://dev.gentoo.org/~rajiv/keychain/keychain-2.0.2-1.spec">keychain-2.0.2-1.spec</uri></ti> <ti>Keychain RPM spec file</ti>
>-	</tr>
>-</table>
>+<p>Finally, as a normal user, run <c>keychain --help</c> for setup instructions.</p>
> 
> </body>
> </section>
>@@ -108,10 +96,10 @@
> <title>Source</title>
> <body>
> <p>
>-The most recent release of <c>keychain</c> can be found at <uri link="http://gentoo.oregonstate.edu/distfiles/keychain-2.0.3.tar.bz2">keychain-2.0.3.tar.bz2</uri>.
>+The most recent release of <c>keychain</c> can be found at <uri link="http://gentoo.oregonstate.edu/distfiles/keychain-2.2.0.tar.bz2">keychain-2.2.0.tar.bz2</uri>.
> </p>
> <pre caption="md5sum">
>-1183410bac4a747cd9ae483a1f24b7c5  keychain-2.0.3.tar.bz2
>+423fc69592f048985d265b2ef927dce4  keychain-2.0.3.tar.bz2
> 5c26f5dce97818cacb4e183c2ea90f30  keychain-2.0.2-1.noarch.rpm
> </pre>
> </body>
>@@ -144,7 +132,28 @@
> <pre caption="ChangeLog for Keychain">
> # ChangeLog for Keychain; http://www.gentoo.org/projects/keychain
> # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL version 2
>-# Written by Daniel Robbins (drobbins@gentoo.org)
>+# Written by Daniel Robbins &lt;drobbins@gentoo.org&gt;
>+# Maintained by Aron Griffis &lt;agriffis@gentoo.org&gt;
>+
>+* keychain 2.2.0 (21 Apr 2004)
>+
>+  21 Apr 2004; Aron Griffis &lt;agriffis@gentoo.org&gt;;
>+  Rewrote most of the code, organized into functions, fixed speed
>+  issues involving ps, fixed compatibility issues for various UNIXes,
>+  hopefully didn't introduce too many bugs.  This version has a
>+  --quick option (for me) and a --timeout option (for carpaski).
>+
>+  Also added a Makefile and converted the man-page to pod for easier
>+  editing.  See perlpod(1) for information on the format.  Note that
>+  the pod is sucked into keychain and colorized when you run make.
>+
>+* keychain 2.0.3 (06 Apr 2003)
>+
>+  06 Apr 2003; Seth Chandler &lt;sethbc@gentoo.org&gt;; 
>+  Added keychain man page, fixed bugs with displaying colors for keychain 
>+  --help.  Also added a $grepopts to fix the grepping for a pid on cygwin
>+  Also added a TODO document
>+  color fix based on submission by Luke Holden &lt;email@alterself.org&gt;
> 
> * keychain 2.0.2 (26 aug 2002)
>

Actions: View | Diff

Attachments on bug 48697: 29825