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

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

03 May '12

commit c0abd9af5a58992509d4e1116a1dd61a8f55b52b Merge: 4f3bd9f 852f167 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu May 3 08:18:56 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/mozconfig-osx-i386 | 4 ++-- build-scripts/config/mozconfig-osx-x86_64 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0

[torbrowser/maint-2.2] Changed the mozbuild installer sequence to directly install into our own directory.
by erinn＠torproject.org 03 May '12

03 May '12

commit 26ede05f976d6e51bf1f51627b5572034667194e Author: Shondoit Walker <shondoit(a)gmail.com> Date: Fri Apr 13 23:34:06 2012 +0200 Changed the mozbuild installer sequence to directly install into our own directory. --- build-scripts/install-mozbuild.bat | 4 ++++ build-scripts/versions.mk | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build-scripts/install-mozbuild.bat b/build-scripts/install-mozbuild.bat new file mode 100644 index 0000000..8e5cdb8 --- /dev/null +++ b/build-scripts/install-mozbuild.bat @@ -0,0 +1,4 @@ +SET MOZBUILDSETUP=%1 +SET TARGETDIR=%2 +SET TARGETDIR=%TARGETDIR:/=\% +"%MOZBUILDSETUP%" /S /D=%TARGETDIR% diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index f783ee0..d837576 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -211,10 +211,7 @@ $(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/* $(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla-build/start-msvc.patch ../src/current-patches/mozilla-build/guess-msvc-x64.bat patch-mozilla-build.sh | $(BUILD_DIR) rm -rf $(MOZBUILD_DIR) /c/mozilla-build -# We could try passing a /D argument here, but then we'd need to convert -# mingw paths into windows paths. We'll just go with the default here. - cd $(FETCH_DIR) && cmd.exe /c "$(MOZBUILD_PACKAGE) /S" - mv /c/mozilla-build $(MOZBUILD_DIR) + cmd.exe //c "$(PWD)/install-mozbuild.bat" "$(abspath $(FETCH_DIR)/$(MOZBUILD_PACKAGE))" "$(abspath $(MOZBUILD_DIR))" # We have to patch mozillabuild cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZBUILD_DIR) cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZBUILD_DIR)

1 0

[torbrowser/maint-2.2] Move the tor prefix declaration into version.mk
by erinn＠torproject.org 03 May '12

03 May '12

commit 411aa8543d050d7c3b56e044d2965319ded0d905 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed May 2 04:55:24 2012 +0200 Move the tor prefix declaration into version.mk --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 86adbc5..f8e87ea 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -77,7 +77,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && make install touch $(STAMP_DIR)/build-libevent -TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib build-pidgin: echo "We're not building pidgin yet!" diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 259039b..4a01376 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -97,7 +97,7 @@ 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-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) +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-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 d837576..91e3aa7 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -229,7 +229,7 @@ $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(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) --enable-gcc-warnings-advisory + cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR) cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install touch $(STAMP_DIR)/build-tor diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 855e211..c126d90 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -97,7 +97,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-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib 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)

1 0

[torbrowser/maint-2.2] Win: Fix qmake path setting for Vidalia's build
by erinn＠torproject.org 03 May '12

03 May '12

commit 098270c72b78537324bb9a229902e45d84df4466 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue May 1 18:02:25 2012 +0200 Win: Fix qmake path setting for Vidalia's build --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 200d6d2..855e211 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -78,7 +78,7 @@ build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && make install touch $(STAMP_DIR)/build-qt -VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) +VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) # XXX Once we build qt on windows, we'll want to add build-qt here build-vidalia: build-openssl $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build

1 0

[torbrowser/maint-2.2] remove useless betterprivacy firefox prefs (closes: #5722)
by erinn＠torproject.org 03 May '12

03 May '12

commit b4ced8a054bef342b6a7fbc7d48cbc3775fa77e5 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu May 3 07:39:44 2012 -0300 remove useless betterprivacy firefox prefs (closes: #5722) --- build-scripts/config/prefs.js | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js index 593db73..46825b5 100644 --- a/build-scripts/config/prefs.js +++ b/build-scripts/config/prefs.js @@ -56,10 +56,6 @@ user_pref("dom.event.contextmenu.enabled", false); user_pref("dom.storage.enabled", false); user_pref("extensions.autoDisableScopes", 0); user_pref("extensions.bootstrappedAddons", "{}"); -user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macromedia"); -user_pref("extensions.bprivacy.donotaskforfolder", true); -user_pref("extensions.bprivacy.donotaskonexit", true); -user_pref("extensions.bprivacy.initiated", true); user_pref("extensions.checkCompatibility.4.*", false); user_pref("extensions.checkUpdateSecurity", true); user_pref("extensions.databaseSchema", 3);

1 0

[torbrowser/maint-2.3] Changed the mozbuild installer sequence to directly install into our own directory.
by erinn＠torproject.org 03 May '12

03 May '12

commit 26ede05f976d6e51bf1f51627b5572034667194e Author: Shondoit Walker <shondoit(a)gmail.com> Date: Fri Apr 13 23:34:06 2012 +0200 Changed the mozbuild installer sequence to directly install into our own directory. --- build-scripts/install-mozbuild.bat | 4 ++++ build-scripts/versions.mk | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build-scripts/install-mozbuild.bat b/build-scripts/install-mozbuild.bat new file mode 100644 index 0000000..8e5cdb8 --- /dev/null +++ b/build-scripts/install-mozbuild.bat @@ -0,0 +1,4 @@ +SET MOZBUILDSETUP=%1 +SET TARGETDIR=%2 +SET TARGETDIR=%TARGETDIR:/=\% +"%MOZBUILDSETUP%" /S /D=%TARGETDIR% diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index f783ee0..d837576 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -211,10 +211,7 @@ $(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/* $(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla-build/start-msvc.patch ../src/current-patches/mozilla-build/guess-msvc-x64.bat patch-mozilla-build.sh | $(BUILD_DIR) rm -rf $(MOZBUILD_DIR) /c/mozilla-build -# We could try passing a /D argument here, but then we'd need to convert -# mingw paths into windows paths. We'll just go with the default here. - cd $(FETCH_DIR) && cmd.exe /c "$(MOZBUILD_PACKAGE) /S" - mv /c/mozilla-build $(MOZBUILD_DIR) + cmd.exe //c "$(PWD)/install-mozbuild.bat" "$(abspath $(FETCH_DIR)/$(MOZBUILD_PACKAGE))" "$(abspath $(MOZBUILD_DIR))" # We have to patch mozillabuild cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZBUILD_DIR) cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZBUILD_DIR)

1 0

[torbrowser/maint-2.3] Move the tor prefix declaration into version.mk
by erinn＠torproject.org 03 May '12

03 May '12

commit 411aa8543d050d7c3b56e044d2965319ded0d905 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed May 2 04:55:24 2012 +0200 Move the tor prefix declaration into version.mk --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 86adbc5..f8e87ea 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -77,7 +77,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && make install touch $(STAMP_DIR)/build-libevent -TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib build-pidgin: echo "We're not building pidgin yet!" diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 259039b..4a01376 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -97,7 +97,7 @@ 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-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) +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-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 d837576..91e3aa7 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -229,7 +229,7 @@ $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(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) --enable-gcc-warnings-advisory + cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR) cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install touch $(STAMP_DIR)/build-tor diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 855e211..c126d90 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -97,7 +97,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-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib 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)

1 0

[torbrowser/maint-2.3] Win: Fix qmake path setting for Vidalia's build
by erinn＠torproject.org 03 May '12

03 May '12

commit 098270c72b78537324bb9a229902e45d84df4466 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue May 1 18:02:25 2012 +0200 Win: Fix qmake path setting for Vidalia's build --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 200d6d2..855e211 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -78,7 +78,7 @@ build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && make install touch $(STAMP_DIR)/build-qt -VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) +VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) # XXX Once we build qt on windows, we'll want to add build-qt here build-vidalia: build-openssl $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build

1 0

[torbrowser/maint-2.3] remove useless betterprivacy firefox prefs (closes: #5722)
by erinn＠torproject.org 03 May '12

03 May '12

commit b4ced8a054bef342b6a7fbc7d48cbc3775fa77e5 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu May 3 07:39:44 2012 -0300 remove useless betterprivacy firefox prefs (closes: #5722) --- build-scripts/config/prefs.js | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js index 593db73..46825b5 100644 --- a/build-scripts/config/prefs.js +++ b/build-scripts/config/prefs.js @@ -56,10 +56,6 @@ user_pref("dom.event.contextmenu.enabled", false); user_pref("dom.storage.enabled", false); user_pref("extensions.autoDisableScopes", 0); user_pref("extensions.bootstrappedAddons", "{}"); -user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macromedia"); -user_pref("extensions.bprivacy.donotaskforfolder", true); -user_pref("extensions.bprivacy.donotaskonexit", true); -user_pref("extensions.bprivacy.initiated", true); user_pref("extensions.checkCompatibility.4.*", false); user_pref("extensions.checkUpdateSecurity", true); user_pref("extensions.databaseSchema", 3);

1 0

[torbrowser/master] Changed the mozbuild installer sequence to directly install into our own directory.
by erinn＠torproject.org 03 May '12

03 May '12

commit 26ede05f976d6e51bf1f51627b5572034667194e Author: Shondoit Walker <shondoit(a)gmail.com> Date: Fri Apr 13 23:34:06 2012 +0200 Changed the mozbuild installer sequence to directly install into our own directory. --- build-scripts/install-mozbuild.bat | 4 ++++ build-scripts/versions.mk | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build-scripts/install-mozbuild.bat b/build-scripts/install-mozbuild.bat new file mode 100644 index 0000000..8e5cdb8 --- /dev/null +++ b/build-scripts/install-mozbuild.bat @@ -0,0 +1,4 @@ +SET MOZBUILDSETUP=%1 +SET TARGETDIR=%2 +SET TARGETDIR=%TARGETDIR:/=\% +"%MOZBUILDSETUP%" /S /D=%TARGETDIR% diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index f783ee0..d837576 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -211,10 +211,7 @@ $(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/* $(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla-build/start-msvc.patch ../src/current-patches/mozilla-build/guess-msvc-x64.bat patch-mozilla-build.sh | $(BUILD_DIR) rm -rf $(MOZBUILD_DIR) /c/mozilla-build -# We could try passing a /D argument here, but then we'd need to convert -# mingw paths into windows paths. We'll just go with the default here. - cd $(FETCH_DIR) && cmd.exe /c "$(MOZBUILD_PACKAGE) /S" - mv /c/mozilla-build $(MOZBUILD_DIR) + cmd.exe //c "$(PWD)/install-mozbuild.bat" "$(abspath $(FETCH_DIR)/$(MOZBUILD_PACKAGE))" "$(abspath $(MOZBUILD_DIR))" # We have to patch mozillabuild cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZBUILD_DIR) cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZBUILD_DIR)

1 0