[or-cvs] r20346: {website} Update debian.wml We now make people aware that using the pa (website/trunk/docs/en)

[sebastian at seul.org]

Author: sebastian
Date: 2009-08-20 13:06:13 -0400 (Thu, 20 Aug 2009)
New Revision: 20346

Modified:
   website/trunk/docs/en/debian.wml
Log:
Update debian.wml

We now make people aware that using the packages from Lenny might
give them outdated Tors, but it mentions that there are security backports.

Based on patch by rudi_s from #tor (thanks!)

Modified: website/trunk/docs/en/debian.wml
===================================================================
--- website/trunk/docs/en/debian.wml	2009-08-20 16:25:08 UTC (rev 20345)
+++ website/trunk/docs/en/debian.wml	2009-08-20 17:06:13 UTC (rev 20346)
@@ -20,6 +20,12 @@
 </p>
 
 <p>
+Note that this might not always give you the latest stable Tor version, but
+you will receive important security fixes. To make sure that you're running
+the latest stable version of Tor, see option two below.
+</p>
+
+<p>
 Now Tor is installed and running. Move on to <a href="<page
 docs/tor-doc-unix>#privoxy">step two</a> of the "Tor on Linux/Unix"
 instructions.
@@ -30,7 +36,7 @@
 <a id="ubuntu"></a>
 <a id="packages"></a>
 <h2><a class="anchor" href="#ubuntu">Option two: Tor on Ubuntu or
-Debian etch</a></h2>
+Debian</a></h2>
 <br />
 
 <p>
@@ -43,14 +49,14 @@
 You'll need to set up our package repository before you can fetch
 Tor. First, you need to figure out the name of your distribution. If
 you're using Ubuntu 9.04, it's "jaunty". Ubuntu 8.10 is "intrepid",
-and Ubuntu 8.04 is "hardy". If you're using Debian etch, it's "etch".
-Then add these lines to your <tt>/etc/apt/sources.list</tt> file:<br />
+and Ubuntu 8.04 is "hardy". If you're using Debian Etch, it's "etch", Debian
+Lenny is "lenny". Then add this line to your <tt>/etc/apt/sources.list</tt>
+file:<br />
 <pre>
 deb     http://mirror.noreply.org/pub/tor &lt;DISTRIBUTION&gt; main
-deb-src http://mirror.noreply.org/pub/tor &lt;DISTRIBUTION&gt; main
 </pre>
-where you substitute the above word (etch, jaunty, intrepid, hardy)
-in place of &lt;DISTRIBUTION&gt;.
+where you substitute the above word (etch, lenny, sid, jaunty, intrepid,
+hardy) in place of &lt;DISTRIBUTION&gt;.
 </p>
 
 <p>
@@ -82,9 +88,7 @@
 your <tt>/etc/apt/sources.list</tt> file:<br />
 <pre>
 deb     http://mirror.noreply.org/pub/tor &lt;DISTRIBUTION&gt; main
-deb-src http://mirror.noreply.org/pub/tor &lt;DISTRIBUTION&gt; main
-deb http://mirror.noreply.org/pub/tor experimental-0.2.1.x-&lt;DISTRIBUTION&gt; main
-deb-src http://mirror.noreply.org/pub/tor experimental-0.2.1.x-&lt;DISTRIBUTION&gt; main
+deb     http://mirror.noreply.org/pub/tor experimental-0.2.1.x-&lt;DISTRIBUTION&gt; main
 </pre>
 where you substitute the name of your distro (etch, lenny, sid, jaunty,
 intrepid, hardy) in place of &lt;DISTRIBUTION&gt;.
@@ -113,11 +117,42 @@
 <br />
 
 <p>
-If you want to build your own debs from source, see our <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorOnDebian#BuildFromSource">guide
-for building debs</a>.
+If you want to build your own debs from source you must first add an
+appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>.
+<pre>
+# For the stable version.
+deb-src http://mirror.noreply.org/pub/tor &lt;DISTRIBUTION&gt; main
+
+# For the unstable version.
+deb-src http://mirror.noreply.org/pub/tor &lt;DISTRIBUTION&gt; main
+deb-src http://mirror.noreply.org/pub/tor experimental-0.2.1.x-&lt;DISTRIBUTION&gt; main
+</pre>
+You also need to install the necessary packages to build your own debs and the
+packages needed to build Tor:
+<pre>
+apt-get install build-essential fakeroot devscripts
+apt-get build-dep tor
+</pre>
+Then you can build Tor in ~/debian-packages:
+<pre>
+mkdir ~/debian-packages; cd ~/debian-packages
+apt-get source tor
+cd tor-*
+debuild -rfakeroot -uc -us
+cd ..
+</pre>
+Now you can install the new package:
+<pre>
+sudo dpkg -i tor_*.deb
+</pre>
 </p>
 
+<p>
+Now Tor is installed and running. Move on to <a href="<page
+docs/tor-doc-unix>#privoxy">step two</a> of the "Tor on Linux/Unix"
+instructions.
+</p>
+
 <hr />
 
 <p>If you have suggestions for improving this document, please <a