- tor-commits - lists.torproject.org

[arm/packaging] Moving last useful bit from notes to deb-prep.sh
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit bc7f08817ec149523e911fea706fc583adbd9e69 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 08:08:51 2011 -0700 Moving last useful bit from notes to deb-prep.sh --- deb-prep.sh | 4 +++- notes.txt | 16 ---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/deb-prep.sh b/deb-prep.sh index cfa2318..9bf7e2b 100755 --- a/deb-prep.sh +++ b/deb-prep.sh @@ -1,6 +1,8 @@ #!/bin/sh # Creates a release directory that's ready to make a debian build. From here -# simply run: +# simply: +# update build/debian/changelog +# ./deb-prep.sh # cd release_deb # ./debian/make-deb # diff --git a/notes.txt b/notes.txt deleted file mode 100644 index 6e01536..0000000 --- a/notes.txt +++ /dev/null @@ -1,16 +0,0 @@ -builds - - Helper scripts for deb and rpm builds. - - For the debian build see 'deb-prep.sh'. At release time: - - bump the version: - - /resources/deb-prep.sh - - /release/src/version.py - - dump /release/ChangeLog into /resources/build/debian/changelog - -TorCtl (dependency) - - Last Updated: 3/21/11 (https://gitweb.torproject.org/pytorctl.git) - To update run the following: - git clone git://git.torproject.org/pytorctl.git - cd pytorctl - git archive master | tar -x -C /path/to/dependences/TorCtl/ -

1 0

[arm/packaging] Adding a deb dependency on python-torctl
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit d811ae2376b324954d0fb5b2834f890c25c5a768 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 08:57:42 2011 -0700 Adding a deb dependency on python-torctl --- build/debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build/debian/control b/build/debian/control index 1c057ec..e00e478 100644 --- a/build/debian/control +++ b/build/debian/control @@ -9,7 +9,7 @@ Homepage: http://www.atagar.com/arm/ Package: tor-arm Architecture: all -Depends: ${misc:Depends}, ${python:Depends} +Depends: ${misc:Depends}, ${python:Depends}, python-torctl Suggests: tor XB-Python-Version: ${python:Versions} Description: terminal status monitor for tor

1 0

[arm/packaging] Adding VCS metadata to debian package
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit d9bf01fc5ea0fa21a801f64341b8f129ed17c04b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 09:03:30 2011 -0700 Adding VCS metadata to debian package requested by intrigeri in debian bug 623312 (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623312) --- build/debian/control | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/build/debian/control b/build/debian/control index e00e478..b11c10f 100644 --- a/build/debian/control +++ b/build/debian/control @@ -12,6 +12,8 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-torctl Suggests: tor XB-Python-Version: ${python:Versions} +Vcs-Git: git://git.torproject.org/arm.git +Vcs-Browser: https://gitweb.torproject.org/arm.git Description: terminal status monitor for tor The anonymizing relay monitor (arm) is a terminal status monitor for Tor relays, intended for command-line aficionados, ssh connections, and anyone

1 0

[arm/packaging] Including instructions for rebuilding in the deb
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 110e0bd86b1a2182a3f4f993c9c43413c181938f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 09:13:36 2011 -0700 Including instructions for rebuilding in the deb requested by intrigeri in debian bug 623311 (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623311) --- build/debian/README.source | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/build/debian/README.source b/build/debian/README.source new file mode 100644 index 0000000..372638d --- /dev/null +++ b/build/debian/README.source @@ -0,0 +1,9 @@ +To rebuild this deb run the following... + +git clone git://git.torproject.org/arm.git +cd arm +git checkout remotes/origin/packaging +./deb-prep-sh +cd release_deb +./debian/make-deb +

1 0

[arm/release] Excluding TorCtl from install when building deb
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit bcb4729c2238e5520e158905b8ba242d2d00722b Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 20 18:44:21 2011 -0700 Excluding TorCtl from install when building deb Dererk is maintaining a deb for TorCtl (python-torctl, http://packages.debian.org/unstable/main/python-torctl) which will be a requirement for arm. Hence, there's no reason to continue bundling TorCtl for that platform. --- setup.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py index 2176a1c..39497aa 100644 --- a/setup.py +++ b/setup.py @@ -72,6 +72,12 @@ if "install" in sys.argv: except IOError, exc: print "Unable to compress man page: %s" % exc +# When installing we include a bundled copy of TorCtl. However, when creating +# a deb we have a dependency on the python-torctl package instead: +# http://packages.debian.org/unstable/main/python-torctl +installPackages = ['arm', 'arm.interface', 'arm.interface.graphing', 'arm.interface.connections', 'arm.util'] +if not isDebInstall: installPackages.append('arm.TorCtl') + setup(name='arm', version=VERSION, description='Terminal tor status monitor', @@ -79,7 +85,7 @@ setup(name='arm', author='Damian Johnson', author_email='atagar(a)torproject.org', url='http://www.atagar.com/arm/', - packages=['arm', 'arm.interface', 'arm.interface.graphing', 'arm.interface.connections', 'arm.util', 'arm.TorCtl'], + packages=installPackages, package_dir={'arm': 'src'}, data_files=[("/usr/bin", ["arm"]), ("/usr/share/man/man1", [manFilename]),

1 0

[arm/release] Version bump for 1.4.2.4
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 152f8511da9db90dedbacb6697d3bc214644931c Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 08:20:19 2011 -0700 Version bump for 1.4.2.4 --- src/version.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.py b/src/version.py index 4c0bbc8..e33cb18 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.2.3' -LAST_MODIFIED = "April 13, 2011" +VERSION = '1.4.2.4' +LAST_MODIFIED = "April 21, 2011"

1 0

[arm/release] Triggering deb-build logic when in "release_deb"
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 8b8568eda8145f6c2ab4295a7924a63a7617ff39 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 09:38:03 2011 -0700 Triggering deb-build logic when in "release_deb" The deb-prep.sh script makes a release_deb directory in which the build takes place. Triggering off of tor-arm is insufficient to catch all of the calls to setup.py while making a deb, causing it to error from TorCtl being missing. --- setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py index 39497aa..9777da1 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ from distutils.core import setup isDebInstall = False for arg in sys.argv: - if "tor-arm" in arg: + if "tor-arm" in arg or "release_deb" in arg: isDebInstall = True break

1 0

r24666: {torstatus} Fix a an XSS opportunity due to missing sanitation of descri (torstatus/trunk/web)
by Sebastian Hahn 23 Apr '11

23 Apr '11

Author: sebastian Date: 2011-04-23 13:38:55 +0000 (Sat, 23 Apr 2011) New Revision: 24666 Modified: torstatus/trunk/web/index.php Log: Fix a an XSS opportunity due to missing sanitation of descriptor values when displaying the contact column. Issue discovered and patch submitted by tagnaq. Modified: torstatus/trunk/web/index.php =================================================================== --- torstatus/trunk/web/index.php 2011-04-23 05:12:49 UTC (rev 24665) +++ torstatus/trunk/web/index.php 2011-04-23 13:38:55 UTC (rev 24666) @@ -759,7 +759,7 @@ $value == "Contact" ): - echo "<td class='TDS'>" . $record[$value] . "</td>"; + echo "<td class='TDS'>" . htmlentities($record[$value], ENT_QUOTES) . "</td>"; break; //case

1 0

r24665: {website} Link to the stable version of the manpage Fixes bug 2975, re (website/trunk/docs/en)
by Sebastian Hahn 23 Apr '11

23 Apr '11

Author: sebastian Date: 2011-04-23 05:12:49 +0000 (Sat, 23 Apr 2011) New Revision: 24665 Modified: website/trunk/docs/en/documentation.wml Log: Link to the stable version of the manpage Fixes bug 2975, reported by HG2G. Thanks! Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2011-04-22 14:41:38 UTC (rev 24664) +++ website/trunk/docs/en/documentation.wml 2011-04-23 05:12:49 UTC (rev 24665) @@ -57,7 +57,7 @@ that arise from The Tor Project in the US. </li> - <li>The <a href="<page docs/tor-manual-dev>">manual</a> + <li>The <a href="<page docs/tor-manual>">manual</a> lists all the possible entries you can put in your <a href="<page docs/faq>#torrc">torrc file</a>. We also provide a <a href="<page docs/tor-manual-dev>">manual for

1 0

r24664: {website} update the mirrors table, update the location of one of the (in website/trunk: . include)
by Andrew Lewman 22 Apr '11

22 Apr '11

Author: phobos Date: 2011-04-22 14:41:38 +0000 (Fri, 22 Apr 2011) New Revision: 24664 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update the mirrors table, update the location of one of the mirrors. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-04-20 21:01:06 UTC (rev 24663) +++ website/trunk/include/mirrors-table.wmi 2011-04-22 14:41:38 UTC (rev 24664) @@ -86,40 +86,6 @@ <tr> - <td>DK</td> - - <td>Zentrum der Gesundheit</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>EE</td> - - <td>CyberSIDE</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td>chaos darmstadt</td> @@ -173,6 +139,23 @@ <td>DE</td> + <td>torservers</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DE</td> + <td>beme it</td> <td>Up to date</td> @@ -205,6 +188,23 @@ <tr> + <td>AT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td> - </td> + <td><a href="http://tor.webersiedlung.at/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td>Xpdm</td> @@ -290,19 +290,36 @@ <tr> - <td>AT</td> + <td>DK</td> - <td></td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> - <td><a href="http://tor.webersiedlung.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> +</tr> + +<tr> + + <td>EE</td> + + <td>CyberSIDE</td> + + <td>Out of date</td> + <td> - </td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -311,7 +328,7 @@ <td>India Tor Fans</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> <td><a href="http://www.torproject.org.in/dist/">http</a></td> @@ -328,7 +345,7 @@ <td>Ninjas</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> <td><a href="http://irani-tor.ath.cx/dist/">http</a></td> @@ -379,7 +396,7 @@ <td>tor</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> <td><a href="http://torproject.is/dist">http</a></td> @@ -409,23 +426,6 @@ <tr> - <td>DE</td> - - <td>torservers</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td>TheOnionRouter</td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-04-20 21:01:06 UTC (rev 24663) +++ website/trunk/update-mirrors.pl 2011-04-22 14:41:38 UTC (rev 24664) @@ -251,9 +251,9 @@ mirror013 => { adminContact => "hostmaster AT zombiewerks DOT com", orgName => "TheOnionRouter", - isoCC => "US", - subRegion => "New Jersey", - region => "North America", + isoCC => "IS", + subRegion => "", + region => "Iceland", ipv4 => "True", ipv6 => "False", loadBalanced => "Unknown",

1 0