[or-cvs] r23105: {arm} added: refactoring and script for building RPMs (in arm/trunk: . debian)
Damian Johnson
atagar1 at gmail.com
Tue Aug 31 05:17:51 UTC 2010
Author: atagar
Date: 2010-08-31 05:17:50 +0000 (Tue, 31 Aug 2010)
New Revision: 23105
Added:
arm/trunk/arm.1.gz
arm/trunk/debian/MANIFEST
arm/trunk/debian/arm.1.gz
arm/trunk/debian/make-rpm
Removed:
arm/trunk/arm.1
arm/trunk/debian/arm.1
Modified:
arm/trunk/debian/manpages
arm/trunk/setup.py
Log:
added: refactoring and script for building RPMs
Deleted: arm/trunk/arm.1
===================================================================
--- arm/trunk/arm.1 2010-08-30 17:25:30 UTC (rev 23104)
+++ arm/trunk/arm.1 2010-08-31 05:17:50 UTC (rev 23105)
@@ -1,69 +0,0 @@
-.TH arm 1 "27 August 2010"
-.SH NAME
-arm - Terminal Tor status monitor
-
-.SH SYNOPSIS
-arm [\fIOPTION\fR]
-
-.SH DESCRIPTION
-The anonymizing relay monitor (arm) is a terminal status monitor for Tor
-relays, intended for command-line aficionados, ssh connections, and anyone
-stuck with a tty terminal. This works much like top does for system usage,
-providing real time statistics for:
- * bandwidth, cpu, and memory usage
- * relay's current configuration
- * logged events
- * connection details (ip, hostname, fingerprint, and consensus data)
- * etc
-
-Defaults and interface properties are configurable via a user provided
-configuration file (for an example see the provided \fBarmrc.sample\fR).
-Releases and information are available at \fIhttp://www.atagar.com/arm\fR.
-
-.SH OPTIONS
-.TP
-\fB\-i\fR, \fB\-\-interface [ADDRESS:]PORT\fR
-tor control port arm should attach to (default is \fB127.0.0.1:9051\fR)
-
-.TP
-\fB\-c\fR, \fB\-\-config CONFIG_PATH\fR
-user provided configuration file (default is \fB~/.armrc\fR)
-
-.TP
-\fB\-b\fR, \fB\-\-blind\fR
-disable connection lookups (netstat, lsof, and ss), dropping the parts of the
-interface that rely on this information
-
-.TP
-\fB\-e\fR, \fB\-\-event EVENT_FLAGS\fR
-flags for tor, arm, and torctl events to be logged (default is \fBN3\fR)
-
- d DEBUG a ADDRMAP k DESCCHANGED s STREAM
- i INFO f AUTHDIR_NEWDESCS g GUARD r STREAM_BW
- n NOTICE h BUILDTIMEOUT_SET l NEWCONSENSUS t STATUS_CLIENT
- w WARN b BW m NEWDESC u STATUS_GENERAL
- e ERR c CIRC p NS v STATUS_SERVER
- j CLIENTS_SEEN q ORCONN
- DINWE tor runlevel+ A All Events
- 12345 arm runlevel+ X No Events
- 67890 torctl runlevel+ U Unknown Events
-
-.TP
-\fB\-v\fR, \fB\-\-verion\fR
-provides version information
-
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-provides usage information
-
-.SH FILES
-.TP
-\fB/usr/arm/armrc.sample\fR
-example configuration file
-
-.SH AUTHOR
-Written by Damian Johnson (atagar1 at gmail.com)
-
-.SH COPYRIGHT
-GNU GPL version 3, \fIhttp://gnu.org/licenses/gpl.html\fR
-
Added: arm/trunk/arm.1.gz
===================================================================
(Binary files differ)
Property changes on: arm/trunk/arm.1.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: arm/trunk/debian/MANIFEST
===================================================================
--- arm/trunk/debian/MANIFEST (rev 0)
+++ arm/trunk/debian/MANIFEST 2010-08-31 05:17:50 UTC (rev 23105)
@@ -0,0 +1,38 @@
+README
+setup.cfg
+setup.py
+arm
+arm.1.gz
+src/__init__.py
+src/prereq.py
+src/starter.py
+src/TorCtl/GeoIPSupport.py
+src/TorCtl/PathSupport.py
+src/TorCtl/SQLSupport.py
+src/TorCtl/ScanSupport.py
+src/TorCtl/StatsSupport.py
+src/TorCtl/TorCtl.py
+src/TorCtl/TorUtil.py
+src/TorCtl/__init__.py
+src/interface/__init__.py
+src/interface/confPanel.py
+src/interface/connPanel.py
+src/interface/controller.py
+src/interface/descriptorPopup.py
+src/interface/fileDescriptorPopup.py
+src/interface/headerPanel.py
+src/interface/logPanel.py
+src/interface/graphing/__init__.py
+src/interface/graphing/bandwidthStats.py
+src/interface/graphing/connStats.py
+src/interface/graphing/graphPanel.py
+src/interface/graphing/psStats.py
+src/util/__init__.py
+src/util/conf.py
+src/util/connections.py
+src/util/hostnames.py
+src/util/log.py
+src/util/panel.py
+src/util/sysTools.py
+src/util/torTools.py
+src/util/uiTools.py
Deleted: arm/trunk/debian/arm.1
===================================================================
--- arm/trunk/debian/arm.1 2010-08-30 17:25:30 UTC (rev 23104)
+++ arm/trunk/debian/arm.1 2010-08-31 05:17:50 UTC (rev 23105)
@@ -1 +0,0 @@
-link ../arm.1
\ No newline at end of file
Added: arm/trunk/debian/arm.1.gz
===================================================================
--- arm/trunk/debian/arm.1.gz (rev 0)
+++ arm/trunk/debian/arm.1.gz 2010-08-31 05:17:50 UTC (rev 23105)
@@ -0,0 +1 @@
+link ../arm.1.gz
\ No newline at end of file
Property changes on: arm/trunk/debian/arm.1.gz
___________________________________________________________________
Added: svn:special
+ *
Added: arm/trunk/debian/make-rpm
===================================================================
--- arm/trunk/debian/make-rpm (rev 0)
+++ arm/trunk/debian/make-rpm 2010-08-31 05:17:50 UTC (rev 23105)
@@ -0,0 +1,20 @@
+#!/bin/sh
+cp debian/MANIFEST ./
+python setup.py bdist_rpm
+
+# cleans up after rpm build
+files="build MANIFEST"
+
+for i in $files
+do
+ if [ -f $i -o -d $i ]; then
+ rm -rf $i
+
+ if [ $? = 0 ]; then
+ echo "removed $i"
+ else
+ exit 1
+ fi
+ fi
+done
+
Property changes on: arm/trunk/debian/make-rpm
___________________________________________________________________
Added: svn:executable
+ *
Modified: arm/trunk/debian/manpages
===================================================================
--- arm/trunk/debian/manpages 2010-08-30 17:25:30 UTC (rev 23104)
+++ arm/trunk/debian/manpages 2010-08-31 05:17:50 UTC (rev 23105)
@@ -1 +1 @@
-arm.1
+arm.1.gz
Modified: arm/trunk/setup.py
===================================================================
--- arm/trunk/setup.py 2010-08-30 17:25:30 UTC (rev 23104)
+++ arm/trunk/setup.py 2010-08-31 05:17:50 UTC (rev 23105)
@@ -13,7 +13,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"]),
+ data_files=[("/usr/share/man/man1", ["arm.1.gz"]),
("/usr/bin", ["arm"])],
)
More information about the tor-commits
mailing list