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

[torbrowser/maint-2.2] Win: Update the Firefox package sequence to a sane variant.
by erinn＠torproject.org 28 May '12

28 May '12

commit 4e405e991f9fc2994a302c97add7ad2424230e42 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Tue May 22 17:23:20 2012 +0200 Win: Update the Firefox package sequence to a sane variant. --- build-scripts/windows.mk | 5 +---- src/current-patches/mozilla-build/start-msvc.patch | 13 ++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e9d2b28..e2537c2 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -111,10 +111,7 @@ copy-firefox: -mkdir -p $(FIREFOX) cp -r config/firefox-portable/* $(FIREFOX) cp "/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86/Microsoft.VC90.CRT/"msvc*90.dll $(FIREFOX)/App/Firefox - cp $(FIREFOX_DIR)/obj-*/dist/*zip $(FIREFOX)/App/Firefox/ - cd $(FIREFOX)/App/Firefox && unzip $(FIREFOX)/App/Firefox/firefox-*\.zip - rm $(FIREFOX)/App/Firefox/firefox-*\.zip - mv $(FIREFOX)/App/Firefox/firefox/* $(FIREFOX)/App/Firefox/ && rmdir $(FIREFOX)/App/Firefox/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 echo "If we're here, we've done something right." diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch index 94b31fa..4101d89 100644 --- a/src/current-patches/mozilla-build/start-msvc.patch +++ b/src/current-patches/mozilla-build/start-msvc.patch @@ -1,3 +1,14 @@ +This patch changes the start-msvcX batch file to suit our needs. +First, it adds a 64-bit-aware-when-running-in-a-32-bit-process guess-msvc.bat. +Second, it adds the option to run 'make' immediately by providing arguments. +The default make arguments contain the following: +Targets build, package: these are needed to build an actual package we can use. +This includes generating manifest and packaging omni.ja, among others. +INNER_MAKE_PACKAGE=true, when the package target is run it will normally create +a zip file that contains the completed package. +Since we grab the staging folder we don't need the zip file. +So instead of running the actual packaging command we 'run' true instead. +(See .\toolkit\mozapps\installer\packager.mk in the FF source for more details) --- start-msvcx.bat.org 2010-08-17 23:01:48 +0200 +++ start-msvcx.bat 2011-11-04 15:28:02 +0100 @@ -7,7 +7,7 @@ @@ -17,5 +28,5 @@ +if "%1"=="" ( + start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i" +) else ( -+ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package" ++ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package INNER_MAKE_PACKAGE=true" +)

1 0

[torbrowser/maint-2.2] bump all tbbs for tor 0.2.2.36
by erinn＠torproject.org 28 May '12

28 May '12

commit 894634d8ae6bce9ff9899a5ae15dcdc358c557e4 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon May 28 15:53:25 2012 -0300 bump all tbbs for tor 0.2.2.36 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 40 insertions(+), 16 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index f379cce..98b6863 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.4.1 - |_ HTTPS-Everywhere 2.0.2 + |_ NoScript 2.4.3 + |_ HTTPS-Everywhere 2.0.5 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index ebe97b4..8609d47 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.4.1 - |_ HTTPS-Everywhere 2.0.2 + |_ NoScript 2.4.3 + |_ HTTPS-Everywhere 2.0.5 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index a3bac24..cd5c811 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.4.1 - |_ HTTPS-Everywhere 2.0.2 + |_ NoScript 2.4.3 + |_ HTTPS-Everywhere 2.0.5 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d3a2697..ef72f13 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=12 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index bfc628d..40b3d01 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=12 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index fdd3902..035875e 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.2.35 +RELEASE_VER=2.2.36 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,14 +8,14 @@ LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17 LIBEVENT_VER=2.0.19-stable -TOR_VER=0.2.2.35 +TOR_VER=0.2.2.36 PIDGIN_VER=2.6.4 FIREFOX_VER=12.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.5.1 -NOSCRIPT_VER=2.4.1 -HTTPSEVERYWHERE_VER=2.0.2 +NOSCRIPT_VER=2.4.3 +HTTPSEVERYWHERE_VER=2.0.5 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e2537c2..60a5b95 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=13 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index db2edfa..7305e5e 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.36-1); suite=linux + + * Update Tor to 0.2.2.36 + * Update NoScript to 2.3.4 + * Update HTTPS Everywhere to 2.0.5 + + -- Erinn Clark <erinn(a)torproject.org> Mon May 28 15:50:12 BRT 2012 + Tor Browser Bundle (2.2.35-12); suite=linux * Update OpenSSL to 1.0.1c diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index f432023..c1e6519 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.36-1); suite=osx + + * Update Tor to 0.2.2.36 + * Update NoScript to 2.3.4 + * Update HTTPS Everywhere to 2.0.5 + + -- Erinn Clark <erinn(a)torproject.org> Mon May 28 15:50:07 BRT 2012 + Tor Browser Bundle (2.2.35-12); suite=osx * Update OpenSSL to 1.0.1c diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 3fd8a29..7d4c989 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.36-1); suite=windows + + * Update Tor to 0.2.2.36 + * Update NoScript to 2.3.4 + * Update HTTPS Everywhere to 2.0.5 + + -- Erinn Clark <erinn(a)torproject.org> Mon May 28 15:50:09 BRT 2012 + Tor Browser Bundle (2.2.35-13); suite=windows * Fix Firefox build to sanitize file paths (closes: #5922)

1 0

[torbrowser/maint-2.3] Win: Update the Firefox package sequence to a sane variant.
by erinn＠torproject.org 28 May '12

28 May '12

commit 4e405e991f9fc2994a302c97add7ad2424230e42 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Tue May 22 17:23:20 2012 +0200 Win: Update the Firefox package sequence to a sane variant. --- build-scripts/windows.mk | 5 +---- src/current-patches/mozilla-build/start-msvc.patch | 13 ++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e9d2b28..e2537c2 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -111,10 +111,7 @@ copy-firefox: -mkdir -p $(FIREFOX) cp -r config/firefox-portable/* $(FIREFOX) cp "/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86/Microsoft.VC90.CRT/"msvc*90.dll $(FIREFOX)/App/Firefox - cp $(FIREFOX_DIR)/obj-*/dist/*zip $(FIREFOX)/App/Firefox/ - cd $(FIREFOX)/App/Firefox && unzip $(FIREFOX)/App/Firefox/firefox-*\.zip - rm $(FIREFOX)/App/Firefox/firefox-*\.zip - mv $(FIREFOX)/App/Firefox/firefox/* $(FIREFOX)/App/Firefox/ && rmdir $(FIREFOX)/App/Firefox/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 echo "If we're here, we've done something right." diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch index 94b31fa..4101d89 100644 --- a/src/current-patches/mozilla-build/start-msvc.patch +++ b/src/current-patches/mozilla-build/start-msvc.patch @@ -1,3 +1,14 @@ +This patch changes the start-msvcX batch file to suit our needs. +First, it adds a 64-bit-aware-when-running-in-a-32-bit-process guess-msvc.bat. +Second, it adds the option to run 'make' immediately by providing arguments. +The default make arguments contain the following: +Targets build, package: these are needed to build an actual package we can use. +This includes generating manifest and packaging omni.ja, among others. +INNER_MAKE_PACKAGE=true, when the package target is run it will normally create +a zip file that contains the completed package. +Since we grab the staging folder we don't need the zip file. +So instead of running the actual packaging command we 'run' true instead. +(See .\toolkit\mozapps\installer\packager.mk in the FF source for more details) --- start-msvcx.bat.org 2010-08-17 23:01:48 +0200 +++ start-msvcx.bat 2011-11-04 15:28:02 +0100 @@ -7,7 +7,7 @@ @@ -17,5 +28,5 @@ +if "%1"=="" ( + start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i" +) else ( -+ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package" ++ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package INNER_MAKE_PACKAGE=true" +)

1 0

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

28 May '12

commit f8897bbdeeeba6d7d93baf53960d4a09bf26b728 Merge: 18952b7 4e405e9 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon May 28 15:40:16 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk | 5 +---- src/current-patches/mozilla-build/start-msvc.patch | 13 ++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-)

1 0

[torbrowser/maint-2.3] bump all tbbs for tor 0.2.2.36
by erinn＠torproject.org 28 May '12

28 May '12

commit 894634d8ae6bce9ff9899a5ae15dcdc358c557e4 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon May 28 15:53:25 2012 -0300 bump all tbbs for tor 0.2.2.36 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 40 insertions(+), 16 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index f379cce..98b6863 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.4.1 - |_ HTTPS-Everywhere 2.0.2 + |_ NoScript 2.4.3 + |_ HTTPS-Everywhere 2.0.5 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index ebe97b4..8609d47 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.4.1 - |_ HTTPS-Everywhere 2.0.2 + |_ NoScript 2.4.3 + |_ HTTPS-Everywhere 2.0.5 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index a3bac24..cd5c811 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.4.1 - |_ HTTPS-Everywhere 2.0.2 + |_ NoScript 2.4.3 + |_ HTTPS-Everywhere 2.0.5 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d3a2697..ef72f13 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=12 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index bfc628d..40b3d01 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=12 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index fdd3902..035875e 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.2.35 +RELEASE_VER=2.2.36 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,14 +8,14 @@ LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17 LIBEVENT_VER=2.0.19-stable -TOR_VER=0.2.2.35 +TOR_VER=0.2.2.36 PIDGIN_VER=2.6.4 FIREFOX_VER=12.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.5.1 -NOSCRIPT_VER=2.4.1 -HTTPSEVERYWHERE_VER=2.0.2 +NOSCRIPT_VER=2.4.3 +HTTPSEVERYWHERE_VER=2.0.5 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e2537c2..60a5b95 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=13 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index db2edfa..7305e5e 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.36-1); suite=linux + + * Update Tor to 0.2.2.36 + * Update NoScript to 2.3.4 + * Update HTTPS Everywhere to 2.0.5 + + -- Erinn Clark <erinn(a)torproject.org> Mon May 28 15:50:12 BRT 2012 + Tor Browser Bundle (2.2.35-12); suite=linux * Update OpenSSL to 1.0.1c diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index f432023..c1e6519 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.36-1); suite=osx + + * Update Tor to 0.2.2.36 + * Update NoScript to 2.3.4 + * Update HTTPS Everywhere to 2.0.5 + + -- Erinn Clark <erinn(a)torproject.org> Mon May 28 15:50:07 BRT 2012 + Tor Browser Bundle (2.2.35-12); suite=osx * Update OpenSSL to 1.0.1c diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 3fd8a29..7d4c989 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.36-1); suite=windows + + * Update Tor to 0.2.2.36 + * Update NoScript to 2.3.4 + * Update HTTPS Everywhere to 2.0.5 + + -- Erinn Clark <erinn(a)torproject.org> Mon May 28 15:50:09 BRT 2012 + Tor Browser Bundle (2.2.35-13); suite=windows * Fix Firefox build to sanitize file paths (closes: #5922)

1 0

[torbrowser/master] Win: Update the Firefox package sequence to a sane variant.
by erinn＠torproject.org 28 May '12

28 May '12

commit 4e405e991f9fc2994a302c97add7ad2424230e42 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Tue May 22 17:23:20 2012 +0200 Win: Update the Firefox package sequence to a sane variant. --- build-scripts/windows.mk | 5 +---- src/current-patches/mozilla-build/start-msvc.patch | 13 ++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e9d2b28..e2537c2 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -111,10 +111,7 @@ copy-firefox: -mkdir -p $(FIREFOX) cp -r config/firefox-portable/* $(FIREFOX) cp "/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86/Microsoft.VC90.CRT/"msvc*90.dll $(FIREFOX)/App/Firefox - cp $(FIREFOX_DIR)/obj-*/dist/*zip $(FIREFOX)/App/Firefox/ - cd $(FIREFOX)/App/Firefox && unzip $(FIREFOX)/App/Firefox/firefox-*\.zip - rm $(FIREFOX)/App/Firefox/firefox-*\.zip - mv $(FIREFOX)/App/Firefox/firefox/* $(FIREFOX)/App/Firefox/ && rmdir $(FIREFOX)/App/Firefox/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 echo "If we're here, we've done something right." diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch index 94b31fa..4101d89 100644 --- a/src/current-patches/mozilla-build/start-msvc.patch +++ b/src/current-patches/mozilla-build/start-msvc.patch @@ -1,3 +1,14 @@ +This patch changes the start-msvcX batch file to suit our needs. +First, it adds a 64-bit-aware-when-running-in-a-32-bit-process guess-msvc.bat. +Second, it adds the option to run 'make' immediately by providing arguments. +The default make arguments contain the following: +Targets build, package: these are needed to build an actual package we can use. +This includes generating manifest and packaging omni.ja, among others. +INNER_MAKE_PACKAGE=true, when the package target is run it will normally create +a zip file that contains the completed package. +Since we grab the staging folder we don't need the zip file. +So instead of running the actual packaging command we 'run' true instead. +(See .\toolkit\mozapps\installer\packager.mk in the FF source for more details) --- start-msvcx.bat.org 2010-08-17 23:01:48 +0200 +++ start-msvcx.bat 2011-11-04 15:28:02 +0100 @@ -7,7 +7,7 @@ @@ -17,5 +28,5 @@ +if "%1"=="" ( + start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i" +) else ( -+ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package" ++ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package INNER_MAKE_PACKAGE=true" +)

1 0

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

28 May '12

commit 6ae1b78e59381b532cc1b60e940bd4df1a7ef1b8 Merge: f8897bb 894634d Author: Erinn Clark <erinn(a)torproject.org> Date: Mon May 28 15:53:44 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 40 insertions(+), 16 deletions(-)

1 0

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

28 May '12

commit f8897bbdeeeba6d7d93baf53960d4a09bf26b728 Merge: 18952b7 4e405e9 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon May 28 15:40:16 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk | 5 +---- src/current-patches/mozilla-build/start-msvc.patch | 13 ++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-)

1 0

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

28 May '12

commit 6ae1b78e59381b532cc1b60e940bd4df1a7ef1b8 Merge: f8897bb 894634d Author: Erinn Clark <erinn(a)torproject.org> Date: Mon May 28 15:53:44 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 40 insertions(+), 16 deletions(-)

1 0

[torbrowser/master] bump all tbbs for tor 0.2.2.36
by erinn＠torproject.org 28 May '12

28 May '12

commit 894634d8ae6bce9ff9899a5ae15dcdc358c557e4 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon May 28 15:53:25 2012 -0300 bump all tbbs for tor 0.2.2.36 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 40 insertions(+), 16 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index f379cce..98b6863 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.4.1 - |_ HTTPS-Everywhere 2.0.2 + |_ NoScript 2.4.3 + |_ HTTPS-Everywhere 2.0.5 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index ebe97b4..8609d47 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.4.1 - |_ HTTPS-Everywhere 2.0.2 + |_ NoScript 2.4.3 + |_ HTTPS-Everywhere 2.0.5 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index a3bac24..cd5c811 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.36 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.4.1 - |_ HTTPS-Everywhere 2.0.2 + |_ NoScript 2.4.3 + |_ HTTPS-Everywhere 2.0.5 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d3a2697..ef72f13 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=12 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index bfc628d..40b3d01 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=12 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index fdd3902..035875e 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.2.35 +RELEASE_VER=2.2.36 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,14 +8,14 @@ LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17 LIBEVENT_VER=2.0.19-stable -TOR_VER=0.2.2.35 +TOR_VER=0.2.2.36 PIDGIN_VER=2.6.4 FIREFOX_VER=12.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.5.1 -NOSCRIPT_VER=2.4.1 -HTTPSEVERYWHERE_VER=2.0.2 +NOSCRIPT_VER=2.4.3 +HTTPSEVERYWHERE_VER=2.0.5 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e2537c2..60a5b95 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=13 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index db2edfa..7305e5e 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.36-1); suite=linux + + * Update Tor to 0.2.2.36 + * Update NoScript to 2.3.4 + * Update HTTPS Everywhere to 2.0.5 + + -- Erinn Clark <erinn(a)torproject.org> Mon May 28 15:50:12 BRT 2012 + Tor Browser Bundle (2.2.35-12); suite=linux * Update OpenSSL to 1.0.1c diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index f432023..c1e6519 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.36-1); suite=osx + + * Update Tor to 0.2.2.36 + * Update NoScript to 2.3.4 + * Update HTTPS Everywhere to 2.0.5 + + -- Erinn Clark <erinn(a)torproject.org> Mon May 28 15:50:07 BRT 2012 + Tor Browser Bundle (2.2.35-12); suite=osx * Update OpenSSL to 1.0.1c diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 3fd8a29..7d4c989 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.36-1); suite=windows + + * Update Tor to 0.2.2.36 + * Update NoScript to 2.3.4 + * Update HTTPS Everywhere to 2.0.5 + + -- Erinn Clark <erinn(a)torproject.org> Mon May 28 15:50:09 BRT 2012 + Tor Browser Bundle (2.2.35-13); suite=windows * Fix Firefox build to sanitize file paths (closes: #5922)

1 0