Browse code

docs/en/debian: don't recommend specific keyserver

Traumschule authored on10/08/2018 12:40:01
Showing1 changed files
... ...
@@ -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
Browse code

debian.html: sources.list generator: add support for Ubuntu 18.04

nusenu authored on22/04/2018 22:14:36 • hiro committed on28/06/2018 17:39:27
Showing1 changed files
... ...
@@ -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>
Browse code

Fix no script version of debian install docs

hiro authored on06/04/2018 10:46:29
Showing1 changed files
... ...
@@ -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 &lt;DISTRIBUTION&gt; main
139
+deb     https://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; 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 &lt;DISTRIBUTION&gt; main
213
-deb     http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-&lt;DISTRIBUTION&gt; main
212
+deb     https://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
213
+deb     https://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-&lt;DISTRIBUTION&gt; 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 &lt;DISTRIBUTION&gt; main
247
+deb-src https://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
248 248
 
249 249
 # For the unstable version.
250
-deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
251
-deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-&lt;DISTRIBUTION&gt; main
250
+deb-src https://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
251
+deb-src https://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-&lt;DISTRIBUTION&gt; main
252 252
 </pre>
253 253
 Substitute the name of your distro (stretch, buster, sid, xenial, ...) in place of &lt;DISTRIBUTION&gt;. Now refresh your sources by running (as root):
254 254
 <pre style="margin: 1.5em 0 1.5em 2em">
Browse code

Fix spurious char in debian doc

hiro authored on03/04/2018 11:34:19
Showing1 changed files
... ...
@@ -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 />
Browse code

Add deb.tpo onion service address to debian docs

hiro authored on03/04/2018 11:02:10
Showing1 changed files
... ...
@@ -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>
Browse code

Provide a note regarding debian Tor LTS

hiro authored on02/04/2018 19:42:01
Showing1 changed files
... ...
@@ -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>
Browse code

Reworded the sentence raspbian is not debian

hiro authored on02/04/2018 19:33:06
Showing1 changed files
... ...
@@ -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.
Browse code

Update debian-selector.js and fix default text in page

hiro authored on02/04/2018 18:20:56
Showing1 changed files
... ...
@@ -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
 
Browse code

Fix small typo

hiro authored on02/04/2018 18:09:35
Showing1 changed files
... ...
@@ -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>
Browse code

Allow https in version of deb.torproject.org repository install instructions

hiro authored on02/04/2018 18:08:36
Showing1 changed files
... ...
@@ -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>
Browse code

Bug 25107: replace ancient debian release names with newer onces

nusenu authored on31/01/2018 23:24:37 • hiromipaw committed on07/02/2018 10:59:18
Showing1 changed files
... ...
@@ -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 &lt;DISTRIBUTION&gt; 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 &lt;DISTRIBUTION&gt;.
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 &lt;DISTRIBUTION&gt; main
205 205
 deb     http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-&lt;DISTRIBUTION&gt; 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
 &lt;DISTRIBUTION&gt;.
210 210
 </p>
211 211
 
Browse code

Bug 25107: fix typo

nusenu authored on31/01/2018 23:14:45 • hiromipaw committed on07/02/2018 10:59:18
Showing1 changed files
... ...
@@ -242,7 +242,7 @@ deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
242 242
 deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
243 243
 deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-&lt;DISTRIBUTION&gt; main
244 244
 </pre>
245
-Substitute the name of your distro (strech, buster, sid, xenial, ...) in place of &lt;DISTRIBUTION&gt;. Now refresh your sources by running (as root):
245
+Substitute the name of your distro (stretch, buster, sid, xenial, ...) in place of &lt;DISTRIBUTION&gt;. 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>
Browse code

Bug 25107: sources.list generator: add Ubuntu Artful Aardvark (17.10)

nusenu authored on31/01/2018 22:39:33 • hiromipaw committed on07/02/2018 10:59:18
Showing1 changed files
... ...
@@ -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>
Browse code

Bug 25107: sources.list generator: remove zesty (we do not offer packages for it)

nusenu authored on31/01/2018 22:14:51 • hiromipaw committed on07/02/2018 10:59:18
Showing1 changed files
... ...
@@ -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>
Browse code

Bug 24994: point to the actual content describing alpha/stable differences

nusenu authored on31/01/2018 22:01:35 • hiromipaw committed on07/02/2018 10:59:18
Showing1 changed files
... ...
@@ -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">
Browse code

Bug 25107: Update the tor alpha version (noscript page version)

nusenu authored on31/01/2018 21:44:17 • hiromipaw committed on07/02/2018 10:59:18
Showing1 changed files
... ...
@@ -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 &lt;DISTRIBUTION&gt; main
205
-deb     http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-&lt;DISTRIBUTION&gt; main
205
+deb     http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-&lt;DISTRIBUTION&gt; 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 &lt;DISTRIBUTION&gt; main
240 240
 
241 241
 # For the unstable version.
242 242
 deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
243
-deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-&lt;DISTRIBUTION&gt; main
243
+deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-&lt;DISTRIBUTION&gt; main
244 244
 </pre>
245
-Substitute the name of your distro (wheezy, sid, trusty, ...) in place of &lt;DISTRIBUTION&gt;. Now refresh your sources by running (as root):
245
+Substitute the name of your distro (strech, buster, sid, xenial, ...) in place of &lt;DISTRIBUTION&gt;. 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>
Browse code

Bug 25107: fix sources.list generator for Debian Buster

nusenu authored on31/01/2018 21:36:54 • hiromipaw committed on07/02/2018 10:59:18
Showing1 changed files
... ...
@@ -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>
Browse code

Add ubuntu zesty to download options

hiromipaw authored on12/01/2018 16:17:42
Showing1 changed files
... ...
@@ -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>
Browse code

Switch out references to apt-get for apt

Signed-off-by: hiromipaw <hiro@torproject.org>

Iain R. Learmonth authored on09/10/2017 22:22:37 • hiromipaw committed on10/10/2017 23:20:26
Showing1 changed files
... ...
@@ -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-&lt;DI
244 244
 </pre>
245 245
 Substitute the name of your distro (wheezy, sid, trusty, ...) in place of &lt;DISTRIBUTION&gt;. 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 ..
Browse code

Change select options

hiromipaw authored on29/06/2017 18:30:38
Showing1 changed files
... ...
@@ -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>
Browse code

Change Debian distros also in blockquote

hiromipaw authored on29/06/2017 16:19:53
Showing1 changed files
... ...
@@ -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
 
Browse code

Change Debian distros also in selector

hiromipaw authored on29/06/2017 16:08:27
Showing1 changed files
... ...
@@ -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>
Browse code

Update Debian distros codenames

hiromipaw authored on29/06/2017 15:53:36
Showing1 changed files
... ...
@@ -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 &lt;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>
Browse code

Do not use onchange=<inline script>, instead add listeners in init

Peter Palfrader authored on19/03/2017 18:31:16
Showing1 changed files
... ...
@@ -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
 
Browse code

Move Debian sources.list generator JS into its own file (re: #21769)

Peter Palfrader authored on19/03/2017 18:23:54
Showing1 changed files
... ...
@@ -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">
Browse code

experimental is 0.3.0.x now, add yakkety

Peter Palfrader authored on27/12/2016 12:58:14
Showing1 changed files
... ...
@@ -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 &lt;DISTRIBUTION&gt; main
363
-deb     http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-&lt;DISTRIBUTION&gt; main
367
+deb     http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-&lt;DISTRIBUTION&gt; 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 &lt;DISTRIBUTION&gt; main
398 402
 
399 403
 # For the unstable version.
400 404
 deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
401
-deb-src http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-&lt;DISTRIBUTION&gt; main
405
+deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-&lt;DISTRIBUTION&gt; main
402 406
 </pre>
403 407
 Substitute the name of your distro (wheezy, sid, trusty, ...) in place of &lt;DISTRIBUTION&gt;. Now refresh your sources by running (as root):
404 408
 <pre style="margin: 1.5em 0 1.5em 2em">
Browse code

use the full keyid for the debian signing key

maybe this will avoid confusion or mistakes by some users

Roger Dingledine authored on13/10/2016 20:58:45
Showing1 changed files
... ...
@@ -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 &lt;DISTRIBUTION&gt;.
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
Browse code

remove 'wily' as an option since it's dead

resolves https://bugs.torproject.org/18021

Roger Dingledine authored on21/09/2016 20:05:10
Showing1 changed files
... ...
@@ -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
Browse code

Update debian packge with 0.2.9-experimental

Sebastian Hahn authored on23/08/2016 01:45:06
Showing1 changed files
... ...
@@ -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 &lt;DISTRIBUTION&gt; main
368
-deb     http://deb.torproject.org/torproject.org tor-experimental-0.2.6.x-&lt;DISTRIBUTION&gt; main
368
+deb     http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-&lt;DISTRIBUTION&gt; 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 &lt;DISTRIBUTION&gt; main
403 403
 
404 404
 # For the unstable version.
405 405
 deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
406
-deb-src http://deb.torproject.org/torproject.org tor-experimental-0.2.6.x-&lt;DISTRIBUTION&gt; main
406
+deb-src http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-&lt;DISTRIBUTION&gt; main
407 407
 </pre>
408 408
 Substitute the name of your distro (wheezy, sid, trusty, ...) in place of &lt;DISTRIBUTION&gt;. Now refresh your sources by running (as root):
409 409
 <pre style="margin: 1.5em 0 1.5em 2em">
Browse code

deb.tpo: update suites, II

Peter Palfrader authored on24/04/2016 09:47:16
Showing1 changed files
... ...
@@ -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>
Browse code

deb.tpo: update suites

Peter Palfrader authored on24/04/2016 09:45:12
Showing1 changed files
... ...
@@ -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
 
Browse code

... without breaking the script

Sebastian Hahn authored on27/02/2016 07:37:53
Showing1 changed files
... ...
@@ -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
-                     'trusty':  [ 'trusty'],
48
+                     'trusty':  [ 'trusty'], },
49 49
        },
50 50
 };
51 51
 
Browse code

remove utopic from supported .deb versions

Sebastian Hahn authored on27/02/2016 07:36:28
Showing1 changed files
... ...
@@ -20,7 +20,6 @@ var software = {
20 20
                      'precise': [ 'precise'],
21 21
                      'saucy':   [ 'saucy'],
22 22
                      'trusty':  [ 'trusty'],
23
-                     'utopic':  [ 'utopic'] },
24 23
          'experimental-0.2.7.x':    { 'wheezy':  [ 'wheezy' ],
25 24
                      'jessie':  [ 'jessie' ],
26 25
                      'stretch': [ 'stretch' ],
... ...
@@ -29,7 +28,6 @@ var software = {
29 28
                      'precise': [ 'precise'],
30 29
                      'saucy':   [ 'saucy'],
31 30
                      'trusty':  [ 'trusty'],
32
-                     'utopic':  [ 'utopic'] },
33 31
        },
34 32
 'tor (from source)': { '_stable': { 'squeeze': [ 'squeeze' ],
35 33
                      'wheezy':  [ 'wheezy' ],
... ...
@@ -40,7 +38,6 @@ var software = {
40 38
                      'precise': [ 'precise'],
41 39
                      'saucy':   [ 'saucy'],
42 40
                      'trusty':  [ 'trusty'],
43
-                     'utopic':  [ 'utopic'] },
44 41
          'experimental-0.2.7.x':    { 'wheezy':  [ 'wheezy' ],
45 42
                      'jessie':  [ 'jessie' ],
46 43
                      'stretch': [ 'stretch' ],
... ...
@@ -49,7 +46,6 @@ var software = {
49 46
                      'precise': [ 'precise'],
50 47
                      'saucy':   [ 'saucy'],
51 48
                      'trusty':  [ 'trusty'],
52
-                     'utopic':  [ 'utopic'] },
53 49
        },
54 50
 };
55 51
 
... ...
@@ -238,7 +234,6 @@ I run
238 234
 <option value="precise">Ubuntu Precise Pangolin</option>
239 235
 <option value="saucy">Ubuntu Saucy Salamander</option>
240 236
 <option value="trusty">Ubuntu Trusty Tahr</option>
241
-<option value="utopic">Ubuntu Utopic Unicorn</option>
242 237
 </select>
243 238
 and want
244 239
 <select id="package" onchange="update()"></select>
Browse code

add stretch to debian download page

Sebastian Hahn authored on28/12/2015 10:06:01
Showing1 changed files
... ...
@@ -14,6 +14,7 @@ var software = {
14 14
 'tor': { '_stable': { 'squeeze': [ 'squeeze' ],
15 15
                      'wheezy':  [ 'wheezy' ],
16 16
                      'jessie':  [ 'jessie' ],
17
+                     'stretch': [ 'stretch' ],
17 18
                      'sid':     [ 'sid' ],
18 19
                      'lucid':   [ 'lucid'],
19 20
                      'precise': [ 'precise'],
... ...
@@ -22,6 +23,7 @@ var software = {
22 23
                      'utopic':  [ 'utopic'] },
23 24
          'experimental-0.2.7.x':    { 'wheezy':  [ 'wheezy' ],
24 25
                      'jessie':  [ 'jessie' ],
26
+                     'stretch': [ 'stretch' ],
25 27
                      'sid':     [ 'sid' ],
26 28
                      'lucid':   [ 'lucid'],
27 29
                      'precise': [ 'precise'],
... ...
@@ -32,6 +34,7 @@ var software = {
32 34
 'tor (from source)': { '_stable': { 'squeeze': [ 'squeeze' ],
33 35
                      'wheezy':  [ 'wheezy' ],
34 36
                      'jessie':  [ 'jessie' ],
37
+                     'stretch': [ 'stretch' ],
35 38
                      'sid':     [ 'sid' ],
36 39
                      'lucid':   [ 'lucid'],
37 40
                      'precise': [ 'precise'],
... ...
@@ -40,6 +43,7 @@ var software = {
40 43
                      'utopic':  [ 'utopic'] },
41 44
          'experimental-0.2.7.x':    { 'wheezy':  [ 'wheezy' ],
42 45
                      'jessie':  [ 'jessie' ],
46
+                     'stretch': [ 'stretch' ],
43 47
                      'sid':     [ 'sid' ],
44 48
                      'lucid':   [ 'lucid'],
45 49
                      'precise': [ 'precise'],
Browse code

update debian stuff more

Sebastian Hahn authored on02/09/2015 14:53:42
Showing1 changed files
... ...
@@ -20,8 +20,7 @@ var software = {
20 20
                      'saucy':   [ 'saucy'],
21 21
                      'trusty':  [ 'trusty'],
22 22
                      'utopic':  [ 'utopic'] },
23
-         'experimental-0.2.6.x':    { 'squeeze': [ 'squeeze' ],
24
-                     'wheezy':  [ 'wheezy' ],
23
+         'experimental-0.2.7.x':    { 'wheezy':  [ 'wheezy' ],
25 24
                      'jessie':  [ 'jessie' ],
26 25
                      'sid':     [ 'sid' ],
27 26
                      'lucid':   [ 'lucid'],
... ...
@@ -39,8 +38,7 @@ var software = {
39 38
                      'saucy':   [ 'saucy'],
40 39
                      'trusty':  [ 'trusty'],
41 40
                      'utopic':  [ 'utopic'] },
42
-         'experimental-0.2.6.x':    { 'squeeze': [ 'squeeze' ],
43
-                     'wheezy':  [ 'wheezy' ],
41
+         'experimental-0.2.7.x':    { 'wheezy':  [ 'wheezy' ],
44 42
                      'jessie':  [ 'jessie' ],
45 43
                      'sid':     [ 'sid' ],
46 44
                      'lucid':   [ 'lucid'],
... ...
@@ -228,7 +226,7 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T
228 226
 <blockquote>
229 227
 I run
230 228
 <select id="distrib" onchange="update()">
231
-<option value="squeeze">Debian oldstable (Squeeze)</option>
229
+<option value="squeeze">Debian oldoldstable (Squeeze)</option>
232 230
 <option value="wheezy">Debian oldstable (Wheezy)</option>
233 231
 <option value="jessie" selected="selected">Debian (Jessie)</option>
234 232
 <option value="sid">Debian unstable (sid)</option>
Browse code

Jessie is stable now

Sebastian Hahn authored on02/09/2015 14:23:28
Showing1 changed files
... ...
@@ -229,8 +229,8 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T
229 229
 I run
230 230
 <select id="distrib" onchange="update()">
231 231
 <option value="squeeze">Debian oldstable (Squeeze)</option>
232
-<option value="wheezy" selected="selected">Debian stable (Wheezy)</option>
233
-<option value="jessie">Debian testing (Jessie)</option>
232
+<option value="wheezy">Debian oldstable (Wheezy)</option>
233
+<option value="jessie" selected="selected">Debian (Jessie)</option>
234 234
 <option value="sid">Debian unstable (sid)</option>
235 235
 <option value="lucid">Ubuntu Lucid Lynx</option>
236 236
 <option value="precise">Ubuntu Precise Pangolin</option>
Browse code

underscore means default. ouch

Sebastian Hahn authored on11/02/2015 19:16:03
Showing1 changed files
... ...
@@ -11,7 +11,7 @@
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': { 'squeeze': [ 'squeeze' ],
15 15
                      'wheezy':  [ 'wheezy' ],
16 16
                      'jessie':  [ 'jessie' ],
17 17
                      'sid':     [ 'sid' ],
... ...
@@ -30,7 +30,7 @@ var software = {
30 30
                      'trusty':  [ 'trusty'],
31 31
                      'utopic':  [ 'utopic'] },
32 32
        },
33
-'tor (from source)': { 'stable': { 'squeeze': [ 'squeeze' ],
33
+'tor (from source)': { '_stable': { 'squeeze': [ 'squeeze' ],
34 34
                      'wheezy':  [ 'wheezy' ],
35 35
                      'jessie':  [ 'jessie' ],
36 36
                      'sid':     [ 'sid' ],
... ...
@@ -89,16 +89,19 @@ function update() {
89 89
     if (package != pkg.prev) {
90 90
         while (ver.firstChild)
91 91
             ver.removeChild(ver.firstChild);
92
+        var selected;
92 93
         for (version in software[package]) {
93 94
             option = document.createElement('option');
94 95
             if (version[0] == '_') {
95 96
                 version = version.slice(1);
97
+                selected = version;
96 98
             }
97 99
             option.appendChild(document.createTextNode(version));
98 100
             option.value = version = version.replace(/ \(.*\)/,'');
99 101
 //alert(version);
100 102
             ver.appendChild(option);
101 103
         }
104
+        ver.value = version = selected || version;
102 105
         pkg.prev = package
103 106
     }
104 107
     try {
Browse code

reorder stable and experimental on debian selector

Sebastian Hahn authored on11/02/2015 19:08:54
Showing1 changed files
... ...
@@ -11,7 +11,7 @@
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': { 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ],
14
+'tor': { 'stable': { 'squeeze': [ 'squeeze' ],
15 15
                      'wheezy':  [ 'wheezy' ],
16 16
                      'jessie':  [ 'jessie' ],
17 17
                      'sid':     [ 'sid' ],
... ...
@@ -20,7 +20,7 @@ var software = {
20 20
                      'saucy':   [ 'saucy'],
21 21
                      'trusty':  [ 'trusty'],
22 22
                      'utopic':  [ 'utopic'] },
23
-         'stable':    { 'squeeze': [ 'squeeze' ],
23
+         'experimental-0.2.6.x':    { 'squeeze': [ 'squeeze' ],
24 24
                      'wheezy':  [ 'wheezy' ],
25 25
                      'jessie':  [ 'jessie' ],
26 26
                      'sid':     [ 'sid' ],
... ...
@@ -30,7 +30,7 @@ var software = {
30 30
                      'trusty':  [ 'trusty'],
31 31
                      'utopic':  [ 'utopic'] },
32 32
        },
33
-'tor (from source)': { 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ],
33
+'tor (from source)': { 'stable': { 'squeeze': [ 'squeeze' ],
34 34
                      'wheezy':  [ 'wheezy' ],
35 35
                      'jessie':  [ 'jessie' ],
36 36
                      'sid':     [ 'sid' ],
... ...
@@ -39,7 +39,7 @@ var software = {
39 39
                      'saucy':   [ 'saucy'],
40 40
                      'trusty':  [ 'trusty'],
41 41
                      'utopic':  [ 'utopic'] },
42
-         'stable':    { 'squeeze': [ 'squeeze' ],
42
+         'experimental-0.2.6.x':    { 'squeeze': [ 'squeeze' ],
43 43
                      'wheezy':  [ 'wheezy' ],
44 44
                      'jessie':  [ 'jessie' ],
45 45
                      'sid':     [ 'sid' ],
... ...
@@ -89,19 +89,16 @@ function update() {
89 89
     if (package != pkg.prev) {
90 90
         while (ver.firstChild)
91 91
             ver.removeChild(ver.firstChild);
92
-        var selected;
93 92
         for (version in software[package]) {
94 93
             option = document.createElement('option');
95 94
             if (version[0] == '_') {
96 95
                 version = version.slice(1);
97
-                selected = version;
98 96
             }
99 97
             option.appendChild(document.createTextNode(version));
100 98
             option.value = version = version.replace(/ \(.*\)/,'');
101 99
 //alert(version);
102 100
             ver.appendChild(option);
103 101
         }
104
-        ver.value = version = selected || version;
105 102
         pkg.prev = package
106 103
     }
107 104
     try {
Browse code

sid is unstable

Sebastian Hahn authored on11/02/2015 19:01:52
Showing1 changed files
... ...
@@ -231,7 +231,7 @@ I run
231 231
 <option value="squeeze">Debian oldstable (Squeeze)</option>
232 232
 <option value="wheezy" selected="selected">Debian stable (Wheezy)</option>
233 233
 <option value="jessie">Debian testing (Jessie)</option>
234
-<option value="sid">Debian sid</option>
234
+<option value="sid">Debian unstable (sid)</option>
235 235
 <option value="lucid">Ubuntu Lucid Lynx</option>
236 236
 <option value="precise">Ubuntu Precise Pangolin</option>
237 237
 <option value="saucy">Ubuntu Saucy Salamander</option>
Browse code

Try to fit form fields in one line on debian page

Sebastian Hahn authored on11/02/2015 18:47:54
Showing1 changed files
... ...
@@ -226,7 +226,7 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T
226 226
 
227 227
 <div id="selector" style="display: none;">
228 228
 <blockquote>
229
-I'm running
229
+I run
230 230
 <select id="distrib" onchange="update()">
231 231
 <option value="squeeze">Debian oldstable (Squeeze)</option>
232 232
 <option value="wheezy" selected="selected">Debian stable (Wheezy)</option>
... ...
@@ -238,7 +238,7 @@ I'm running
238 238
 <option value="trusty">Ubuntu Trusty Tahr</option>
239 239
 <option value="utopic">Ubuntu Utopic Unicorn</option>
240 240
 </select>
241
-and installing
241
+and want
242 242
 <select id="package" onchange="update()"></select>
243 243
 version
244 244
 <select id="version" onchange="update()"></select>
Browse code

Show stable entry along with experimental for debian

Sebastian Hahn authored on11/02/2015 18:46:22
Showing1 changed files
... ...
@@ -128,17 +128,22 @@ function update() {
128 128
             }
129 129
             txt += "http://deb.torproject.org/torproject.org";
130 130
             txt += " ";
131
-            if (version != 'stable') {
132
-                txt += package;
133
-                txt += "-";
134
-                txt += version;
135
-                txt += "-";
136
-            }
137 131
             txt += keys[i];
138 132
             txt += " main";
139 133
             need_signed = true;
140 134
             target = keys[i];
141 135
             txt = "deb " + txt + "\ndeb-src " + txt;
136
+            if (version != 'stable') {
137
+                txt2 = "http://deb.torproject.org/torproject.org";
138
+                txt2 += " ";
139
+                txt2 += package;
140
+                txt2 += "-";
141
+                txt2 += version;
142
+                txt2 += "-";
143
+                txt2 += keys[i];
144
+                txt2 += " main";
145
+                txt = txt + "\ndeb " + txt2 + "\ndeb-src " + txt2;
146
+            }
142 147
         }
143 148
         txt += "\n";
144 149
     }
Browse code

Always show deb-src entry on debian page

Sebastian Hahn authored on11/02/2015 18:43:19
Showing1 changed files
... ...
@@ -122,13 +122,11 @@ function update() {
122 122
             txt += sources[keys[i]];
123 123
             target = keys[i];
124 124
         } else {
125
-            txt += "deb";
126 125
             if (package.slice(-7, -1) == 'source') {
127
-                txt += '-src';
128 126
                 package = package.split(' ')[0];
129
-                source_install = true
127
+                source_install = true;
130 128
             }
131
-            txt += " http://deb.torproject.org/torproject.org";
129
+            txt += "http://deb.torproject.org/torproject.org";
132 130
             txt += " ";
133 131
             if (version != 'stable') {
134 132
                 txt += package;
... ...
@@ -140,15 +138,14 @@ function update() {
140 138
             txt += " main";
141 139
             need_signed = true;
142 140
             target = keys[i];
141
+            txt = "deb " + txt + "\ndeb-src " + txt;
143 142
         }
144 143
         txt += "\n";
145 144
     }
146 145
     replaceText(src, txt);
147
-    //document.getElementById('signed').style.display = need_signed ? 'block' : 'none';
148 146
     document.getElementById('regular-install').style.display = source_install ? 'none' : 'block';
149 147
     document.getElementById('source-install').style.display = source_install ? 'block' : 'none';
150 148
     document.getElementById('source-install2').style.display = source_install ? 'block' : 'none';
151
-    //replaceText(document.getElementById('apt-target'), (keys && keys.length && target != distrib && target != distrib + '-security') ? ' -t ' + target : '');
152 149
     replaceText(document.getElementById('apt-package'), package);
153 150
     document.getElementById('apt-source').style.display = (keys && keys.length) ? 'block' : 'none';
154 151
     document.getElementById('apt-get').style.display = keys ? 'block' : 'none';
Browse code

Update Debian page to include js sources.list selector

Implements ticket 3985

Sebastian Hahn authored on11/02/2015 12:04:15
Showing1 changed files
... ...
@@ -3,6 +3,165 @@
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': { 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ],
15
+                     'wheezy':  [ 'wheezy' ],
16
+                     'jessie':  [ 'jessie' ],
17
+                     'sid':     [ 'sid' ],
18
+                     'lucid':   [ 'lucid'],
19
+                     'precise': [ 'precise'],
20
+                     'saucy':   [ 'saucy'],
21
+                     'trusty':  [ 'trusty'],
22
+                     'utopic':  [ 'utopic'] },
23
+         'stable':    { 'squeeze': [ 'squeeze' ],
24
+                     'wheezy':  [ 'wheezy' ],
25
+                     'jessie':  [ 'jessie' ],
26
+                     'sid':     [ 'sid' ],
27
+                     'lucid':   [ 'lucid'],
28
+                     'precise': [ 'precise'],
29
+                     'saucy':   [ 'saucy'],
30
+                     'trusty':  [ 'trusty'],
31
+                     'utopic':  [ 'utopic'] },
32
+       },
33
+'tor (from source)': { 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ],
34
+                     'wheezy':  [ 'wheezy' ],
35
+                     'jessie':  [ 'jessie' ],
36
+                     'sid':     [ 'sid' ],
37
+                     'lucid':   [ 'lucid'],
38
+                     'precise': [ 'precise'],
39
+                     'saucy':   [ 'saucy'],
40
+                     'trusty':  [ 'trusty'],
41
+                     'utopic':  [ 'utopic'] },
42
+         'stable':    { 'squeeze': [ 'squeeze' ],
43
+                     'wheezy':  [ 'wheezy' ],
44
+                     'jessie':  [ 'jessie' ],
45
+                     'sid':     [ 'sid' ],
46
+                     'lucid':   [ 'lucid'],
47
+                     'precise': [ 'precise'],
48
+                     'saucy':   [ 'saucy'],
49
+                     'trusty':  [ 'trusty'],
50
+                     'utopic':  [ 'utopic'] },
51
+       },
52
+};
53
+
54
+function init() {
55
+    pkg = document.getElementById('package');
56
+    for (soft in software) {
57
+        if (soft != pkg.value) {
58
+            option = document.createElement('option');
59
+            option.value = soft;
60
+            option.appendChild(document.createTextNode(soft.charAt(0).toUpperCase() + soft.slice(1)));
61
+            pkg.appendChild(option);
62
+        }
63
+    }
64
+
65
+    apt_get = document.getElementById('apt-get');
66
+    para = document.createElement('p');
67
+    para.id = 'sorry';
68
+    para.style.display = 'none';
69
+    apt_get.parentNode.insertBefore(para, apt_get);
70
+    para.appendChild(document.createTextNode("Sorry, this version is not available.\n"));
71
+
72
+    document.getElementById('selector').style.display = 'block';
73
+
74
+    update();
75
+}
76
+
77
+function replaceText(src, txt) {
78
+    while (src.firstChild)
79
+        src.removeChild(src.firstChild);
80
+    src.appendChild(document.createTextNode(txt));
81
+}
82
+
83
+function update() {
84
+    pkg = document.getElementById('package');
85
+    ver = document.getElementById('version');
86
+    package = pkg.value;
87
+    version = ver.value;
88
+    distrib = document.getElementById('distrib').value;
89
+    if (package != pkg.prev) {
90
+        while (ver.firstChild)
91
+            ver.removeChild(ver.firstChild);
92
+        var selected;
93
+        for (version in software[package]) {
94
+            option = document.createElement('option');
95
+            if (version[0] == '_') {
96
+                version = version.slice(1);
97
+                selected = version;
98
+            }
99
+            option.appendChild(document.createTextNode(version));
100
+            option.value = version = version.replace(/ \(.*\)/,'');
101
+//alert(version);
102
+            ver.appendChild(option);
103
+        }
104
+        ver.value = version = selected || version;
105
+        pkg.prev = package
106
+    }
107
+    try {
108
+        keys = software[package][version][distrib];
109
+    } catch (e) {
110
+        try {
111
+            keys = software[package]['_' + version][distrib];
112
+        } catch (e) { };
113
+    }
114
+    src = document.getElementById('sources');
115
+    txt = '';
116
+    need_signed = false;
117
+    source_install = false;
118
+    target = '';
119
+    for (i = 0; keys && (i < keys.length); i++) {
120
+//alert(keys[i]);
121
+        if (keys[i] in sources) {
122
+            txt += sources[keys[i]];
123
+            target = keys[i];
124
+        } else {
125
+            txt += "deb";
126
+            if (package.slice(-7, -1) == 'source') {
127
+                txt += '-src';
128
+                package = package.split(' ')[0];
129
+                source_install = true
130
+            }
131
+            txt += " http://deb.torproject.org/torproject.org";
132
+            txt += " ";
133
+            if (version != 'stable') {
134
+                txt += package;
135
+                txt += "-";
136
+                txt += version;
137
+                txt += "-";
138
+            }
139
+            txt += keys[i];
140
+            txt += " main";
141
+            need_signed = true;
142
+            target = keys[i];
143
+        }
144
+        txt += "\n";
145
+    }
146
+    replaceText(src, txt);
147
+    //document.getElementById('signed').style.display = need_signed ? 'block' : 'none';
148
+    document.getElementById('regular-install').style.display = source_install ? 'none' : 'block';
149
+    document.getElementById('source-install').style.display = source_install ? 'block' : 'none';
150
+    document.getElementById('source-install2').style.display = source_install ? 'block' : 'none';
151
+    //replaceText(document.getElementById('apt-target'), (keys && keys.length && target != distrib && target != distrib + '-security') ? ' -t ' + target : '');
152
+    replaceText(document.getElementById('apt-package'), package);
153
+    document.getElementById('apt-source').style.display = (keys && keys.length) ? 'block' : 'none';
154
+    document.getElementById('apt-get').style.display = keys ? 'block' : 'none';
155
+    document.getElementById('sorry').style.display = keys ? 'none' : 'block';
156
+}
157
+
158
+window.onload = init;
159
+
160
+-->
161
+</script>
162
+
163
+
164
+
6