April 2011 - tor-commits - lists.torproject.org

[arm/master] Merging trunk for release 1.3.7.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

1 0

[arm/master] Upping the release version to reflect the previous hotfix.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 36fae04fe74e06fe18851b723c2a3fb535344c10 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 10 03:24:23 2010 +0000 Upping the release version to reflect the previous hotfix. svn:r22850 --- init/starter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/init/starter.py b/init/starter.py index 8ce8315..05c5b59 100644 --- a/init/starter.py +++ b/init/starter.py @@ -25,7 +25,7 @@ import util.torTools import util.uiTools import TorCtl.TorUtil -VERSION = "1.3.6" +VERSION = "1.3.6b" LAST_MODIFIED = "July 7, 2010" DEFAULT_CONFIG = os.path.expanduser("~/.armrc")

1 0

[arm/master] Revisions for the deb release build.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 9da2275af16d586dcfc30582765dcfc6b1d898d0 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 7 06:08:47 2010 +0000 Revisions for the deb release build. svn:r23441 --- debian/changelog | 10 ++++++++-- debian/control | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5464df0..9dd15fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ -tor-arm (0.3.6) unstable; urgency=low +tor-arm (1.3.7) unstable; urgency=low + + * see http://www.atagar.com/arm/log.php + + -- Damian Johnson (www.atagar.com) <atagar1(a)gmail.com> Wed, 6 Oct 2010 22:30:43 -0700 + +tor-arm (1.3.6) unstable; urgency=low * Initial release. - -- Damian Johnson <atagar(a)torproject.org> Mon, 30 Aug 2010 08:13:43 -0700 + -- Damian Johnson (www.atagar.com) <atagar1(a)gmail.com> Mon, 30 Aug 2010 08:13:43 -0700 diff --git a/debian/control b/debian/control index 9d019cc..7bd04fa 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,9 @@ Source: tor-arm Section: comm Priority: extra -Maintainer: Damian Johnson <atagar1(a)gmail.com> +Maintainer: Damian Johnson (www.atagar.com) <atagar1(a)gmail.com> Build-Depends: debhelper (>= 5), python-support (>= 0.6), cdbs (>= 0.4.49), python -Standards-Version: 3.8.3 +Standards-Version: 3.8.0 Homepage: http://www.atagar.com/arm Package: tor-arm

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] 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] 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] Including additional deb changes in its changelog
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit c2b25c5eaf366c72cf3e359a7d774eb03b5e550e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 23 10:27:11 2011 -0700 Including additional deb changes in its changelog --- build/debian/changelog | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index 5fdd2a4..1626da9 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,14 +1,11 @@ tor-arm (1.4.2.4-1) unstable; urgency=low * Upstream release 1.4.2.4. - - -- 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). + * Including pkg building instructions at README.source (closes: #623311). + * Adding Vcs-Git and Vcs-Browser control fields (closes: #623312). - -- Damian Johnson <atagar(a)torproject.org> Sat, 22 Apr 2011 1:25:43 -0700 + -- Damian Johnson <atagar(a)torproject.org> Sat, 22 Apr 2011 1:30:43 -0700 tor-arm (1.4.1.2-2) unstable; urgency=low

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] 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] 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