- tor-commits - lists.torproject.org

[torbrowser/maint-2.3] Remove Vidalia geometry.
by erinn＠torproject.org 02 Aug '12

02 Aug '12

commit 23b36fe831e38d385011435fdec1f10b15dc97db Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Jul 25 21:11:29 2012 +0200 Remove Vidalia geometry. We want to use the default geometry instead of some random predefined geometry in the config. --- .../config/alpha/vidalia.conf.ff-obfsproxy | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy index 6d6fa7d..a781b7a 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy @@ -17,18 +17,3 @@ DataDirectory=..\\Data\\Tor ProxyType=none UseBridges=true Bridge=obfs2 38.229.33.18:42401, obfs2 85.17.20.242:61264, obfs2 85.214.131.213:1051, obfs2 86.59.30.35:45605, obfs2 91.208.34.7:5353, obfs2 109.105.109.163:53999, obfs2 109.163.233.195:1051, obfs2 128.31.0.34:1051, obfs2 131.215.158.1:29936, obfs2 173.254.192.38:1051, obfs2 188.40.20.215:32982, obfs2 212.112.242.160:49259, obfs2 213.108.105.129:36609 - -[MessageLog] -Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x2\xc9\0\0\x2\x96\0\0\0\b\0\0\0\x1e\0\0\x2\xc1\0\0\x2\x8e\0\0\0\0\0\0) - -[BandwidthGraph] -Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x2(\0\0\x1X\0\0\0\0\0\0\0\0\0\0\x2(\0\0\x1X\0\0\0\0\0\0) - -[NetViewer] -Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x3K\0\0\x2S\0\0\0\0\0\0\0\0\0\0\x3K\0\0\x2S\0\0\0\0\0\0) - -[ConfigDialog] -Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x2W\0\0\x1\x8f\0\0\0\0\0\0\0\0\0\0\x2W\0\0\x1\x8f\0\0\0\0\0\0) - -[MainWindow] -Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\x1J\0\0\0\xaf\0\0\x2\xb5\0\0\x2R\0\0\x1R\0\0\0\xcd\0\0\x2\xad\0\0\x2J\0\0\0\0\0\0)

1 0

[torbrowser/maint-2.3] Add config files for obfsproxy on Linux and OSX.
by erinn＠torproject.org 02 Aug '12

02 Aug '12

commit 8f1fd9e59b95d5ba7b3865fcc92d21f70fb45c78 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Jul 25 21:59:57 2012 +0200 Add config files for obfsproxy on Linux and OSX. --- build-scripts/config/alpha/torrc-obfsproxy-linux | 31 ++++++++++++++++++++ build-scripts/config/alpha/torrc-obfsproxy-osx | 31 ++++++++++++++++++++ .../config/alpha/vidalia.conf.ff-obfsproxy-linux | 20 +++++++++++++ .../config/alpha/vidalia.conf.ff-obfsproxy-osx | 19 ++++++++++++ 4 files changed, 101 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/alpha/torrc-obfsproxy-linux b/build-scripts/config/alpha/torrc-obfsproxy-linux new file mode 100644 index 0000000..24788b3 --- /dev/null +++ b/build-scripts/config/alpha/torrc-obfsproxy-linux @@ -0,0 +1,31 @@ +# If non-zero, try to write to disk less frequently than we would otherwise. +AvoidDiskWrites 1 +# Store working data, state, keys, and caches here. +DataDirectory ./Data/Tor +GeoIPFile ./Data/Tor/geoip +# Where to send logging messages. Format is minSeverity[-maxSeverity] +# (stderr|stdout|syslog|file FILENAME). +Log notice stdout +# Bind to this address to listen to connections from SOCKS-speaking +# applications. +SocksPort auto +SocksListenAddress 127.0.0.1 +ControlPort auto + +UseBridges 1 + +bridge obfs2 38.229.33.18:42401 +bridge obfs2 85.17.20.242:61264 +bridge obfs2 85.214.131.213:1051 +bridge obfs2 86.59.30.35:45605 +bridge obfs2 91.208.34.7:5353 +bridge obfs2 109.105.109.163:53999 +bridge obfs2 109.163.233.195:1051 +bridge obfs2 128.31.0.34:1051 +bridge obfs2 131.215.158.1:29936 +bridge obfs2 173.254.192.38:1051 +bridge obfs2 188.40.20.215:32982 +bridge obfs2 212.112.242.160:49259 +bridge obfs2 213.108.105.129:36609 + +ClientTransportPlugin obfs2 exec obfsproxy --managed diff --git a/build-scripts/config/alpha/torrc-obfsproxy-osx b/build-scripts/config/alpha/torrc-obfsproxy-osx new file mode 100644 index 0000000..80d343d --- /dev/null +++ b/build-scripts/config/alpha/torrc-obfsproxy-osx @@ -0,0 +1,31 @@ +# If non-zero, try to write to disk less frequently than we would otherwise. +AvoidDiskWrites 1 +# Store working data, state, keys, and caches here. +DataDirectory ../../Contents/Resources/Data/Tor +GeoIPFile ../../Contents/Resources/Data/Tor/geoip +# Where to send logging messages. Format is minSeverity[-maxSeverity] +# (stderr|stdout|syslog|file FILENAME). +Log notice stdout +# Bind to this address to listen to connections from SOCKS-speaking +# applications. +SocksPort auto +SocksListenAddress 127.0.0.1 +ControlPort auto + +UseBridges 1 + +bridge obfs2 38.229.33.18:42401 +bridge obfs2 85.17.20.242:61264 +bridge obfs2 85.214.131.213:1051 +bridge obfs2 86.59.30.35:45605 +bridge obfs2 91.208.34.7:5353 +bridge obfs2 109.105.109.163:53999 +bridge obfs2 109.163.233.195:1051 +bridge obfs2 128.31.0.34:1051 +bridge obfs2 131.215.158.1:29936 +bridge obfs2 173.254.192.38:1051 +bridge obfs2 188.40.20.215:32982 +bridge obfs2 212.112.242.160:49259 +bridge obfs2 213.108.105.129:36609 + +ClientTransportPlugin obfs2 exec obfsproxy --managed diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux new file mode 100644 index 0000000..bd09a17 --- /dev/null +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux @@ -0,0 +1,20 @@ +[General] +InterfaceStyle=Cleanlooks +LanguageCode=en +PluginPath=./Data/Vidalia/plugins + +[Tor] +ControlPort=9051 +TorExecutable=./App/tor +Torrc=./Data/Tor/torrc +AutoControl=true +DataDirectory=./Data/Tor + +[TBB] +BrowserDirectory=. +BrowserExecutable=firefox + +[Network] +ProxyType=none +UseBridges=true +Bridge=obfs2 38.229.33.18:42401, obfs2 85.17.20.242:61264, obfs2 85.214.131.213:1051, obfs2 86.59.30.35:45605, obfs2 91.208.34.7:5353, obfs2 109.105.109.163:53999, obfs2 109.163.233.195:1051, obfs2 128.31.0.34:1051, obfs2 131.215.158.1:29936, obfs2 173.254.192.38:1051, obfs2 188.40.20.215:32982, obfs2 212.112.242.160:49259, obfs2 213.108.105.129:36609 diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx new file mode 100644 index 0000000..e2d857e --- /dev/null +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx @@ -0,0 +1,19 @@ +[General] +PluginPath=../../Library/Vidalia/plugins +LanguageCode=en + +[Tor] +ControlPort=9051 +TorExecutable=../../Contents/MacOS/tor +Torrc=../../Library/Vidalia/torrc +AutoControl=true +DataDirectory=../../Contents/Resources/Data/Tor + +[TBB] +BrowserDirectory=../../ +BrowserExecutable=firefox-bin + +[Network] +ProxyType=none +UseBridges=true +Bridge=obfs2 38.229.33.18:42401, obfs2 85.17.20.242:61264, obfs2 85.214.131.213:1051, obfs2 86.59.30.35:45605, obfs2 91.208.34.7:5353, obfs2 109.105.109.163:53999, obfs2 109.163.233.195:1051, obfs2 128.31.0.34:1051, obfs2 131.215.158.1:29936, obfs2 173.254.192.38:1051, obfs2 188.40.20.215:32982, obfs2 212.112.242.160:49259, obfs2 213.108.105.129:36609

1 0

[torbrowser/maint-2.3] Linux: Update vidalia.confs to work with the new Vidalia.
by erinn＠torproject.org 02 Aug '12

02 Aug '12

commit 0490fa4c0189105b3b4fb1d431a7d321b9ecc817 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Thu Jul 26 15:18:30 2012 +0200 Linux: Update vidalia.confs to work with the new Vidalia. --- .../config/alpha/vidalia.conf.ff-obfsproxy-linux | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux index bd09a17..cb97dc2 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux @@ -1,18 +1,19 @@ [General] +BrowserDirectory=./Firefox +BrowserExecutable=firefox InterfaceStyle=Cleanlooks LanguageCode=en -PluginPath=./Data/Vidalia/plugins +ProfileDirectory=../../Data/profile +DefaultProfileDirectory=./defaults/profile +PluginsDirectory=../../Data/profile/extensions +DefaultPluginsDirectory=./extensions [Tor] ControlPort=9051 -TorExecutable=./App/tor -Torrc=./Data/Tor/torrc +TorExecutable=./tor +Torrc=../Data/Tor/torrc AutoControl=true -DataDirectory=./Data/Tor - -[TBB] -BrowserDirectory=. -BrowserExecutable=firefox +DataDirectory=../Data/Tor [Network] ProxyType=none

1 0

[torbrowser/maint-2.3] Linux: Fix torrc to start obfsproxy from the working directory.
by erinn＠torproject.org 02 Aug '12

02 Aug '12

commit 3076032b3d579cc1065b15626acce631bffaca44 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Thu Jul 26 15:20:12 2012 +0200 Linux: Fix torrc to start obfsproxy from the working directory. --- build-scripts/config/alpha/torrc-obfsproxy-linux | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/alpha/torrc-obfsproxy-linux b/build-scripts/config/alpha/torrc-obfsproxy-linux index 24788b3..59ca799 100644 --- a/build-scripts/config/alpha/torrc-obfsproxy-linux +++ b/build-scripts/config/alpha/torrc-obfsproxy-linux @@ -28,4 +28,4 @@ bridge obfs2 188.40.20.215:32982 bridge obfs2 212.112.242.160:49259 bridge obfs2 213.108.105.129:36609 -ClientTransportPlugin obfs2 exec obfsproxy --managed +ClientTransportPlugin obfs2 exec ./App/obfsproxy --managed

1 0

[torbrowser/maint-2.3] Add option for automatic build of obfsproxy TBBs.
by erinn＠torproject.org 02 Aug '12

02 Aug '12

commit a08b546605d13d82e6f664bf8e2d8b3caf61327c Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Jul 25 22:18:19 2012 +0200 Add option for automatic build of obfsproxy TBBs. Introduces the flag USE_OBFSPROXY. When set to 1, an obfsproxy bundle will be build. --- build-scripts/linux-alpha.mk | 34 +++++++++++++++++++++++++++++++++- build-scripts/osx-alpha.mk | 31 ++++++++++++++++++++++++++++++- build-scripts/windows-alpha.mk | 32 +++++++++++++++++++++++++++++--- 3 files changed, 92 insertions(+), 5 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 96d715d..28cfa40 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -82,6 +82,13 @@ TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-lib build-pidgin: echo "We're not building pidgin yet!" +build-obfsproxy: $(OBFSPROXY_DIR) +ifeq ($(USE_OBFSPROXY),1) + cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) + cd $(OBFSPROXY_DIR) && make + cd $(OBFSPROXY_DIR) && make install +endif + build-firefox: config/dot_mozconfig $(FIREFOX_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official @@ -94,7 +101,7 @@ copy-firefox: mkdir -p $(BUILD_DIR)/Firefox cp -r $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/firefox/* $(BUILD_DIR)/Firefox -build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox copy-firefox +build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox copy-firefox build-obfsproxy echo "If we're here, we've done something right." ## Location of compiled libraries @@ -115,12 +122,17 @@ VIDALIA=$(BUILT_DIR)/usr/local/bin/vidalia ## Someday, this will be our custom Firefox FIREFOX=$(BUILD_DIR)/Firefox PIDGIN=$(COMPILED_BINS)/pidgin +OBFSPROXY=$(COMPILED_BINS)/obfsproxy ## Location of utility applications WGET:=$(shell which wget) ## Destination for the generic bundle +ifeq ($(USE_OBFSPROXY),1) +DEST=generic-obfsproxy-bundle +else DEST=generic-bundle +endif ## Name of the bundle NAME=tor-browser @@ -131,6 +143,7 @@ DISTDIR=tbbl-alpha-dist ## Version and name of the compressed bundle (also used for source) VERSION=$(RELEASE_VER)-$(BUILD_NUM)-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- +OBFS_COMPRESSED_BASENAME=tor-obfsproxy-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) @@ -138,8 +151,12 @@ IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) ifeq ($(USE_PIDGIN),1) COMPRESSED_NAME=$(IM_COMPRESSED_NAME) else +ifeq ($(USE_OBFSPROXY),1) +COMPRESSED_NAME=$(OBFS_COMPRESSED_NAME) +else COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) endif +endif ## Extensions to install by default DEFAULT_EXTENSIONS=torbutton.xpi noscript.xpi httpseverywhere.xpi @@ -261,6 +278,9 @@ install-binaries: # Vidalia cp $(VIDALIA) $(APPDIR) cp $(TOR) $(APPDIR) +ifeq ($(USE_OBFSPROXY),1) + cp $(OBFSPROXY) $(APPDIR) +endif ## Fixup ## Collect up license files @@ -274,6 +294,10 @@ install-docs: cp ../changelog.linux-2.3 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific cp ../README.LINUX-2.3 $(DOCSDIR)/README-TorBrowserBundle +ifeq ($(USE_OBFSPROXY),1) + mkdir -p $(DOCSDIR)/Obfsproxy + cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy +endif ## Copy over Firefox install-firefox: @@ -304,10 +328,18 @@ endif ifeq ($(USE_PIDGIN),1) cp config/vidalia.conf.ff+pidgin-linux $(DEST)/Data/Vidalia/vidalia.conf else +ifeq ($(USE_OBFSPROXY),1) + cp config/alpha/vidalia.conf.ff-obfsproxy-linux $(DEST)/Data/Vidalia/vidalia.conf +else cp config/alpha/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf endif +endif ## Configure Tor +ifeq ($(USE_OBFSPROXY),1) + cp config/alpha/torrc-obfsproxy-linux $(DEST)/Data/Tor/torrc +else cp config/alpha/torrc-linux $(DEST)/Data/Tor/torrc +endif cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip chmod 700 $(DEST)/Data/Tor diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 4c6a1a4..9f1319d 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -117,6 +117,13 @@ TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VE TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --disable-dependency-tracking $(CC) +build-obfsproxy: $(OBFSPROXY_DIR) +ifeq ($(USE_OBFSPROXY),1) + cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) + cd $(OBFSPROXY_DIR) && make + cd $(OBFSPROXY_DIR) && make install +endif + build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official @@ -127,7 +134,7 @@ copy-firefox: -rm -rf $(BUILD_DIR)/TorBrowser.app cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/TorBrowser.app -build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox +build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox build-obfsproxy echo "If we're here, we've done something right." ## Location of compiled libraries @@ -147,12 +154,17 @@ TOR=$(COMPILED_BINS)/tor ## Someday, this will be our custom Firefox FIREFOX=$(BUILD_DIR)/TorBrowser.app PIDGIN=$(COMPILED_BINS)/pidgin +OBFSPROXY=$(COMPILED_BINS)/obfsproxy ## Location of utility applications WGET:=$(shell which wget) ## Destination for the generic bundle +ifeq ($(USE_OBFSPROXY),1) +DEST=generic-obfsproxy-bundle +else DEST=generic-bundle +endif ## Name of the bundle NAME=TorBrowser @@ -163,6 +175,7 @@ DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) VERSION=$(RELEASE_VER)-$(BUILD_NUM) DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- +OBFS_COMPRESSED_BASENAME=TorBrowser-Obfsproxy-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) @@ -170,8 +183,12 @@ IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) ifeq ($(USE_PIDGIN),1) COMPRESSED_NAME=$(IM_COMPRESSED_NAME) else +ifeq ($(USE_OBFSPROXY),1) +COMPRESSED_NAME=$(OBFS_COMPRESSED_NAME) +else COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) endif +endif ## Extensions to install by default DEFAULT_EXTENSIONS=torbutton.xpi @@ -270,6 +287,9 @@ install-binaries: # Vidalia cp -R $(VIDALIA) $(APPDIR)/Vidalia.app cp $(TOR) $(APPDIR) +ifeq ($(USE_OBFSPROXY),1) + cp $(OBFSPROXY) $(APPDIR) +endif VIDALIA_PLUGINS=$(BUILD_DIR)/vidalia-plugins install-plugins: @@ -310,14 +330,23 @@ configure-apps: mkdir -p $(DEST)/Library/Vidalia/plugins #cp -r $(BUILD_DIR)/vidalia-plugins/tbb $(DEST)/Library/Vidalia/plugins mkdir -p $(DEST)/Library/Vidalia + +ifeq ($(USE_OBFSPROXY),1) + cp config/vidalia.conf.ff-obfsproxy-osx $(DEST)/Library/Vidalia/vidalia.conf +else ifeq ($(USE_SANDBOX),1) cp config/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf else cp config/alpha/vidalia.conf.ff-osx $(DEST)/Library/Vidalia/vidalia.conf endif +endif ## Configure Tor +ifeq ($(USE_OBFSPROXY),1) + cp config/alpha/torrc-obfsproxy-osx $(DEST)/Library/Vidalia/torrc +else cp config/alpha/torrc-osx $(DEST)/Library/Vidalia/torrc +endif cp $(TOR_DIR)/src/config/geoip $(DEST)/Contents/Resources/Data/Tor/geoip chmod 700 $(DATADIR)/Tor diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 39dffe5..97ababf 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -81,7 +81,7 @@ build-qt: build-zlib build-openssl $(QT_DIR) VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DWIX_BINARY_DIR=$(WIX_LIB) # XXX Once we build qt on windows, we'll want to add build-qt here build-vidalia: PATH+=:$(QT_LIB) -build-vidalia: $(VIDALIA_DIR) $(WIX_LIB) +build-vidalia: $(VIDALIA_DIR) | $(WIX_LIB) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) .. cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) @@ -103,10 +103,12 @@ TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --disable-asciidoc build-tor:PATH+=:$(BUILT_DIR)/bin -build-obfsproxy: +build-obfsproxy: $(OBFSPROXY_DIR) +ifeq ($(USE_OBFSPROXY),1) cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) cd $(OBFSPROXY_DIR) && make cd $(OBFSPROXY_DIR) && make install +endif build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig @@ -121,7 +123,7 @@ copy-firefox: cp "/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86/Microsoft.VC90.CRT/"msvc*90.dll $(FIREFOX)/App/Firefox cp -r $(FIREFOX_DIR)/obj-*/dist/firefox/* $(FIREFOX)/App/Firefox -build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox +build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox build-obfsproxy echo "If we're here, we've done something right." ## Location of compiled libraries @@ -137,7 +139,11 @@ LIBEVENT=$(COMPILED_LIBS) ## Destination for the generic bundle +ifeq ($(USE_OBFSPROXY),1) +DEST="Generic Obfsproxy Bundle" +else DEST="Generic Bundle" +endif ## Name of the bundle NAME="Tor Browser" @@ -148,6 +154,7 @@ DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) VERSION=$(RELEASE_VER)-$(BUILD_NUM) DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) +OBFS_COMPRESSED_BASENAME=tor-obfsproxy-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) @@ -155,8 +162,12 @@ IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) ifeq ($(USE_PIDGIN),1) COMPRESSED_NAME=$(IM_COMPRESSED_NAME) else +ifeq ($(USE_OBFSPROXY),1) +COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) +else COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) endif +endif ## Extensions to install by default DEFAULT_EXTENSIONS=torbutton.xpi @@ -260,6 +271,9 @@ install-binaries: cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR) cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR) cp $(TOR)/src/or/tor.exe $(APPDIR) +ifeq ($(USE_OBFSPROXY),1) + cp $(OBFSPROXY_DIR)/obfsproxy.exe $(APPDIR) +endif install-plugins: mkdir -p $(DATADIR)/Vidalia/plugins @@ -280,6 +294,10 @@ install-docs: cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW cp ../changelog.windows-2.3 $(DOCSDIR)/changelog cp ../README.WIN-2.3 $(DOCSDIR)/README-TorBrowserBundle +ifeq ($(USE_OBFSPROXY),1) + mkdir -p $(DOCSDIR)/Obfsproxy + cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy +endif ## Copy over FirefoxPortable install-firefoxportable: @@ -319,10 +337,18 @@ endif ifeq ($(USE_PIDGIN),1) cp config/alpha/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf else +ifeq ($(USE_OBFSPROXY),1) + cp config/alpha/vidalia.conf.ff-obfsproxy $(DEST)/Data/Vidalia/vidalia.conf +else cp config/alpha/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf endif +endif ## Configure Tor +ifeq ($(USE_OBFSPROXY),1) + cp config/alpha/torrc-obfsproxy $(DEST)/Data/Tor/torrc +else cp config/alpha/torrc $(DEST)/Data/Tor/torrc +endif cp $(TOR)/src/config/geoip $(DEST)/Data/Tor launcher:

1 0

[torbrowser/maint-2.3] OSX: fix vidalia.conf.ff-obsproxy-osx to use Vidalia 0.2.20 values and update Makefile paths
by erinn＠torproject.org 02 Aug '12

02 Aug '12

commit 3805fff5a0fc9b2f6ad590a109ff27c842258436 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jul 31 10:54:52 2012 +0100 OSX: fix vidalia.conf.ff-obsproxy-osx to use Vidalia 0.2.20 values and update Makefile paths --- .../config/alpha/vidalia.conf.ff-obfsproxy-osx | 17 +++++++++-------- build-scripts/osx-alpha.mk | 5 ++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx index e2d857e..833fbe4 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx @@ -1,17 +1,18 @@ [General] -PluginPath=../../Library/Vidalia/plugins +BrowserDirectory=../../../ +BrowserExecutable=TorBrowser.app/Contents/MacOS/firefox-bin +ProfileDirectory=../../Library/Application Support/Firefox/Profiles/profile +DefaultProfileDirectory=TorBrowser.app/Contents/MacOS/defaults/profile +PluginsDirectory=../../MacOS/Data/plugins +DefaultPluginsDirectory=../../MacOS/Data/plugins LanguageCode=en [Tor] ControlPort=9051 -TorExecutable=../../Contents/MacOS/tor -Torrc=../../Library/Vidalia/torrc +TorExecutable=../../../tor +Torrc=../../../../../Library/Vidalia/torrc AutoControl=true -DataDirectory=../../Contents/Resources/Data/Tor - -[TBB] -BrowserDirectory=../../ -BrowserExecutable=firefox-bin +DataDirectory=../../../../Resources/Data/Tor/ [Network] ProxyType=none diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 9f1319d..377fba9 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -332,7 +332,7 @@ configure-apps: mkdir -p $(DEST)/Library/Vidalia ifeq ($(USE_OBFSPROXY),1) - cp config/vidalia.conf.ff-obfsproxy-osx $(DEST)/Library/Vidalia/vidalia.conf + cp config/alpha/vidalia.conf.ff-obfsproxy-osx $(DEST)/Library/Vidalia/vidalia.conf else ifeq ($(USE_SANDBOX),1) cp config/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf @@ -378,6 +378,9 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -mkdir $(DISTDIR) #hdiutil create -volname "Tor Browser Bundle for OS X" -format UDBZ -imagekey zlib-level=9 -srcfolder $(DISTDIR)/tmp/ $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).dmg zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app +ifeq ($(USE_OBFSPROXY),1) + zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)obfsproxy-$(LANGCODE).zip $(NAME)_$(LANGCODE).app +endif -rm -f *.zip *.xpi copy-files_%: generic-bundle.stamp

1 0

[torbrowser/master] Remove Vidalia geometry.
by erinn＠torproject.org 02 Aug '12

02 Aug '12

commit 23b36fe831e38d385011435fdec1f10b15dc97db Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Jul 25 21:11:29 2012 +0200 Remove Vidalia geometry. We want to use the default geometry instead of some random predefined geometry in the config. --- .../config/alpha/vidalia.conf.ff-obfsproxy | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy index 6d6fa7d..a781b7a 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy @@ -17,18 +17,3 @@ DataDirectory=..\\Data\\Tor ProxyType=none UseBridges=true Bridge=obfs2 38.229.33.18:42401, obfs2 85.17.20.242:61264, obfs2 85.214.131.213:1051, obfs2 86.59.30.35:45605, obfs2 91.208.34.7:5353, obfs2 109.105.109.163:53999, obfs2 109.163.233.195:1051, obfs2 128.31.0.34:1051, obfs2 131.215.158.1:29936, obfs2 173.254.192.38:1051, obfs2 188.40.20.215:32982, obfs2 212.112.242.160:49259, obfs2 213.108.105.129:36609 - -[MessageLog] -Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x2\xc9\0\0\x2\x96\0\0\0\b\0\0\0\x1e\0\0\x2\xc1\0\0\x2\x8e\0\0\0\0\0\0) - -[BandwidthGraph] -Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x2(\0\0\x1X\0\0\0\0\0\0\0\0\0\0\x2(\0\0\x1X\0\0\0\0\0\0) - -[NetViewer] -Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x3K\0\0\x2S\0\0\0\0\0\0\0\0\0\0\x3K\0\0\x2S\0\0\0\0\0\0) - -[ConfigDialog] -Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x2W\0\0\x1\x8f\0\0\0\0\0\0\0\0\0\0\x2W\0\0\x1\x8f\0\0\0\0\0\0) - -[MainWindow] -Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\x1J\0\0\0\xaf\0\0\x2\xb5\0\0\x2R\0\0\x1R\0\0\0\xcd\0\0\x2\xad\0\0\x2J\0\0\0\0\0\0)

1 0

[torbrowser/maint-2.3] give obfsproxy bundles their own name
by erinn＠torproject.org 02 Aug '12

02 Aug '12

commit 7f0cf43bf0daf09bf4b5caddd1a0ab6a4b72f613 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Aug 2 07:57:15 2012 +0100 give obfsproxy bundles their own name --- build-scripts/linux-alpha.mk | 3 +++ build-scripts/windows-alpha.mk | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 28cfa40..ceb2014 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -377,6 +377,9 @@ bundle-localized: bundle-localized_$(LANGCODE).stamp compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).tar.gz -mkdir $(DISTDIR) +ifeq ($(USE_OBFSPROXY),1) + tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)obfsproxy-$(LANGCODE).tar.gz +endif tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz rm *.zip *.xpi diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 97ababf..7bdb8cb 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -373,6 +373,9 @@ bundle-localized: bundle-localized_$(LANGCODE).stamp compressed-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe +ifeq ($(USE_OBFSPROXY),1) + cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)-obfsproxy_$(LANGCODE).exe $(NAME) +endif cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME) copy-files_%: generic-bundle.stamp

1 0

[torbrowser/master] Add config files for obfsproxy on Linux and OSX.
by erinn＠torproject.org 02 Aug '12

02 Aug '12

commit 8f1fd9e59b95d5ba7b3865fcc92d21f70fb45c78 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Jul 25 21:59:57 2012 +0200 Add config files for obfsproxy on Linux and OSX. --- build-scripts/config/alpha/torrc-obfsproxy-linux | 31 ++++++++++++++++++++ build-scripts/config/alpha/torrc-obfsproxy-osx | 31 ++++++++++++++++++++ .../config/alpha/vidalia.conf.ff-obfsproxy-linux | 20 +++++++++++++ .../config/alpha/vidalia.conf.ff-obfsproxy-osx | 19 ++++++++++++ 4 files changed, 101 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/alpha/torrc-obfsproxy-linux b/build-scripts/config/alpha/torrc-obfsproxy-linux new file mode 100644 index 0000000..24788b3 --- /dev/null +++ b/build-scripts/config/alpha/torrc-obfsproxy-linux @@ -0,0 +1,31 @@ +# If non-zero, try to write to disk less frequently than we would otherwise. +AvoidDiskWrites 1 +# Store working data, state, keys, and caches here. +DataDirectory ./Data/Tor +GeoIPFile ./Data/Tor/geoip +# Where to send logging messages. Format is minSeverity[-maxSeverity] +# (stderr|stdout|syslog|file FILENAME). +Log notice stdout +# Bind to this address to listen to connections from SOCKS-speaking +# applications. +SocksPort auto +SocksListenAddress 127.0.0.1 +ControlPort auto + +UseBridges 1 + +bridge obfs2 38.229.33.18:42401 +bridge obfs2 85.17.20.242:61264 +bridge obfs2 85.214.131.213:1051 +bridge obfs2 86.59.30.35:45605 +bridge obfs2 91.208.34.7:5353 +bridge obfs2 109.105.109.163:53999 +bridge obfs2 109.163.233.195:1051 +bridge obfs2 128.31.0.34:1051 +bridge obfs2 131.215.158.1:29936 +bridge obfs2 173.254.192.38:1051 +bridge obfs2 188.40.20.215:32982 +bridge obfs2 212.112.242.160:49259 +bridge obfs2 213.108.105.129:36609 + +ClientTransportPlugin obfs2 exec obfsproxy --managed diff --git a/build-scripts/config/alpha/torrc-obfsproxy-osx b/build-scripts/config/alpha/torrc-obfsproxy-osx new file mode 100644 index 0000000..80d343d --- /dev/null +++ b/build-scripts/config/alpha/torrc-obfsproxy-osx @@ -0,0 +1,31 @@ +# If non-zero, try to write to disk less frequently than we would otherwise. +AvoidDiskWrites 1 +# Store working data, state, keys, and caches here. +DataDirectory ../../Contents/Resources/Data/Tor +GeoIPFile ../../Contents/Resources/Data/Tor/geoip +# Where to send logging messages. Format is minSeverity[-maxSeverity] +# (stderr|stdout|syslog|file FILENAME). +Log notice stdout +# Bind to this address to listen to connections from SOCKS-speaking +# applications. +SocksPort auto +SocksListenAddress 127.0.0.1 +ControlPort auto + +UseBridges 1 + +bridge obfs2 38.229.33.18:42401 +bridge obfs2 85.17.20.242:61264 +bridge obfs2 85.214.131.213:1051 +bridge obfs2 86.59.30.35:45605 +bridge obfs2 91.208.34.7:5353 +bridge obfs2 109.105.109.163:53999 +bridge obfs2 109.163.233.195:1051 +bridge obfs2 128.31.0.34:1051 +bridge obfs2 131.215.158.1:29936 +bridge obfs2 173.254.192.38:1051 +bridge obfs2 188.40.20.215:32982 +bridge obfs2 212.112.242.160:49259 +bridge obfs2 213.108.105.129:36609 + +ClientTransportPlugin obfs2 exec obfsproxy --managed diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux new file mode 100644 index 0000000..bd09a17 --- /dev/null +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux @@ -0,0 +1,20 @@ +[General] +InterfaceStyle=Cleanlooks +LanguageCode=en +PluginPath=./Data/Vidalia/plugins + +[Tor] +ControlPort=9051 +TorExecutable=./App/tor +Torrc=./Data/Tor/torrc +AutoControl=true +DataDirectory=./Data/Tor + +[TBB] +BrowserDirectory=. +BrowserExecutable=firefox + +[Network] +ProxyType=none +UseBridges=true +Bridge=obfs2 38.229.33.18:42401, obfs2 85.17.20.242:61264, obfs2 85.214.131.213:1051, obfs2 86.59.30.35:45605, obfs2 91.208.34.7:5353, obfs2 109.105.109.163:53999, obfs2 109.163.233.195:1051, obfs2 128.31.0.34:1051, obfs2 131.215.158.1:29936, obfs2 173.254.192.38:1051, obfs2 188.40.20.215:32982, obfs2 212.112.242.160:49259, obfs2 213.108.105.129:36609 diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx new file mode 100644 index 0000000..e2d857e --- /dev/null +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx @@ -0,0 +1,19 @@ +[General] +PluginPath=../../Library/Vidalia/plugins +LanguageCode=en + +[Tor] +ControlPort=9051 +TorExecutable=../../Contents/MacOS/tor +Torrc=../../Library/Vidalia/torrc +AutoControl=true +DataDirectory=../../Contents/Resources/Data/Tor + +[TBB] +BrowserDirectory=../../ +BrowserExecutable=firefox-bin + +[Network] +ProxyType=none +UseBridges=true +Bridge=obfs2 38.229.33.18:42401, obfs2 85.17.20.242:61264, obfs2 85.214.131.213:1051, obfs2 86.59.30.35:45605, obfs2 91.208.34.7:5353, obfs2 109.105.109.163:53999, obfs2 109.163.233.195:1051, obfs2 128.31.0.34:1051, obfs2 131.215.158.1:29936, obfs2 173.254.192.38:1051, obfs2 188.40.20.215:32982, obfs2 212.112.242.160:49259, obfs2 213.108.105.129:36609

1 0

[torbrowser/master] Add option for automatic build of obfsproxy TBBs.
by erinn＠torproject.org 02 Aug '12

02 Aug '12

commit a08b546605d13d82e6f664bf8e2d8b3caf61327c Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Jul 25 22:18:19 2012 +0200 Add option for automatic build of obfsproxy TBBs. Introduces the flag USE_OBFSPROXY. When set to 1, an obfsproxy bundle will be build. --- build-scripts/linux-alpha.mk | 34 +++++++++++++++++++++++++++++++++- build-scripts/osx-alpha.mk | 31 ++++++++++++++++++++++++++++++- build-scripts/windows-alpha.mk | 32 +++++++++++++++++++++++++++++--- 3 files changed, 92 insertions(+), 5 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 96d715d..28cfa40 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -82,6 +82,13 @@ TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-lib build-pidgin: echo "We're not building pidgin yet!" +build-obfsproxy: $(OBFSPROXY_DIR) +ifeq ($(USE_OBFSPROXY),1) + cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) + cd $(OBFSPROXY_DIR) && make + cd $(OBFSPROXY_DIR) && make install +endif + build-firefox: config/dot_mozconfig $(FIREFOX_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official @@ -94,7 +101,7 @@ copy-firefox: mkdir -p $(BUILD_DIR)/Firefox cp -r $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/firefox/* $(BUILD_DIR)/Firefox -build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox copy-firefox +build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox copy-firefox build-obfsproxy echo "If we're here, we've done something right." ## Location of compiled libraries @@ -115,12 +122,17 @@ VIDALIA=$(BUILT_DIR)/usr/local/bin/vidalia ## Someday, this will be our custom Firefox FIREFOX=$(BUILD_DIR)/Firefox PIDGIN=$(COMPILED_BINS)/pidgin +OBFSPROXY=$(COMPILED_BINS)/obfsproxy ## Location of utility applications WGET:=$(shell which wget) ## Destination for the generic bundle +ifeq ($(USE_OBFSPROXY),1) +DEST=generic-obfsproxy-bundle +else DEST=generic-bundle +endif ## Name of the bundle NAME=tor-browser @@ -131,6 +143,7 @@ DISTDIR=tbbl-alpha-dist ## Version and name of the compressed bundle (also used for source) VERSION=$(RELEASE_VER)-$(BUILD_NUM)-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- +OBFS_COMPRESSED_BASENAME=tor-obfsproxy-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) @@ -138,8 +151,12 @@ IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) ifeq ($(USE_PIDGIN),1) COMPRESSED_NAME=$(IM_COMPRESSED_NAME) else +ifeq ($(USE_OBFSPROXY),1) +COMPRESSED_NAME=$(OBFS_COMPRESSED_NAME) +else COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) endif +endif ## Extensions to install by default DEFAULT_EXTENSIONS=torbutton.xpi noscript.xpi httpseverywhere.xpi @@ -261,6 +278,9 @@ install-binaries: # Vidalia cp $(VIDALIA) $(APPDIR) cp $(TOR) $(APPDIR) +ifeq ($(USE_OBFSPROXY),1) + cp $(OBFSPROXY) $(APPDIR) +endif ## Fixup ## Collect up license files @@ -274,6 +294,10 @@ install-docs: cp ../changelog.linux-2.3 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific cp ../README.LINUX-2.3 $(DOCSDIR)/README-TorBrowserBundle +ifeq ($(USE_OBFSPROXY),1) + mkdir -p $(DOCSDIR)/Obfsproxy + cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy +endif ## Copy over Firefox install-firefox: @@ -304,10 +328,18 @@ endif ifeq ($(USE_PIDGIN),1) cp config/vidalia.conf.ff+pidgin-linux $(DEST)/Data/Vidalia/vidalia.conf else +ifeq ($(USE_OBFSPROXY),1) + cp config/alpha/vidalia.conf.ff-obfsproxy-linux $(DEST)/Data/Vidalia/vidalia.conf +else cp config/alpha/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf endif +endif ## Configure Tor +ifeq ($(USE_OBFSPROXY),1) + cp config/alpha/torrc-obfsproxy-linux $(DEST)/Data/Tor/torrc +else cp config/alpha/torrc-linux $(DEST)/Data/Tor/torrc +endif cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip chmod 700 $(DEST)/Data/Tor diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 4c6a1a4..9f1319d 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -117,6 +117,13 @@ TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VE TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --disable-dependency-tracking $(CC) +build-obfsproxy: $(OBFSPROXY_DIR) +ifeq ($(USE_OBFSPROXY),1) + cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) + cd $(OBFSPROXY_DIR) && make + cd $(OBFSPROXY_DIR) && make install +endif + build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official @@ -127,7 +134,7 @@ copy-firefox: -rm -rf $(BUILD_DIR)/TorBrowser.app cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/TorBrowser.app -build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox +build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox build-obfsproxy echo "If we're here, we've done something right." ## Location of compiled libraries @@ -147,12 +154,17 @@ TOR=$(COMPILED_BINS)/tor ## Someday, this will be our custom Firefox FIREFOX=$(BUILD_DIR)/TorBrowser.app PIDGIN=$(COMPILED_BINS)/pidgin +OBFSPROXY=$(COMPILED_BINS)/obfsproxy ## Location of utility applications WGET:=$(shell which wget) ## Destination for the generic bundle +ifeq ($(USE_OBFSPROXY),1) +DEST=generic-obfsproxy-bundle +else DEST=generic-bundle +endif ## Name of the bundle NAME=TorBrowser @@ -163,6 +175,7 @@ DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) VERSION=$(RELEASE_VER)-$(BUILD_NUM) DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- +OBFS_COMPRESSED_BASENAME=TorBrowser-Obfsproxy-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) @@ -170,8 +183,12 @@ IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) ifeq ($(USE_PIDGIN),1) COMPRESSED_NAME=$(IM_COMPRESSED_NAME) else +ifeq ($(USE_OBFSPROXY),1) +COMPRESSED_NAME=$(OBFS_COMPRESSED_NAME) +else COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) endif +endif ## Extensions to install by default DEFAULT_EXTENSIONS=torbutton.xpi @@ -270,6 +287,9 @@ install-binaries: # Vidalia cp -R $(VIDALIA) $(APPDIR)/Vidalia.app cp $(TOR) $(APPDIR) +ifeq ($(USE_OBFSPROXY),1) + cp $(OBFSPROXY) $(APPDIR) +endif VIDALIA_PLUGINS=$(BUILD_DIR)/vidalia-plugins install-plugins: @@ -310,14 +330,23 @@ configure-apps: mkdir -p $(DEST)/Library/Vidalia/plugins #cp -r $(BUILD_DIR)/vidalia-plugins/tbb $(DEST)/Library/Vidalia/plugins mkdir -p $(DEST)/Library/Vidalia + +ifeq ($(USE_OBFSPROXY),1) + cp config/vidalia.conf.ff-obfsproxy-osx $(DEST)/Library/Vidalia/vidalia.conf +else ifeq ($(USE_SANDBOX),1) cp config/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf else cp config/alpha/vidalia.conf.ff-osx $(DEST)/Library/Vidalia/vidalia.conf endif +endif ## Configure Tor +ifeq ($(USE_OBFSPROXY),1) + cp config/alpha/torrc-obfsproxy-osx $(DEST)/Library/Vidalia/torrc +else cp config/alpha/torrc-osx $(DEST)/Library/Vidalia/torrc +endif cp $(TOR_DIR)/src/config/geoip $(DEST)/Contents/Resources/Data/Tor/geoip chmod 700 $(DATADIR)/Tor diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 39dffe5..97ababf 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -81,7 +81,7 @@ build-qt: build-zlib build-openssl $(QT_DIR) VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DWIX_BINARY_DIR=$(WIX_LIB) # XXX Once we build qt on windows, we'll want to add build-qt here build-vidalia: PATH+=:$(QT_LIB) -build-vidalia: $(VIDALIA_DIR) $(WIX_LIB) +build-vidalia: $(VIDALIA_DIR) | $(WIX_LIB) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) .. cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) @@ -103,10 +103,12 @@ TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --disable-asciidoc build-tor:PATH+=:$(BUILT_DIR)/bin -build-obfsproxy: +build-obfsproxy: $(OBFSPROXY_DIR) +ifeq ($(USE_OBFSPROXY),1) cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) cd $(OBFSPROXY_DIR) && make cd $(OBFSPROXY_DIR) && make install +endif build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig @@ -121,7 +123,7 @@ copy-firefox: cp "/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86/Microsoft.VC90.CRT/"msvc*90.dll $(FIREFOX)/App/Firefox cp -r $(FIREFOX_DIR)/obj-*/dist/firefox/* $(FIREFOX)/App/Firefox -build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox +build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox build-obfsproxy echo "If we're here, we've done something right." ## Location of compiled libraries @@ -137,7 +139,11 @@ LIBEVENT=$(COMPILED_LIBS) ## Destination for the generic bundle +ifeq ($(USE_OBFSPROXY),1) +DEST="Generic Obfsproxy Bundle" +else DEST="Generic Bundle" +endif ## Name of the bundle NAME="Tor Browser" @@ -148,6 +154,7 @@ DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) VERSION=$(RELEASE_VER)-$(BUILD_NUM) DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) +OBFS_COMPRESSED_BASENAME=tor-obfsproxy-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) @@ -155,8 +162,12 @@ IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) ifeq ($(USE_PIDGIN),1) COMPRESSED_NAME=$(IM_COMPRESSED_NAME) else +ifeq ($(USE_OBFSPROXY),1) +COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) +else COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) endif +endif ## Extensions to install by default DEFAULT_EXTENSIONS=torbutton.xpi @@ -260,6 +271,9 @@ install-binaries: cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR) cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR) cp $(TOR)/src/or/tor.exe $(APPDIR) +ifeq ($(USE_OBFSPROXY),1) + cp $(OBFSPROXY_DIR)/obfsproxy.exe $(APPDIR) +endif install-plugins: mkdir -p $(DATADIR)/Vidalia/plugins @@ -280,6 +294,10 @@ install-docs: cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW cp ../changelog.windows-2.3 $(DOCSDIR)/changelog cp ../README.WIN-2.3 $(DOCSDIR)/README-TorBrowserBundle +ifeq ($(USE_OBFSPROXY),1) + mkdir -p $(DOCSDIR)/Obfsproxy + cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy +endif ## Copy over FirefoxPortable install-firefoxportable: @@ -319,10 +337,18 @@ endif ifeq ($(USE_PIDGIN),1) cp config/alpha/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf else +ifeq ($(USE_OBFSPROXY),1) + cp config/alpha/vidalia.conf.ff-obfsproxy $(DEST)/Data/Vidalia/vidalia.conf +else cp config/alpha/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf endif +endif ## Configure Tor +ifeq ($(USE_OBFSPROXY),1) + cp config/alpha/torrc-obfsproxy $(DEST)/Data/Tor/torrc +else cp config/alpha/torrc $(DEST)/Data/Tor/torrc +endif cp $(TOR)/src/config/geoip $(DEST)/Data/Tor launcher:

1 0