[or-cvs] r23144: {arm} change: rearranging resources to keep only things important (in arm/trunk: . debian src)
Damian Johnson
atagar1 at gmail.com
Tue Sep 7 16:37:32 UTC 2010
Author: atagar
Date: 2010-09-07 16:37:31 +0000 (Tue, 07 Sep 2010)
New Revision: 23144
Added:
arm/trunk/debian/arm.1.gz
arm/trunk/debian/setup.cfg
Removed:
arm/trunk/arm.1.gz
arm/trunk/debian/arm.1.gz
arm/trunk/setup.cfg
Modified:
arm/trunk/README
arm/trunk/TODO
arm/trunk/debian/MANIFEST
arm/trunk/debian/make-deb
arm/trunk/debian/make-rpm
arm/trunk/install
arm/trunk/setup.py
arm/trunk/src/uninstall
Log:
change: rearranging resources to keep only things important for the user in the root directory
fix: path mistake when uninstalling the man page
Modified: arm/trunk/README
===================================================================
--- arm/trunk/README 2010-09-07 14:57:01 UTC (rev 23143)
+++ arm/trunk/README 2010-09-07 16:37:31 UTC (rev 23144)
@@ -60,13 +60,12 @@
> Is there any chance that arm will leak data?
-Yes - arm is a passive listener with one exception. The second page
+Not by default, arm is a passive listener with one exception. The second page
(connections) provides the hostnames of Tor relays you're connected to. This
means reverse DNS lookups which, if monitored, could leak your current
-connections to an eavesdropper. However, lookups are only made upon request
-(when showing connection details or listing connections by hostname) and you
-can disable lookups entirely with 'r' - see the page's help for the current
-status.
+connections to an eavesdropper. However, this is disabled by default and
+lookups are only made upon request (when showing connection details or listing
+connections by hostname). See the page's help for how to enable lookups.
That said, this is not a terribly big whoop. ISPs and anyone sniffing your
connection already have this data - the only difference is that instead of
Modified: arm/trunk/TODO
===================================================================
--- arm/trunk/TODO 2010-09-07 14:57:01 UTC (rev 23143)
+++ arm/trunk/TODO 2010-09-07 16:37:31 UTC (rev 23144)
@@ -22,6 +22,8 @@
events to be easily saved.
- condense tor/arm log listing types if they're the same
Ie, make default "TOR/ARM NOTICE - ERR"
+ - drop duplicate or overly verbose messages (feature request by asn)
+ check if asn wants to implement this when refactoring is done
[ ] conf panel
- move torrc validation into util
- fetch text via getinfo rather than reading directly?
@@ -220,5 +222,6 @@
startup time by several seconds)
* follow up on control-spec proposals
Proposal and related information is available at:
- http://archives.seul.org/or/dev/Jun-2010/msg00008.html
+ https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/spec/proposals/172-circ-getinfo-option.txt
+ https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/spec/proposals/173-getinfo-option-expansion.txt
Deleted: arm/trunk/arm.1.gz
===================================================================
(Binary files differ)
Modified: arm/trunk/debian/MANIFEST
===================================================================
--- arm/trunk/debian/MANIFEST 2010-09-07 14:57:01 UTC (rev 23143)
+++ arm/trunk/debian/MANIFEST 2010-09-07 16:37:31 UTC (rev 23144)
@@ -2,7 +2,7 @@
setup.cfg
setup.py
arm
-arm.1.gz
+debian/arm.1.gz
src/__init__.py
src/prereq.py
src/starter.py
Deleted: arm/trunk/debian/arm.1.gz
===================================================================
--- arm/trunk/debian/arm.1.gz 2010-09-07 14:57:01 UTC (rev 23143)
+++ arm/trunk/debian/arm.1.gz 2010-09-07 16:37:31 UTC (rev 23144)
@@ -1 +0,0 @@
-link ../arm.1.gz
\ No newline at end of file
Copied: arm/trunk/debian/arm.1.gz (from rev 23105, arm/trunk/arm.1.gz)
===================================================================
(Binary files differ)
Modified: arm/trunk/debian/make-deb
===================================================================
--- arm/trunk/debian/make-deb 2010-09-07 14:57:01 UTC (rev 23143)
+++ arm/trunk/debian/make-deb 2010-09-07 16:37:31 UTC (rev 23144)
@@ -1,8 +1,10 @@
#!/bin/sh
+cp debian/setup.cfg ./
+cp debian/arm.1.gz ./
debuild -I.svn -i.svn -I.pyc -i.pyc
# cleans up after deb build
-files="build debian/tor-arm debian/python-module-stampdir debian/tor-arm.debhelper.log debian/files debian/tor-arm.substvars"
+files="build debian/tor-arm debian/python-module-stampdir debian/tor-arm.debhelper.log debian/files debian/tor-arm.substvars setup.cfg arm.1.gz"
for i in $files
do
Modified: arm/trunk/debian/make-rpm
===================================================================
--- arm/trunk/debian/make-rpm 2010-09-07 14:57:01 UTC (rev 23143)
+++ arm/trunk/debian/make-rpm 2010-09-07 16:37:31 UTC (rev 23144)
@@ -1,9 +1,10 @@
#!/bin/sh
+cp debian/setup.cfg ./
cp debian/MANIFEST ./
python setup.py bdist_rpm
# cleans up after rpm build
-files="build MANIFEST"
+files="build setup.cfg MANIFEST"
for i in $files
do
Copied: arm/trunk/debian/setup.cfg (from rev 23104, arm/trunk/setup.cfg)
===================================================================
--- arm/trunk/debian/setup.cfg (rev 0)
+++ arm/trunk/debian/setup.cfg 2010-09-07 16:37:31 UTC (rev 23144)
@@ -0,0 +1,3 @@
+[install]
+install-purelib=/usr/lib
+
Modified: arm/trunk/install
===================================================================
--- arm/trunk/install 2010-09-07 14:57:01 UTC (rev 23143)
+++ arm/trunk/install 2010-09-07 16:37:31 UTC (rev 23144)
@@ -2,7 +2,8 @@
python src/prereq.py
if [ $? = 0 ]; then
- python setup.py install --install-purelib /usr/lib
+ python setup.py -q install --install-purelib /usr/lib
rm -rf ./build
+ echo "installed to /usr/lib/arm"
fi
Deleted: arm/trunk/setup.cfg
===================================================================
--- arm/trunk/setup.cfg 2010-09-07 14:57:01 UTC (rev 23143)
+++ arm/trunk/setup.cfg 2010-09-07 16:37:31 UTC (rev 23144)
@@ -1,3 +0,0 @@
-[install]
-install-purelib=/usr/lib
-
Modified: arm/trunk/setup.py
===================================================================
--- arm/trunk/setup.py 2010-09-07 14:57:01 UTC (rev 23143)
+++ arm/trunk/setup.py 2010-09-07 16:37:31 UTC (rev 23144)
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import os
+import sys
from distutils.core import setup
VERSION = '1.3.6_dev'
@@ -13,7 +14,7 @@
url='http://www.atagar.com/arm/',
packages=['arm', 'arm.interface', 'arm.interface.graphing', 'arm.util', 'arm.TorCtl'],
package_dir={'arm': 'src'},
- data_files=[("/usr/share/man/man1", ["arm.1.gz"]),
+ data_files=[("/usr/share/man/man1", ["debian/arm.1.gz"]),
("/usr/bin", ["arm"])],
)
@@ -23,6 +24,6 @@
# TODO: not sure how to remove this from the deb build too...
eggPath = '/usr/lib/arm-%s.egg-info' % VERSION
if os.path.isfile(eggPath):
- print "Removing %s" % eggPath
+ if "-q" not in sys.argv: print "Removing %s" % eggPath
os.remove(eggPath)
Modified: arm/trunk/src/uninstall
===================================================================
--- arm/trunk/src/uninstall 2010-09-07 14:57:01 UTC (rev 23143)
+++ arm/trunk/src/uninstall 2010-09-07 16:37:31 UTC (rev 23144)
@@ -1,5 +1,5 @@
#!/bin/sh
-files="/usr/bin/arm /usr/share/man/man1/arm.1 /usr/lib/arm"
+files="/usr/bin/arm /usr/share/man/man1/arm.1.gz /usr/lib/arm"
for i in $files
do
More information about the tor-commits
mailing list