- tor-commits - lists.torproject.org

[arm/master] Tidying up the interpretor panel
by atagar＠torproject.org 29 Aug '11

29 Aug '11

commit d8d13f5fe5be8a29732d73d535df963aca34c8d9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 14:57:43 2011 -0700 Tidying up the interpretor panel --- src/cli/interpretorPanel.py | 72 +++++++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 33 deletions(-) diff --git a/src/cli/interpretorPanel.py b/src/cli/interpretorPanel.py index b81fa85..162fd19 100644 --- a/src/cli/interpretorPanel.py +++ b/src/cli/interpretorPanel.py @@ -5,28 +5,48 @@ information, tab completion, and other usability features. import curses -from util import enum, panel, textInput, torInterpretor, torTools, uiTools - -from TorCtl import TorCtl +from util import panel, textInput, torInterpretor, uiTools USAGE_INFO = "to use this panel press enter" +PROMPT_LINE = [(torInterpretor.PROMPT, torInterpretor.Formats.PROMPT), (USAGE_INFO, torInterpretor.Formats.USAGE)] # limits used for cropping -COMMAND_BACKLOG = 100 -LINES_BACKLOG = 2000 +BACKLOG_LIMIT = 100 +LINES_LIMIT = 2000 + +# lazy loaded curses formatting constants +FORMATS = {} + +def getFormat(format): + """ + Provides the curses drawing attributes for a torInterpretor.Formats enum. + This returns plain formatting if the entry doesn't exist. + + Arguments: + format - format enum to fetch + """ + + # initializes formats if they haven't yet been loaded + if not FORMATS: + FORMATS[torInterpretor.Formats.PROMPT] = curses.A_BOLD | uiTools.getColor("green") + FORMATS[torInterpretor.Formats.INPUT] = uiTools.getColor("cyan") + FORMATS[torInterpretor.Formats.INPUT_INTERPRETOR] = curses.A_BOLD | uiTools.getColor("magenta") + FORMATS[torInterpretor.Formats.INPUT_CMD] = curses.A_BOLD | uiTools.getColor("green") + FORMATS[torInterpretor.Formats.INPUT_ARG] = curses.A_BOLD | uiTools.getColor("cyan") + FORMATS[torInterpretor.Formats.OUTPUT] = uiTools.getColor("blue") + FORMATS[torInterpretor.Formats.USAGE] = uiTools.getColor("cyan") + FORMATS[torInterpretor.Formats.HELP] = uiTools.getColor("magenta") + FORMATS[torInterpretor.Formats.ERROR] = curses.A_BOLD | uiTools.getColor("red") + + return FORMATS.get(format, curses.A_NORMAL) class InterpretorPanel(panel.Panel): def __init__(self, stdscr): panel.Panel.__init__(self, stdscr, "interpretor", 0) self.isInputMode = False self.scroll = 0 - self.formats = {} # lazy loaded curses formatting constants - self.previousCommands = [] # user input, newest to oldest - - # contents of the panel (oldest to newest), each line is a list of (msg, - # format enum) tuples - - self.contents = [[(torInterpretor.PROMPT, torInterpretor.Formats.PROMPT), (USAGE_INFO, torInterpretor.Formats.USAGE)]] + self.previousCommands = [] # user input, newest to oldest + self.contents = [PROMPT_LINE] # (msg, format enum) tuples being displayed (oldest to newest) def prompt(self): """ @@ -34,9 +54,7 @@ class InterpretorPanel(panel.Panel): a blank line. """ - if not self.formats: self._initFormats() self.isInputMode = True - panel.CURSES_LOCK.acquire() while self.isInputMode: @@ -50,14 +68,17 @@ class InterpretorPanel(panel.Panel): if len(self.contents) > self.maxY - 1: xOffset += 3 # offset for scrollbar - input = self.getstr(min(self.maxY - 1, len(self.contents)), xOffset, "", self.formats[torInterpretor.Formats.INPUT], validator = validator) + inputLine = min(self.maxY - 1, len(self.contents)) + inputFormat = getFormat(torInterpretor.Formats.INPUT) + input = self.getstr(inputLine, xOffset, "", inputFormat, validator = validator) input, isDone = input.strip(), False if not input: + # terminate input when we get a blank line isDone = True else: self.previousCommands.insert(0, input) - self.previousCommands = self.previousCommands[:COMMAND_BACKLOG] + self.previousCommands = self.previousCommands[:BACKLOG_LIMIT] try: inputEntry, outputEntry = torInterpretor.handleQuery(input) @@ -70,7 +91,7 @@ class InterpretorPanel(panel.Panel): self.contents.append(promptEntry) # if too long then crop lines - cropLines = len(self.contents) - LINES_BACKLOG + cropLines = len(self.contents) - LINES_LIMIT if cropLines > 0: self.contents = self.contents[cropLines:] if isDone: @@ -80,8 +101,6 @@ class InterpretorPanel(panel.Panel): panel.CURSES_LOCK.release() def handleKey(self, key): - # TODO: allow contents to be searched (with hilighting?) - isKeystrokeConsumed = True if uiTools.isSelectionKey(key): self.prompt() @@ -97,8 +116,6 @@ class InterpretorPanel(panel.Panel): return isKeystrokeConsumed def draw(self, width, height): - if not self.formats: self._initFormats() - # page title usageMsg = " (enter \"/help\" for usage or a blank line to stop)" if self.isInputMode else "" self.addstr(0, 0, "Control Interpretor%s:" % usageMsg, curses.A_STANDOUT) @@ -118,21 +135,10 @@ class InterpretorPanel(panel.Panel): cursor = xOffset for msg, formatEntry in entry: - format = self.formats.get(formatEntry, curses.A_NORMAL) + format = getFormat(formatEntry) self.addstr(drawLine, cursor, msg, format) cursor += len(msg) drawLine += 1 if drawLine >= height: break - def _initFormats(self): - self.formats[torInterpretor.Formats.PROMPT] = curses.A_BOLD | uiTools.getColor("green") - self.formats[torInterpretor.Formats.INPUT] = uiTools.getColor("cyan") - self.formats[torInterpretor.Formats.INPUT_INTERPRETOR] = curses.A_BOLD | uiTools.getColor("magenta") - self.formats[torInterpretor.Formats.INPUT_CMD] = curses.A_BOLD | uiTools.getColor("green") - self.formats[torInterpretor.Formats.INPUT_ARG] = curses.A_BOLD | uiTools.getColor("cyan") - self.formats[torInterpretor.Formats.OUTPUT] = uiTools.getColor("blue") - self.formats[torInterpretor.Formats.USAGE] = uiTools.getColor("cyan") - self.formats[torInterpretor.Formats.HELP] = uiTools.getColor("magenta") - self.formats[torInterpretor.Formats.ERROR] = curses.A_BOLD | uiTools.getColor("red") -

1 0

[arm/master] Tab completion for control prompt input
by atagar＠torproject.org 29 Aug '11

29 Aug '11

commit aaec744638d997447db3b4c50a3080d93835dd12 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 17:41:17 2011 -0700 Tab completion for control prompt input This provides autocompletion for the control prompt based on the capabilities of the attached tor instance (fetching options from GETINFO info/names, config/names, etc). This uses readline so it's working for the terminal prompt but not the panel interpretor (which will need a validator implementation). --- src/util/torInterpretor.py | 122 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 116 insertions(+), 6 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 866495d..fecc2ac 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -62,14 +62,115 @@ def format(msg, *attr): if encodings: return (CSI % ";".join(encodings)) + msg + RESET - else: - raise IOError("BLARG! %s" % str(attr)) - return msg + else: return msg + +class TorCommandOptions: + """ + Command autocompleter, fetching the valid options from the attached Tor + instance. + """ + + def __init__(self): + self.commands = [] + conn = torTools.getConn() + + # adds all of the valid GETINFO options + infoOptions = conn.getInfo("info/names") + if infoOptions: + for line in infoOptions.split("\n"): + if " " in line: + # skipping non-existant options mentioned in: + # https://trac.torproject.org/projects/tor/ticket/3844 + + if line.startswith("config/*") or line.startswith("dir-usage"): + continue + + # strips off the ending asterisk if it accepts a value + infoOpt = line.split(" ", 1)[0] + + if infoOpt.endswith("*"): + infoOpt = infoOpt[:-1] + + self.commands.append("GETINFO %s" % infoOpt) + else: self.commands.append("GETINFO ") + + # adds all of the valid GETCONF / SETCONF / RESETCONF options + confOptions = conn.getInfo("config/names") + if confOptions: + # individual options are '<name> <type>' pairs + confEntries = [opt.split(" ", 1)[0] for opt in confOptions.split("\n")] + self.commands += ["GETCONF %s" % conf for conf in confEntries] + self.commands += ["SETCONF %s " % conf for conf in confEntries] + self.commands += ["RESETCONF %s" % conf for conf in confEntries] + else: + self.commands.append("GETCONF ") + self.commands.append("SETCONF ") + self.commands.append("RESETCONF ") + + # adds all of the valid SETEVENT options + eventOptions = conn.getInfo("events/names") + if eventOptions: + self.commands += ["SETEVENT %s" % event for event in eventOptions.split(" ")] + else: self.commands.append("SETEVENT ") + + # adds all of the valid USEFEATURE options + featureOptions = conn.getInfo("features/names") + if featureOptions: + self.commands += ["USEFEATURE %s" % feature for feature in featureOptions.split(" ")] + else: self.commands.append("USEFEATURE ") + + # adds all of the valid SIGNAL options + # this can't yet be fetched dynamically, as per: + # https://trac.torproject.org/projects/tor/ticket/3842 + + signals = ("RELOAD", "SHUTDOWN", "DUMP", "DEBUG", "HALT", "HUP", "INT", + "USR1", "USR2", "TERM", "NEWNYM", "CLEARDNSCACHE") + self.commands += ["SIGNAL %s" % sig for sig in signals] + + # shouldn't use AUTHENTICATE since we only provide the prompt with an + # authenticated controller connection + #self.commands.append("AUTHENTICATE") + + # other options + self.commands.append("SAVECONF") + self.commands.append("MAPADDRESS ") + self.commands.append("EXTENDCIRCUIT ") + self.commands.append("SETCIRCUITPURPOSE ") + self.commands.append("SETROUTERPURPOSE ") + self.commands.append("ATTACHSTREAM ") + self.commands.append("+POSTDESCRIPTOR ") # TODO: needs to support multiline options for this (ugg) + self.commands.append("REDIRECTSTREAM ") + self.commands.append("CLOSESTREAM ") + self.commands.append("CLOSECIRCUIT ") + self.commands.append("RESOLVE ") + self.commands.append("PROTOCOLINFO ") + self.commands.append("+LOADCONF") # TODO: another multiline... + self.commands.append("TAKEOWNERSHIP") + self.commands.append("QUIT") # TODO: give a confirmation when the user does this? + + def complete(self, text, state): + # provides case insensetive autocompletion options based on self.commands + for cmd in self.commands: + if cmd.lower().startswith(text.lower()): + if not state: return cmd + else: state -= 1 def prompt(): prompt = format(">>> ", Color.GREEN, Attr.BOLD) input = "" + # sets up tab autocompetion + torCommands = TorCommandOptions() + readline.parse_and_bind("tab: complete") + readline.set_completer(torCommands.complete) + + # Essentially disables autocompletion by word delimiters. This is because + # autocompletion options are full commands (ex. "GETINFO version") so we want + # "GETINFO" to match to all the options rather than be treated as a complete + # command by itself. + + readline.set_completer_delims("\n") + formatMap = {} # mapping of Format to Color and Attr enums formatMap[Formats.PROMPT] = (Attr.BOLD, Color.GREEN) formatMap[Formats.INPUT] = (Color.CYAN, ) @@ -82,7 +183,13 @@ def prompt(): formatMap[Formats.ERROR] = (Attr.BOLD, Color.RED) while input != "/quit": - input = raw_input(prompt) + try: + input = raw_input(prompt) + except: + # moves cursor to the next line and terminates (most commonly + # KeyboardInterrupt and EOFErro) + print + break _, outputEntry = handleQuery(input) @@ -129,16 +236,19 @@ def handleQuery(input): if " " in input: cmd, arg = input.split(" ", 1) else: cmd, arg = input, "" + # makes commands uppercase to match the spec + cmd = cmd.upper() + inputEntry.append((cmd + " ", Formats.INPUT_CMD)) if arg: inputEntry.append((arg, Formats.INPUT_ARG)) - if cmd.upper() == "GETINFO": + if cmd == "GETINFO": try: response = conn.getInfo(arg, suppressExc = False) outputEntry.append((response, Formats.OUTPUT)) except Exception, exc: outputEntry.append((str(exc), Formats.ERROR)) - elif cmd.upper() == "SETCONF": + elif cmd == "SETCONF": if "=" in arg: param, value = arg.split("=", 1)

1 0

[arm/master] Basic tab completion for interpretor panel
by atagar＠torproject.org 29 Aug '11

29 Aug '11

commit 7b58a20d69150d3628b758ddef7c014b740cb5de Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 18:27:16 2011 -0700 Basic tab completion for interpretor panel This performs tab completion in the interpretor panel when there's a single match. This does not, however, provide suggestions or common prefix completion yet. The suggestions in particular are gonna be a pita... --- src/cli/interpretorPanel.py | 3 +++ src/util/textInput.py | 34 ++++++++++++++++++++++++++++++++++ src/util/torInterpretor.py | 16 +++++++++++++++- 3 files changed, 52 insertions(+), 1 deletions(-) diff --git a/src/cli/interpretorPanel.py b/src/cli/interpretorPanel.py index 162fd19..95866db 100644 --- a/src/cli/interpretorPanel.py +++ b/src/cli/interpretorPanel.py @@ -61,8 +61,11 @@ class InterpretorPanel(panel.Panel): self.redraw(True) # intercepts input so user can cycle through the history + torCommands = torInterpretor.TorCommandOptions() + validator = textInput.BasicValidator() validator = textInput.HistoryValidator(self.previousCommands, validator) + validator = textInput.TabCompleter(torCommands.getMatches, validator) xOffset = len(torInterpretor.PROMPT) if len(self.contents) > self.maxY - 1: diff --git a/src/util/textInput.py b/src/util/textInput.py index c3c229f..31a5305 100644 --- a/src/util/textInput.py +++ b/src/util/textInput.py @@ -148,3 +148,37 @@ class HistoryValidator(TextInputValidator): return PASS +class TabCompleter(TextInputValidator): + """ + Provides tab completion based on the current input, finishing if there's only + a single match. This expects a functor that accepts the current input and + provides matches. + """ + + def __init__(self, completer, nextValidator = None): + TextInputValidator.__init__(self, nextValidator) + + # functor that accepts a string and gives a list of matches + self.completer = completer + + def handleKey(self, key, textbox): + # Matches against the tab key. The ord('\t') is nine, though strangely none + # of the curses.KEY_*TAB constants match this... + if key == 9: + matches = self.completer(textbox.gather().strip()) + + if len(matches) == 1: + # only a single match, fill it in + newInput = matches[0] + y, _ = textbox.win.getyx() + _, maxX = textbox.win.getmaxyx() + textbox.win.clear() + textbox.win.addstr(y, 0, newInput[:maxX - 1]) + textbox.win.move(y, min(len(newInput), maxX - 1)) + elif len(matches) > 1: + pass # TODO: somehow display matches... this is not gonna be fun + + return None + + return PASS + diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index fecc2ac..cffe200 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -148,8 +148,22 @@ class TorCommandOptions: self.commands.append("TAKEOWNERSHIP") self.commands.append("QUIT") # TODO: give a confirmation when the user does this? + def getMatches(self, text): + """ + Provides all options that match the given input. + + Arguments: + text - user input text to be matched against + """ + + return [cmd for cmd in self.commands if cmd.lower().startswith(text.lower())] + def complete(self, text, state): - # provides case insensetive autocompletion options based on self.commands + """ + Provides case insensetive autocompletion options, acting as a functor for + the readlines set_completer function. + """ + for cmd in self.commands: if cmd.lower().startswith(text.lower()): if not state: return cmd

1 0

[arm/master] Common prefix tab completion for interpretor panel
by atagar＠torproject.org 29 Aug '11

29 Aug '11

commit d6dca592931b529435d769fbf993659523cb08d6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 18:38:17 2011 -0700 Common prefix tab completion for interpretor panel Implementing common prefix autocompletion for the interpretor panel. Only thing left is displaying the matches... --- src/util/textInput.py | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/util/textInput.py b/src/util/textInput.py index 31a5305..c0f01ce 100644 --- a/src/util/textInput.py +++ b/src/util/textInput.py @@ -4,6 +4,7 @@ These can be chained together with the first matching validator taking precidence. """ +import os import curses PASS = -1 @@ -165,18 +166,28 @@ class TabCompleter(TextInputValidator): # Matches against the tab key. The ord('\t') is nine, though strangely none # of the curses.KEY_*TAB constants match this... if key == 9: - matches = self.completer(textbox.gather().strip()) + currentContents = textbox.gather().strip() + matches = self.completer(currentContents) + newInput = None if len(matches) == 1: # only a single match, fill it in newInput = matches[0] + elif len(matches) > 1: + # looks for a common prefix we can complete + commonPrefix = os.path.commonprefix(matches) # weird that this comes from path... + + if commonPrefix != currentContents: + newInput = commonPrefix + + # TODO: somehow display matches... this is not gonna be fun + + if newInput: y, _ = textbox.win.getyx() _, maxX = textbox.win.getmaxyx() textbox.win.clear() textbox.win.addstr(y, 0, newInput[:maxX - 1]) textbox.win.move(y, min(len(newInput), maxX - 1)) - elif len(matches) > 1: - pass # TODO: somehow display matches... this is not gonna be fun return None

1 0

[torspec/master] renumber CONF_CHANGED section
by arma＠torproject.org 28 Aug '11

28 Aug '11

commit 60118160829d7d01b70c04004aa39c4ef62cb089 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Aug 28 19:38:31 2011 -0400 renumber CONF_CHANGED section --- control-spec.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index a5550d3..61c858a 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1831,7 +1831,7 @@ 650-CLIENTS_SEEN TimeStarted="2008-12-25 23:50:43" CountrySummary=us=16,de=8,uk=8 -4.1.15. New consensus networkstatus has arrived. +4.1.15. New consensus networkstatus has arrived The syntax is: "650" "+" "NEWCONSENSUS" CRLF 1*NetworkStatus "." CRLF "650" SP @@ -1844,7 +1844,7 @@ [First added in 0.2.1.13-alpha] -4.1.16. New circuit buildtime has been set. +4.1.16. New circuit buildtime has been set The syntax is: "650" SP "BUILDTIMEOUT_SET" SP Type SP "TOTAL_TIMES=" Total SP @@ -1902,7 +1902,7 @@ [First added in 0.2.3.1-alpha] -4.1.17. Configuration changed +4.1.18. Configuration changed The syntax is: StartReplyLine *(MidReplyLine) EndReplyLine

1 0

[torspec/master] Clarify multi-line commands in control spec
by nickm＠torproject.org 28 Aug '11

28 Aug '11

commit 361171e63145ecaa5c760ad3ec927a0dc9eec83f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Aug 28 19:35:39 2011 -0400 Clarify multi-line commands in control spec --- control-spec.txt | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 2dd9a92..55f7654 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -103,11 +103,16 @@ 2.2. Commands from controller to Tor - Command = Keyword Arguments CRLF / "+" Keyword Arguments CRLF Data + Command = Keyword Arguments CRLF / "+" Keyword Arguments CRLF CmdData Keyword = 1*ALPHA Arguments = *(SP / VCHAR) - Specific commands and their arguments are described below in section 3. + A command is either a single line containing a Keyword and arguments, or a + multiline command whose initial keyword begins with +, and whose data + section ends with a single "." on a line of its own. (We use a special + character to distinguish multiline commands so that Tor can correctly parse + multi-line commands that it does not recognize.) Specific commands and + their arguments are described below in section 3. 2.3. Replies from Tor to the controller @@ -175,11 +180,11 @@ Address = ip4-address / ip6-address / hostname (XXXX Define these) - ; A "Data" section is a sequence of octets concluded by the terminating + ; A "CmdData" section is a sequence of octets concluded by the terminating ; sequence CRLF "." CRLF. The terminating sequence may not appear in the ; body of the data. Leading periods on lines in the data are escaped with ; an additional leading period as in RFC 2821 section 4.5.2. - Data = *DataLine "." CRLF + CmdData = *DataLine "." CRLF DataLine = CRLF / "." 1*LineItem CRLF / NonDotItem *LineItem CRLF LineItem = NonCR / 1*CR NonCRLF NonDotItem = NonDotCR / 1*CR NonCRLF

1 0

[torspec/master] Fix ambiguity in splitting keyword from arguments
by nickm＠torproject.org 28 Aug '11

28 Aug '11

commit f30a4da9abe66ddec3fc92d0d8437fb89bfe65af Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Aug 28 19:37:49 2011 -0400 Fix ambiguity in splitting keyword from arguments --- control-spec.txt | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 55f7654..a5550d3 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -103,9 +103,9 @@ 2.2. Commands from controller to Tor - Command = Keyword Arguments CRLF / "+" Keyword Arguments CRLF CmdData + Command = Keyword OptArguments CRLF / "+" Keyword OptArguments CRLF CmdData Keyword = 1*ALPHA - Arguments = *(SP / VCHAR) + OptArguments = [ SP *(SP / VCHAR) ] A command is either a single line containing a Keyword and arguments, or a multiline command whose initial keyword begins with +, and whose data @@ -927,7 +927,7 @@ AuthLine = "250-AUTH" SP "METHODS=" AuthMethod *("," AuthMethod) *(SP "COOKIEFILE=" AuthCookieFile) CRLF - VersionLine = "250-VERSION" SP "Tor=" TorVersion [SP Arguments] CRLF + VersionLine = "250-VERSION" SP "Tor=" TorVersion OptArguments CRLF AuthMethod = "NULL" / ; No authentication is required @@ -937,7 +937,7 @@ AuthCookieFile = QuotedString TorVersion = QuotedString - OtherLine = "250-" Keyword [SP Arguments] CRLF + OtherLine = "250-" Keyword OptArguments CRLF PIVERSION: 1*DIGIT @@ -1370,9 +1370,9 @@ StatusKeyword = 1*(ALNUM / "_") StatusValue = 1*(ALNUM / '_') / QuotedString - Action is a string, and Arguments is a series of keyword=value - pairs on the same line. Values may be space-terminated strings, - or quoted strings. + StatusAction is a string, and StatusArguments is a series of + keyword=value pairs on the same line. Values may be space-terminated + strings, or quoted strings. These events are always produced with EXTENDED_EVENTS and VERBOSE_NAMES; see the explanations in the USEFEATURE section

1 0

r24974: {website} bump all package versions to tor 0.2.2.32 (website/trunk/include)
by Erinn Clark 28 Aug '11

28 Aug '11

Author: erinn Date: 2011-08-28 21:28:13 +0000 (Sun, 28 Aug 2011) New Revision: 24974 Modified: website/trunk/include/versions.wmi Log: bump all package versions to tor 0.2.2.32 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-08-28 19:00:52 UTC (rev 24973) +++ website/trunk/include/versions.wmi 2011-08-28 21:28:13 UTC (rev 24974) @@ -1,53 +1,53 @@ <define-tag version-stable whitespace=delete>0.2.2.32</define-tag> <define-tag version-alpha whitespace=delete>0.2.3.2-alpha</define-tag> -<define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-win32-stable whitespace=delete>0.2.2.32</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-win32-bundle-stable whitespace=delete>0.2.2.32</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.30-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.32-<version-vidalia-stable></define-tag> -<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.32</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.32</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-osx-x86-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-x86-stable whitespace=delete>0.2.2.32</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.32</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>1.3.27</define-tag> -<define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>1.3.28</define-tag> +<define-tag version-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.13-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>3.6.20</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> -<define-tag version-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> +<define-tag version-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.13</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.13</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.14</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.14</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.13, zlib-1.2.5, openssl-0.9.8p</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.20</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> -<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> +<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.23</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>1.0.24</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.20</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> -<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> +<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> -<define-tag version-torbrowserbundleff5 whitespace=delete>2.2.30-1</define-tag> +<define-tag version-torbrowserbundleff5 whitespace=delete>2.2.32-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.14</define-tag> @@ -60,18 +60,18 @@ <define-tag package-win32-stable whitespace=delete>/dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> <define-tag package-win32-alpha whitespace=delete>/dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> -<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.12.exe</define-tag> +<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> <define-tag package-win32-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> -<define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.12.exe</define-tag> +<define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> -<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.12-i386.dmg</define-tag> +<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.14-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> -<define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.12-i386.dmg</define-tag> +<define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.14-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-osx-x86-bundle-alpha></define-tag> -<define-tag package-osx-ppc-bundle-stable whitespace=delete>/dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.12-ppc.dmg</define-tag> -<define-tag package-osx-ppc-bundle-alpha whitespace=delete>/dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.12-ppc.dmg</define-tag> +<define-tag package-osx-ppc-bundle-stable whitespace=delete>/dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.14-ppc.dmg</define-tag> +<define-tag package-osx-ppc-bundle-alpha whitespace=delete>/dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.14-ppc.dmg</define-tag> <define-tag package-osx-x86-stable whitespace=delete>/dist/osx-x86/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag> <define-tag package-osx-x86-alpha whitespace=delete>/dist/osx-x86/Tor-<version-osx-alpha>-i386-Bundle.dmg</define-tag>

1 0

[torbutton/master] Fix permissions and missing directory in build docuscript.
by mikeperry＠torproject.org 28 Aug '11

28 Aug '11

commit b049877222dfa9990246836098dab2bf45bc569e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Aug 28 13:25:51 2011 -0700 Fix permissions and missing directory in build docuscript. --- README.RELEASE | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/README.RELEASE b/README.RELEASE index c77e952..b485f41 100644 --- a/README.RELEASE +++ b/README.RELEASE @@ -44,6 +44,7 @@ cd torbutton-release git tag -v ${VERSION} # verify signature against git protocol haaAAXXXX git checkout -b tag-${VERSION} ${VERSION} + mkdir ./pkg sh makexpi.sh #. SHA1 + Sign the .xpi @@ -53,6 +54,7 @@ #. Upload .xpi to website + chmod 664 ./pkg/torbutton-${VERSION}.xpi* torsocks scp ./pkg/torbutton-${VERSION}.xpi* vescum:/srv/www-master.torproject.org/htdocs/dist/torbutton/ torsocks scp ./pkg/torbutton-${VERSION}.xpi vescum:/srv/www-master.torproject.org/htdocs/dist/torbutton/torbutton-curre… torsocks scp ./pkg/torbutton-${VERSION}.xpi.asc vescum:/srv/www-master.torproject.org/htdocs/dist/torbutton/torbutton-curre…

1 0

[torbrowser/maint-2.2] add auto port selection to windows config files
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 9f30b4174acda826297b0e75c3e25dfabc164250 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 20:42:52 2011 +0100 add auto port selection to windows config files --- build-scripts/config/torrc | 3 ++- build-scripts/config/vidalia.conf.ff | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/torrc b/build-scripts/config/torrc index 29154fb..143c71a 100644 --- a/build-scripts/config/torrc +++ b/build-scripts/config/torrc @@ -8,5 +8,6 @@ GeoIPFile .\Data\Tor\geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9050 +SocksPort auto SocksListenAddress 127.0.0.1 +ControlPort auto diff --git a/build-scripts/config/vidalia.conf.ff b/build-scripts/config/vidalia.conf.ff index 03ed00a..d66f53f 100644 --- a/build-scripts/config/vidalia.conf.ff +++ b/build-scripts/config/vidalia.conf.ff @@ -7,3 +7,5 @@ LanguageCode=en ControlPort=9051 TorExecutable=.\\App\\tor.exe Torrc=.\\Data\\Tor\\torrc +AutoControl=true +DataDirectory=.\\Data\\Tor

1 0