- tor-commits - lists.torproject.org

[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] Converting deb prep to use git rather than svn
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 1a3cbf38fd9cbffa42d211055201892b112e210c Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 07:57:06 2011 -0700 Converting deb prep to use git rather than svn --- deb-prep.sh | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/deb-prep.sh b/deb-prep.sh index 69f109d..cfa2318 100755 --- a/deb-prep.sh +++ b/deb-prep.sh @@ -12,13 +12,17 @@ # alternate (works, but svn export is simpler): # tar czf tor-arm_1.3.7.orig.tar.gz --exclude-vcs --exclude="*.pyc" -v release -svn export release release_deb +export DEB_VERSION="1.2.3.4" + +mkdir release_deb +git archive --format=tar release | (cd ./release_deb && tar xf -) # edits the man page path for the sample armrc to reflect where it's located # on debian: # /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_1.4.2.0.orig.tar.gz release_deb -svn export resources/build/debian release_deb/debian +tar czf tor-arm_${DEB_VERSION}.orig.tar.gz release_deb + +(cd build && git archive --format=tar packaging debian) | (cd ./release_deb && tar xf -)

1 0

[arm/packaging] Converting rpm prep to use git rather than svn
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 89ffa9d28314ddcc913a60c369fc801beab669dd Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 07:59:33 2011 -0700 Converting rpm prep to use git rather than svn --- rpm-prep.sh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rpm-prep.sh b/rpm-prep.sh index 5c22f83..09c422b 100755 --- a/rpm-prep.sh +++ b/rpm-prep.sh @@ -4,6 +4,7 @@ # cd release_rpm # ./redhat/make-rpm -svn export release release_rpm -svn export resources/build/redhat release_rpm/redhat +mkdir release_rpm +git archive --format=tar release | (cd ./release_rpm && tar xf -) +(cd build && git archive --format=tar packaging redhat) | (cd ./release_rpm && tar xf -)

1 0

[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