[tor-commits] r25784: {website} Updated RPM instructions for EL5 due to separate rpm signing (website/trunk/docs/en)

[Ondrej Mikle]

Author: hiviah
Date: 2012-09-07 13:13:16 +0000 (Fri, 07 Sep 2012)
New Revision: 25784

Modified:
   website/trunk/docs/en/rpms.wml
Log:
Updated RPM instructions for EL5 due to separate rpm signing key

Modified: website/trunk/docs/en/rpms.wml
===================================================================
--- website/trunk/docs/en/rpms.wml	2012-09-06 20:26:50 UTC (rev 25783)
+++ website/trunk/docs/en/rpms.wml	2012-09-07 13:13:16 UTC (rev 25784)
@@ -17,7 +17,7 @@
     
     <p><strong>Do not</strong> use the packages in the native repositories. They are
     frequently out of date. That means you'll be missing stability and
-    security fixes.
+    security fixes. Repositories contain i686 and x86_64 builds.
     </p>
     
     <p>
@@ -25,6 +25,12 @@
     Tor.  Assuming yum, in /etc/yum.repos.d/, create a file called
     torproject.repo.  Edit this file with the following information:
     </p>
+
+    <p>For Fedora 16, Fedora 17, RHEL 6 (and clones), use following repo file - 
+    substitute DISTRIBUTION with one of the following: fc/16, fc/17 or el/6
+    according to your distribution.
+    </p>
+    
 <pre>[tor-experimental]
 name=Tor experimental repo
 enabled=1
@@ -41,17 +47,36 @@
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
 </pre>
     <p>
-    If you wish to track the experimental releases of Tor, you should substitute
-    DISTRIBUTION with one of the following: el/5, el/6, fc/16 and fc/17
-    </p>
-
-    <p>
     The keys's fingerprint should be (for RPM-GPG-KEY-torproject.org.asc above,
     yum will ask about the fingerprint):
     </p>
 <pre>3B9E EEB9 7B1E 827B CF0A  0D96 8AF5 653C 5AC0 01F1</pre>
 
+    <p>Packages for RHEL 5 (and clones) are signed with different key due to
+    old rpm limitations, use this repo file:
+    </p>
+    
+<pre>[tor-experimental]
+name=Tor experimental repo
+enabled=1
+baseurl=http://deb.torproject.org/torproject.org/rpm/el/5/$basearch/
+gpgcheck=1
+gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.EL5.asc
+
+[tor-experimental-source]
+name=Tor experimental source repo
+enabled=1
+autorefresh=0
+baseurl=http://deb.torproject.org/torproject.org/rpm/el/5/SRPMS
+gpgcheck=1
+gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.EL5.asc
+</pre>
     <p>
+    Fingerprint of RPM-GPG-KEY-torproject.org.EL5.asc key above should be:
+    </p>
+<pre>9D27 0E2A 351C B4CB 6D95  78AF F8E7 95F8 B4D4 03EA</pre>
+
+    <p>
     Then install Tor by running:
     </p>
 <pre>yum install tor</pre>