... | ... |
@@ -221,7 +221,7 @@ sid, xenial, ...) in place of |
221 | 221 |
<p> |
222 | 222 |
Then run the following commands at your command prompt: |
223 | 223 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
224 |
-gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 |
|
224 |
+gpg --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 |
|
225 | 225 |
gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - |
226 | 226 |
apt update |
227 | 227 |
apt install tor deb.torproject.org-keyring |
... | ... |
@@ -78,6 +78,7 @@ I run |
78 | 78 |
<option value="trusty">Ubuntu Trusty Tahr (14.04 LTS)</option> |
79 | 79 |
<option value="xenial">Ubuntu Xenial Xerus (16.04 LTS)</option> |
80 | 80 |
<option value="artful">Ubuntu Artful Aardvark (17.10)</option> |
81 |
+<option value="bionic">Ubuntu Bionic Beaver (18.04 LTS)</option> |
|
81 | 82 |
</select> |
82 | 83 |
and want |
83 | 84 |
<select id="package"></select> |
... | ... |
@@ -136,7 +136,7 @@ Then add this line to your |
136 | 136 |
<tt>/etc/apt/sources.list</tt> |
137 | 137 |
file:<br /> |
138 | 138 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
139 |
-deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
|
139 |
+deb https://deb.torproject.org/torproject.org <DISTRIBUTION> main |
|
140 | 140 |
</pre> |
141 | 141 |
where you put the codename of your distribution (i.e. stretch, buster, sid |
142 | 142 |
or whatever it is) |
... | ... |
@@ -209,8 +209,8 @@ download/download-unix>#packagediff">development branch</a> of Tor instead |
209 | 209 |
(more features and more bugs), you need to add a different set of lines |
210 | 210 |
to your <tt>/etc/apt/sources.list</tt> file:<br /> |
211 | 211 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
212 |
-deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
|
213 |
-deb http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main |
|
212 |
+deb https://deb.torproject.org/torproject.org <DISTRIBUTION> main |
|
213 |
+deb https://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main |
|
214 | 214 |
</pre> |
215 | 215 |
where you again substitute the name of your distro (stretch, buster, |
216 | 216 |
sid, xenial, ...) in place of |
... | ... |
@@ -244,11 +244,11 @@ If you want to build your own debs from source you must first add an |
244 | 244 |
appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>. |
245 | 245 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
246 | 246 |
# For the stable version. |
247 |
-deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
|
247 |
+deb-src https://deb.torproject.org/torproject.org <DISTRIBUTION> main |
|
248 | 248 |
|
249 | 249 |
# For the unstable version. |
250 |
-deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
|
251 |
-deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main |
|
250 |
+deb-src https://deb.torproject.org/torproject.org <DISTRIBUTION> main |
|
251 |
+deb-src https://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main |
|
252 | 252 |
</pre> |
253 | 253 |
Substitute the name of your distro (stretch, buster, sid, xenial, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root): |
254 | 254 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
... | ... |
@@ -191,10 +191,10 @@ access it you might try to use the name of one of its part instead. Try |
191 | 191 |
<code>tor.mirror.youam.de</code>. |
192 | 192 |
</p> |
193 | 193 |
|
194 |
-<p><code>deb.torproject.org</code> is also served through now also served via THS: |
|
195 |
-<a href="http://sdscoq7snqtznauu.onion">​http://sdscoq7snqtznauu.onion/</a>. |
|
194 |
+<p><code>deb.torproject.org</code> is also served through now also served via onion service: |
|
195 |
+<a href="http://sdscoq7snqtznauu.onion">http://sdscoq7snqtznauu.onion/</a>. |
|
196 | 196 |
<br /> |
197 |
-See ​<a href="https://onion.torproject.org/">https://onion.torproject.org</a> for all |
|
197 |
+See <a href="https://onion.torproject.org/">https://onion.torproject.org</a> for all |
|
198 | 198 |
torproject.org onion addresses.</p> |
199 | 199 |
|
200 | 200 |
<hr /> |
... | ... |
@@ -191,6 +191,12 @@ access it you might try to use the name of one of its part instead. Try |
191 | 191 |
<code>tor.mirror.youam.de</code>. |
192 | 192 |
</p> |
193 | 193 |
|
194 |
+<p><code>deb.torproject.org</code> is also served through now also served via THS: |
|
195 |
+<a href="http://sdscoq7snqtznauu.onion">​http://sdscoq7snqtznauu.onion/</a>. |
|
196 |
+<br /> |
|
197 |
+See ​<a href="https://onion.torproject.org/">https://onion.torproject.org</a> for all |
|
198 |
+torproject.org onion addresses.</p> |
|
199 |
+ |
|
194 | 200 |
<hr /> |
195 | 201 |
|
196 | 202 |
<a id="development"></a> |
... | ... |
@@ -25,10 +25,10 @@ If you're using Debian, just run |
25 | 25 |
as root. |
26 | 26 |
</p> |
27 | 27 |
|
28 |
-<p> |
|
29 |
-Note that this might not always give you the latest stable Tor version, but |
|
30 |
-you will receive important security fixes. To make sure that you're running |
|
31 |
-the latest stable version of Tor, see option two below. |
|
28 |
+<p>Debian provides the <a href="https://packages.debian.org/stretch/tor">LTS</a> |
|
29 |
+version of Tor. Note that this might not always give you the latest stable |
|
30 |
+Tor version, but you will receive important security fixes. To make sure |
|
31 |
+that you're running the latest stable version of Tor, see option two below. |
|
32 | 32 |
</p> |
33 | 33 |
|
34 | 34 |
<p> |
... | ... |
@@ -52,8 +52,8 @@ and security fixes. |
52 | 52 |
</p> |
53 | 53 |
|
54 | 54 |
<p> |
55 |
-<b>Raspbian is not Debian.</b> These packages will be confusingly broken |
|
56 |
-for Raspbian users, since Raspbian called their architecture armhf but |
|
55 |
+<b>Raspbian is not Debian.</b> Tor might run fine on the Raspberry Pi 2 / 3 but not the first generation Pi. |
|
56 |
+These packages might be confusingly broken for Raspbian users, since Raspbian called their architecture armhf but |
|
57 | 57 |
Debian already has an armhf. See <a |
58 | 58 |
href="http://tor.stackexchange.com/questions/242/how-to-run-tor-on-raspbian-on-the-raspberry-pi">this |
59 | 59 |
post</a> for details. |
... | ... |
@@ -89,7 +89,7 @@ version |
89 | 89 |
<div id="apt-source"> |
90 | 90 |
<p>You need to add the following entry in <code>/etc/apt/sources.list</code> or a new file in <code>/etc/apt/sources.list.d/</code>:</p> |
91 | 91 |
|
92 |
-<blockquote><pre id="sources">deb https://deb.torproject.org/torproject.org stretch main |
|
92 |
+<blockquote><pre id="sources">deb https://deb.torproject.org/torproject.org jessie main |
|
93 | 93 |
</pre></blockquote> |
94 | 94 |
</div> |
95 | 95 |
|
... | ... |
@@ -93,7 +93,7 @@ version |
93 | 93 |
</pre></blockquote> |
94 | 94 |
</div> |
95 | 95 |
|
96 |
-<p>Please not that the <a href="https://packages.debian.org/stretch/apt-transport-https">apt-transport-https package</a> is required to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure).</p> |
|
96 |
+<p>Please note that the <a href="https://packages.debian.org/stretch/apt-transport-https">apt-transport-https package</a> is required to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure).</p> |
|
97 | 97 |
|
98 | 98 |
<div id="sig"> |
99 | 99 |
<p>Then add the gpg key used to sign the packages by running the following commands at your command prompt:</p> |
... | ... |
@@ -63,7 +63,7 @@ post</a> for details. |
63 | 63 |
You'll need to set up our package repository before you can fetch |
64 | 64 |
Tor. First, you need to figure out the name of your distribution. A |
65 | 65 |
quick command to run is <tt>lsb_release -c</tt> or <tt>cat /etc/debian_version</tt>. |
66 |
-If in doubt about your Debian version, check <a href="http://www.debian.org/releases/">the Debian website</a>. |
|
66 |
+If in doubt about your Debian version, check <a href="https://www.debian.org/releases/">the Debian website</a>. |
|
67 | 67 |
For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#Table_of_versions">Wikipedia</a>. |
68 | 68 |
</p> |
69 | 69 |
|
... | ... |
@@ -89,10 +89,12 @@ version |
89 | 89 |
<div id="apt-source"> |
90 | 90 |
<p>You need to add the following entry in <code>/etc/apt/sources.list</code> or a new file in <code>/etc/apt/sources.list.d/</code>:</p> |
91 | 91 |
|
92 |
-<blockquote><pre id="sources">deb http://deb.torproject.org/torproject.org jessie main |
|
92 |
+<blockquote><pre id="sources">deb https://deb.torproject.org/torproject.org stretch main |
|
93 | 93 |
</pre></blockquote> |
94 | 94 |
</div> |
95 | 95 |
|
96 |
+<p>Please not that the <a href="https://packages.debian.org/stretch/apt-transport-https">apt-transport-https package</a> is required to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure).</p> |
|
97 |
+ |
|
96 | 98 |
<div id="sig"> |
97 | 99 |
<p>Then add the gpg key used to sign the packages by running the following commands at your command prompt:</p> |
98 | 100 |
<blockquote><pre> |
... | ... |
@@ -136,8 +136,8 @@ file:<br /> |
136 | 136 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
137 | 137 |
deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
138 | 138 |
</pre> |
139 |
-where you put the codename of your distribution (i.e. lenny, sid, |
|
140 |
-saucy or whatever it is) |
|
139 |
+where you put the codename of your distribution (i.e. stretch, buster, sid |
|
140 |
+or whatever it is) |
|
141 | 141 |
in place of <DISTRIBUTION>. |
142 | 142 |
</p> |
143 | 143 |
|
... | ... |
@@ -204,8 +204,8 @@ to your <tt>/etc/apt/sources.list</tt> file:<br /> |
204 | 204 |
deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
205 | 205 |
deb http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main |
206 | 206 |
</pre> |
207 |
-where you again substitute the name of your distro (lenny, |
|
208 |
-sid, saucy, ...) in place of |
|
207 |
+where you again substitute the name of your distro (stretch, buster, |
|
208 |
+sid, xenial, ...) in place of |
|
209 | 209 |
<DISTRIBUTION>. |
210 | 210 |
</p> |
211 | 211 |
|
... | ... |
@@ -242,7 +242,7 @@ deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
242 | 242 |
deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
243 | 243 |
deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main |
244 | 244 |
</pre> |
245 |
-Substitute the name of your distro (strech, buster, sid, xenial, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root): |
|
245 |
+Substitute the name of your distro (stretch, buster, sid, xenial, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root): |
|
246 | 246 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
247 | 247 |
apt update |
248 | 248 |
</pre> |
... | ... |
@@ -75,8 +75,9 @@ I run |
75 | 75 |
<option value="stretch" selected="selected">Debian stable (stretch)</option> |
76 | 76 |
<option value="buster">Debian testing (buster)</option> |
77 | 77 |
<option value="sid">Debian unstable (sid)</option> |
78 |
-<option value="trusty">Ubuntu Trusty Tahr</option> |
|
79 |
-<option value="xenial">Ubuntu Xenial Xerus</option> |
|
78 |
+<option value="trusty">Ubuntu Trusty Tahr (14.04 LTS)</option> |
|
79 |
+<option value="xenial">Ubuntu Xenial Xerus (16.04 LTS)</option> |
|
80 |
+<option value="artful">Ubuntu Artful Aardvark (17.10)</option> |
|
80 | 81 |
</select> |
81 | 82 |
and want |
82 | 83 |
<select id="package"></select> |
... | ... |
@@ -77,7 +77,6 @@ I run |
77 | 77 |
<option value="sid">Debian unstable (sid)</option> |
78 | 78 |
<option value="trusty">Ubuntu Trusty Tahr</option> |
79 | 79 |
<option value="xenial">Ubuntu Xenial Xerus</option> |
80 |
-<option value="zesty">Ubuntu Zesty Zapus</option> |
|
81 | 80 |
</select> |
82 | 81 |
and want |
83 | 82 |
<select id="package"></select> |
... | ... |
@@ -197,7 +197,7 @@ development branch of Tor on Debian or Ubuntu</a></h2> |
197 | 197 |
<br /> |
198 | 198 |
|
199 | 199 |
<p>If you want to use the <a href="<page |
200 |
-download/download>#packagediff">development branch</a> of Tor instead |
|
200 |
+download/download-unix>#packagediff">development branch</a> of Tor instead |
|
201 | 201 |
(more features and more bugs), you need to add a different set of lines |
202 | 202 |
to your <tt>/etc/apt/sources.list</tt> file:<br /> |
203 | 203 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
... | ... |
@@ -202,7 +202,7 @@ download/download>#packagediff">development branch</a> of Tor instead |
202 | 202 |
to your <tt>/etc/apt/sources.list</tt> file:<br /> |
203 | 203 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
204 | 204 |
deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
205 |
-deb http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-<DISTRIBUTION> main |
|
205 |
+deb http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main |
|
206 | 206 |
</pre> |
207 | 207 |
where you again substitute the name of your distro (lenny, |
208 | 208 |
sid, saucy, ...) in place of |
... | ... |
@@ -240,9 +240,9 @@ deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
240 | 240 |
|
241 | 241 |
# For the unstable version. |
242 | 242 |
deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
243 |
-deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-<DISTRIBUTION> main |
|
243 |
+deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main |
|
244 | 244 |
</pre> |
245 |
-Substitute the name of your distro (wheezy, sid, trusty, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root): |
|
245 |
+Substitute the name of your distro (strech, buster, sid, xenial, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root): |
|
246 | 246 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
247 | 247 |
apt update |
248 | 248 |
</pre> |
... | ... |
@@ -73,7 +73,7 @@ I run |
73 | 73 |
<select id="distrib"> |
74 | 74 |
<option value="jessie">Debian oldstable (jessie)</option> |
75 | 75 |
<option value="stretch" selected="selected">Debian stable (stretch)</option> |
76 |
-<option value="testing">Debian testing (buster)</option> |
|
76 |
+<option value="buster">Debian testing (buster)</option> |
|
77 | 77 |
<option value="sid">Debian unstable (sid)</option> |
78 | 78 |
<option value="trusty">Ubuntu Trusty Tahr</option> |
79 | 79 |
<option value="xenial">Ubuntu Xenial Xerus</option> |
... | ... |
@@ -75,9 +75,9 @@ I run |
75 | 75 |
<option value="stretch" selected="selected">Debian stable (stretch)</option> |
76 | 76 |
<option value="testing">Debian testing (buster)</option> |
77 | 77 |
<option value="sid">Debian unstable (sid)</option> |
78 |
-<option value="precise">Ubuntu Precise Pangolin</option> |
|
79 | 78 |
<option value="trusty">Ubuntu Trusty Tahr</option> |
80 | 79 |
<option value="xenial">Ubuntu Xenial Xerus</option> |
80 |
+<option value="zesty">Ubuntu Zesty Zapus</option> |
|
81 | 81 |
</select> |
82 | 82 |
and want |
83 | 83 |
<select id="package"></select> |
Signed-off-by: hiromipaw <hiro@torproject.org>
... | ... |
@@ -21,7 +21,7 @@ Debian Buster - testing, or Debian Sid - unstable</a></h2> |
21 | 21 |
|
22 | 22 |
<p> |
23 | 23 |
If you're using Debian, just run |
24 |
-</blockquote><pre> apt-get install tor </pre></blockquote> |
|
24 |
+</blockquote><pre> apt install tor </pre></blockquote> |
|
25 | 25 |
as root. |
26 | 26 |
</p> |
27 | 27 |
|
... | ... |
@@ -104,10 +104,10 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - |
104 | 104 |
|
105 | 105 |
<div id="apt-get"> |
106 | 106 |
<p>You can install it with the following commands:</p> |
107 |
-<blockquote><pre>$ apt-get update |
|
108 |
-<span id="regular-install">$ apt-get install <span id="apt-package">tor</span> deb.torproject.org-keyring</span> |
|
109 |
-<span id="source-install">$ apt-get install build-essential fakeroot devscripts |
|
110 |
-$ apt-get build-dep tor deb.torproject.org-keyring</span></pre></blockquote> |
|
107 |
+<blockquote><pre>$ apt update |
|
108 |
+<span id="regular-install">$ apt install <span id="apt-package">tor</span> deb.torproject.org-keyring</span> |
|
109 |
+<span id="source-install">$ apt install build-essential fakeroot devscripts |
|
110 |
+$ apt build-dep tor deb.torproject.org-keyring</span></pre></blockquote> |
|
111 | 111 |
|
112 | 112 |
<div id="source-install2"> |
113 | 113 |
<p> |
... | ... |
@@ -115,7 +115,7 @@ Then you can build Tor in ~/debian-packages: |
115 | 115 |
</p> |
116 | 116 |
<blockquote><pre> |
117 | 117 |
$ mkdir ~/debian-packages; cd ~/debian-packages |
118 |
-$ apt-get source tor |
|
118 |
+$ apt source tor |
|
119 | 119 |
$ cd tor-* |
120 | 120 |
$ debuild -rfakeroot -uc -us |
121 | 121 |
$ cd .. |
... | ... |
@@ -151,7 +151,7 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - |
151 | 151 |
Now refresh your sources, running the following command (as root) at your |
152 | 152 |
command prompt: |
153 | 153 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
154 |
-apt-get update |
|
154 |
+apt update |
|
155 | 155 |
</pre> |
156 | 156 |
If there are no errors you're good to continue. |
157 | 157 |
</p> |
... | ... |
@@ -160,14 +160,14 @@ If there are no errors you're good to continue. |
160 | 160 |
We provide a Debian package to help you keep our signing key current. It is |
161 | 161 |
recommended you use it. Install it using |
162 | 162 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
163 |
-apt-get install deb.torproject.org-keyring |
|
163 |
+apt install deb.torproject.org-keyring |
|
164 | 164 |
</pre> |
165 | 165 |
</p> |
166 | 166 |
|
167 | 167 |
<p> |
168 | 168 |
To finally install Tor just run: |
169 | 169 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
170 |
-apt-get install tor |
|
170 |
+apt install tor |
|
171 | 171 |
</pre> |
172 | 172 |
</p> |
173 | 173 |
|
... | ... |
@@ -214,8 +214,8 @@ Then run the following commands at your command prompt: |
214 | 214 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
215 | 215 |
gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 |
216 | 216 |
gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - |
217 |
-apt-get update |
|
218 |
-apt-get install tor deb.torproject.org-keyring |
|
217 |
+apt update |
|
218 |
+apt install tor deb.torproject.org-keyring |
|
219 | 219 |
</pre> |
220 | 220 |
</p> |
221 | 221 |
|
... | ... |
@@ -244,18 +244,18 @@ deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-<DI |
244 | 244 |
</pre> |
245 | 245 |
Substitute the name of your distro (wheezy, sid, trusty, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root): |
246 | 246 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
247 |
-apt-get update |
|
247 |
+apt update |
|
248 | 248 |
</pre> |
249 | 249 |
You also need to install the necessary packages to build your own debs and the |
250 | 250 |
packages needed to build Tor: |
251 | 251 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
252 |
-apt-get install build-essential fakeroot devscripts |
|
253 |
-apt-get build-dep tor |
|
252 |
+apt install build-essential fakeroot devscripts |
|
253 |
+apt build-dep tor |
|
254 | 254 |
</pre> |
255 | 255 |
Then you can build Tor in ~/debian-packages: |
256 | 256 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
257 | 257 |
mkdir ~/debian-packages; cd ~/debian-packages |
258 |
-apt-get source tor |
|
258 |
+apt source tor |
|
259 | 259 |
cd tor-* |
260 | 260 |
debuild -rfakeroot -uc -us |
261 | 261 |
cd .. |
... | ... |
@@ -71,9 +71,9 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T |
71 | 71 |
<blockquote> |
72 | 72 |
I run |
73 | 73 |
<select id="distrib"> |
74 |
-<option value="wheezy">Debian oldstable (jessie)</option> |
|
75 |
-<option value="jessie" selected="selected">Debian stable (stretch)</option> |
|
76 |
-<option value="stretch">Debian testing (buster)</option> |
|
74 |
+<option value="jessie">Debian oldstable (jessie)</option> |
|
75 |
+<option value="stretch" selected="selected">Debian stable (stretch)</option> |
|
76 |
+<option value="testing">Debian testing (buster)</option> |
|
77 | 77 |
<option value="sid">Debian unstable (sid)</option> |
78 | 78 |
<option value="precise">Ubuntu Precise Pangolin</option> |
79 | 79 |
<option value="trusty">Ubuntu Trusty Tahr</option> |
... | ... |
@@ -89,7 +89,7 @@ version |
89 | 89 |
<div id="apt-source"> |
90 | 90 |
<p>You need to add the following entry in <code>/etc/apt/sources.list</code> or a new file in <code>/etc/apt/sources.list.d/</code>:</p> |
91 | 91 |
|
92 |
-<blockquote><pre id="sources">deb http://deb.torproject.org/torproject.org wheezy main |
|
92 |
+<blockquote><pre id="sources">deb http://deb.torproject.org/torproject.org jessie main |
|
93 | 93 |
</pre></blockquote> |
94 | 94 |
</div> |
95 | 95 |
|
... | ... |
@@ -71,9 +71,9 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T |
71 | 71 |
<blockquote> |
72 | 72 |
I run |
73 | 73 |
<select id="distrib"> |
74 |
-<option value="wheezy">Debian oldstable (wheezy)</option> |
|
75 |
-<option value="jessie" selected="selected">Debian stable (jessie)</option> |
|
76 |
-<option value="stretch">Debian testing (stretch)</option> |
|
74 |
+<option value="wheezy">Debian oldstable (jessie)</option> |
|
75 |
+<option value="jessie" selected="selected">Debian stable (stretch)</option> |
|
76 |
+<option value="stretch">Debian testing (buster)</option> |
|
77 | 77 |
<option value="sid">Debian unstable (sid)</option> |
78 | 78 |
<option value="precise">Ubuntu Precise Pangolin</option> |
79 | 79 |
<option value="trusty">Ubuntu Trusty Tahr</option> |
... | ... |
@@ -15,8 +15,8 @@ |
15 | 15 |
</div> |
16 | 16 |
<div id="maincol"> |
17 | 17 |
<a id="debian"></a> |
18 |
-<h2><a class="anchor" href="#debian">Option one: Tor on Debian stable, |
|
19 |
-Debian sid, or Debian testing</a></h2> |
|
18 |
+<h2><a class="anchor" href="#debian">Option one: Tor on Debian Stretch - stable, |
|
19 |
+Debian Buster - testing, or Debian Sid - unstable</a></h2> |
|
20 | 20 |
<br /> |
21 | 21 |
|
22 | 22 |
<p> |
... | ... |
@@ -246,7 +246,7 @@ Substitute the name of your distro (wheezy, sid, trusty, ...) in place of <DI |
246 | 246 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
247 | 247 |
apt-get update |
248 | 248 |
</pre> |
249 |
-You also need to install the necessary packages to build your own debs and the |
|
249 |
+You also need to install the necessary packages to build your own debs and the |
|
250 | 250 |
packages needed to build Tor: |
251 | 251 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
252 | 252 |
apt-get install build-essential fakeroot devscripts |
... | ... |
@@ -282,4 +282,4 @@ instructions. |
282 | 282 |
<!-- END SIDECOL --> |
283 | 283 |
</div> |
284 | 284 |
<!-- END CONTENT --> |
285 |
-#include <foot.wmi> |
|
285 |
+#include <foot.wmi> |
... | ... |
@@ -70,7 +70,7 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T |
70 | 70 |
<div id="selector" style="display: none;"> |
71 | 71 |
<blockquote> |
72 | 72 |
I run |
73 |
-<select id="distrib" onchange="update()"> |
|
73 |
+<select id="distrib"> |
|
74 | 74 |
<option value="wheezy">Debian oldstable (wheezy)</option> |
75 | 75 |
<option value="jessie" selected="selected">Debian stable (jessie)</option> |
76 | 76 |
<option value="stretch">Debian testing (stretch)</option> |
... | ... |
@@ -80,9 +80,9 @@ I run |
80 | 80 |
<option value="xenial">Ubuntu Xenial Xerus</option> |
81 | 81 |
</select> |
82 | 82 |
and want |
83 |
-<select id="package" onchange="update()"></select> |
|
83 |
+<select id="package"></select> |
|
84 | 84 |
version |
85 |
-<select id="version" onchange="update()"></select> |
|
85 |
+<select id="version"></select> |
|
86 | 86 |
</blockquote> |
87 | 87 |
|
88 | 88 |
|
... | ... |
@@ -3,171 +3,9 @@ |
3 | 3 |
# Translation-Priority: 3-low |
4 | 4 |
|
5 | 5 |
#include "head.wmi" TITLE="Tor Project: Debian/Ubuntu Instructions" CHARSET="UTF-8" |
6 |
- |
|
7 |
-<script> |
|
8 |
-<!-- |
|
9 |
-// This code is based on the http://mozilla.debian.net sources.list |
|
10 |
-// generator as originally written by Mike Hommey. It is licensed under |
|
11 |
-// the terms of the GNU GPLv2, http://www.gnu.org/licenses/gpl-2.0.html. |
|
12 |
-var sources = {}; |
|
13 |
-var software = { |
|
14 |
-'tor': { '_stable': { |
|
15 |
- 'wheezy': [ 'wheezy' ], |
|
16 |
- 'jessie': [ 'jessie' ], |
|
17 |
- 'stretch': [ 'stretch' ], |
|
18 |
- 'sid': [ 'sid' ], |
|
19 |
- 'precise': [ 'precise'], |
|
20 |
- 'trusty': [ 'trusty'], |
|
21 |
- 'xenial': [ 'xenial'], |
|
22 |
- 'yakkety': [ 'yakkety'], |
|
23 |
- }, |
|
24 |
- 'experimental-0.3.0.x': { |
|
25 |
- 'wheezy': [ 'wheezy' ], |
|
26 |
- 'jessie': [ 'jessie' ], |
|
27 |
- 'stretch': [ 'stretch' ], |
|
28 |
- 'sid': [ 'sid' ], |
|
29 |
- 'precise': [ 'precise'], |
|
30 |
- 'trusty': [ 'trusty'], |
|
31 |
- 'xenial': [ 'xenial'], |
|
32 |
- 'yakkety': [ 'yakkety'], |
|
33 |
- }, |
|
34 |
- }, |
|
35 |
-'tor (from source)': { |
|
36 |
- '_stable': { |
|
37 |
- 'wheezy': [ 'wheezy' ], |
|
38 |
- 'jessie': [ 'jessie' ], |
|
39 |
- 'stretch': [ 'stretch' ], |
|
40 |
- 'sid': [ 'sid' ], |
|
41 |
- 'precise': [ 'precise'], |
|
42 |
- 'trusty': [ 'trusty'], |
|
43 |
- 'xenial': [ 'xenial'], |
|
44 |
- 'yakkety': [ 'yakkety'], |
|
45 |
- }, |
|
46 |
- 'experimental-0.3.0.x': { |
|
47 |
- 'wheezy': [ 'wheezy' ], |
|
48 |
- 'jessie': [ 'jessie' ], |
|
49 |
- 'stretch': [ 'stretch' ], |
|
50 |
- 'sid': [ 'sid' ], |
|
51 |
- 'precise': [ 'precise'], |
|
52 |
- 'trusty': [ 'trusty'], |
|
53 |
- 'xenial': [ 'xenial'], |
|
54 |
- 'yakkety': [ 'yakkety'], |
|
55 |
- }, |
|
56 |
- }, |
|
57 |
-}; |
|
58 |
- |
|
59 |
-function init() { |
|
60 |
- pkg = document.getElementById('package'); |
|
61 |
- for (soft in software) { |
|
62 |
- if (soft != pkg.value) { |
|
63 |
- option = document.createElement('option'); |
|
64 |
- option.value = soft; |
|
65 |
- option.appendChild(document.createTextNode(soft.charAt(0).toUpperCase() + soft.slice(1))); |
|
66 |
- pkg.appendChild(option); |
|
67 |
- } |
|
68 |
- } |
|
69 |
- |
|
70 |
- apt_get = document.getElementById('apt-get'); |
|
71 |
- para = document.createElement('p'); |
|
72 |
- para.id = 'sorry'; |
|
73 |
- para.style.display = 'none'; |
|
74 |
- apt_get.parentNode.insertBefore(para, apt_get); |
|
75 |
- para.appendChild(document.createTextNode("Sorry, this version is not available.\n")); |
|
76 |
- |
|
77 |
- document.getElementById('selector').style.display = 'block'; |
|
78 |
- |
|
79 |
- update(); |
|
80 |
-} |
|
81 |
- |
|
82 |
-function replaceText(src, txt) { |
|
83 |
- while (src.firstChild) |
|
84 |
- src.removeChild(src.firstChild); |
|
85 |
- src.appendChild(document.createTextNode(txt)); |
|
86 |
-} |
|
87 |
- |
|
88 |
-function update() { |
|
89 |
- pkg = document.getElementById('package'); |
|
90 |
- ver = document.getElementById('version'); |
|
91 |
- package = pkg.value; |
|
92 |
- version = ver.value; |
|
93 |
- distrib = document.getElementById('distrib').value; |
|
94 |
- if (package != pkg.prev) { |
|
95 |
- while (ver.firstChild) |
|
96 |
- ver.removeChild(ver.firstChild); |
|
97 |
- var selected; |
|
98 |
- for (version in software[package]) { |
|
99 |
- option = document.createElement('option'); |
|
100 |
- if (version[0] == '_') { |
|
101 |
- version = version.slice(1); |
|
102 |
- selected = version; |
|
103 |
- } |
|
104 |
- option.appendChild(document.createTextNode(version)); |
|
105 |
- option.value = version = version.replace(/ \(.*\)/,''); |
|
106 |
-//alert(version); |
|
107 |
- ver.appendChild(option); |
|
108 |
- } |
|
109 |
- ver.value = version = selected || version; |
|
110 |
- pkg.prev = package |
|
111 |
- } |
|
112 |
- try { |
|
113 |
- keys = software[package][version][distrib]; |
|
114 |
- } catch (e) { |
|
115 |
- try { |
|
116 |
- keys = software[package]['_' + version][distrib]; |
|
117 |
- } catch (e) { }; |
|
118 |
- } |
|
119 |
- src = document.getElementById('sources'); |
|
120 |
- txt = ''; |
|
121 |
- need_signed = false; |
|
122 |
- source_install = false; |
|
123 |
- target = ''; |
|
124 |
- for (i = 0; keys && (i < keys.length); i++) { |
|
125 |
-//alert(keys[i]); |
|
126 |
- if (keys[i] in sources) { |
|
127 |
- txt += sources[keys[i]]; |
|
128 |
- target = keys[i]; |
|
129 |
- } else { |
|
130 |
- if (package.slice(-7, -1) == 'source') { |
|
131 |
- package = package.split(' ')[0]; |
|
132 |
- source_install = true; |
|
133 |
- } |
|
134 |
- txt += "http://deb.torproject.org/torproject.org"; |
|
135 |
- txt += " "; |
|
136 |
- txt += keys[i]; |
|
137 |
- txt += " main"; |
|
138 |
- need_signed = true; |
|
139 |
- target = keys[i]; |
|
140 |
- txt = "deb " + txt + "\ndeb-src " + txt; |
|
141 |
- if (version != 'stable') { |
|
142 |
- txt2 = "http://deb.torproject.org/torproject.org"; |
|
143 |
- txt2 += " "; |
|
144 |
- txt2 += package; |
|
145 |
- txt2 += "-"; |
|
146 |
- txt2 += version; |
|
147 |
- txt2 += "-"; |
|
148 |
- txt2 += keys[i]; |
|
149 |
- txt2 += " main"; |
|
150 |
- txt = txt + "\ndeb " + txt2 + "\ndeb-src " + txt2; |
|
151 |
- } |
|
152 |
- } |
|
153 |
- txt += "\n"; |
|
154 |
- } |
|
155 |
- replaceText(src, txt); |
|
156 |
- document.getElementById('regular-install').style.display = source_install ? 'none' : 'block'; |
|
157 |
- document.getElementById('source-install').style.display = source_install ? 'block' : 'none'; |
|
158 |
- document.getElementById('source-install2').style.display = source_install ? 'block' : 'none'; |
|
159 |
- replaceText(document.getElementById('apt-package'), package); |
|
160 |
- document.getElementById('apt-source').style.display = (keys && keys.length) ? 'block' : 'none'; |
|
161 |
- document.getElementById('apt-get').style.display = keys ? 'block' : 'none'; |
|
162 |
- document.getElementById('sorry').style.display = keys ? 'none' : 'block'; |
|
163 |
-} |
|
164 |
- |
|
165 |
-window.onload = init; |
|
166 |
- |
|
167 |
-</script> |
|
168 |
- |
|
169 |
- |
|
6 |
+{#meta#: |
|
7 |
+<script type="text/javascript" src="debian-selector.js"></script> |
|
8 |
+:#meta#} |
|
170 | 9 |
|
171 | 10 |
<div id="content" class="clearfix"> |
172 | 11 |
<div id="breadcrumbs"> |
... | ... |
@@ -19,8 +19,9 @@ var software = { |
19 | 19 |
'precise': [ 'precise'], |
20 | 20 |
'trusty': [ 'trusty'], |
21 | 21 |
'xenial': [ 'xenial'], |
22 |
+ 'yakkety': [ 'yakkety'], |
|
22 | 23 |
}, |
23 |
- 'experimental-0.2.9.x': { |
|
24 |
+ 'experimental-0.3.0.x': { |
|
24 | 25 |
'wheezy': [ 'wheezy' ], |
25 | 26 |
'jessie': [ 'jessie' ], |
26 | 27 |
'stretch': [ 'stretch' ], |
... | ... |
@@ -28,6 +29,7 @@ var software = { |
28 | 29 |
'precise': [ 'precise'], |
29 | 30 |
'trusty': [ 'trusty'], |
30 | 31 |
'xenial': [ 'xenial'], |
32 |
+ 'yakkety': [ 'yakkety'], |
|
31 | 33 |
}, |
32 | 34 |
}, |
33 | 35 |
'tor (from source)': { |
... | ... |
@@ -39,8 +41,9 @@ var software = { |
39 | 41 |
'precise': [ 'precise'], |
40 | 42 |
'trusty': [ 'trusty'], |
41 | 43 |
'xenial': [ 'xenial'], |
44 |
+ 'yakkety': [ 'yakkety'], |
|
42 | 45 |
}, |
43 |
- 'experimental-0.2.9.x': { |
|
46 |
+ 'experimental-0.3.0.x': { |
|
44 | 47 |
'wheezy': [ 'wheezy' ], |
45 | 48 |
'jessie': [ 'jessie' ], |
46 | 49 |
'stretch': [ 'stretch' ], |
... | ... |
@@ -48,6 +51,7 @@ var software = { |
48 | 51 |
'precise': [ 'precise'], |
49 | 52 |
'trusty': [ 'trusty'], |
50 | 53 |
'xenial': [ 'xenial'], |
54 |
+ 'yakkety': [ 'yakkety'], |
|
51 | 55 |
}, |
52 | 56 |
}, |
53 | 57 |
}; |
... | ... |
@@ -360,7 +364,7 @@ download/download>#packagediff">development branch</a> of Tor instead |
360 | 364 |
to your <tt>/etc/apt/sources.list</tt> file:<br /> |
361 | 365 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
362 | 366 |
deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
363 |
-deb http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-<DISTRIBUTION> main |
|
367 |
+deb http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-<DISTRIBUTION> main |
|
364 | 368 |
</pre> |
365 | 369 |
where you again substitute the name of your distro (lenny, |
366 | 370 |
sid, saucy, ...) in place of |
... | ... |
@@ -398,7 +402,7 @@ deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
398 | 402 |
|
399 | 403 |
# For the unstable version. |
400 | 404 |
deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
401 |
-deb-src http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-<DISTRIBUTION> main |
|
405 |
+deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-<DISTRIBUTION> main |
|
402 | 406 |
</pre> |
403 | 407 |
Substitute the name of your distro (wheezy, sid, trusty, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root): |
404 | 408 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
maybe this will avoid confusion or mistakes by some users
... | ... |
@@ -254,7 +254,7 @@ version |
254 | 254 |
<div id="sig"> |
255 | 255 |
<p>Then add the gpg key used to sign the packages by running the following commands at your command prompt:</p> |
256 | 256 |
<blockquote><pre> |
257 |
-gpg --keyserver keys.gnupg.net --recv 886DDD89 |
|
257 |
+gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 |
|
258 | 258 |
gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - |
259 | 259 |
</pre></blockquote> |
260 | 260 |
</div> |
... | ... |
@@ -303,7 +303,7 @@ in place of <DISTRIBUTION>. |
303 | 303 |
Then add the gpg key used to sign the packages by running the following |
304 | 304 |
commands at your command prompt: |
305 | 305 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
306 |
-gpg --keyserver keys.gnupg.net --recv 886DDD89 |
|
306 |
+gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 |
|
307 | 307 |
gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - |
308 | 308 |
</pre> |
309 | 309 |
Now refresh your sources, running the following command (as root) at your |
... | ... |
@@ -370,7 +370,7 @@ sid, saucy, ...) in place of |
370 | 370 |
<p> |
371 | 371 |
Then run the following commands at your command prompt: |
372 | 372 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
373 |
-gpg --keyserver keys.gnupg.net --recv 886DDD89 |
|
373 |
+gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 |
|
374 | 374 |
gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - |
375 | 375 |
apt-get update |
376 | 376 |
apt-get install tor deb.torproject.org-keyring |
resolves https://bugs.torproject.org/18021
... | ... |
@@ -18,7 +18,6 @@ var software = { |
18 | 18 |
'sid': [ 'sid' ], |
19 | 19 |
'precise': [ 'precise'], |
20 | 20 |
'trusty': [ 'trusty'], |
21 |
- 'wily': [ 'wily'], |
|
22 | 21 |
'xenial': [ 'xenial'], |
23 | 22 |
}, |
24 | 23 |
'experimental-0.2.9.x': { |
... | ... |
@@ -28,7 +27,6 @@ var software = { |
28 | 27 |
'sid': [ 'sid' ], |
29 | 28 |
'precise': [ 'precise'], |
30 | 29 |
'trusty': [ 'trusty'], |
31 |
- 'wily': [ 'wily'], |
|
32 | 30 |
'xenial': [ 'xenial'], |
33 | 31 |
}, |
34 | 32 |
}, |
... | ... |
@@ -40,7 +38,6 @@ var software = { |
40 | 38 |
'sid': [ 'sid' ], |
41 | 39 |
'precise': [ 'precise'], |
42 | 40 |
'trusty': [ 'trusty'], |
43 |
- 'wily': [ 'wily'], |
|
44 | 41 |
'xenial': [ 'xenial'], |
45 | 42 |
}, |
46 | 43 |
'experimental-0.2.9.x': { |
... | ... |
@@ -50,7 +47,6 @@ var software = { |
50 | 47 |
'sid': [ 'sid' ], |
51 | 48 |
'precise': [ 'precise'], |
52 | 49 |
'trusty': [ 'trusty'], |
53 |
- 'wily': [ 'wily'], |
|
54 | 50 |
'xenial': [ 'xenial'], |
55 | 51 |
}, |
56 | 52 |
}, |
... | ... |
@@ -239,7 +235,6 @@ I run |
239 | 235 |
<option value="sid">Debian unstable (sid)</option> |
240 | 236 |
<option value="precise">Ubuntu Precise Pangolin</option> |
241 | 237 |
<option value="trusty">Ubuntu Trusty Tahr</option> |
242 |
-<option value="wily">Ubuntu Wily Werewolf</option> |
|
243 | 238 |
<option value="xenial">Ubuntu Xenial Xerus</option> |
244 | 239 |
</select> |
245 | 240 |
and want |
... | ... |
@@ -21,7 +21,7 @@ var software = { |
21 | 21 |
'wily': [ 'wily'], |
22 | 22 |
'xenial': [ 'xenial'], |
23 | 23 |
}, |
24 |
- 'experimental-0.2.8.x': { |
|
24 |
+ 'experimental-0.2.9.x': { |
|
25 | 25 |
'wheezy': [ 'wheezy' ], |
26 | 26 |
'jessie': [ 'jessie' ], |
27 | 27 |
'stretch': [ 'stretch' ], |
... | ... |
@@ -43,7 +43,7 @@ var software = { |
43 | 43 |
'wily': [ 'wily'], |
44 | 44 |
'xenial': [ 'xenial'], |
45 | 45 |
}, |
46 |
- 'experimental-0.2.8.x': { |
|
46 |
+ 'experimental-0.2.9.x': { |
|
47 | 47 |
'wheezy': [ 'wheezy' ], |
48 | 48 |
'jessie': [ 'jessie' ], |
49 | 49 |
'stretch': [ 'stretch' ], |
... | ... |
@@ -365,7 +365,7 @@ download/download>#packagediff">development branch</a> of Tor instead |
365 | 365 |
to your <tt>/etc/apt/sources.list</tt> file:<br /> |
366 | 366 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
367 | 367 |
deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
368 |
-deb http://deb.torproject.org/torproject.org tor-experimental-0.2.6.x-<DISTRIBUTION> main |
|
368 |
+deb http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-<DISTRIBUTION> main |
|
369 | 369 |
</pre> |
370 | 370 |
where you again substitute the name of your distro (lenny, |
371 | 371 |
sid, saucy, ...) in place of |
... | ... |
@@ -403,7 +403,7 @@ deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
403 | 403 |
|
404 | 404 |
# For the unstable version. |
405 | 405 |
deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main |
406 |
-deb-src http://deb.torproject.org/torproject.org tor-experimental-0.2.6.x-<DISTRIBUTION> main |
|
406 |
+deb-src http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-<DISTRIBUTION> main |
|
407 | 407 |
</pre> |
408 | 408 |
Substitute the name of your distro (wheezy, sid, trusty, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root): |
409 | 409 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
... | ... |
@@ -233,14 +233,14 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T |
233 | 233 |
<blockquote> |
234 | 234 |
I run |
235 | 235 |
<select id="distrib" onchange="update()"> |
236 |
-<option value="squeeze">Debian oldoldstable (Squeeze)</option> |
|
237 |
-<option value="wheezy">Debian oldstable (Wheezy)</option> |
|
238 |
-<option value="jessie" selected="selected">Debian (Jessie)</option> |
|
236 |
+<option value="wheezy">Debian oldstable (wheezy)</option> |
|
237 |
+<option value="jessie" selected="selected">Debian stable (jessie)</option> |
|
238 |
+<option value="stretch">Debian testing (stretch)</option> |
|
239 | 239 |
<option value="sid">Debian unstable (sid)</option> |
240 |
-<option value="lucid">Ubuntu Lucid Lynx</option> |
|
241 | 240 |
<option value="precise">Ubuntu Precise Pangolin</option> |
242 |
-<option value="saucy">Ubuntu Saucy Salamander</option> |
|
243 | 241 |
<option value="trusty">Ubuntu Trusty Tahr</option> |
242 |
+<option value="wily">Ubuntu Wily Werewolf</option> |
|
243 |
+<option value="xenial">Ubuntu Xenial Xerus</option> |
|
244 | 244 |
</select> |
245 | 245 |
and want |
246 | 246 |
<select id="package" onchange="update()"></select> |
... | ... |
@@ -11,41 +11,48 @@ |
11 | 11 |
// the terms of the GNU GPLv2, http://www.gnu.org/licenses/gpl-2.0.html. |
12 | 12 |
var sources = {}; |
13 | 13 |
var software = { |
14 |
-'tor': { '_stable': { 'squeeze': [ 'squeeze' ], |
|
14 |
+'tor': { '_stable': { |
|
15 | 15 |
'wheezy': [ 'wheezy' ], |
16 | 16 |
'jessie': [ 'jessie' ], |
17 | 17 |
'stretch': [ 'stretch' ], |
18 | 18 |
'sid': [ 'sid' ], |
19 |
- 'lucid': [ 'lucid'], |
|
20 | 19 |
'precise': [ 'precise'], |
21 |
- 'saucy': [ 'saucy'], |
|
22 |
- 'trusty': [ 'trusty'], }, |
|
23 |
- 'experimental-0.2.7.x': { 'wheezy': [ 'wheezy' ], |
|
20 |
+ 'trusty': [ 'trusty'], |
|
21 |
+ 'wily': [ 'wily'], |
|
22 |
+ 'xenial': [ 'xenial'], |
|
23 |
+ }, |
|
24 |
+ 'experimental-0.2.8.x': { |
|
25 |
+ 'wheezy': [ 'wheezy' ], |
|
24 | 26 |
'jessie': [ 'jessie' ], |
25 | 27 |
'stretch': [ 'stretch' ], |
26 | 28 |
'sid': [ 'sid' ], |
27 |
- 'lucid': [ 'lucid'], |
|
28 | 29 |
'precise': [ 'precise'], |
29 |
- 'saucy': [ 'saucy'], |
|
30 |
- 'trusty': [ 'trusty'], }, |
|
30 |
+ 'trusty': [ 'trusty'], |
|
31 |
+ 'wily': [ 'wily'], |
|
32 |
+ 'xenial': [ 'xenial'], |
|
33 |
+ }, |
|
31 | 34 |
}, |
32 |
-'tor (from source)': { '_stable': { 'squeeze': [ 'squeeze' ], |
|
35 |
+'tor (from source)': { |
|
36 |
+ '_stable': { |
|
33 | 37 |
'wheezy': [ 'wheezy' ], |
34 | 38 |
'jessie': [ 'jessie' ], |
35 | 39 |
'stretch': [ 'stretch' ], |
36 | 40 |
'sid': [ 'sid' ], |
37 |
- 'lucid': [ 'lucid'], |
|
38 | 41 |
'precise': [ 'precise'], |
39 |
- 'saucy': [ 'saucy'], |
|
40 |
- 'trusty': [ 'trusty'], }, |
|
41 |
- 'experimental-0.2.7.x': { 'wheezy': [ 'wheezy' ], |
|
42 |
+ 'trusty': [ 'trusty'], |
|
43 |
+ 'wily': [ 'wily'], |
|
44 |
+ 'xenial': [ 'xenial'], |
|
45 |
+ }, |
|
46 |
+ 'experimental-0.2.8.x': { |
|
47 |
+ 'wheezy': [ 'wheezy' ], |
|
42 | 48 |
'jessie': [ 'jessie' ], |
43 | 49 |
'stretch': [ 'stretch' ], |
44 | 50 |
'sid': [ 'sid' ], |
45 |
- 'lucid': [ 'lucid'], |
|
46 | 51 |
'precise': [ 'precise'], |
47 |
- 'saucy': [ 'saucy'], |
|
48 |
- 'trusty': [ 'trusty'], }, |
|
52 |
+ 'trusty': [ 'trusty'], |
|
53 |
+ 'wily': [ 'wily'], |
|
54 |
+ 'xenial': [ 'xenial'], |
|
55 |
+ }, |
|
49 | 56 |
}, |
50 | 57 |
}; |
51 | 58 |
|
... | ... |
@@ -19,7 +19,7 @@ var software = { |
19 | 19 |
'lucid': [ 'lucid'], |
20 | 20 |
'precise': [ 'precise'], |
21 | 21 |
'saucy': [ 'saucy'], |
22 |
- 'trusty': [ 'trusty'], |
|
22 |
+ 'trusty': [ 'trusty'], }, |
|
23 | 23 |
'experimental-0.2.7.x': { 'wheezy': [ 'wheezy' ], |
24 | 24 |
'jessie': [ 'jessie' ], |
25 | 25 |
'stretch': [ 'stretch' ], |
... | ... |
@@ -27,7 +27,7 @@ var software = { |
27 | 27 |
'lucid': [ 'lucid'], |
28 | 28 |
'precise': [ 'precise'], |
29 | 29 |
'saucy': [ 'saucy'], |
30 |
- 'trusty': [ 'trusty'], |
|
30 |
+ 'trusty': [ 'trusty'], }, |
|
31 | 31 |
}, |
32 | 32 |
'tor (from source)': { '_stable': { 'squeeze': [ 'squeeze' ], |
33 | 33 |
'wheezy': [ 'wheezy' ], |
... | ... |
@@ -37,7 +37,7 @@ var software = { |
37 | 37 |
'lucid': [ 'lucid'], |
38 | 38 |
'precise': [ 'precise'], |
39 | 39 |
'saucy': [ 'saucy'], |
40 |
- 'trusty': [ 'trusty'], |
|
40 |
+ 'trusty': [ 'trusty'], }, |
|
41 | 41 |
'experimental-0.2.7.x': { 'wheezy': [ 'wheezy' ], |
42 | 42 |
'jessie': [ 'jessie' ], |
43 | 43 |
'stretch': [ 'stretch' ], |
... | ... |
@@ -45,7 +45,7 @@ var software = { |
45 | 45 |
'lucid': [ 'lucid'], |
46 | 46 |
'precise': [ 'precise'], |
47 | 47 |
'saucy': [ 'saucy'], |
48 |