- tor-commits - lists.torproject.org

[arm/master] Hotfix for the 1.4.1 release:
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 4794d9275c50f3cfb850e8bfbfde828bafe53dd4 Merge: 95e0106 9b1b7b5 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 12 04:56:09 2011 +0000 Hotfix for the 1.4.1 release: change: including platform, python version, and arm/tor configurations in debug dumps change: adding summaries for server config options fix: properly parse the ps field when displaying decimal seconds (patch by Fabian) fix: error when initial recource lookups fail (caught by Trystero) svn:r24064 ChangeLog | 2 +- TODO | 9 ++++--- armrc.sample | 1 + src/settings.cfg | 34 +++++++++++++++++++++++++++++ src/starter.py | 57 ++++++++++++++++++++++++++++++++++++++++++++++++- src/util/sysTools.py | 24 ++++++++++++++------- src/util/uiTools.py | 5 +++- src/version.py | 4 +- 8 files changed, 118 insertions(+), 18 deletions(-) diff --cc src/version.py index 1306ee9,f6e1269..ddd3748 --- a/src/version.py +++ b/src/version.py @@@ -2,6 -2,6 +2,6 @@@ Provides arm's version and release date. """ - VERSION = '1.4.1' - LAST_MODIFIED = "January 7, 2011" -VERSION = '1.4.1_dev' -LAST_MODIFIED = "January 7, 2011" ++VERSION = '1.4.1.1' ++LAST_MODIFIED = "January 11, 2011"

1 0

[arm/master] Hotfix to help gentoo ebuilds (https://bugs.gentoo.org/349792)
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 5fe915d46d01906215676e64765abb2d9b4064f5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 16 02:18:44 2011 +0000 Hotfix to help gentoo ebuilds (https://bugs.gentoo.org/349792) svn:r24092 --- setup.py | 20 ++++++++++++++++++-- src/version.py | 4 ++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index edae307..03caaa3 100644 --- a/setup.py +++ b/setup.py @@ -17,6 +17,23 @@ for arg in sys.argv: docPath = "/usr/share/doc/%s" % ("tor-arm" if isDebInstall else "arm") +# Allow the docPath to be overridden via a '--docPath' argument. This is to +# support custom documentation locations on Gentoo, as discussed in: +# https://bugs.gentoo.org/349792 + +try: + docPathFlagIndex = sys.argv.index("--docPath") + if docPathFlagIndex < len(sys.argv) - 1: + docPath = sys.argv[docPathFlagIndex + 1] + + # remove the custom --docPath argument (otherwise the setup call will + # complain about them) + del sys.argv[docPathFlagIndex:docPathFlagIndex + 3] + else: + print "No path provided for --docPath" + sys.exit(1) +except ValueError: pass # --docPath flag not found + # Provides the configuration option to install to "/usr/share" rather than as a # python module. Alternatives are to either provide this as an input argument # (not an option for deb/rpm builds) or add a setup.cfg with: @@ -77,8 +94,7 @@ if manFilename != 'arm.1' and os.path.isfile(manFilename): # Removes the egg_info file. Apparently it is not optional during setup # (hardcoded in distutils/command/install.py), nor are there any arguments to -# bypass its creation. -# TODO: not sure how to remove this from the deb build too... +# bypass its creation. The deb build removes this as part of its rules script. eggPath = '/usr/share/arm-%s.egg-info' % VERSION if not isDebInstall and os.path.isfile(eggPath): diff --git a/src/version.py b/src/version.py index cf86296..a851658 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.1.2' -LAST_MODIFIED = "January 12, 2011" +VERSION = '1.4.1.3' +LAST_MODIFIED = "January 15, 2011"

1 0

[arm/master] Making git ignore TorCtl and python bytecode (pyc)
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit e8f3e8ce98faf315dfe2f40dac978c4066894211 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 20 19:30:08 2011 -0700 Making git ignore TorCtl and python bytecode (pyc) --- .gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9b955dd --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.pyc +src/TorCtl/ +

1 0

[arm/master] Hotfix to pick up r24560 (crashing issue when there's extra spacing in the HiddenServicePort config option)
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit e11b597f2f9e10c5ddc173a32c9c080d1d886179 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 5 02:44:58 2011 +0000 Hotfix to pick up r24560 (crashing issue when there's extra spacing in the HiddenServicePort config option) svn:r24562 --- ChangeLog | 8 +++++++- src/util/torTools.py | 2 +- src/version.py | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f7f0bb..bee46bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ CHANGE LOG -4/4/11 - version 1.4.2 +4/4/11 - version 1.4.2 (r24555) This release chiefly consists of a fully reimplemented connection panel. Besides being a sane, maintainable implementation this includes numerous new features and improvements like full circuit paths, applications involved for local connections, and better type identification. * added: full rewrite of the connection panel, providing: @@ -47,6 +47,7 @@ This release chiefly consists of a fully reimplemented connection panel. Besides * fix: the 'startup.dataDirectory' config option was being ignored * fix: recognizing the proper private ip ranges of the 172.* block * fix: missing 'is default' option from config sort ordering + * fix (4/4/11): hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard) 1/7/11 - version 1.4.1 (r24054) Platform specific enhancements including BSD compatibility and vastly improved performance on Linux. @@ -89,6 +90,11 @@ Platform specific enhancements including BSD compatibility and vastly improved p * fix: connection resolution wasn't finding results if tor was running under a different name * fix: brought all Linux connection resolvers into parity (established tcp connections only) * fix: commands with quoted pipes were being mis-parsed by the sysTools' call function + * fix (1/11/11, r24064): including platform, python version, and arm/tor configurations in debug dumps + * fix (1/11/11, r24064): properly parse the ps field when displaying decimal seconds (patch by Fabian) + * fix (1/11/11, r24064): error when initial resource lookups fail (caught by Trystero) + * fix (1/12/11, r24075): decimal seconds in the ps uptime field were being misparsed (patch by Fabian) + * fix (1/15/11, r24092): adding a --docPath argument to help Gentoo ebuilds (https://bugs.gentoo.org/349792) 11/27/10 - version 1.4.0 (r23873) Introducing a new page for managing tor's configuration, along with several other improvements. diff --git a/src/util/torTools.py b/src/util/torTools.py index cbdf900..696e712 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1750,7 +1750,7 @@ class Controller(TorCtl.PostEventListener): if " " in hsEntry: # parses the target, checking if it's a port or IP:Port combination - hsTarget = hsEntry.split(" ")[1] + hsTarget = hsEntry.split()[1] if ":" in hsTarget: hsPort = hsTarget.split(":")[1] # target is the IP:Port diff --git a/src/version.py b/src/version.py index a86b0bb..ee7c493 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.2' +VERSION = '1.4.2.1' LAST_MODIFIED = "April 4, 2011"

1 0

[arm/master] Arm version 1.4.2 release.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit d0bb81a4518525860666f7ad19315d8164c74697 Merge: 5fe915d d2204b4 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 4 15:22:31 2011 +0000 Arm version 1.4.2 release. svn:r24555 ChangeLog | 48 ++ README | 27 +- TODO | 281 --------- armrc.sample | 70 ++- src/interface/configPanel.py | 260 +++++---- src/interface/connPanel.py | 6 +- src/interface/connections/__init__.py | 6 + src/interface/connections/circEntry.py | 216 +++++++ src/interface/connections/connEntry.py | 864 ++++++++++++++++++++++++++++ src/interface/connections/connPanel.py | 398 +++++++++++++ src/interface/connections/entries.py | 183 ++++++ src/interface/controller.py | 236 ++++++--- src/interface/descriptorPopup.py | 2 +- src/interface/graphing/__init__.py | 2 +- src/interface/graphing/bandwidthStats.py | 26 +- src/interface/graphing/connStats.py | 4 +- src/interface/graphing/graphPanel.py | 21 +- src/interface/headerPanel.py | 27 +- src/interface/logPanel.py | 75 ++-- src/interface/torrcPanel.py | 16 +- src/settings.cfg | 365 ++++++++++++ src/starter.py | 44 +-- src/test.py | 46 ++- src/util/__init__.py | 2 +- src/util/conf.py | 23 +- src/util/connections.py | 341 ++++++++++-- src/util/enum.py | 116 ++++ src/util/log.py | 50 +-- src/util/panel.py | 92 +++- src/util/procTools.py | 20 +- src/util/sysTools.py | 4 +- src/util/torConfig.py | 138 +++-- src/util/torTools.py | 904 ++++++++++++++++++++++++++++-- src/util/uiTools.py | 135 ++++- src/version.py | 4 +- 35 files changed, 4249 insertions(+), 803 deletions(-) diff --cc src/version.py index a851658,f97b26d..a86b0bb --- a/src/version.py +++ b/src/version.py @@@ -2,6 -2,6 +2,6 @@@ Provides arm's version and release date. """ - VERSION = '1.4.1.3' - LAST_MODIFIED = "January 15, 2011" -VERSION = '1.4.2_dev' -LAST_MODIFIED = "January 7, 2011" ++VERSION = '1.4.2' ++LAST_MODIFIED = "April 4, 2011"

1 0

[arm/master] 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/master] Hotfix for r24613 (release 1.4.2.3)
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 855ccf62986c1db2e1f0e42b5a1498a2c3d1f61a Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 13 14:58:56 2011 +0000 Hotfix for r24613 (release 1.4.2.3) svn:r24614 --- src/interface/connections/connEntry.py | 2 +- src/version.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/interface/connections/connEntry.py b/src/interface/connections/connEntry.py index 3f4ec6b..1c2543f 100644 --- a/src/interface/connections/connEntry.py +++ b/src/interface/connections/connEntry.py @@ -368,7 +368,7 @@ class ConnectionLine(entries.ConnectionPanelLine): # known relay then it might be client traffic conn = torTools.getConn() - if "Guard" in conn.getMyFlags() or conn.getOption("BridgeRelay") == "1": + if "Guard" in conn.getMyFlags([]) or conn.getOption("BridgeRelay") == "1": allMatches = conn.getRelayFingerprint(self.foreign.getIpAddr(), getAllMatches = True) return allMatches == [] elif myType == Category.EXIT: diff --git a/src/version.py b/src/version.py index 81a5d88..4c0bbc8 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.2.2' -LAST_MODIFIED = "April 6, 2011" +VERSION = '1.4.2.3' +LAST_MODIFIED = "April 13, 2011"

1 0

[arm/master] Merge release commit 'bcb4729'
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 43656fe1228ecf1bdc0ffce792e32a98f14241ea Merge: d1d54c0 bcb4729 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 08:39:04 2011 -0700 Merge release commit 'bcb4729' Conflicts: ChangeLog setup.py src/version.py setup.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)

1 0

[arm/master] Another hotfix from Fabian (for decimal seconds in the uptime field of ps results)
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit bb7c907e840b6e4ef6f9af671a763b4bc79df0ec Merge: 4794d92 623d26f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 13 03:11:36 2011 +0000 Another hotfix from Fabian (for decimal seconds in the uptime field of ps results) svn:r24075 src/util/uiTools.py | 6 ++---- src/version.py | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --cc src/version.py index ddd3748,f6e1269..cf86296 --- a/src/version.py +++ b/src/version.py @@@ -2,6 -2,6 +2,6 @@@ Provides arm's version and release date. """ - VERSION = '1.4.1.1' - LAST_MODIFIED = "January 11, 2011" -VERSION = '1.4.1_dev' -LAST_MODIFIED = "January 7, 2011" ++VERSION = '1.4.1.2' ++LAST_MODIFIED = "January 12, 2011"

1 0

[arm/master] Hotfix for r24570.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 8b498b39a4f48e44b3addce98a239438f131361a Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 7 01:30:11 2011 +0000 Hotfix for r24570. svn:r24571 --- setup.py | 2 +- src/version.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 03caaa3..2176a1c 100644 --- a/setup.py +++ b/setup.py @@ -79,7 +79,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.util', 'arm.TorCtl'], + packages=['arm', 'arm.interface', 'arm.interface.graphing', 'arm.interface.connections', 'arm.util', 'arm.TorCtl'], package_dir={'arm': 'src'}, data_files=[("/usr/bin", ["arm"]), ("/usr/share/man/man1", [manFilename]), diff --git a/src/version.py b/src/version.py index ee7c493..81a5d88 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.2.1' -LAST_MODIFIED = "April 4, 2011" +VERSION = '1.4.2.2' +LAST_MODIFIED = "April 6, 2011"

1 0