tor-commits April 2012

tor-commits@lists.torproject.org

16 participants
941 discussions

[torbrowser/master] Settings I have to change
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit dc9c276c0061fe2946c6e2c5901d0a2e29ef4742 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Apr 2 11:32:37 2012 +0200 Settings I have to change --- build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index dc46d8a..8b61137 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -31,7 +31,7 @@ BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION) $(LD_MIN_VERSION) ## Build machine specific settings # Number of cpu cores used to build in parallel -NUM_CORES=4 +NUM_CORES=8 ## Location of directory for source fetching FETCH_DIR=$(PWD)/build @@ -76,7 +76,7 @@ build-qt: build-zlib build-openssl $(QT_DIR) touch $(STAMP_DIR)/build-qt VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \ - -DCMAKE_BUILD_TYPE=debug .. + -DCMAKE_BUILD_TYPE=debug -DCMAKE_OSX_SYSROOT=${SDK_PATH} .. build-vidalia: build-openssl build-qt $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && \

1 0

[torbrowser/master] Openssl 1.0.1b released, fixes 1.0.1a compile on osx
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit 77ba44ef96d1005810c38a80f89aae78b419925a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 26 14:59:20 2012 +0200 Openssl 1.0.1b released, fixes 1.0.1a compile on osx That means we can get rid of the patch again... --- build-scripts/versions.mk | 2 +- .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 -------------------- 2 files changed, 1 insertions(+), 27 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index fdc67c0..9788cfb 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.35 ZLIB_VER=1.2.6 -OPENSSL_VER=1.0.1a +OPENSSL_VER=1.0.1b LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17 diff --git a/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch b/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch deleted file mode 100644 index 3fbd39c..0000000 --- a/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 24d73c226f53c01d1d8400cc4fdad23f5a45412b Mon Sep 17 00:00:00 2001 -From: Sebastian Hahn <sebastian(a)torproject.org> -Date: Wed, 25 Apr 2012 23:58:47 +0200 -Subject: [PATCH] Fix openssl 1.0.1a compile - ---- - crypto/evp/e_rc4_hmac_md5.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c -index 3f32b25..e65380d 100644 ---- a/crypto/evp/e_rc4_hmac_md5.c -+++ b/crypto/evp/e_rc4_hmac_md5.c -@@ -103,7 +103,8 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, - #if !defined(OPENSSL_NO_ASM) && ( \ - defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_AMD64) || defined(_M_X64) || \ -- defined(__INTEL__) ) -+ defined(__INTEL__) ) && \ -+ !(defined(__APPLE__) && defined(__MACH__)) - #define STITCHED_CALL - #endif - --- -1.7.10 -

1 0

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

26 Apr '12

commit 92f635537c9c95174346d2552b5f81e6a2151199 Merge: f81c8eb 77ba44e Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Apr 26 10:04:55 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 5 ---- build-scripts/osx.mk | 9 +----- build-scripts/versions.mk | 9 ++++++- build-scripts/windows.mk | 7 +---- .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 -------------------- 5 files changed, 11 insertions(+), 45 deletions(-)

1 0

[torbrowser/master] Extract common build-tor functionality
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit ed8185ac00b355b036f25055bbdf831284fb9531 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 24 15:03:00 2012 +0200 Extract common build-tor functionality This is just duplicated code atm, which we should get rid of as much as possible. --- build-scripts/linux.mk | 5 ----- build-scripts/osx.mk | 5 ----- build-scripts/versions.mk | 7 +++++++ build-scripts/windows.mk | 7 +------ 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index fa776de..6441b25 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -78,11 +78,6 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) touch $(STAMP_DIR)/build-libevent TOR_OPTS=--enable-gcc-warnings --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) -build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) - cd $(TOR_DIR) && ./configure $(TOR_OPTS) - cd $(TOR_DIR) && make -j $(NUM_CORES) - cd $(TOR_DIR) && make install - touch $(STAMP_DIR)/build-tor build-pidgin: echo "We're not building pidgin yet!" diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 8b61137..4619c78 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -98,11 +98,6 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" TOR_OPTS=--enable-gcc-warnings-advisory --enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) -build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) - cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) - cd $(TOR_DIR) && make -j $(NUM_CORES) - cd $(TOR_DIR) && make install - touch $(STAMP_DIR)/build-tor build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index bc2d689..fdc67c0 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -230,6 +230,13 @@ $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) cd $(FETCH_DIR) && tar -xmf $(OBFSPROXY_PACKAGE) -C $(BUILD_DIR)/ +# Common build functionality. Modified by variables set in OS-specific makefiles +build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) + cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) + cd $(TOR_DIR) && make -j $(NUM_CORES) + cd $(TOR_DIR) && make install + touch $(STAMP_DIR)/build-tor + clean-fetch-%: rm -rf $(FETCH_DIR)/$($($*)_PACKAGE) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 3a1acd4..135989f 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -98,12 +98,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-gcc-warnings --enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) -build-tor:PATH+=:$(BUILT_DIR)/bin -build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) - cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) - cd $(TOR_DIR) && make -j $(NUM_CORES) - cd $(TOR_DIR) && make install - touch $(STAMP_DIR)/build-tor +build-tor:PATH+=:$(BUILT_DIR)/bin 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

1 0

[torbrowser/maint-2.3] Extract common build-tor functionality
by erinn＠torproject.org 26 Apr '12

26 Apr '12

1 0

[torbrowser/maint-2.2] Openssl 1.0.1b released, fixes 1.0.1a compile on osx
by erinn＠torproject.org 26 Apr '12

26 Apr '12

1 0

[torbrowser/maint-2.2] Settings I have to change
by erinn＠torproject.org 26 Apr '12

26 Apr '12

1 0

[torbrowser/maint-2.2] Extract common build-tor functionality
by erinn＠torproject.org 26 Apr '12

26 Apr '12

1 0

[torbrowser/maint-2.3] Settings I have to change
by erinn＠torproject.org 26 Apr '12

26 Apr '12

1 0

[torbrowser/maint-2.2] Disable indexedDB. It's a PoS.
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit 4cb193f25578d756c06515baed544244a9cdbfad Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Apr 25 21:28:44 2012 -0700 Disable indexedDB. It's a PoS. From my read of the source code, it's almost impossible to clear the data out of this son of a bitch, and it doesn't even have private-browsing mode observers... It needs to go back into the oven. --- build-scripts/config/no-polipo-4.0.js | 1 + build-scripts/config/windows-4.0.js | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js index 42c5fb7..593db73 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.0.js @@ -175,3 +175,4 @@ user_pref("browser.search.order.1", "Startpage"); user_pref("browser.search.order.2", "DuckDuckGo"); user_pref("browser.search.order.3", "Google"); user_pref("browser.search.selectedEngine", "Startpage"); // bam +user_pref("dom.indexedDB.enabled", false); diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index 42c5fb7..593db73 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -175,3 +175,4 @@ user_pref("browser.search.order.1", "Startpage"); user_pref("browser.search.order.2", "DuckDuckGo"); user_pref("browser.search.order.3", "Google"); user_pref("browser.search.selectedEngine", "Startpage"); // bam +user_pref("dom.indexedDB.enabled", false);

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
95
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2012