tbb-commits

tbb-commits@lists.torproject.org

1 participants
17624 discussions

[tor-browser-bundle/master] Specify a tag for fteproxy for all builds.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit d4470583ce2d681589e1f56b73fbbef83c3510be Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 09:39:48 2014 -0800 Specify a tag for fteproxy for all builds. --- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.nightly | 1 + 3 files changed, 3 insertions(+) diff --git a/gitian/versions b/gitian/versions index 389e3e1..11eb1db 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f190d5a..b6ee2c2 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 0c7f50d..436536e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master +FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5

1 0

[tor-browser-bundle/master] Remove a diff file.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit ec7da09f018252ff92d3728eb22e27e0934f83d1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 05:25:35 2014 -0800 Remove a diff file. It got added during a conflict resolution that got squashed. --- gitian/versions.diff | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/gitian/versions.diff b/gitian/versions.diff deleted file mode 100644 index 69001a8..0000000 --- a/gitian/versions.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/gitian/versions.nightly b/gitian/versions.nightly -index b9b5835..f3dfe9d 100755 ---- a/gitian/versions.nightly -+++ b/gitian/versions.nightly -@@ -12,13 +12,14 @@ NSIS_TAG=v0.1 - ZLIB_TAG=v1.2.8 - LIBEVENT_TAG=release-2.0.21-stable - MINGW_REV=6184 --PYPTLIB_TAG=pyptlib-0.0.4 --OBFSPROXY_TAG=obfsproxy-0.2.3 -+PYPTLIB_TAG=pyptlib-0.0.5 -+OBFSPROXY_TAG=obfsproxy-0.2.4 - FLASHPROXY_TAG=1.6 - - GITIAN_TAG=tor-browser-builder-3.0-4 - - OPENSSL_VER=1.0.1f -+GMP_VER=5.1.3 - FIREFOX_LANG_VER=24.3.0esr - BINUTILS_VER=2.22 - GCC_VER=4.6.3 -@@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 - - ## File names for the source packages - OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz -+GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 - NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi - TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz - OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb -@@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz - - # Hashes for packages with weak sigs or no sigs - OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a -+GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 - OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc - TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 - NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 -@@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 - - ## Non-git package URLs - OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} -+GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} - TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… - OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… - BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser-bundle/master] Bug 9353: Fix ibus issues on some Linux systems.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit c05c7728ef352e598750993190b76485addc26a2 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 28 09:55:55 2014 +0000 Bug 9353: Fix ibus issues on some Linux systems. --- RelativeLink/RelativeLink.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 9bab08c..0d25a28 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -189,6 +189,13 @@ fi mydir="`dirname "$myname"`" test -d "$mydir" && cd "$mydir" +# This is a fix for an ibus issue on some Linux systems. See #9353 for more +# details. The symlink needs to be created before we change HOME. +if [ ! -d ".config/ibus" ]; then + mkdir -p .config/ibus + ln -nsf ~/.config/ibus/bus .config/ibus +fi + # If ${PWD} results in a zero length HOME, we can try something else... if [ ! "${PWD}" ]; then # "hacking around some braindamage"

1 0

[tor-browser-bundle/master] Bug #10104: Use new rebased gitian checkout.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 014725628fdb30d612c5276581eb70202d1d1c59 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 26 12:56:47 2014 -0800 Bug #10104: Use new rebased gitian checkout. Should fix LXC builds. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index a29a4ba..389e3e1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.0-4 +GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 55efa38..87b68ca 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -17,7 +17,7 @@ OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.0-4 +GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 diff --git a/gitian/versions.beta b/gitian/versions.beta index 241e855..d68854a 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -19,7 +19,7 @@ FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.0-4 +GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5a8fcd0..0c7f50d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ OBFSPROXY_TAG=master FLASHPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.0-4 +GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Put the "Tor" subdirectory at the head of PATH for DLL access.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit fadb9d2edb3ded8b66e7b2da3182bf78af329339 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Feb 20 19:15:17 2014 +0000 Put the "Tor" subdirectory at the head of PATH for DLL access. Pluggable transport executables are in their own subdirectory, PluggableTransports, but they need to have access to the OpenSSL DLLs. Adding the directory containing the DLLs to PATH makes them visible. I put the directory at the front of PATH and not the end, just in case there is a libeay32.dll or ssleay32.dll somewhere else on the system. https://trac.torproject.org/projects/tor/ticket/10845 --- RelativeLink/RelativeLink.c | 123 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 3 deletions(-) diff --git a/RelativeLink/RelativeLink.c b/RelativeLink/RelativeLink.c index bae4647..9a6c9f5 100755 --- a/RelativeLink/RelativeLink.c +++ b/RelativeLink/RelativeLink.c @@ -1,4 +1,6 @@ #include <windows.h> +#include <stdio.h> +#include <tchar.h> // // RelativeLink.c @@ -22,8 +24,119 @@ // Put it in the proper place. // -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +// Get the absolute path to a subdirectory of the current directory; i.e. +// "C:\cwd\reldir". Returns a malloc-allocated string or NULL on error. +LPTSTR GetSubdirectory(LPCTSTR reldir) +{ + DWORD bufsize, n; + int len; + LPTSTR cwd, subdir; + + cwd = NULL; + subdir = NULL; + + // The first call to GetCurrentDirectory gets the buffer size; the second + // fills the buffer. + bufsize = GetCurrentDirectory(0, NULL); + if (bufsize == 0) + goto bail; + cwd = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (cwd == NULL) + goto bail; + n = GetCurrentDirectory(bufsize, cwd); + if (n == 0 || n >= bufsize) + goto bail; + + bufsize = _tcslen(cwd) + 1 + _tcslen(reldir) + 1; + subdir = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (subdir == NULL) + goto bail; + len = _sntprintf(subdir, bufsize, "%s\\%s", cwd, reldir); + if (len < 0 || (DWORD) len >= bufsize) + goto bail; + + free(cwd); + return subdir; + +bail: + if (cwd != NULL) + free(cwd); + if (subdir != NULL) + free(subdir); + return NULL; +} + +// Add a directory to the beginning of the PATH environment variable. Returns 0 +// on failure, nonzero on success. +// http://msdn.microsoft.com/en-us/library/windows/desktop/ms682009%28v=vs.85%… +DWORD PrependToPath(LPCTSTR dir) +{ + DWORD bufsize, n, rc, err; + int len; + LPTSTR path, value; + + path = NULL; + value = NULL; + + // First find out how big a buffer we need. + bufsize = GetEnvironmentVariable(TEXT ("PATH"), NULL, 0); + if (bufsize == 0) + { + err = GetLastError(); + if (err == ERROR_ENVVAR_NOT_FOUND) + // If the variable doesn't yet exist, just set it and return. + return SetEnvironmentVariable(TEXT ("PATH"), dir); + else + goto bail; + } + // Now that we know the buffer size, get the value. + path = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (path == NULL) + goto bail; + n = GetEnvironmentVariable(TEXT ("PATH"), path, bufsize); + if (n == 0 || n >= bufsize) + goto bail; + + bufsize = _tcslen(dir) + 1 + _tcslen(path) + 1; + value = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (value == NULL) + goto bail; + len = _sntprintf(value, bufsize, "%s;%s", dir, path); + if (len < 0 || (DWORD) len >= bufsize) + goto bail; + + rc = SetEnvironmentVariable(TEXT ("PATH"), value); + if (rc == 0) + goto bail; + + free(path); + free(value); + return 1; + +bail: + if (path != NULL) + free(path); + if (value != NULL) + free(value); + return 0; +} + +// Returns 0 on failure and nonzero on success. +DWORD StartTorBrowser(void) { + TCHAR *TorDir; + DWORD rc; + // Put the Tor subdirectory at the beginning of PATH so that pluggable + // transports (in their own subdirectory) can access DLLs. + // https://trac.torproject.org/projects/tor/ticket/10845 + TorDir = GetSubdirectory(TEXT ("Tor")); + if (TorDir == NULL) + return 0; + rc = PrependToPath(TorDir); + free(TorDir); + if (rc == 0) + return 0; + STARTUPINFO si; PROCESS_INFORMATION pi; @@ -34,8 +147,12 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine TCHAR *ProgramToStart; ProgramToStart = TEXT ("Browser\\firefox.exe -no-remote -profile .\\Data\\Browser\\profile.default\\"); - if( !CreateProcess( - NULL, ProgramToStart, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + return CreateProcess( NULL, ProgramToStart, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); +} + +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +{ + if (!StartTorBrowser()) { MessageBox ( NULL, TEXT ("Unable to start Tor Browser"), NULL, MB_OK); return -1;

1 0

[tor-browser-bundle/master] Bug #4261: Generate DMGs for MacOS.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 535c7ebbdcdc0c5def8ec640e2f8626fb7396f78 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 26 10:45:24 2014 -0800 Bug #4261: Generate DMGs for MacOS. Compressed with bzip2 (UDBZ) and complete with a background and desktop shortcut! --- Bundle-Data/mac.dmg/.DS_Store | Bin 0 -> 12292 bytes Bundle-Data/mac.dmg/._Desktop | Bin 0 -> 303592 bytes Bundle-Data/mac.dmg/.background/background.png | Bin 0 -> 50020 bytes Bundle-Data/mac.dmg/Desktop | Bin 0 -> 300120 bytes gitian/build-helpers/ddmg.sh | 28 ++++++ gitian/descriptors/mac/gitian-bundle.yml | 108 ++++++++++++++++-------- gitian/fetch-inputs.sh | 1 + gitian/mkbundle-mac.sh | 7 +- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.beta | 1 + gitian/versions.diff | 45 ++++++++++ gitian/versions.nightly | 1 + 13 files changed, 156 insertions(+), 37 deletions(-) diff --git a/Bundle-Data/mac.dmg/.DS_Store b/Bundle-Data/mac.dmg/.DS_Store new file mode 100644 index 0000000..9bec18c Binary files /dev/null and b/Bundle-Data/mac.dmg/.DS_Store differ diff --git a/Bundle-Data/mac.dmg/._Desktop b/Bundle-Data/mac.dmg/._Desktop new file mode 100644 index 0000000..a1e0b7f Binary files /dev/null and b/Bundle-Data/mac.dmg/._Desktop differ diff --git a/Bundle-Data/mac.dmg/.background/background.png b/Bundle-Data/mac.dmg/.background/background.png new file mode 100644 index 0000000..94e4584 Binary files /dev/null and b/Bundle-Data/mac.dmg/.background/background.png differ diff --git a/Bundle-Data/mac.dmg/Desktop b/Bundle-Data/mac.dmg/Desktop new file mode 100644 index 0000000..3c88450 Binary files /dev/null and b/Bundle-Data/mac.dmg/Desktop differ diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh new file mode 100755 index 0000000..f9f54da --- /dev/null +++ b/gitian/build-helpers/ddmg.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# Crappy deterministic dmg wrapper +export LC_ALL=C + +DMGFILE=$1 +shift + +# Attempt to normalize inode ordering.. +# XXX: the genisoimage -path-list argument seems broken +mkdir -p ~/build/tmp/dmg +cd $@ +for i in `find . | sort` +do + if [ -d $i ]; + then + mkdir -p ~/build/tmp/dmg/$i + else + cp --parents -d --preserve=all $i ~/build/tmp/dmg/ + fi +done + +find ~/build/tmp/dmg -executable -exec chmod 700 {} \; +find ~/build/tmp/dmg ! -executable -exec chmod 600 {} \; + +genisoimage -D -V "Tor Browser" -no-pad -R -apple -o tbb-uncompressed.dmg ~/build/tmp/dmg/ +~/build/libdmg-hfsplus/dmg/dmg dmg tbb-uncompressed.dmg $DMGFILE +rm tbb-uncompressed.dmg +rm -rf ~/build/tmp/dmg/ diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 428dbee..da7e918 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -12,6 +12,11 @@ packages: - "nsis" - "faketime" - "python" +- "hfsprogs" +- "genisoimage" +- "cmake" +- "zlib1g-dev" +- "libbz2-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" @@ -20,6 +25,8 @@ remotes: "dir": "torbutton" - "url": "https://git.torproject.org/https-everywhere.git" "dir": "https-everywhere" +- "url": "https://github.com/vasi/libdmg-hfsplus.git" + "dir": "libdmg-hfsplus" files: # TODO: Can we use an env for this file+version?? - "tor-browser-mac32-gbuilt.zip" @@ -28,9 +35,11 @@ files: - "torrc-defaults-appendix-mac" - "relativelink-src.zip" - "mac-skeleton.zip" +- "mac-dmg.zip" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" - "dzip.sh" +- "ddmg.sh" - "bare-version" - "bundle.inputs" - "versions" @@ -46,12 +55,20 @@ script: | export TORBROWSER_VERSION=`cat bare-version` export LC_ALL=C umask 0022 + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then + export TORBROWSER_APP="TorBrowserBundle" + export TORBROWSER_NAME="TorBrowserBundle" + else + export TORBROWSER_APP="TorBrowser" + export TORBROWSER_NAME="TorBrowserBundle" + fi # mkdir -p $OUTDIR/ - mkdir -p TorBrowserBundle.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org - mkdir -p TorBrowserBundle.app/Data/Browser/Caches - mkdir -p TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ - mkdir -p TorBrowserBundle.app/Docs/sources + mkdir -p dmg + mkdir -p $TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p $TORBROWSER_NAME.app/Data/Browser/Caches + mkdir -p $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ + mkdir -p $TORBROWSER_NAME.app/Docs/sources # cd tor-launcher make clean @@ -62,7 +79,7 @@ script: | unzip ../*.xpi rm ../*.xpi ~/build/dzip.sh ../tor-launcher(a)torproject.org.xpi . - mv ../tor-launcher(a)torproject.org.xpi ../../../TorBrowserBundle.app/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi + mv ../tor-launcher(a)torproject.org.xpi ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi cd ../../../ # cd torbutton @@ -74,7 +91,7 @@ script: | unzip ../*.xpi rm ../*.xpi ~/build/dzip.sh ../torbutton(a)torproject.org.xpi . - mv ../torbutton(a)torproject.org.xpi ../../../TorBrowserBundle.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi + mv ../torbutton(a)torproject.org.xpi ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi cd ../../../ # cd https-everywhere @@ -82,11 +99,11 @@ script: | # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master ./makexpi.sh - cp ./pkg/*.xpi ../TorBrowserBundle.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + cp ./pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. # - cp *.xpi ./TorBrowserBundle.app/Data/Browser/profile.default/extensions/ - cd ./TorBrowserBundle.app/Data/Browser/profile.default/extensions/ + cp *.xpi ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ + cd ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi cd https-everywhere(a)eff.org unzip ../https-everywhere(a)eff.org.xpi @@ -95,14 +112,14 @@ script: | # unzip relativelink-src.zip cd RelativeLink - cp RelativeLinkOSX.sh ../TorBrowserBundle.app/Contents/MacOS/TorBrowserBundle + cp RelativeLinkOSX.sh ../$TORBROWSER_NAME.app/Contents/MacOS/TorBrowserBundle cd .. # unzip ~/build/tor-mac$GBUILD_BITS-gbuilt.zip if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-mac$GBUILD_BITS-gbuilt.zip fi - cd TorBrowserBundle.app + cd $TORBROWSER_NAME.app unzip ~/build/mac-skeleton.zip sed -i -e "s/TORBROWSER_VERSION/$TORBROWSER_VERSION/" Contents/Info.plist unzip ~/build/tbb-docs.zip @@ -117,40 +134,54 @@ script: | cd ../../../ # # Copy reproducibility info - cp versions TorBrowserBundle.app/Docs/sources/ - cp bundle.inputs TorBrowserBundle.app/Docs/sources/bundle.inputs + cp versions $TORBROWSER_NAME.app/Docs/sources/ + cp bundle.inputs $TORBROWSER_NAME.app/Docs/sources/bundle.inputs # - # FF24 puts the prefs in a different jar: - if [ -f TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then - pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ - else - pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ - fi + # Set up DMG skeleton + cd libdmg-hfsplus + cmake CMakeLists.txt + cd dmg + make + cd ../../ + cd dmg + unzip ~/build/mac-dmg.zip + cd .. + # + # FF24 puts the prefs in the browser jar: + pushd $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js popd - # XXX: DMG plz - cp -a TorBrowserBundle.app TorBrowserBundle_en-US.app - ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip TorBrowserBundle_en-US.app - rm -rf TorBrowserBundle_en-US.app + # + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then + cp -a ~/build/$TORBROWSER_NAME.app ~/build/${TORBROWSER_NAME}_en-US.app + ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip ${TORBROWSER_NAME}_en-US.app + rm -rf ~/build/${TORBROWSER_NAME}_en-US.app + else + cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app + ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg + rm -rf ~/build/dmg/$TORBROWSER_APP.app + fi + mv $TORBROWSER_NAME.app ${TORBROWSER_NAME}_plain.app # unzip mac-langpacks.zip cd mac-langpacks - for i in *.xpi + for LANG in $BUNDLE_LOCALES do - LANG=`basename $i .xpi` - cp -a ../TorBrowserBundle.app ../TorBrowserBundle_$LANG.app - cp $i ../TorBrowserBundle_$LANG.app/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi - cd .. - - # FF24 puts the prefs in a different jar: - if [ -f TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then - pushd TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ + xpi=$LANG.xpi + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then + DEST=${TORBROWSER_APP}_$LANG else - pushd TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ + DEST=$TORBROWSER_APP fi + cp -a ../${TORBROWSER_NAME}_plain.app ~/build/dmg/$DEST.app + cp $xpi ~/build/dmg/$DEST.app/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + cd .. + + # FF24 puts the prefs in the browser jar: + pushd ~/build/dmg/$DEST.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ mkdir -p defaults/preferences cp ~/build/000-tor-browser.js defaults/preferences/000-tor-browser.js @@ -158,8 +189,15 @@ script: | zip -Xm omni.ja defaults/preferences/000-tor-browser.js popd - ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip TorBrowserBundle_$LANG.app - rm -rf TorBrowserBundle_$LANG.app + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then + pushd ~/build/dmg/ + ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip $DEST.app + rm -rf TorBrowserBundle_$LANG.app + popd + else + ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.dmg ~/build/dmg/ + rm -rf ~/build/dmg/$DEST.app + fi cd mac-langpacks done cd .. diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index d757f4d..c2bf811 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -292,6 +292,7 @@ pyptlib https://git.torproject.org/pluggable-transports/pyptlib.gi obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git flashproxy https://git.torproject.org/flashproxy.git fteproxy https://github.com/kpdyer/fteproxy.git +libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG EOF exit 0 diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index e8b3aa1..d6bffce 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -62,6 +62,9 @@ cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac rm -f $GITIAN_DIR/inputs/mac-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-skeleton.zip . +cd ../mac.dmg +rm -f $GITIAN_DIR/inputs/mac-dmg.zip +$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-dmg.zip . cd $WRAPPER_DIR @@ -155,7 +158,7 @@ then cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libdmg-hfsplus=$LIBDMG_TAG,https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-mac.log.`date +%Y%m%d%H%M%S` @@ -164,7 +167,7 @@ then #cp -a build/out/*.dmg $WRAPPER_DIR mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ - cp -a build/out/*.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 + cp -a build/out/* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 touch $GITIAN_DIR/inputs/bundle-mac.gbuilt else echo diff --git a/gitian/versions b/gitian/versions index f3dfe9d..a29a4ba 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0741b8f..55efa38 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.beta b/gitian/versions.beta index 6ac5a34..241e855 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -17,6 +17,7 @@ PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.6 +LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.diff b/gitian/versions.diff new file mode 100644 index 0000000..69001a8 --- /dev/null +++ b/gitian/versions.diff @@ -0,0 +1,45 @@ +diff --git a/gitian/versions.nightly b/gitian/versions.nightly +index b9b5835..f3dfe9d 100755 +--- a/gitian/versions.nightly ++++ b/gitian/versions.nightly +@@ -12,13 +12,14 @@ NSIS_TAG=v0.1 + ZLIB_TAG=v1.2.8 + LIBEVENT_TAG=release-2.0.21-stable + MINGW_REV=6184 +-PYPTLIB_TAG=pyptlib-0.0.4 +-OBFSPROXY_TAG=obfsproxy-0.2.3 ++PYPTLIB_TAG=pyptlib-0.0.5 ++OBFSPROXY_TAG=obfsproxy-0.2.4 + FLASHPROXY_TAG=1.6 + + GITIAN_TAG=tor-browser-builder-3.0-4 + + OPENSSL_VER=1.0.1f ++GMP_VER=5.1.3 + FIREFOX_LANG_VER=24.3.0esr + BINUTILS_VER=2.22 + GCC_VER=4.6.3 +@@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 + + ## File names for the source packages + OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz ++GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 + NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi + TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz + OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb +@@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz + + # Hashes for packages with weak sigs or no sigs + OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a ++GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 + OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc + TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 + NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +@@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 + + ## Non-git package URLs + OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} ++GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} + TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… + OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… + BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5e6bc6f..5a8fcd0 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master +LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.0-4

1 0

[tor-browser-bundle/master] Bump versions for Tor Launcher.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit fb91914f6901509eab2daaa11b607a789646393d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 21:46:23 2014 -0800 Bump versions for Tor Launcher. --- gitian/versions.alpha | 2 +- gitian/versions.beta | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 87b68ca..f190d5a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -5,7 +5,7 @@ VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.5.1-alpha -TORLAUNCHER_TAG=0.2.4.4 +TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 diff --git a/gitian/versions.beta b/gitian/versions.beta index d68854a..a2c91b9 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6-beta-2 +TORBROWSER_VERSION=3.6-beta-1 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" BUILD_PT_BUNDLES=1 @@ -6,7 +6,7 @@ VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.4.20 -TORLAUNCHER_TAG=0.2.4.4 +TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1

1 0

[tor-browser-bundle/master] Use versions file itself to decide which locales to build.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 3618f8600080f675a4592c5a7667c349bb3364a2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 21:53:10 2014 -0800 Use versions file itself to decide which locales to build. --- gitian/descriptors/linux/gitian-bundle.yml | 6 +++--- gitian/descriptors/windows/gitian-bundle.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 958fb65..36c2efc 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -134,11 +134,11 @@ script: | # unzip linux-langpacks.zip cd linux-langpacks - for i in *.xpi + for LANG in $BUNDLE_LOCALES do - LANG=`basename $i .xpi` + xpi=$LANG.xpi cp -a ../tor-browser ../tor-browser_$LANG - cp $i ../tor-browser_$LANG/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + cp $xpi ../tor-browser_$LANG/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. # FF24 puts the prefs in a different jar: diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index f8e6d1b..8cf2f05 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -131,10 +131,10 @@ script: | # unzip ../win32-langpacks.zip cd win32-langpacks - for i in *.xpi + for LANG in $BUNDLE_LOCALES do - LANG=`basename $i .xpi` - cp $i ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + xpi=$LANG.xpi + cp $xpi ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. # FF24 puts the prefs in a different jar:

1 0

[tor-browser-bundle/master] Add GMP to all version files.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 44ae9c486d59692b1f7f72b2b8a8ae45506a579a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 18:37:06 2014 -0800 Add GMP to all version files. Otherwise fetch-inputs barfs. --- gitian/versions | 8 ++++++-- gitian/versions.alpha | 8 ++++++-- gitian/versions.nightly | 4 ++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index b9b5835..f3dfe9d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -12,13 +12,14 @@ NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 -PYPTLIB_TAG=pyptlib-0.0.4 -OBFSPROXY_TAG=obfsproxy-0.2.3 +PYPTLIB_TAG=pyptlib-0.0.5 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f +GMP_VER=5.1.3 FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 @@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 @@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2172e63..0741b8f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -12,13 +12,14 @@ NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 -PYPTLIB_TAG=pyptlib-0.0.4 -OBFSPROXY_TAG=obfsproxy-0.2.3 +PYPTLIB_TAG=pyptlib-0.0.5 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f +GMP_VER=5.1.3 FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 @@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 @@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e2ab7aa..5e6bc6f 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -19,6 +19,7 @@ FLASHPROXY_TAG=master GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f +GMP_VER=5.1.3 FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 @@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.14-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=c0c089f994c71a8e504fa26fed9fbbb16dbd7e49d4bef2cf9bc6a2159ae5f073 @@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser-bundle/master] Bump Tor Browser version.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit fa3c928577a505978a8eba11904b6038cb4809fa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 18:06:24 2014 -0800 Bump Tor Browser version. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 21307e9..b9b5835 100755 --- a/gitian/versions +++ b/gitian/versions @@ -3,7 +3,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.4.20 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0c34485..2172e63 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -3,7 +3,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.5.1-alpha TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0 diff --git a/gitian/versions.beta b/gitian/versions.beta index 97bf8ca..6ac5a34 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.4.20 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits