Ticket #10362: fteproxy-3.6.patch

File fteproxy-3.6.patch, 20.3 KB (added by kpdyer, 6 years ago)

Patch for https://gitweb.torproject.org/user/dcf/tor-browser-bundle.git (3.6-beta) to include fteproxy in the TBB.

  • Bundle-Data/beta/linux/torrc-defaults-appendix

    diff -ENwbur tor-browser-bundle/Bundle-Data/beta/linux/torrc-defaults-appendix tor-browser-bundle.fteproxy/Bundle-Data/beta/linux/torrc-defaults-appendix
    old new  
    11
     2## fteproxy configuration
     3# Bridge fte bridges.fteproxy.org:8080
     4
     5ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed
     6
    27## obfsproxy configuration
    38#
    49# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
  • Bundle-Data/beta/mac/torrc-defaults-appendix

    diff -ENwbur tor-browser-bundle/Bundle-Data/beta/mac/torrc-defaults-appendix tor-browser-bundle.fteproxy/Bundle-Data/beta/mac/torrc-defaults-appendix
    old new  
    11
     2## fteproxy configuration
     3# Bridge fte bridges.fteproxy.org:8080
     4
     5ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed
     6
    27## obfsproxy configuration
    38#
    49# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
  • Bundle-Data/beta/windows/torrc-defaults-appendix

    diff -ENwbur tor-browser-bundle/Bundle-Data/beta/windows/torrc-defaults-appendix tor-browser-bundle.fteproxy/Bundle-Data/beta/windows/torrc-defaults-appendix
    old new  
     1## fteproxy configuration
     2# Bridge fte bridges.fteproxy.org:8080
     3
     4ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed
    15
    26## obfsproxy configuration
    37#
  • Bundle-Data/mac-tor.sh

    diff -ENwbur tor-browser-bundle/Bundle-Data/mac-tor.sh tor-browser-bundle.fteproxy/Bundle-Data/mac-tor.sh
    old new  
    22# Compiled Python modules require a compatible Python, which means 32-bit 2.6.
    33export VERSIONER_PYTHON_VERSION=2.6
    44export VERSIONER_PYTHON_PREFER_32_BIT=yes
     5export DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH
    56# Set the current working directory to the directory containing this executable,
    67# so that pluggable transport executables can be given with relative paths. This
    78# works around a change in OS X 10.9, where the current working directory is
  • gitian/build-helpers/wine-wrappers/g++.py

    diff -ENwbur tor-browser-bundle/gitian/build-helpers/wine-wrappers/g++.py tor-browser-bundle.fteproxy/gitian/build-helpers/wine-wrappers/g++.py
    old new  
     1#!/usr/bin/env python
     2
     3# A wrapper for i686-w64-mingw32-g++ that removes -mno-cygwin and converts
     4# Windows paths to Unix paths, so that the w64-mingw32 g++ can be called by
     5# Python distutils.
     6
     7import os
     8import subprocess
     9import sys
     10
     11import common
     12
     13args = ["/usr/bin/i686-w64-mingw32-g++"]
     14sys.argv.pop(0)
     15while sys.argv:
     16    a = sys.argv.pop(0)
     17    if not a.startswith("-"):
     18        args.append(common.winepath(a))
     19        continue
     20    if a == "-mno-cygwin":
     21        continue
     22    if a == "--output-lib":
     23        o = sys.argv.pop(0)
     24        a = "-out-implib="+o
     25    if a in ("-I", "-L"):
     26        args.append(a)
     27        args.append(common.winepath(sys.argv.pop(0)))
     28        continue
     29    o = common.search_startswith(a, ("-I", "-L"))
     30    if o is not None:
     31        path = a[len(o):]
     32        args.append("%s%s" % (o, common.winepath(path)))
     33        continue
     34    args.append(a)
     35p = common.popen_faketime(args, stderr=subprocess.PIPE)
     36stderr = p.stderr.read()
     37sys.stderr.write(stderr)
     38if " error: " in stderr:
     39    sys.exit(1)
  • gitian/build-helpers/wine-wrappers/setup.py

    diff -ENwbur tor-browser-bundle/gitian/build-helpers/wine-wrappers/setup.py tor-browser-bundle.fteproxy/gitian/build-helpers/wine-wrappers/setup.py
    old new  
    11from distutils.core import setup
    22import py2exe
    33setup(
    4     console=["gcc.py", "dllwrap.py", "swig.py"],
     4    console=["gcc.py", "g++.py", "dllwrap.py", "swig.py"],
    55    zipfile=None,
    66    options={"py2exe": {"bundle_files": 1, "compressed": True}}
    77)
  • gitian/descriptors/linux/gitian-pluggable-transports.yml

    diff -ENwbur tor-browser-bundle/gitian/descriptors/linux/gitian-pluggable-transports.yml tor-browser-bundle.fteproxy/gitian/descriptors/linux/gitian-pluggable-transports.yml
    old new  
    1010- "unzip"
    1111- "zip"
    1212- "swig"
     13- "m4"
    1314- "python-setuptools"
    1415- "python-dev"
    1516- "faketime"
     
    2425  "dir": "obfsproxy"
    2526- "url": "https://git.torproject.org/flashproxy.git"
    2627  "dir": "flashproxy"
     28- "url": "https://github.com/kpdyer/fteproxy.git"
     29  "dir": "fteproxy"
    2730files:
     31- "gmp.tar.bz2"
    2832- "pycrypto.tar.gz"
    2933- "argparse.tar.gz"
    3034- "zope.interface.zip"
     
    5155  mkdir -p $PTDIR
    5256  mkdir -p $INSTDIR/Debug/
    5357  #
     58  tar xvf gmp.tar.bz2
     59  cd gmp-*
     60  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     61  ./configure --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx
     62  make
     63  make install
     64  cp -an $INSTDIR/gmp/lib/*.so* $INSTDIR/Tor
     65  cd ..
     66  #
    5467  cd pyptlib
    5568  find -type f | xargs touch --date="$REFERENCE_DATETIME"
    5669  python setup.py build --build-lib build
     
    118131  cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy
    119132  cd ..
    120133  #
     134  cd fteproxy
     135  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     136  CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" make
     137  cp -a bin/fteproxy $PTDIR/
     138  cp -ra fte $PTDIR/
     139  mkdir -p $INSTDIR/Docs/fteproxy
     140  cp -a {COPYING,README.md} $INSTDIR/Docs/fteproxy
     141  cd ..
     142  #
    121143  cd $INSTDIR
    122144  #
    123145  ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/
  • gitian/descriptors/mac/gitian-pluggable-transports.yml

    diff -ENwbur tor-browser-bundle/gitian/descriptors/mac/gitian-pluggable-transports.yml tor-browser-bundle.fteproxy/gitian/descriptors/mac/gitian-pluggable-transports.yml
    old new  
    99- "unzip"
    1010- "zip"
    1111- "swig"
     12- "m4"
    1213- "python-setuptools"
     14- "python-dev"
    1315- "faketime"
    1416- "libtool"
    1517#- "libssl0.9.8"
     
    2325  "dir": "obfsproxy"
    2426- "url": "https://git.torproject.org/flashproxy.git"
    2527  "dir": "flashproxy"
     28- "url": "https://github.com/kpdyer/fteproxy.git"
     29  "dir": "fteproxy"
    2630files:
     31- "gmp.tar.bz2"
    2732- "pycrypto.tar.gz"
    2833- "argparse.tar.gz"
    2934- "zope.interface.zip"
     
    4853  #export CXXFLAGS=$CFLAGS
    4954  #export LDFLAGS=$CFLAGS
    5055  export PATH="$PATH:/usr/apple-osx/bin/"
     56  export AR=/usr/apple-osx/bin/i686-apple-darwin11-ar
    5157  export CC=/usr/apple-osx/bin/i686-apple-darwin11-gcc
     58  export CXX=/usr/apple-osx/bin/i686-apple-darwin11-g++
    5259  # http://bugs.python.org/issue9437
    5360  export LDSHARED="$CC -pthread -shared"
    54   export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I.  -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5"
     61  export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I.  -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib"
     62  export CXXFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I.  -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib"
    5563  export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5"
    5664  #
    5765  mkdir -p $PTDIR/
     
    6472  # For OpenSSL
    6573  sudo ln -s /usr/apple-osx/bin/apple-osx-gcc /usr/apple-osx/bin/i686-apple-darwin11-cc
    6674  #
     75  tar xvf gmp.tar.bz2
     76  cd gmp-*
     77  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     78  ./configure --host=i686-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx
     79  make
     80  make install
     81  cp $INSTDIR/gmp/lib/*dylib* $INSTDIR/TorBrowserBundle.app/Tor/
     82  cd ..
     83  #
    6784  cd pyptlib
    6885  find -type f | xargs touch --date="$REFERENCE_DATETIME"
    6986  python setup.py build --build-lib build
     
    141158  cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy
    142159  cd ..
    143160  #
     161  cd fteproxy
     162  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     163  CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CFLAGS" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CXXFLAGS" make
     164  cp -a bin/fteproxy $PTDIR/
     165  cp -ra fte $PTDIR/
     166  mkdir -p $INSTDIR/Docs/fteproxy
     167  cp -a {COPYING,README.md} $INSTDIR/Docs/fteproxy
     168  cd ..
     169  #
    144170  cd $INSTDIR
    145171  ~/build/dzip.sh pluggable-transports-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app
    146172  cp pluggable-transports-mac$GBUILD_BITS-gbuilt.zip $OUTDIR/
  • gitian/descriptors/windows/gitian-pluggable-transports.yml

    diff -ENwbur tor-browser-bundle/gitian/descriptors/windows/gitian-pluggable-transports.yml tor-browser-bundle.fteproxy/gitian/descriptors/windows/gitian-pluggable-transports.yml
    old new  
    1010- "zip"
    1111- "swig"
    1212- "p7zip-full"
     13- "m4"
    1314- "mingw-w64"
     15- "g++-mingw-w64"
     16- "python-dev"
    1417- "faketime"
    1518- "libtool"
    1619reference_datetime: "2000-01-01 00:00:00"
     
    2326  "dir": "obfsproxy"
    2427- "url": "https://git.torproject.org/flashproxy.git"
    2528  "dir": "flashproxy"
     29- "url": "https://github.com/kpdyer/fteproxy.git"
     30  "dir": "fteproxy"
    2631files:
     32- "gmp.tar.bz2"
    2733- "setuptools.tar.gz"
    2834- "pycrypto.tar.gz"
    2935- "zope.interface.zip"
     
    7278    rm -rf "$tmpdir"
    7379  }
    7480  #
     81  #
     82  tar xvf gmp.tar.bz2
     83  cd gmp-*
     84  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     85  ./configure --prefix=$INSTDIR/gmp --host=i686-w64-mingw32 --enable-cxx --disable-static --enable-shared
     86  make
     87  make install
     88  cp -an $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor
     89  cp -an $INSTDIR/gmp/lib/*dll* $INSTDIR/Tor
     90  cd ..
     91  #
     92  #
    7593  # Install a Wine new enough to have a fix for http://bugs.winehq.org/show_bug.cgi?id=29764;
    7694  # otherwise Python run under Wine constantly crashes in _PyVerify_fd, which is
    7795  # called by such common operations as io.open and os.fstat (anything involving
     
    104122  mkdir -p build/bdist.win32/winexe/bundle-2.7/
    105123  cp -a $INSTDIR/python/python27.dll build/bdist.win32/winexe/bundle-2.7/
    106124  LD_PRELOAD= $INSTPYTHON setup.py py2exe
    107   cp -a dist/gcc.exe dist/dllwrap.exe dist/swig.exe $WINEROOT/windows/
     125  cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe dist/swig.exe $WINEROOT/windows/
    108126  cd ..
    109127  #
    110128  tar xzf setuptools.tar.gz
     
    157175  cd obfsproxy
    158176  find -type f | xargs touch --date="$REFERENCE_DATETIME"
    159177  LD_PRELOAD= $INSTPYTHON setup_py2exe.py py2exe
     178  LD_PRELOAD= $INSTPYTHON setup.py install
    160179  py2exe_zip_timestomp py2exe_bundle/dist/obfsproxy.zip
    161180  cp -an py2exe_bundle/dist/{*.pyd,*.exe,*.zip} $PTDIR/
    162181  mkdir -p $INSTDIR/Docs/Obfsproxy
     
    188207  cp {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy
    189208  cd ..
    190209  #
     210  cd fteproxy
     211  cp $INSTDIR/gmp/bin/*dll* .
     212  cp $INSTDIR/gmp/lib/*dll* .
     213  ln -s $INSTDIR/gmp thirdparty/gmp
     214  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     215  make win32
     216  make thirdparty/re2/obj/libre2.a
     217  LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --inplace
     218  LD_PRELOAD= $INSTPYTHON setup.py py2exe
     219  mkdir -p $PTDIR/fte
     220  mkdir -p $PTDIR/fte/tests
     221  cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/
     222  cp -an fte/VERSION $PTDIR/fte
     223  cp -ran fte/defs $PTDIR/fte
     224  cp -ran fte/tests/dfas $PTDIR/fte/tests
     225  cp -an thirdparty/gmp/bin/*.dll $PTDIR/
     226  mkdir -p $INSTDIR/Docs/fteproxy
     227  cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy
     228  cd ..
     229  #
    191230  # http://bugs.winehq.org/show_bug.cgi?id=3591
    192231  cp -a $INSTDIR/python/python27.dll $PTDIR/
    193232  #
  • gitian/fetch-inputs.sh

    diff -ENwbur tor-browser-bundle/gitian/fetch-inputs.sh tor-browser-bundle.fteproxy/gitian/fetch-inputs.sh
    old new  
    132132#  fi
    133133#done
    134134
    135 for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI
     135for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP
    136136do
    137137  PACKAGE="${i}_PACKAGE"
    138138  URL="${i}_URL"
     
    217217
    218218# Verify packages with weak or no signatures via direct sha256 check
    219219# (OpenSSL is signed with MD5, and OSXSDK is not signed at all)
    220 for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS # OPENSSL
     220for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS GMP # OPENSSL
    221221do
    222222   PACKAGE="${i}_PACKAGE"
    223223   HASH="${i}_HASH"
     
    264264ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz
    265265ln -sf "$PY2EXE_PACKAGE" py2exe.exe
    266266ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz
     267ln -sf "$GMP_PACKAGE" gmp.tar.bz2
    267268
    268269# Fetch latest gitian-builder itself
    269270# XXX - this is broken if a non-standard inputs dir is selected using the command line flag.
     
    290291pyptlib               https://git.torproject.org/pluggable-transports/pyptlib.git
    291292obfsproxy             https://git.torproject.org/pluggable-transports/obfsproxy.git
    292293flashproxy            https://git.torproject.org/flashproxy.git
     294fteproxy              https://github.com/kpdyer/fteproxy.git
    293295EOF
    294296
    295297exit 0
  • gitian/mkbundle-linux.sh

    Binary files tor-browser-bundle/gitian/gpg/GMP.gpg and tor-browser-bundle.fteproxy/gitian/gpg/GMP.gpg differ
    diff -ENwbur tor-browser-bundle/gitian/mkbundle-linux.sh tor-browser-bundle.fteproxy/gitian/mkbundle-linux.sh
    old new  
    130130  echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******"
    131131  echo
    132132
    133   ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml
     133  ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml
    134134  if [ $? -ne 0 ];
    135135  then
    136136    #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S`
  • gitian/mkbundle-mac.sh

    diff -ENwbur tor-browser-bundle/gitian/mkbundle-mac.sh tor-browser-bundle.fteproxy/gitian/mkbundle-mac.sh
    old new  
    127127  echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******"
    128128  echo
    129129
    130   ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml
     130  ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml
    131131  if [ $? -ne 0 ];
    132132  then
    133133    #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S`
  • gitian/mkbundle-windows.sh

    diff -ENwbur tor-browser-bundle/gitian/mkbundle-windows.sh tor-browser-bundle.fteproxy/gitian/mkbundle-windows.sh
    old new  
    128128  echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******"
    129129  echo
    130130
    131   ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml
     131  ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml
    132132  if [ $? -ne 0 ];
    133133  then
    134134    #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S`
  • tor-browser-bundle

    diff -ENwbur tor-browser-bundle/gitian/versions tor-browser-bundle.fteproxy/gitian/versions
    old new  
    1313ZLIB_TAG=v1.2.8
    1414LIBEVENT_TAG=release-2.0.21-stable
    1515MINGW_REV=6184
    16 PYPTLIB_TAG=pyptlib-0.0.4
    17 OBFSPROXY_TAG=obfsproxy-0.2.3
     16PYPTLIB_TAG=pyptlib-0.0.5
     17OBFSPROXY_TAG=obfsproxy-0.2.4
    1818FLASHPROXY_TAG=1.4
     19FTEPROXY_TAG=0.2.6
    1920
    2021GITIAN_TAG=tor-browser-builder-3.0-4
    2122
  • gitian/versions.alpha

    diff -ENwbur tor-browser-bundle/gitian/versions.alpha tor-browser-bundle.fteproxy/gitian/versions.alpha
    old new  
    1313ZLIB_TAG=v1.2.8
    1414LIBEVENT_TAG=release-2.0.21-stable
    1515MINGW_REV=6184
    16 PYPTLIB_TAG=pyptlib-0.0.4
    17 OBFSPROXY_TAG=obfsproxy-0.2.3
     16PYPTLIB_TAG=pyptlib-0.0.5
     17OBFSPROXY_TAG=obfsproxy-0.2.4
    1818FLASHPROXY_TAG=1.4
     19FTEPROXY_TAG=0.2.6
    1920
    2021GITIAN_TAG=tor-browser-builder-3.0-4
    2122
  • gitian/versions.beta

    diff -ENwbur tor-browser-bundle/gitian/versions.beta tor-browser-bundle.fteproxy/gitian/versions.beta
    old new  
    1414ZLIB_TAG=v1.2.8
    1515LIBEVENT_TAG=release-2.0.21-stable
    1616MINGW_REV=6184
    17 PYPTLIB_TAG=pyptlib-0.0.4
    18 OBFSPROXY_TAG=obfsproxy-0.2.3
     17PYPTLIB_TAG=pyptlib-0.0.5
     18OBFSPROXY_TAG=obfsproxy-0.2.4
    1919FLASHPROXY_TAG=1.4
     20FTEPROXY_TAG=0.2.6
    2021
    2122GITIAN_TAG=tor-browser-builder-3.0-4
    2223
    2324# OPENSSL_VER=1.0.1e
     25GMP_VER=5.1.3
    2426FIREFOX_LANG_VER=24.2.0esr
    2527BINUTILS_VER=2.22
    2628GCC_VER=4.6.3
     
    3537
    3638## File names for the source packages
    3739# OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
     40GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
    3841NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.7-sm+fx+fn.xpi
    3942TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
    4043OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
     
    5457
    5558# Hashes for packages with weak sigs or no sigs
    5659# OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3
     60GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
    5761OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
    5862TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
    5963NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e
     
    6973
    7074## Non-git package URLs
    7175# OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
     76GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE}
    7277TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE}
    7378OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE}
    7479BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}