- tor-commits - lists.torproject.org

[arm/master] Hotfix for the graphing issue tomb spotted as a hotfix. Also updating the TODO for kicks and giggles.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit e9d0ac02c1df9239e6dc094bbbd7e9e2b68bcf20 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 8 16:39:11 2010 +0000 Hotfix for the graphing issue tomb spotted as a hotfix. Also updating the TODO for kicks and giggles. svn:r23464 --- TODO | 226 +++++++++++++++------------------ src/interface/graphing/graphPanel.py | 4 +- 2 files changed, 105 insertions(+), 125 deletions(-) diff --git a/TODO b/TODO index 3e0dbb0..6b0fe37 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,6 @@ TODO -- Remaining work for next release (1.3.7) +- Roadmap and completed work for next release (1.3.8) [ ] refactor panels Currently the interface is a bit of a rat's nest (especially the controller). The goal is to use better modularization to both simplify @@ -9,50 +9,50 @@ TODO progress - /init and /util are done and /interface is partly done. Known bugs are being fixed while refactoring. - [X] log panel [ ] conf panel - move torrc validation into util - fetch text via getinfo rather than reading directly? - conn.get_info("config-text") + conn.get_info("config-text") - improve parsing failure notice to give line number - just giving "[ARM-WARN] Unable to validate torrc" isn't very - helpful... - * release prep - * ask helix about steps for getting a deb and rpm included in the tor repo - * check performance of this version vs last version (general screen refresh - times) - * stress test under debug level and debug level with large log file - * pylint --indent-string=" " --disable=C,R interface/foo.py | less - * double check __init__.py and README for changes - -- Roadmap for version 1.3.8 - [ ] refactor panels + just giving "[ARM-WARN] Unable to validate torrc" isn't very + helpful... [ ] conn panel - expand client connections and note location in circuit (entry-exit) - for clients list all connections to detect what's going through tor - and what isn't? If not then netstat calls are unnecessary. + and what isn't? If not then netstat calls are unnecessary. - check family connections to see if they're alive (VERSION cell - handshake?) + handshake?) - fallback when pid or connection querying via pid is unavailable - List all connections listed both by netstat and the consensus + List all connections listed both by netstat and the consensus - note when connection times are estimates (color?), ie connection - was established before arm + was established before arm - connection uptime to associate inbound/outbound connections? - Identify controller connections (if it's arm, vidalia, etc) with - special detail page for them + special detail page for them - provide bridge / client country statistics - Include bridge related data via GETINFO option (feature request - by waltman and ioerror). + Include bridge related data via GETINFO option (feature request + by waltman and ioerror). - pick apart applications like iftop and pktstat to see how they get - per-connection bandwidth usage. Forum thread discussing it: - https://bbs.archlinux.org/viewtopic.php?pid=715906 - [ ] controller and popup panels + per-connection bandwidth usage. Forum thread discussing it: + https://bbs.archlinux.org/viewtopic.php?pid=715906 + - give usage stats for exit port usage (popup?) - country data for client connections (requested by ioerror) + [ ] attempt to clear controller password from memory + - http://www.codexon.com/posts/clearing-passwords-in-memory-with-python + * release prep + * pylint --indent-string=" " --disable=C,R interface/foo.py | less + * double check __init__.py and README for changes + +- Roadmap for version 1.3.9 + [ ] refactor panels + [ ] controller and popup panels - allow arm to resume after restarting tor This requires a full move to the torTools controller. - - provide measurements for startup time, and try improving bottlenecks + - provide measurements for startup time, and try to improve bottlenecks [ ] setup scripts for arm [ ] updater (checks for a new tarball and installs it automatically) + - attempt to verify download signature, providing a warning if unable + to do so [ ] look into CAPs to get around permission issues for connection listing sudo wrapper for arm to help arm run as the same user as tor? Irc suggestions: @@ -60,6 +60,7 @@ TODO - http://www.linuxjournal.com/article/5737 - Bugs + * path for sample armrc in man page is wrong * when in client mode and tor stops the header panel doesn't say so * util are assuming that tor is running under the default command name attempt to determine the command name at runtime (if the pid is available @@ -106,12 +107,23 @@ TODO * connection uptimes shouldn't show fractions of a second * connections aren't cleared when control port closes -- Features - * general purpose method of erroring nicely - Some errors cause portions of the display to die, but curses limps along - and overwrites the stacktrace. This has been mostly solved, but all errors - should result in a clean death, with the stacktrace saved and a nice - message for the user. +- Future Features + * control port interpreter (interactive prompt) + Panel and startup option (-t maybe?) for providing raw control port access + along with usability improvements (piggybacking on the arm connection): + * irc like help (ex "/help GETINFO" could provide a summary of getinfo + commands, partly using the results from "GETINFO info/names") + * tab completion and up/down for previous commands + * warn and get confirmation if command would disrupt arm (for instance + 'SETEVENTS') + * 'safe' option that restricts to read-only access (start with this) + * issue sighup reset + * menus + * http://gnosis.cx/publish/programming/charming_python_6.html ? + * additional options: + * make update rates configurable via the ui + * dialog with flag descriptions and other help + * menu with all torrc options (making them editable/toggleable) * client mode use cases * not sure what sort of information would be useful in the header (to replace the orport, fingerprint, flags, etc) @@ -122,21 +134,35 @@ TODO [notice] Opening Socks listener on 127.0.0.1:9050 [notice] Opening Transparent pf/netfilter listener on 127.0.0.1:9040 [notice] Opening DNS listener on 127.0.0.1:53 - * rdns and whois lookups (to find ISP, country, and jurisdiction, etc) - To avoid disclosing connection data to third parties this needs to be - an all-or-nothing operation (ie, needs to fetch information on all - relays or none of them). Plan is something like: + * rdns and whois lookups (to find ISP, country, and jurisdiction, etc) + To avoid disclosing connection data to third parties this needs to be + an all-or-nothing operation (ie, needs to fetch information on all + relays or none of them). Plan is something like: * add resolving/caching capabilities to fetch information on all relays and distil whois entries to just what we care about (hosting provider or ISP), by default updating the cache on a daily basis * construct tarball and make this available for download rather than fetching everything at each client - * possibly make these archives downloadable from peer relays (note: - this is a no-go for clients) via torrents or some dirport like scheme - * special page for client related information, such as ips of our client - circuits at the exit + * possibly make these archives downloadable from peer relays (this is a + no-go for clients) via torrents or some dirport like scheme * look at vidalia for ideas * need to solicit for ideas on what would be most helpful to clients + * general purpose method of erroring nicely + Some errors cause portions of the display to die, but curses limps along + and overwrites the stacktrace. This has been mostly solved, but all errors + should result in a clean death, with the stacktrace saved and a nice + message for the user. + * handle mutiple tor instances + * screen style (dialog for switching between instances) + * extra window with whatever stats can be aggregated over all instances + * option to save the current settings to the config + * provide warning at startup if the armrc doesn't exist, with instructions + for generating it + * email alerts for changes to the relay's status, similar to tor-weather + * simple alert if tor shuts down + * accounting and alerts for if the bandwidth drops to zero + * daily/weekly/etc alerts for basic status (log output, bandwidth history, + etc), borrowing from the consensus tracker for some of the formatting * mac installer * Couple of options include macport and dmg... * macport (http://guide.macports.org/#development) @@ -153,91 +179,45 @@ TODO Plugin for distutils. Like most mac packaging, this can only run on a mac. It also requires setuptools: http://www.errorhelp.com/search/details/74034/importerror-no-module-named-s… - * email alerts for changes to the relay's status, similar to tor-weather - * simple alert if tor shuts down - * accounting and alerts for if the bandwidth drops to zero - * daily/weekly/etc alerts for basic status (log output, bandwidth history, - etc), borrowing from the consensus tracker for some of the formatting - * check if batch getInfo/getOption calls provide much performance benefit - * page with details on client circuits, attempting to detect details like - country, ISP, latency, exit policy for the circuit, traffic, etc - * attempt to clear controller password from memory - http://www.codexon.com/posts/clearing-passwords-in-memory-with-python + * look into additions to the used apis + * curses (python 2.6 extended?): http://docs.python.org/library/curses.html + * new control options (like "desc-annotations/id/<OR identity>")? + * look into better supporting hidden services (what could be useful here?) + * provide option for a consensus page + Shows full consensus with an interface similar to the connection panel. + For this Mike's ConsensusTracker would be helpful (though boost the + startup time by several seconds) + * show qos stats + Take a look at 'linux-tor-prio.sh' to see if any of the stats are + available and interesting. * escaping function for uiTools' formatted strings - * make update rates configurable via the ui - Also provide option for saving these settings to the config - * config option to cap resource usage - * dialog with flag descriptions and other help * switch check of ip address validity to regex? - match = re.match("(\d*)\.(\d*)\.(\d*)\.(\d*)", ip) - http://wang.yuxuan.org/blog/2009/4/2/python_script_to_convert_from_ip_range… - * audit tor connections - Provide warnings if tor misbehaves, checks possibly including: - - ensuring ExitPolicyRejectPrivate is being obeyed - - check that ExitPolicy violations don't occur (not possible yet since - not all relays aren't identified) - - check that all connections are properly related to a circuit, for - instance no outbound connections without a corresponding inbound (not - possible yet due to being unable to correlate connections to circuits) - * check file descriptors being accessed by tor to see if they're outside the - known pattern - * add page that allows raw control port access - Start with -t (or -c?) option for commandline-only access with help, - syntax highlighting, and other spiffy extras - - Piggyback on the arm connection, providing something like an interactive - prompt. In addition, provide: - - irc like help (ex "/help GETINFO" could provide a summary of getinfo - commands, partly using the results from "GETINFO info/names") - - tab completion and up/down populates previous entries - - warn and get confirmation if command would disrupt arm (for instance - 'SETEVENTS') - - 'guard' option that restricts to GETINFO only (start with this) - - issue sighup reset - * menu with all torrc options (making them editable/toggleable) - * Setup wizard for new relays - Setting the password and such for torrc generation (idea by ioerror) - * menus? - http://gnosis.cx/publish/programming/charming_python_6.html - * look into better supporting hidden services (what could be useful here?) - * look into providing UPnP support - This might be provided by tor itself so wait and see... + match = re.match("(\d*)\.(\d*)\.(\d*)\.(\d*)", ip) + http://wang.yuxuan.org/blog/2009/4/2/python_script_to_convert_from_ip_range… + * setup wizard for new relays + Setting the password and such for torrc generation. Maybe a netinstaller + that fetches the right package for the plagform, verifies signatures, etc? + (idea by ioerror) + * audit what tor does + * Provide warnings if tor connections misbehaves, for instance: + * ensuring ExitPolicyRejectPrivate is being obeyed + * check that ExitPolicy violations don't occur (not possible yet since + not all relays aren't identified) + * check that all connections are properly related to a circuit, for + instance no outbound connections without a corresponding inbound (not + possible yet due to being unable to correlate connections to circuits) + * check file descriptors being accessed by tor to see if they're outside a + known pattern + * script that dumps relay stats to stdout + Derived from an idea by StrangeCharm. Django has a small terminal coloring + module that could be nice for formatting. Could possibly include: + * desc / ns information for our relay + * ps / netstat stats like load, uptime, and connection counts, etc + * implement control-spec proposals: + * https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/spec/proposals/172-cir… + * https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/spec/proposals/173-get… * unit tests - Primarily for util, for instance 'addfstr' woudl be a good candidate. - * show qos stats - Take a look at 'linux-tor-prio.sh' to see if any of the stats are - available and interesting. - * handle mutiple tor instances - First multiple tor instances on the same system, then via remote - connections too. - * Investigations of other possible tools: - * look into additions to the used apis - - curses (python 2.6 extended?): http://docs.python.org/library/curses.html - - new control options (like "desc-annotations/id/<OR identity>")? - - look deeper into TorCtl functions (has a resolve function? hu?) - * whois lookup for relays? ISP listing? - * look into what sort of information tcpdump and iptraf provides (probably - can't use for privacy reasons) - * vnstat, nload, mrtg, and traceroute - -- Ideas (low priority) + Primarily for util, for instance 'addfstr' would be a good candidate. * python 3 compatibility - Currently blocked on TorCtl support. - * bundle script that dumps relay stats to stdout - Django has a small terminal coloring module that could be nice for - formatting. Could possibly include: - - desc / ns information for our relay - - ps / netstat stats like load, uptime, and connection counts, etc - derived from an idea by StrangeCharm - * localization - Abstract strings from code and provide on translation portal. Thus far - there hasn't been any requests for this. - * provide option for a consensus page - Shows full consensus with an interface similar to the connection panel. - For this Mike's ConsensusTracker would be helpful (though boost the - startup time by several seconds) - * follow up on control-spec proposals - Proposal and related information is available at: - https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/spec/proposals/172-cir… - https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/spec/proposals/173-get… + Currently blocked on TorCtl support. diff --git a/src/interface/graphing/graphPanel.py b/src/interface/graphing/graphPanel.py index 9a8e1e4..706db75 100644 --- a/src/interface/graphing/graphPanel.py +++ b/src/interface/graphing/graphPanel.py @@ -340,11 +340,11 @@ class GraphPanel(panel.Panel): # creates bar graph (both primary and secondary) for col in range(graphCol): - colCount = param.primaryCounts[self.updateInterval][col + 1] - primaryMinBound + colCount = int(param.primaryCounts[self.updateInterval][col + 1]) - primaryMinBound colHeight = min(self.graphHeight, self.graphHeight * colCount / (max(1, primaryMaxBound) - primaryMinBound)) for row in range(colHeight): self.addstr(self.graphHeight + 1 - row, col + 5, " ", curses.A_STANDOUT | primaryColor) - colCount = param.secondaryCounts[self.updateInterval][col + 1] - secondaryMinBound + colCount = int(param.secondaryCounts[self.updateInterval][col + 1]) - secondaryMinBound colHeight = min(self.graphHeight, self.graphHeight * colCount / (max(1, secondaryMaxBound) - secondaryMinBound)) for row in range(colHeight): self.addstr(self.graphHeight + 1 - row, col + graphCol + 10, " ", curses.A_STANDOUT | secondaryColor)

1 0

[arm/master] Hotfixes for a couple issues discovered in the release and repairing the rpm build (not quite working yet, though).
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 79b7e13a0d6050f924b56ea8e62ecbf826917dbd Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 1 03:55:25 2010 +0000 Hotfixes for a couple issues discovered in the release and repairing the rpm build (not quite working yet, though). fix: install script was failing to make the temporary directory for the compressed man page fix: a torrc validation log entries had a typo svn:r23882 --- setup.py | 8 +++++++- src/interface/controller.py | 4 ++-- src/version.py | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 57a71da..d11080f 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,13 @@ if "install" in sys.argv: # temporary destination for the man page guarenteed to be unoccupied (to # avoid conflicting with files that are already there) - manOutputFile = gzip.open(tempfile.mktemp("/arm.1.gz"), 'wb') + tmpFilename = tempfile.mktemp("/arm.1.gz") + + # make dir if the path doesn't already exist + baseDir = os.path.dirname(tmpFilename) + if not os.path.exists(baseDir): os.makedirs(baseDir) + + manOutputFile = gzip.open(tmpFilename, 'wb') manOutputFile.write(manContents) manOutputFile.close() diff --git a/src/interface/controller.py b/src/interface/controller.py index a90bd85..d3fe1d6 100644 --- a/src/interface/controller.py +++ b/src/interface/controller.py @@ -492,9 +492,9 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): if defaultOptions: if len(defaultOptions) > 1: - msg += "\n- entries match their default values" + msg += "\n- entries match their default values: " else: - msg += "\n- entry matches its default value" + msg += "\n- entry matches its default value: " defaultOptions.sort() msg += ", ".join(defaultOptions) diff --git a/src/version.py b/src/version.py index a35c4ee..fc30f0b 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.0' -LAST_MODIFIED = "November 27, 2010" +VERSION = '1.4.0-2' +LAST_MODIFIED = "November 30, 2010"

1 0

[arm/master] Backporting fix for parsing multi-line exit policies to current release.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit d50aefb997137c360b4cd51d31faf83d93d9417d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 7 22:00:08 2010 +0000 Backporting fix for parsing multi-line exit policies to current release. svn:r22820 --- interface/connPanel.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/interface/connPanel.py b/interface/connPanel.py index d78c3ed..2fb1d72 100644 --- a/interface/connPanel.py +++ b/interface/connPanel.py @@ -8,7 +8,7 @@ import curses from threading import RLock from TorCtl import TorCtl -from util import log, connections, hostnames, panel, uiTools +from util import log, connections, hostnames, panel, torTools, uiTools # Scrubs private data from any connection that might belong to client or exit # traffic. This is a little overly conservative, hiding anything that isn't @@ -192,7 +192,10 @@ class ConnPanel(TorCtl.PostEventListener, panel.Panel): else: self.family = [] self.isBridge = self.conn.get_option("BridgeRelay")[0][1] == "1" - self.exitPolicy = self.conn.get_option("ExitPolicy")[0][1] + + policyEntries = torTools.getConn().getOption("ExitPolicy", multiple=True) + self.exitPolicy = ",".join(policyEntries) + self.exitPolicy = self.exitPolicy.replace("\\t", " ").replace("\"", "") if self.exitPolicy: self.exitPolicy += "," + self.conn.get_info("exit-policy/default")["exit-policy/default"] else: self.exitPolicy = self.conn.get_info("exit-policy/default")["exit-policy/default"]

1 0

[arm/packaging] VCS fields are expected to be in the upper section
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 129a413b23edeca1274351d858bc2661a9dd6c08 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 09:32:19 2011 -0700 VCS fields are expected to be in the upper section When in the build contents of deb/control this casued repeated warnings (not lintian errors): dpkg-source: warning: unknown information field 'Vcs-Git' in input data in package's section of control info file dpkg-source: warning: unknown information field 'Vcs-Browser' in input data in package's section of control info file --- build/debian/control | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/debian/control b/build/debian/control index b11c10f..793d6fc 100644 --- a/build/debian/control +++ b/build/debian/control @@ -5,6 +5,8 @@ Maintainer: Damian Johnson <atagar(a)torproject.org> Build-Depends: debhelper (>= 5), python-support (>= 0.6), cdbs (>= 0.4.49), python Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 +Vcs-Git: git://git.torproject.org/arm.git +Vcs-Browser: https://gitweb.torproject.org/arm.git Homepage: http://www.atagar.com/arm/ Package: tor-arm @@ -12,8 +14,6 @@ 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] Deb build process expects a local branches
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit e8cf0f4e96443dccfc9f0afa1674345631933e43 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 09:24:10 2011 -0700 Deb build process expects a local branches The deb-prep.sh script is written to use a local release and packaging branch, so if they don't exist it errors. --- build/debian/README.source | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/build/debian/README.source b/build/debian/README.source index 372638d..8f3bbdd 100644 --- a/build/debian/README.source +++ b/build/debian/README.source @@ -2,7 +2,8 @@ To rebuild this deb run the following... git clone git://git.torproject.org/arm.git cd arm -git checkout remotes/origin/packaging +git checkout -b release remotes/origin/release +git checkout -b packaging remotes/origin/packaging ./deb-prep-sh cd release_deb ./debian/make-deb

1 0

[arm/packaging] Making deb-prep take the arm version as an arg
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 292058c721a7370da6fb54094bf784b37d5d5599 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 09:05:03 2011 -0700 Making deb-prep take the arm version as an arg --- build/debian/README.source | 2 +- deb-prep.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build/debian/README.source b/build/debian/README.source index 8f3bbdd..078cc52 100644 --- a/build/debian/README.source +++ b/build/debian/README.source @@ -4,7 +4,7 @@ git clone git://git.torproject.org/arm.git cd arm git checkout -b release remotes/origin/release git checkout -b packaging remotes/origin/packaging -./deb-prep-sh +./deb-prep-sh <arm version> cd release_deb ./debian/make-deb diff --git a/deb-prep.sh b/deb-prep.sh index 6962143..f054064 100755 --- a/deb-prep.sh +++ b/deb-prep.sh @@ -14,7 +14,12 @@ # alternate (works, but not sure if it'll miss resources like gitignore): # tar czf tor-arm_1.3.7.orig.tar.gz --exclude-vcs --exclude="*.pyc" -v release -export DEB_VERSION="1.4.2.4" +if [ $# -lt 1 ] + then + echo "Usage: ./deb-prep.sh <arm version>" + exit 1 + else debVersion=$1 +fi mkdir release_deb git archive --format=tar release | (cd ./release_deb && tar xf -) @@ -24,7 +29,7 @@ git archive --format=tar release | (cd ./release_deb && tar xf -) # /usr/share/doc/arm/armrc.sample -> /usr/share/doc/tor-arm/armrc.sample.gz sed -i 's/\/usr\/share\/doc\/arm\/armrc.sample/\/usr\/share\/doc\/tor-arm\/armrc.sample.gz/g' release_deb/arm.1 -tar czf tor-arm_${DEB_VERSION}.orig.tar.gz release_deb +tar czf tor-arm_${debVersion}.orig.tar.gz release_deb (cd build && git archive --format=tar packaging debian) | (cd ./release_deb && tar xf -)

1 0

[arm/packaging] Adding an exporter script for arm's release branch
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit ff6e10a843539f92e9178606c81ea7044356bed2 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 17:57:18 2011 -0700 Adding an exporter script for arm's release branch A downside of moving from svn to git is that we no longer have a bundled TorCtl or easy counterpart of 'svn export'. This does both of these things to make generating release exports easy. --- export.sh | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/export.sh b/export.sh new file mode 100755 index 0000000..79c6b38 --- /dev/null +++ b/export.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# Exports a copy of arm's release branch to the given location. This copy is +# stripped of git metadata and includes a bundled copy of TorCtl. This accepts +# an optional argument for where to place the export. + +if [ $# -lt 1 ] + then exportDst="./arm" + else exportDst=$1 +fi + +# if the destination already exists then abort +if [ -d $exportDst ] +then + echo "unable to export, destination already exists: $exportDst" + exit 1 +fi + +# exports arm's release branch +mkdir $exportDst +git archive --format=tar release | (cd $exportDst && tar xf -) + +# fetches torctl to /tmp +torctlDir="$(mktemp -d)" +git clone git://git.torproject.org/pytorctl.git $torctlDir > /dev/null + +# exports torctl to the arm directory +(cd $torctlDir && git archive --format=tar --prefix=TorCtl/ master) | (cd $exportDst/src && tar xf - 2> /dev/null) + +# cleans up the temporary torctl repo +rm -rf torctlDir + +echo "arm exported to $exportDst" +

1 0

[arm/packaging] Applying dererk's patches for removing torctl
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit b550c7e53e3b9274d0f8dd98f6b13c80ca545b22 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 09:20:30 2011 -0700 Applying dererk's patches for removing torctl Dererk removed the bundled TorCtl for the previously uploaded arm deb and added himself to the uploaders field. Adding the debian/* changes made for that. --- build/debian/changelog | 8 ++++++++ build/debian/control | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index 6af48b4..bebe47e 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -4,6 +4,14 @@ tor-arm (1.4.2.4-1) unstable; urgency=low -- Damian Johnson <atagar(a)torproject.org> Sat, 21 Apr 2011 1:30:43 -0700 +tor-arm (1.4.1.2-2) unstable; urgency=low + + * Stripping out bundle TorCtl library, added run-time dep on python-torctl. + * Temporarly patching setuptools scripts to use system-wide TorCtl lib. + * Adding myself as Uploader. + + -- Ulises Vitulli <dererk(a)debian.org> Wed, 20 Apr 2011 11:36:17 -0300 + tor-arm (1.4.2.0-1) unstable; urgency=low * Upstream release 1.4.2.0. diff --git a/build/debian/control b/build/debian/control index 793d6fc..21a5308 100644 --- a/build/debian/control +++ b/build/debian/control @@ -2,6 +2,7 @@ Source: tor-arm Section: comm Priority: extra Maintainer: Damian Johnson <atagar(a)torproject.org> +Uploaders: Ulises Vitulli <dererk(a)debian.org> Build-Depends: debhelper (>= 5), python-support (>= 0.6), cdbs (>= 0.4.49), python Standards-Version: 3.9.1 XS-Python-Version: >= 2.5

1 0

[arm/packaging] Bumping the Debian Standards-Version
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit b78238a33c5763382d6c85ddca74197851bf5a7d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 09:33:17 2011 -0700 Bumping the Debian Standards-Version suggested by dererk --- build/debian/changelog | 8 +++++++- build/debian/control | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index bebe47e..5fdd2a4 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -2,7 +2,13 @@ tor-arm (1.4.2.4-1) unstable; urgency=low * Upstream release 1.4.2.4. - -- Damian Johnson <atagar(a)torproject.org> Sat, 21 Apr 2011 1:30:43 -0700 + -- Damian Johnson <atagar(a)torproject.org> Sat, 22 Apr 2011 1:30:43 -0700 + +tor-arm (1.4.2.4-1) unstable; urgency=low + + * Updated Standard-version to 3.9.2.0 (no changes needed). + + -- Damian Johnson <atagar(a)torproject.org> Sat, 22 Apr 2011 1:25:43 -0700 tor-arm (1.4.1.2-2) unstable; urgency=low diff --git a/build/debian/control b/build/debian/control index 21a5308..e9cb710 100644 --- a/build/debian/control +++ b/build/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Damian Johnson <atagar(a)torproject.org> Uploaders: Ulises Vitulli <dererk(a)debian.org> Build-Depends: debhelper (>= 5), python-support (>= 0.6), cdbs (>= 0.4.49), python -Standards-Version: 3.9.1 +Standards-Version: 3.9.2.0 XS-Python-Version: >= 2.5 Vcs-Git: git://git.torproject.org/arm.git Vcs-Browser: https://gitweb.torproject.org/arm.git

1 0

[arm/packaging] Bumping deb changelog to 1.4.2.4.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 8291777b45b337037be469a988a83051840e6b41 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 17:48:56 2011 -0700 Bumping deb changelog to 1.4.2.4. --- build/debian/changelog | 6 ++++++ deb-prep.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index 138b201..6af48b4 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,3 +1,9 @@ +tor-arm (1.4.2.4-1) unstable; urgency=low + + * Upstream release 1.4.2.4. + + -- Damian Johnson <atagar(a)torproject.org> Sat, 21 Apr 2011 1:30:43 -0700 + tor-arm (1.4.2.0-1) unstable; urgency=low * Upstream release 1.4.2.0. diff --git a/deb-prep.sh b/deb-prep.sh index 9bf7e2b..6962143 100755 --- a/deb-prep.sh +++ b/deb-prep.sh @@ -11,10 +11,10 @@ # dpkg-source -x tor-arm_1.4.0.1-1.dsc # debuild -rfakeroot -uc -us -j3 -# alternate (works, but svn export is simpler): +# alternate (works, but not sure if it'll miss resources like gitignore): # tar czf tor-arm_1.3.7.orig.tar.gz --exclude-vcs --exclude="*.pyc" -v release -export DEB_VERSION="1.2.3.4" +export DEB_VERSION="1.4.2.4" mkdir release_deb git archive --format=tar release | (cd ./release_deb && tar xf -)

1 0