- tor-commits - lists.torproject.org

[torbrowser/master] Added cleaning before retrieving source packages.
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit aff263156531d6ff39fd0db3affe3cfc2bf1cf2d Author: Shondoit Walker <shondoit(a)gmail.com> Date: Fri Nov 4 16:34:13 2011 +0100 Added cleaning before retrieving source packages. --- build-scripts/versions.mk | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 38fc45b..cbcca64 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -52,28 +52,35 @@ fetch-source-osx: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-to -mkdir $(FETCH_DIR) fetch-zlib: + -rm -f $(FETCH_DIR)/$(ZLIB_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) fetch-libpng: + -rm -f $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBPNG_URL) fetch-qt: + -rm -f $(FETCH_DIR)/$(QT_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL) fetch-openssl: + -rm -f $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) fetch-vidalia: + -rm -f $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) fetch-libevent: + -rm -f $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) fetch-tor: + -rm -f $(FETCH_DIR)/$(TOR_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL) fetch-firefox: - -rm -rf $(FETCH_DIR)/mozilla-release + -rm -f $(FETCH_DIR)/$(FIREFOX_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) unpack-source: unpack-zlib unpack-openssl unpack-libpng unpack-qt unpack-vidalia unpack-libevent unpack-tor unpack-firefox

1 0

[torbrowser/master] Added new target to patch mozilla-build as needed. Added support for mozilla-build in the build-firefox target
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit 2b9f333f55a32e46dc520c03b0ab94a6fa1bceda Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Nov 9 22:39:57 2011 +0100 Added new target to patch mozilla-build as needed. Added support for mozilla-build in the build-firefox target --- build-scripts/windows.mk | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index cdfd754..b79d2e4 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -56,6 +56,9 @@ VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe" CC=gcc +MSVC_VER=9 +FIREFOX_DIR=/c/mozilla-build/mozilla-release +MOZ_BUILD=/c/mozilla-build ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-windows @@ -108,13 +111,18 @@ build-tor: cd $(TOR_DIR) && make cd $(TOR_DIR) && make install -FIREFOX_DIR=/c/mozilla-build/mozilla-release +patch-mozbuild: + cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZ_BUILD) + cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZ_BUILD) + cp patch-mozilla-build.sh $(MOZ_BUILD) + cd $(MOZ_BUILD) && ./patch-mozilla-build.sh $(MSVC_VER) + build-firefox: cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-any-src.sh -# cmd /c C:/mozilla-build/start-msvc9 + cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)" build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor echo "If we're here, we've done something right."

1 0

[torbrowser/master] Patching for mozilla-build. start-msvc.patch will change mozilla-build to use our altered guess-msvc.bat and perform 'make -f client.mk' if a folder is given. guess-msvc-x64.bat is the standard guess-msvc.bat changed to be 64-bit aware. It redirects the registry queries to the required view of the registry.
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit aec6689de7305d025a38fe0af7caa357b5096b96 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Nov 9 22:49:02 2011 +0100 Patching for mozilla-build. start-msvc.patch will change mozilla-build to use our altered guess-msvc.bat and perform 'make -f client.mk' if a folder is given. guess-msvc-x64.bat is the standard guess-msvc.bat changed to be 64-bit aware. It redirects the registry queries to the required view of the registry. --- build-scripts/patch-mozilla-build.sh | 6 + .../mozilla-build/guess-msvc-x64.bat | 215 ++++++++++++++++++++ src/current-patches/mozilla-build/start-msvc.patch | 21 ++ 3 files changed, 242 insertions(+), 0 deletions(-) diff --git a/build-scripts/patch-mozilla-build.sh b/build-scripts/patch-mozilla-build.sh new file mode 100644 index 0000000..ba64629 --- /dev/null +++ b/build-scripts/patch-mozilla-build.sh @@ -0,0 +1,6 @@ +#!/bin/sh +#Patch the start file for the specified version. + +MSVC_VER=$1 + +patch start-msvc$MSVC_VER.bat -t < start-msvc.patch || exit 1 diff --git a/src/current-patches/mozilla-build/guess-msvc-x64.bat b/src/current-patches/mozilla-build/guess-msvc-x64.bat new file mode 100644 index 0000000..71a1f60 --- /dev/null +++ b/src/current-patches/mozilla-build/guess-msvc-x64.bat @@ -0,0 +1,215 @@ +REM -*- Mode: fundamental; tab-width: 8; indent-tabs-mode: 1 -*- +@ECHO OFF + +set CYGWIN= +if not defined MOZ_NO_RESET_PATH ( + set PATH=%SystemRoot%\System32;%SystemRoot%;%SystemRoot%\System32\Wbem +) + +REM if DISPLAY is set, rxvt attempts to load libX11.dll and fails to start +REM (see mozilla bug 376828) +SET DISPLAY= + +SET INCLUDE= +SET LIB= + +IF EXIST %WINDIR%\SysNative\reg.exe ( + SET REGNATIVE=%WINDIR%\SysNative\reg.Exe + SET REG32=%WINDIR%\System32\reg.exe +) ELSE ( + SET REGNATIVE=%WINDIR%\System32\reg.exe + IF EXIST %WINDIR%\SysWOW64\reg.exe ( + SET REG32=%WINDIR%\SysWOW64\reg.exe + ) ELSE ( + SET REG32=%WINDIR%\System32\reg.exe + ) +) + +SET MSVCROOTKEY=HKLM\SOFTWARE\Microsoft\VisualStudio +SET MSVCEXPROOTKEY=HKLM\SOFTWARE\Microsoft\VCExpress + +SET MSVC6KEY=%MSVCROOTKEY%\6.0\Setup\Microsoft Visual C++ +SET MSVC71KEY=%MSVCROOTKEY%\7.1\Setup\VC +SET MSVC8KEY=%MSVCROOTKEY%\8.0\Setup\VC +SET MSVC8EXPRESSKEY=%MSVCEXPROOTKEY%\8.0\Setup\VC +SET MSVC9KEY=%MSVCROOTKEY%\9.0\Setup\VC +SET MSVC9EXPRESSKEY=%MSVCEXPROOTKEY%\9.0\Setup\VC +SET MSVC10KEY=%MSVCROOTKEY%\10.0\Setup\VC +SET MSVC10EXPRESSKEY=%MSVCEXPROOTKEY%\10.0\Setup\VC + +REM First see if we can find MSVC, then set the variable +REM NOTE: delims=<tab><space> +REM NOTE: run the initial REQ QUERY outside of the if() to set ERRORLEVEL correctly + +%REG32% QUERY "%MSVC6KEY%" /v ProductDir >nul 2>nul +if "%VC6DIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC6KEY%" /v ProductDir') DO SET VC6DIR=%%B + ) +) + +%REG32% QUERY "%MSVC71KEY%" /v ProductDir >nul 2>nul +if "%VC71DIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC71KEY%" /v ProductDir') DO SET VC71DIR=%%B + ) +) + +%REG32% QUERY "%MSVC8KEY%" /v ProductDir >nul 2>nul +if "%VC8DIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC8KEY%" /v ProductDir') DO SET VC8DIR=%%B + ) +) + +%REG32% QUERY "%MSVC8EXPRESSKEY%" /v ProductDir >nul 2>nul +if "%VC8EXPRESSDIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC8EXPRESSKEY%" /v ProductDir') DO SET VC8EXPRESSDIR=%%B + ) +) + +%REG32% QUERY "%MSVC9KEY%" /v ProductDir >nul 2>nul +if "%VC9DIR%"=="" ( + REM Newer SDKs (6.1, 7.0) install the VC9 compilers and set this key, + REM but they're functionally equivalent to the VC9 Express compilers. + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC9KEY%" /v ProductDir') DO SET TEMPVC9DIR=%%B + ) +) + +REM We'll double-check for a VC9 Pro install here per the comment above. +%REG32% QUERY "%MSVCROOTKEY%\9.0\InstalledProducts\Microsoft Visual C++" >nul 2>nul +if NOT "%TEMPVC9DIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + SET "VC9DIR=%TEMPVC9DIR%" + ) ELSE ( + SET "VC9EXPRESSDIR=%TEMPVC9DIR%" + ) +) + +%REG32% QUERY "%MSVC9EXPRESSKEY%" /v ProductDir >nul 2>nul +if "%VC9EXPRESSDIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC9EXPRESSKEY%" /v ProductDir') DO SET VC9EXPRESSDIR=%%B + ) +) + +%REG32% QUERY "%MSVC10KEY%" /v ProductDir >nul 2>nul +if "%VC10DIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC10KEY%" /v ProductDir') DO SET VC10DIR=%%B + ) +) + +%REG32% QUERY "%MSVC10EXPRESSKEY%" /v ProductDir >nul 2>nul +if "%VC8EXPRESSDIR%"=="" ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* delims= " %%A IN ('%REG32% QUERY "%MSVC10EXPRESSKEY%" /v ProductDir') DO SET VC10EXPRESSDIR=%%B + ) +) + +REM Look for Installed SDKs: +SET SDKROOTKEY=HKLM\SOFTWARE\Microsoft\MicrosoftSDK\InstalledSDKs +SET SDK2003SP1KEY=%SDKROOTKEY%\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3 +SET SDK2003SP2KEY=%SDKROOTKEY%\D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1 +SET SDK6KEY=HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.0 +REM 6.0A comes with Visual C++ 2008. If you have 6.0 installed, even +REM the express edition will update you to 6.0A +SET SDK6AKEY=HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.0A +SET SDK61KEY=HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.1 +SET SDK7KEY=HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0 + +REM Just a base value to compare against +SET SDKVER=0 +SET SDKMINORVER=0 + +REM Support a maximum version of the Windows SDK to use, to support older +REM branches and older compilers. (Note that this is unrelated to the configure +REM option on which version of Windows to support.) +IF NOT DEFINED MOZ_MAXWINSDK ( + REM Maximum WinSDK version to use; 2 digits for major, 2 for minor, 2 for revision + REM Revivsion is A = 01, B = 02, etc. + SET MOZ_MAXWINSDK=999999 +) + + +%REGNATIVE% QUERY "%SDK7KEY%" /v InstallationFolder >nul 2>nul +if "%SDKDIR%"=="" IF %MOZ_MAXWINSDK% GEQ 70000 ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* usebackq delims= " %%A IN (`%REGNATIVE% QUERY "%SDK7KEY%" /v InstallationFolder`) DO SET SDKDIR=%%B + SET SDKVER=7 + ) +) + +%REGNATIVE% QUERY "%SDK61KEY%" /v InstallationFolder >nul 2>nul +if "%SDKDIR%"=="" IF %MOZ_MAXWINSDK% GEQ 60100 ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* usebackq delims= " %%A IN (`%REGNATIVE% QUERY "%SDK61KEY%" /v InstallationFolder`) DO SET SDKDIR=%%B + SET SDKVER=6 + SET SDKMINORVER=1 + ) +) + +%REGNATIVE% QUERY "%SDK6AKEY%" /v InstallationFolder >nul 2>nul +if "%SDKDIR%"=="" IF %MOZ_MAXWINSDK% GEQ 60001 ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* usebackq delims= " %%A IN (`%REGNATIVE% QUERY "%SDK6AKEY%" /v InstallationFolder`) DO SET SDKDIR=%%B + SET SDKVER=6 + REM insane, I know! + SET SDKMINORVER=0A + ) +) + +%REGNATIVE% QUERY "%SDK6KEY%" /v InstallationFolder >nul 2>nul +if "%SDKDIR%"=="" IF %MOZ_MAXWINSDK% GEQ 60000 ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=2* usebackq delims= " %%A IN (`%REGNATIVE% QUERY "%SDK6KEY%" /v InstallationFolder`) DO SET SDKDIR=%%B + SET SDKVER=6 + ) +) + +REM The Vista SDK (6.0 and 6.0A) ships with a VC8 Express install + +if "%SDKVER%"=="6" ( + if "%VC8EXPRESSDIR%"=="" ( + SET VC8EXPRESSDIR=%SDKDIR%VC\ + ) +) + +%REGNATIVE% QUERY "%SDK2003SP2KEY%" /v "Install Dir" >nul 2>nul +if "%PSDKDIR%"=="" IF %MOZ_MAXWINSDK% GEQ 50000 ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=3* delims= " %%A IN ('%REGNATIVE% QUERY "%SDK2003SP2KEY%" /v "Install Dir"') DO SET PSDKDIR=%%B + REM arbitrary, but works for me + SET PSDKVER=5 + ) +) + +%REGNATIVE% QUERY "%SDK2003SP1KEY%" /v "Install Dir" >nul 2>nul +if "%PSDKDIR%"=="" IF %MOZ_MAXWINSDK% GEQ 40000 ( + IF %ERRORLEVEL% EQU 0 ( + FOR /F "tokens=3* delims= " %%A IN ('%REGNATIVE% QUERY "%SDK2003SP1KEY%" /v "Install Dir"') DO SET PSDKDIR=%%B + SET PSDKVER=4 + ) +) + +if defined %VC6DIR% (ECHO Visual C++ 6 directory: %VC6DIR%) +if defined %VC71DIR% (ECHO Visual C++ 7.1 directory: %VC71DIR%) +if defined %VC8DIR% (ECHO Visual C++ 8 directory: %VC8DIR%) +if defined %VC8EXPRESSDIR% (ECHO Visual C++ 8 Express directory: %VC8EXPRESSDIR%) +if defined %VC9DIR% (ECHO Visual C++ 9 directory: %VC9DIR%) +if defined %VC9EXPRESSDIR% (ECHO Visual C++ 9 Express directory: %VC9EXPRESSDIR%) +if defined %VC10DIR% (ECHO Visual C++ 10 directory: %VC10DIR%) +if defined %VC10EXPRESSDIR% (ECHO Visual C++ 10 Express directory: %VC10EXPRESSDIR%) +if "%SDKDIR%"=="" ( + SET SDKDIR=%PSDKDIR% + SET SDKVER=%PSDKVER% +) else ( + ECHO Windows SDK directory: %SDKDIR% + ECHO Windows SDK version: %SDKVER%.%SDKMINORVER% +) +if not "%PSDKDIR%"=="" ( + ECHO Platform SDK directory: %PSDKDIR% + ECHO Platform SDK version: %PSDKVER% +) diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch new file mode 100644 index 0000000..6d70b86 --- /dev/null +++ b/src/current-patches/mozilla-build/start-msvc.patch @@ -0,0 +1,21 @@ +--- start-msvcx.bat.org 2010-08-17 23:01:48 +0200 ++++ start-msvcx.bat 2011-11-04 15:28:02 +0100 +@@ -7,7 +7,7 @@ + echo "Mozilla tools directory: %MOZBUILDDIR%" + + REM Get MSVC paths +-call "%MOZBUILDDIR%guess-msvc.bat" ++call "%MOZBUILDDIR%guess-msvc-x64.bat" + + REM Use the "new" moztools-static + set MOZ_TOOLS=%MOZBUILDDIR%moztools +@@ -84,4 +84,8 @@ + ) + ) + +-start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i ++if "%1"=="" ( ++ start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i" ++) else ( ++ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && make -f client.mk" ++)

1 0

[torbrowser/master] update windows mozilla-build directory to new location
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit 0e96ca2e08f5604a876fd7e65be7b5072b21ff5d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 10 02:59:12 2011 +0000 update windows mozilla-build directory to new location --- build-scripts/windows.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index b79d2e4..50efe76 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -57,8 +57,8 @@ WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe" CC=gcc MSVC_VER=9 -FIREFOX_DIR=/c/mozilla-build/mozilla-release -MOZ_BUILD=/c/mozilla-build +FIREFOX_DIR=/c/build/mozilla-build/mozilla-release +MOZ_BUILD=/c/build/mozilla-build ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-windows

1 0

[torbrowser/master] Merge branch 'clean-versions' into maint-2.2
by erinn＠torproject.org 10 Nov '11

10 Nov '11

commit 872c450fcf862f803ca36f624226246d5d8b87a1 Merge: aec6689 aff2631 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Nov 10 02:58:56 2011 +0000 Merge branch 'clean-versions' into maint-2.2 build-scripts/versions.mk | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)

1 0

[torflow/master] 4264 bad argument to SSLTestResult
by mikeperry＠torproject.org 09 Nov '11

09 Nov '11

commit ae161dd458bb01717dea207023ce5b490cc47aae Author: aagbsn <aagbsn(a)extc.org> Date: Wed Oct 19 15:04:58 2011 -0700 4264 bad argument to SSLTestResult replaced string "NoExit" with None because parent class TestResult does not expect a string. --- NetworkScanners/ExitAuthority/soat.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py index f647495..e462b57 100755 --- a/NetworkScanners/ExitAuthority/soat.py +++ b/NetworkScanners/ExitAuthority/soat.py @@ -1589,7 +1589,7 @@ class BaseSSLTest(Test): if ssl_domain.cert_changed: plog("NOTICE", "Fully dynamic certificate host "+address) - result = SSLTestResult("NoExit", "NotStored!", address, ssl_file_name, + result = SSLTestResult(None, "NotStored!", address, ssl_file_name, TEST_INCONCLUSIVE, INCONCLUSIVE_DYNAMICSSL) if self.rescan_nodes: @@ -1601,7 +1601,7 @@ class BaseSSLTest(Test): if not ssl_domain.num_certs(): plog("NOTICE", "No non-tor certs available for "+address) - result = SSLTestResult("NoExit", "NoStored!", address, ssl_file_name, + result = SSLTestResult(None, "NotStored!", address, ssl_file_name, TEST_INCONCLUSIVE, INCONCLUSIVE_NOLOCALCONTENT) if self.rescan_nodes:

1 0

[torflow/master] 4355 - correct inconsistency in documentation
by mikeperry＠torproject.org 09 Nov '11

09 Nov '11

commit 556ebd57f0176392a8934053e06b2efb81b3c3a2 Author: aagbsn <aagbsn(a)extc.org> Date: Sat Oct 29 21:00:05 2011 -0700 4355 - correct inconsistency in documentation We incorrectly reference SQLAlchemy-5.5. Updated to reference SQLAlchemy-7.x --- NetworkScanners/BwAuthority/README.BwAuthorities | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.BwAuthorities b/NetworkScanners/BwAuthority/README.BwAuthorities index 2653404..bfdffde 100644 --- a/NetworkScanners/BwAuthority/README.BwAuthorities +++ b/NetworkScanners/BwAuthority/README.BwAuthorities @@ -32,7 +32,7 @@ No special configure script options are needed, but again, both need to be running the master branch from tor git. -4. Download SQLAlchemy 0.5.x-latest and Elixir 0.6.x-latest +4. Download SQLAlchemy 0.7.x-latest and Elixir 0.7.x-latest The latest version of SQLAlchemy is 0.7.2 and the latest version of Elixir is 0.7.1 at the time of writing. While TorFlow is written to be compatible @@ -95,7 +95,7 @@ The new user should have write access to your bwscan dir from step 5. This is the script that will launch the scanners. By default, it launches four in parallel, and expects the git checkout to be in ../../../tor.git/, and the SQLAlchemy extraction to be in -../../../SQLAlchemy-0.5.5 +../../../SQLAlchemy-0.7.x Again, note that this is the same directory that contains the torflow checkout directory.

1 0

[torflow/master] Merge remote branch 'aagbsn/4355-documentation-inconsistency'
by mikeperry＠torproject.org 09 Nov '11

09 Nov '11

commit 2fea9e266636067216ebb9885fc08ac6fcc9993e Merge: 88f0912 556ebd5 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Nov 9 15:02:29 2011 -0800 Merge remote branch 'aagbsn/4355-documentation-inconsistency' NetworkScanners/BwAuthority/README.BwAuthorities | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[torflow/master] Merge remote branch 'aagbsn/4264-bad-argument-to-ssltestresult'
by mikeperry＠torproject.org 09 Nov '11

09 Nov '11

commit 8e94360d71e6e37c0dd19d7f43885cef2c265b99 Merge: 2fea9e2 ae161dd Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Nov 9 15:04:46 2011 -0800 Merge remote branch 'aagbsn/4264-bad-argument-to-ssltestresult' NetworkScanners/ExitAuthority/soat.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[torflow/master] Fix whitespace.
by mikeperry＠torproject.org 09 Nov '11

09 Nov '11

commit 88f0912e771cdf0982f7f51954477d65b9010e97 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Nov 9 14:19:47 2011 -0800 Fix whitespace. No tabs, plz. --- NetworkScanners/ExitAuthority/soat.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py index f647495..8d325fa 100755 --- a/NetworkScanners/ExitAuthority/soat.py +++ b/NetworkScanners/ExitAuthority/soat.py @@ -2661,8 +2661,8 @@ def usage(): def main(argv): # make sure we have something to test for if len(argv) < 2: - usage() - return + usage() + return TorUtil.read_config(data_dir+"/torctl.cfg") @@ -2670,11 +2670,11 @@ def main(argv): # make sure the arguments are correct try: - flags, trailer = getopt.getopt(argv[1:], [], opts) + flags, trailer = getopt.getopt(argv[1:], [], opts) except getopt.error, msg: - print msg - usage() - return + print msg + usage() + return # get specific test types do_resume = False

1 0