Direct RPM users to Fedora/EPEL packages
Ondrej Mikle

Ondrej Mikle commited on 2016-07-05 22:09:31
Zeige 1 geänderte Dateien mit 3 Einfügungen und 97 Löschungen.

... ...
@@ -15,106 +15,12 @@
15 15
     linux distributions.</a></h2>
16 16
     <br>
17 17
     
18
-    <p><strong>Do not</strong> use the packages in the native repositories. They are
19
-    frequently out of date. That means you'll be missing stability and
20
-    security fixes.
21
-    </p>
22
-    
23
-    <p>
24
-    You'll need to set up our package repository before you can fetch
25
-    Tor. Repositories contain i686 and x86_64 builds. Assuming yum, in
26
-    /etc/yum.repos.d/, create a file called
27
-    torproject.repo.  Edit this file with the following information:
28
-    </p>
29
-
30
-    <h3>Fedora 22/23 and EL6/7 packages</h3>
31
-
32
-    <p>For Fedora 22, Fedora 23, RHEL 6, RHEL 7 (and clones), use following
33
-    repo file - substitute DISTRIBUTION with one of the following: fc/22, fc/23,
34
-    el/6, el/7 according to your distribution.
35
-    </p>
36
-    
37
-<pre>[tor]
38
-name=Tor repo
39
-enabled=1
40
-baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/
41
-gpgcheck=1
42
-gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
43
-repo_gpgcheck=1
44
-
45
-[tor-source]
46
-name=Tor source repo
47
-enabled=1
48
-autorefresh=0
49
-baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS
50
-gpgcheck=1
51
-gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
52
-repo_gpgcheck=1
53
-</pre>
54
-    <p>
55
-    The key's fingerprint should be:
56
-    </p>
57
-<pre>E273 44C4 BD24 BEDF E4F4  C741 803F EFB7 F4B8 5E0F</pre>
58
-
59
-    <h3>Name clash warning</h3>
60
-
61
-    <p>There is identically named 'tor' package in the EPEL and Fedora
62
-    repositories. Due to this unfortunate name clash, the packages might
63
-    "update over one another", depending on patchversion.  Solution is to use
64
-    <tt>Exclude=tor</tt> line in the relevant <tt>/etc/yum.repos.d/</tt>
65
-    file.
66
-    </p> 
67
-    
68
-    <p>E.g. you may exclude EPEL's Tor package by putting the mentioned exclude
69
-    line under [epel] section in <tt>/etc/yum.repos.d/epel.repo</tt>.
70
-    For Fedora, you usually need that exclude in fedora.repo and
71
-    fedora-updates.repo file.
72
-    </p>
73
-    
74
-    <h3>Package installation and running</h3>
18
+    <h3>Fedora, RHEL, CentOS, Scientific Linux packages</h3>
75 19
 
76
-    <p>
77
-    Once you have the repo file, install Tor using (yum will ask about the
78
-    key's fingerprint the first time):
79
-    </p>
80
-<pre>yum install tor</pre>
81
-    
82
-    <p>
83
-    Start Tor using:
84
-    </p>
85
-<pre>service tor start</pre>
86
-    
87
-    <p>
88
-    Now Tor is installed and running. Move on to <a href="<page
89
-    docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix"
90
-    instructions.
91
-    </p>
92
-    
93
-    <p style="font-size: small">
94
-    The DNS name <code>deb.torproject.org</code> is actually a set of independent
95
-    servers in a DNS round-robin configuration.  If for some reason you cannot
96
-    use it, you might be able to access one of the individual servers
97
-    instead.  Try
98
-    <code>deb-master.torproject.org</code>,
99
-    <code>mirror.netcologne.de</code> or
100
-    <code>tor.mirror.youam.de</code>.
20
+    <p>Use native Fedora packages for Fedora distribution or <a href="https://fedoraproject.org/wiki/EPEL">EPEL</a> 
21
+    packages for distribitons derived from RHEL.
101 22
     </p>
102 23
 
103
-    <hr>
104
-    
105
-    <hr>
106
-    
107
-    <h2>Alpha/development packages</a></h2>
108
-    <br>
109
-    
110
-    <p>
111
-    There is a repository that contains packages for latest alpha branch of Tor.
112
-    If you'd like to experiment with them, use one of the above repo files, just
113
-    change the baseurl to (similarly to previous section, substitute
114
-    DISTRIBUTION based on your distribution; for source rpms use "SRPMS" instead
115
-    of $basearch):
116
-    </p>
117
-<pre>baseurl=https://deb.torproject.org/torproject.org/rpm/tor-testing/DISTRIBUTION/$basearch/</pre>
118 24
     
119 25
     <a id="source"></a>
120 26
     <h2><a class="anchor" href="#source">Building from source</a></h2>
121 27