June 2012 - tor-commits - lists.torproject.org

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit a8043f0b9c767675e906f324fc3b9c34fbbedc33 Merge: 0fdea13 b9f4cc4 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 12 15:34:53 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)

1 0

[torbrowser/master] change the way torbutton is installed on linux since the old method no longer works
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit b9f4cc4144ea87f0dc08d6e1e9fd5b6fe8b23ef1 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 12 15:34:33 2012 -0300 change the way torbutton is installed on linux since the old method no longer works --- build-scripts/linux.mk | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index b122469..170916b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -336,7 +336,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language \ + make -f linux.mk copy-files_$* install-extensions install-torbutton install-lang-extensions patch-vidalia-language patch-firefox-language \ patch-pidgin-language update-extension-pref write-tbb-version touch $(STAMP_DIR)/bundle-localized_$*.stamp @@ -359,7 +359,7 @@ DUMMYPROFILE=$(BUNDLE)/.mozilla/ ## This is a little overcomplicated, but I'm keeping it here in case there are ## extensions we want to use in the future install-extensions: $(DEFAULT_EXTENSIONS) - for extension in *.xpi; \ + for extension in httpseverywhere.xpi noscript.xpi; \ do \ cp $$extension $$extension.zip; \ ext_id=$$(unzip -p $$extension.zip install.rdf | sed -n '/<em:id>/{s#[^<]*<em:id>$.*$</em:id>#\1#p;q}'); \ @@ -368,6 +368,10 @@ install-extensions: $(DEFAULT_EXTENSIONS) (cd $(BUNDLE)/Data/profile/extensions/$$ext_id/ && unzip *.zip && rm *.zip); \ done +install-torbutton: torbutton.xpi + mkdir -p $(BUNDLE)/Data/profile/extensions/ + cp torbutton.xpi $(BUNDLE)/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi + ## Language extensions need to be handled differently from other extensions install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US)

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit a8043f0b9c767675e906f324fc3b9c34fbbedc33 Merge: 0fdea13 b9f4cc4 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 12 15:34:53 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit 0fdea13a3edb93509857fd41cb1f3727210432f1 Merge: c7a53ba 1ee67f4 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 12 15:30:33 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 src/current-patches/mozilla-build/start-msvc.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit 0fdea13a3edb93509857fd41cb1f3727210432f1 Merge: c7a53ba 1ee67f4 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 12 15:30:33 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 src/current-patches/mozilla-build/start-msvc.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] Fix patching of start-msvcX.bat.
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit 1ee67f4606f921be1c9e135ea2692e316bdacbd5 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sat Jun 9 15:00:27 2012 +0200 Fix patching of start-msvcX.bat. Changes seem to be made in the new Firefox releases, which requires us to change our patching to call the Makefile in $(OBJDIR). --- src/current-patches/mozilla-build/start-msvc.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch index 4101d89..6ca3c55 100644 --- a/src/current-patches/mozilla-build/start-msvc.patch +++ b/src/current-patches/mozilla-build/start-msvc.patch @@ -28,5 +28,5 @@ So instead of running the actual packaging command we 'run' true instead. +if "%1"=="" ( + start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i" +) else ( -+ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package INNER_MAKE_PACKAGE=true" ++ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build && "%2" "%3" -C obj-* package INNER_MAKE_PACKAGE=true" +)

1 0

[torbrowser/master] Fix patching of start-msvcX.bat.
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit 1ee67f4606f921be1c9e135ea2692e316bdacbd5 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sat Jun 9 15:00:27 2012 +0200 Fix patching of start-msvcX.bat. Changes seem to be made in the new Firefox releases, which requires us to change our patching to call the Makefile in $(OBJDIR). --- src/current-patches/mozilla-build/start-msvc.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch index 4101d89..6ca3c55 100644 --- a/src/current-patches/mozilla-build/start-msvc.patch +++ b/src/current-patches/mozilla-build/start-msvc.patch @@ -28,5 +28,5 @@ So instead of running the actual packaging command we 'run' true instead. +if "%1"=="" ( + start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i" +) else ( -+ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package INNER_MAKE_PACKAGE=true" ++ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build && "%2" "%3" -C obj-* package INNER_MAKE_PACKAGE=true" +)

1 0

[torbrowser/maint-2.2] Fix patching of start-msvcX.bat.
by erinn＠torproject.org 12 Jun '12

12 Jun '12

commit 1ee67f4606f921be1c9e135ea2692e316bdacbd5 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sat Jun 9 15:00:27 2012 +0200 Fix patching of start-msvcX.bat. Changes seem to be made in the new Firefox releases, which requires us to change our patching to call the Makefile in $(OBJDIR). --- src/current-patches/mozilla-build/start-msvc.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch index 4101d89..6ca3c55 100644 --- a/src/current-patches/mozilla-build/start-msvc.patch +++ b/src/current-patches/mozilla-build/start-msvc.patch @@ -28,5 +28,5 @@ So instead of running the actual packaging command we 'run' true instead. +if "%1"=="" ( + start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i" +) else ( -+ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package INNER_MAKE_PACKAGE=true" ++ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build && "%2" "%3" -C obj-* package INNER_MAKE_PACKAGE=true" +)

1 0

[stem/master] Added convenient methods in BaseController and Controller.
by atagar＠torproject.org 12 Jun '12

12 Jun '12

commit c4b5917be15fdfce5921b2dd704f025be59ae97d Author: Beck <csybeck(a)gmail.com> Date: Thu Jun 7 10:45:57 2012 +0800 Added convenient methods in BaseController and Controller. --- stem/control.py | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/stem/control.py b/stem/control.py index 25b7b68..9ceb630 100644 --- a/stem/control.py +++ b/stem/control.py @@ -200,8 +200,6 @@ class BaseController: """ return self._socket - - def add_status_listener(self, callback, spawn = True): """ @@ -481,46 +479,46 @@ class Controller(BaseController): except stem.socket.ControllerError, exc: if default == UNDEFINED: raise exc else: return default - + def get_version(self): """ A convenience method to get tor version that current controller is connected to. - + :returns: :class:`stem.version.Version` - + :raises: * :class:`stem.socket.ControllerError` if unable to query the version * ValueError if unable to parse the version """ - + import stem.version raw_str = self.get_info("version") version_str = raw_str[:raw_str.find(' ')] return stem.version.Version(version_str) - + def authenticate(self, *args, **kwargs): """ A convenience method to authenticate the controller. - + :param: see :func:`stem.connection.authenticate` - + :raises: see :func:`stem.connection.authenticate` """ - + import stem.connection stem.connection.authenticate(self, *args, **kwargs) - + def protocolinfo(self): """ A convenience method to get the protocol info of the controller. - + :returns: :class:`stem.response.protocolinfo.ProtocolInfoResponse` provided by tor - + :raises: * :class:`stem.socket.ProtocolError` if the PROTOCOLINFO response is malformed * :class:`stem.socket.SocketError` if problems arise in establishing or using the socket """ - + import stem.connection return stem.connection.get_protocolinfo(self)

1 0

[stem/master] Added convenient methods in BaseController and Controller.
by atagar＠torproject.org 12 Jun '12

12 Jun '12

commit de09fd34f4246b3b0323998de3829962bcad0dc7 Author: Beck <csybeck(a)gmail.com> Date: Thu Jun 7 10:45:57 2012 +0800 Added convenient methods in BaseController and Controller. --- stem/control.py | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index 71b81bc..3568937 100644 --- a/stem/control.py +++ b/stem/control.py @@ -14,12 +14,15 @@ interacting at a higher level. Controller - General controller class intended for direct use. +- get_info - issues a GETINFO query + +- get_version - convenient method to get tor version BaseController - Base controller class asynchronous message handling. |- msg - communicates with the tor process |- is_alive - reports if our connection to tor is open or closed |- connect - connects or reconnects to tor |- close - shuts down our connection to the tor process + |- authenticate - convenient method to authenticate the controller + |- protocolinfo - convenient method to get the protocol info |- get_socket - provides the socket used for control communication |- add_status_listener - notifies a callback of changes in our status |- remove_status_listener - prevents further notification of status changes @@ -197,6 +200,26 @@ class BaseController: """ return self._socket + + def authenticate(self, *args, **kwargs): + """ + A convenient method to authenticate the controller. See the docstring of + :func:`stem.connection.authenticate` for details about parameters and + exceptions. + """ + + import stem.connection + stem.connection.authenticate(self, *args, **kwargs) + + def protocolinfo(self): + """ + A convenient method to get the protocol info of the controller. See the + docstring of :func:`stem.connection.get_protocolinfo()` for details about + params, return value, and exceptions. + """ + + import stem.connection + return stem.connection.get_protocolinfo(self) def add_status_listener(self, callback, spawn = True): """ @@ -477,3 +500,12 @@ class Controller(BaseController): if default == UNDEFINED: raise exc else: return default + def get_version(self): + """ + A convenient method to get tor version from controller. See the docstring + of :func:`get_info` for details about parameters, return value and + exceptions. + """ + + return self.get_info("version") +

1 0