- tor-commits - lists.torproject.org

[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

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.2] 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/maint-2.2] 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/maint-2.2] 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] 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/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

[torbrowser/maint-2.2] Add 3 patches.
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit 4003c4d5f777359bf30b5c0b75d4618a23b263a9 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Apr 25 15:17:23 2012 -0700 Add 3 patches. 0014-Make-Download-manager-memory-only.patch - fixes #4017 0015-Undo-some-Mozilla-braindamage.patch - fixes #5668 0016-Add-DDG-and-StartPage-to-Omnibox.patch - files from #4902 --- ...nents.interfaces-lookupMethod-from-conten.patch | 2 +- ...0002-Make-Permissions-Manager-memory-only.patch | 2 +- ...-Make-Intermediate-Cert-Store-memory-only.patch | 2 +- .../firefox/0004-Add-a-string-based-cacheKey.patch | 2 +- .../0005-Block-all-plugins-except-flash.patch | 2 +- ...ontent-pref-service-memory-only-clearable.patch | 2 +- ...owser-exit-when-not-launched-from-Vidalia.patch | 2 +- .../0008-Disable-SSL-Session-ID-tracking.patch | 2 +- ...observer-event-to-close-persistent-connec.patch | 2 +- ...e-client-values-only-to-CSS-Media-Queries.patch | 2 +- ...11-Limit-the-number-of-fonts-per-document.patch | 2 +- ...ize-HTTP-request-order-and-pipeline-depth.patch | 2 +- .../0013-Rebrand-Firefox-to-TorBrowser.patch | 7 +- .../0014-Make-Download-manager-memory-only.patch | 57 +++++++++++++ .../0015-Undo-some-Mozilla-braindamage.patch | 28 +++++++ .../0016-Add-DDG-and-StartPage-to-Omnibox.patch | 84 ++++++++++++++++++++ 16 files changed, 184 insertions(+), 16 deletions(-) diff --git a/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch b/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch index 159399a..df1c202 100644 --- a/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch +++ b/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch @@ -1,7 +1,7 @@ From 878aa170944f7d44a76f0eb09214d46b6028c549 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:40:40 -0800 -Subject: [PATCH 01/12] Block Components.interfaces,lookupMethod from content +Subject: [PATCH 01/16] Block Components.interfaces,lookupMethod from content This patch removes the ability of content script to access Components.interfaces.* as well as call or access Components.lookupMethod. diff --git a/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch b/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch index b3a8372..f38dc99 100644 --- a/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch +++ b/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch @@ -1,7 +1,7 @@ From 5f47c5bdf95633e28b6e338ba8794243b429aefb Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:45:16 -0800 -Subject: [PATCH 02/12] Make Permissions Manager memory-only +Subject: [PATCH 02/16] Make Permissions Manager memory-only This patch exposes a pref 'permissions.memory_only' that properly isolates the permissions manager to memory, which is responsible for all user specified diff --git a/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch index 8563f82..617a78e 100644 --- a/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch +++ b/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch @@ -1,7 +1,7 @@ From 8cb78993225793692fe0560d25db4af55e0553bd Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 19 Aug 2011 17:58:23 -0700 -Subject: [PATCH 03/12] Make Intermediate Cert Store memory-only. +Subject: [PATCH 03/16] Make Intermediate Cert Store memory-only. This patch makes the intermediate SSL cert store exist in memory only. diff --git a/src/current-patches/firefox/0004-Add-a-string-based-cacheKey.patch b/src/current-patches/firefox/0004-Add-a-string-based-cacheKey.patch index 8c5a717..7ddd877 100644 --- a/src/current-patches/firefox/0004-Add-a-string-based-cacheKey.patch +++ b/src/current-patches/firefox/0004-Add-a-string-based-cacheKey.patch @@ -1,7 +1,7 @@ From c4212c764149b74a04aad7d15cb3df810512e4ba Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 2 Sep 2011 20:47:02 -0700 -Subject: [PATCH 04/12] Add a string-based cacheKey. +Subject: [PATCH 04/16] Add a string-based cacheKey. Used for isolating cache according to same-origin policy. --- diff --git a/src/current-patches/firefox/0005-Block-all-plugins-except-flash.patch b/src/current-patches/firefox/0005-Block-all-plugins-except-flash.patch index 00bf898..9a577c0 100644 --- a/src/current-patches/firefox/0005-Block-all-plugins-except-flash.patch +++ b/src/current-patches/firefox/0005-Block-all-plugins-except-flash.patch @@ -1,7 +1,7 @@ From 89d6deddce94c720793a33a1c9fc812ad65116a9 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:50:15 -0800 -Subject: [PATCH 05/12] Block all plugins except flash. +Subject: [PATCH 05/16] Block all plugins except flash. We cannot use the @mozilla.org/extensions/blocklist;1 service, because we actually want to stop plugins from ever entering the browser's process space diff --git a/src/current-patches/firefox/0006-Make-content-pref-service-memory-only-clearable.patch b/src/current-patches/firefox/0006-Make-content-pref-service-memory-only-clearable.patch index c494e1e..a26bfec 100644 --- a/src/current-patches/firefox/0006-Make-content-pref-service-memory-only-clearable.patch +++ b/src/current-patches/firefox/0006-Make-content-pref-service-memory-only-clearable.patch @@ -1,7 +1,7 @@ From b2cc8f517c6589def4cc126af0b5f1898d61541c Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu, 8 Sep 2011 08:40:17 -0700 -Subject: [PATCH 06/12] Make content pref service memory-only + clearable +Subject: [PATCH 06/16] Make content pref service memory-only + clearable This prevents random urls from being inserted into content-prefs.sqllite in the profile directory as content prefs change (includes site-zoom and perhaps diff --git a/src/current-patches/firefox/0007-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch b/src/current-patches/firefox/0007-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch index f4c3794..9b76f8c 100644 --- a/src/current-patches/firefox/0007-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch +++ b/src/current-patches/firefox/0007-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch @@ -1,7 +1,7 @@ From 57e5abfa15950713acfb5d9a94f636579dde4d12 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun, 9 Oct 2011 22:50:07 -0700 -Subject: [PATCH 07/12] Make Tor Browser exit when not launched from Vidalia +Subject: [PATCH 07/16] Make Tor Browser exit when not launched from Vidalia Turns out the Windows 7 UI encourages users to "dock" their Tor Browser app for easy relaunch. If they manage to do this, we should fail closed rather diff --git a/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch b/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch index a4ba645..ff692fe 100644 --- a/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch +++ b/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch @@ -1,7 +1,7 @@ From 4d7f3122a76e0d5a31ba352880892fecd493252b Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed, 7 Dec 2011 19:36:38 -0800 -Subject: [PATCH 08/12] Disable SSL Session ID tracking. +Subject: [PATCH 08/16] Disable SSL Session ID tracking. We can't easily bind SSL Session ID tracking to url bar domain, so we have to disable them to satisfy diff --git a/src/current-patches/firefox/0009-Provide-an-observer-event-to-close-persistent-connec.patch b/src/current-patches/firefox/0009-Provide-an-observer-event-to-close-persistent-connec.patch index 47007bb..2c5f135 100644 --- a/src/current-patches/firefox/0009-Provide-an-observer-event-to-close-persistent-connec.patch +++ b/src/current-patches/firefox/0009-Provide-an-observer-event-to-close-persistent-connec.patch @@ -1,7 +1,7 @@ From 873acaa3fd6df60fe57f1549cdb45df7e277808d Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:53:28 -0800 -Subject: [PATCH 09/12] Provide an observer event to close persistent +Subject: [PATCH 09/16] Provide an observer event to close persistent connections We need to prevent linkability across "New Identity", which includes closing diff --git a/src/current-patches/firefox/0010-Provide-client-values-only-to-CSS-Media-Queries.patch b/src/current-patches/firefox/0010-Provide-client-values-only-to-CSS-Media-Queries.patch index 5618c19..661f0ca 100644 --- a/src/current-patches/firefox/0010-Provide-client-values-only-to-CSS-Media-Queries.patch +++ b/src/current-patches/firefox/0010-Provide-client-values-only-to-CSS-Media-Queries.patch @@ -1,7 +1,7 @@ From a27dcd387d8c3c1f1e150dcdd3c8aa1872ad14b5 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue, 20 Dec 2011 21:02:49 -0800 -Subject: [PATCH 10/12] Provide client values only to CSS Media Queries +Subject: [PATCH 10/16] Provide client values only to CSS Media Queries Also disable a bunch of Mozilla extensions that smell like they are fingerprintable. diff --git a/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch b/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch index d5d606b..9dce423 100644 --- a/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch +++ b/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch @@ -1,7 +1,7 @@ From c4d1c23872e2be83f33f2b9bfc5c49d2b98c73a6 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 16:01:21 -0800 -Subject: [PATCH 11/12] Limit the number of fonts per document. +Subject: [PATCH 11/16] Limit the number of fonts per document. We create two prefs: browser.display.max_font_count and browser.display.max_font_attempts. diff --git a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch index 2449c5a..0615abd 100644 --- a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -1,7 +1,7 @@ From 6147cea4de151dade922b3c2787016f70c222458 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 24 Apr 2012 17:21:45 -0700 -Subject: [PATCH 12/12] Randomize HTTP request order and pipeline depth. +Subject: [PATCH 12/16] Randomize HTTP request order and pipeline depth. This is an experimental defense against http://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf diff --git a/src/current-patches/firefox/0013-Rebrand-Firefox-to-TorBrowser.patch b/src/current-patches/firefox/0013-Rebrand-Firefox-to-TorBrowser.patch index 1d77887..81ee4e2 100644 --- a/src/current-patches/firefox/0013-Rebrand-Firefox-to-TorBrowser.patch +++ b/src/current-patches/firefox/0013-Rebrand-Firefox-to-TorBrowser.patch @@ -1,11 +1,10 @@ -From 947d85fbe7cefca8d621f615fabe8b6731569d4c Wed Aug 25 00:08:14 2012 +From 6a588618b49d59512c118802911d6f95c610299f Mon Sep 17 00:00:00 2001 From: Erinn Clark <erinn(a)torproject.org> Date: Wed, 25 Apr 2012 09:14:00 -0300 -Subject: [PATCH] Rebrand Firefox to TorBrowser +Subject: [PATCH 13/16] Rebrand Firefox to TorBrowser This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. - --- browser/branding/official/configure.sh | 2 +- browser/branding/official/locales/en-US/brand.dtd | 6 +++--- @@ -47,5 +46,5 @@ index 5f3ad54..62ac2fd 100644 homePageSingleStartMain=Firefox Start, a fast home page with built-in search homePageImport=Import your home page from %S -- -1.7.7.4 +1.7.5.4 diff --git a/src/current-patches/firefox/0014-Make-Download-manager-memory-only.patch b/src/current-patches/firefox/0014-Make-Download-manager-memory-only.patch new file mode 100644 index 0000000..6634688 --- /dev/null +++ b/src/current-patches/firefox/0014-Make-Download-manager-memory-only.patch @@ -0,0 +1,57 @@ +From e01aaa410e0e8fabf75841ad6b975fc3ff89e154 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Wed, 25 Apr 2012 13:39:35 -0700 +Subject: [PATCH 14/16] Make Download manager memory only. + +Solves https://trac.torproject.org/projects/tor/ticket/4017. + +Yes, this is an ugly hack. We *could* send the observer notification from +Torbutton to tell the download manager to switch to memory, but then we have +to dance around and tell it again if the user switches in and out of private +browsing mode.. + +The right way to do this is with a pref. Maybe I'll get to that someday, if +this breaks enough times in conflict. +--- + toolkit/components/downloads/nsDownloadManager.cpp | 4 ++-- + toolkit/components/downloads/nsDownloadManager.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp +index 17c9dcb..62e0ad9 100644 +--- a/toolkit/components/downloads/nsDownloadManager.cpp ++++ b/toolkit/components/downloads/nsDownloadManager.cpp +@@ -2002,7 +2002,7 @@ nsDownloadManager::Observe(nsISupports *aSubject, + if (NS_LITERAL_STRING("memory").Equals(aData)) + return SwitchDatabaseTypeTo(DATABASE_MEMORY); + else if (NS_LITERAL_STRING("disk").Equals(aData)) +- return SwitchDatabaseTypeTo(DATABASE_DISK); ++ return SwitchDatabaseTypeTo(DATABASE_MEMORY); + } + else if (strcmp(aTopic, "alertclickcallback") == 0) { + nsCOMPtr<nsIDownloadManagerUI> dmui = +@@ -2079,7 +2079,7 @@ nsDownloadManager::OnLeavePrivateBrowsingMode() + (void)ResumeAllDownloads(false); + + // Switch back to the on-disk DB again +- (void)SwitchDatabaseTypeTo(DATABASE_DISK); ++ //(void)SwitchDatabaseTypeTo(DATABASE_DISK); + + mInPrivateBrowsing = false; + } +diff --git a/toolkit/components/downloads/nsDownloadManager.h b/toolkit/components/downloads/nsDownloadManager.h +index 54312e4..cb63b52 100644 +--- a/toolkit/components/downloads/nsDownloadManager.h ++++ b/toolkit/components/downloads/nsDownloadManager.h +@@ -90,7 +90,7 @@ public: + + virtual ~nsDownloadManager(); + nsDownloadManager() : +- mDBType(DATABASE_DISK) ++ mDBType(DATABASE_MEMORY) + , mInPrivateBrowsing(false) + #ifdef DOWNLOAD_SCANNER + , mScanner(nsnull) +-- +1.7.5.4 + diff --git a/src/current-patches/firefox/0015-Undo-some-Mozilla-braindamage.patch b/src/current-patches/firefox/0015-Undo-some-Mozilla-braindamage.patch new file mode 100644 index 0000000..88e204f --- /dev/null +++ b/src/current-patches/firefox/0015-Undo-some-Mozilla-braindamage.patch @@ -0,0 +1,28 @@ +From 74be7d742204d48fbb51a90275781378948ba749 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Wed, 25 Apr 2012 13:42:52 -0700 +Subject: [PATCH 15/16] Undo some Mozilla braindamage. + +https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c33 + +Seriously guys? +--- + widget/nsIDragService.idl | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/widget/nsIDragService.idl b/widget/nsIDragService.idl +index e42c578..6863a88 100644 +--- a/widget/nsIDragService.idl ++++ b/widget/nsIDragService.idl +@@ -48,7 +48,7 @@ interface nsIDOMDragEvent; + interface nsIDOMDataTransfer; + interface nsISelection; + +-[scriptable, uuid(82B58ADA-F490-4C3D-B737-1057C4F1D052), builtinclass] ++[scriptable, uuid(82B58ADA-F490-4C3D-B737-1057C4F1D052)] + interface nsIDragService : nsISupports + { + const long DRAGDROP_ACTION_NONE = 0; +-- +1.7.5.4 + diff --git a/src/current-patches/firefox/0016-Add-DDG-and-StartPage-to-Omnibox.patch b/src/current-patches/firefox/0016-Add-DDG-and-StartPage-to-Omnibox.patch new file mode 100644 index 0000000..2206d96 --- /dev/null +++ b/src/current-patches/firefox/0016-Add-DDG-and-StartPage-to-Omnibox.patch @@ -0,0 +1,84 @@ +From 67552486c7e0a1b8797e0cb562bddf771aa2015b Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Wed, 25 Apr 2012 15:03:46 -0700 +Subject: [PATCH 16/16] Add DDG and StartPage to Omnibox. + +You mean there are search engines that don't require captchas if you don't +have a cookie? Holy crap. Get those in there now. +--- + browser/locales/en-US/searchplugins/duckduckgo.xml | 29 ++++++++++++++++++++ + browser/locales/en-US/searchplugins/list.txt | 2 + + browser/locales/en-US/searchplugins/startpage.xml | 11 +++++++ + 3 files changed, 42 insertions(+), 0 deletions(-) + create mode 100644 browser/locales/en-US/searchplugins/duckduckgo.xml + create mode 100644 browser/locales/en-US/searchplugins/startpage.xml + +diff --git a/browser/locales/en-US/searchplugins/duckduckgo.xml b/browser/locales/en-US/searchplugins/duckduckgo.xml +new file mode 100644 +index 0000000..4f00b4d +--- /dev/null ++++ b/browser/locales/en-US/searchplugins/duckduckgo.xml +@@ -0,0 +1,29 @@ ++<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> ++<ShortName>DuckDuckGo</ShortName> ++<Description>Duck Duck Go</Description> ++<InputEncoding>UTF-8</InputEncoding> ++<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8n ++IOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rB ++Uv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n///// ++/05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v// ++//////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9h ++XPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg ++7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs ++5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/ ++JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8n IOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg ++7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1 ++/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/ ++fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y ++1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg ++7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDs ++AScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAA ++AAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMAD ++AADwDwAA+B8AAA==</Image> ++<Url type="text/html" method="POST" template="https://duckduckgo.com/html/"> ++ <Param name="q" value="{searchTerms}"/> ++</Url> ++<SearchForm>https://duckduckgo.com/html/</SearchForm> ++</SearchPlugin> +diff --git a/browser/locales/en-US/searchplugins/list.txt b/browser/locales/en-US/searchplugins/list.txt +index 2a1141a..0466f4e 100644 +--- a/browser/locales/en-US/searchplugins/list.txt ++++ b/browser/locales/en-US/searchplugins/list.txt +@@ -1,7 +1,9 @@ + amazondotcom + bing ++duckduckgo + eBay + google ++startpage + twitter + wikipedia + yahoo +diff --git a/browser/locales/en-US/searchplugins/startpage.xml b/browser/locales/en-US/searchplugins/startpage.xml +new file mode 100644 +index 0000000..1a310b1 +--- /dev/null ++++ b/browser/locales/en-US/searchplugins/startpage.xml +@@ -0,0 +1,11 @@ ++<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> ++<ShortName>Startpage</ShortName> ++<Description>Start Page</Description> ++<InputEncoding>UTF-8</InputEncoding> ++<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2jkj+9YtD/vWLQ/71i0P+9otD/vaLRP72i0T+9YtE/vWLRP72i0T+9otD/vaNRP72jUT+9otF/vaLRf73kkv+9Yc///WJP//1iT//9Yk///rAmf/94Mz/+sCa//aRTv/1iUH/9ok///aJP//2i0H/9otB//aJQv/2iUL/9otC//aNRP/2jUT/9o1E//aNRP/6wpv////////////96dr/95dQ//aNRP/2kET/9pBG//aQRv/2kEb/9pBG//aRR//3lEz/95BH//mueP/7xJ3/959g//efYf/4p23//vDm//3p2//3kEr/95FJ//aRSf/niFH/95FK//aRSv/2mE//95hS/vq4iP/////////////////81bj/95xZ//q4iP//////+bF+//eZT//njFT/PSqi/2xGjv/2mVD/951V/vedVv783cX///////vQrf/++PP///////748//+8uj///////m3gf/olFr/PSuj/w8Pt/9sSJD/951V//eeWf73oVv++8ul///////5sXf/+KRi//vRsf////////////3r3v/olF//Piyk/w8Pt/9sSJH/+J5Z//ieWv/3oV/++KZf/vihXP/97N7//vn0//zTs//6wJP/+bBy//q6iP/onW//Piyl/w8Pt/8fGbH/m2iB/+icY//4pGD/96hl/viqZf74pmD/+Kxr//3iy/////////n1//ivbP/onGj/Pi2m/w8Pt/8uJKz/fFeQ/x8Zsf8+Lqb/6J9r//ivbP74rm3++Klm//mpZv/5q2f/+bR9//m0e//poW7/Pi6n/w8Pt/9sTZj/+Ktp//ira/+rd4P/Dw+3/4xijv/5snH+ +LN1/vmvbf/5r23/+a5t//mvb//4r2//TTuk/w8Pt/8fGrL/6ah1//ivcP/4r3P/q3yI/w8Pt/+MZpP/+bN5/vm4ev75t3X/+bV1//m1df/5t3X/+Ld3/8qUhP98XZn/Hxqz/+mse//5t3f/2p+B/x8as/8PD7f/u4qK//m7fv76u4D++bl7//m3fP/5uXz/+bl8//m5fP/5t3z/+bl//x8as/9NPKf/fWCb/x8as/8PD7f/bVOh//q5f//6v4X++sGI/vm9g//5voX/+b6F//m9hf/6vYX/+r6F//nCh/+bepr/Hxu0/w8Pt/8PD7f/fWOh//q+hf/6wof/+saN/vrGjf75xIv/+ceL//nEi//5xIv/+sSL//rHi//6x43/+ceN/+m7kP+7lpj/6ruQ//rHkP/6x43/+seQ//rLlf76ypT++seR//rJkf/6yZH/+seR//rJkf/6yZH/+8mR//vJlP/7yZT/+smU//rJlP/6yZT/+8yV//rJlf/6zpn+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</Image> ++ ++<Url type="text/html" method="POST" template="https://startpage.com/do/search"> ++ <Param name="q" value="{searchTerms}"/> ++</Url> ++<SearchForm>https://startpage.com/do/search/</SearchForm> ++</SearchPlugin> +-- +1.7.5.4 +

1 0