Ticket #12130: obfs4-bundle.diff

File obfs4-bundle.diff, 17.0 KB (added by yawning, 5 years ago)

Round 2, with windows fixed.

  • gitian/descriptors/linux/gitian-pluggable-transports.yml

    diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
    index baaad50..2ddda39 100644
    a b remotes: 
    2929  "dir": "goptlib"
    3030- "url": "https://git.torproject.org/pluggable-transports/meek.git"
    3131  "dir": "meek"
     32- "url": "https://github.com/agl/ed25519.git"
     33  "dir": "ed25519"
     34- "url": "https://github.com/dchest/siphash.git"
     35  "dir": "siphash"
     36- "url": "https://github.com/yawning/obfs4.git"
     37  "dir": "obfs4"
    3238files:
    3339- "openssl.tar.gz"
    3440- "gmp.tar.bz2"
    files: 
    4046- "m2crypto.tar.gz"
    4147- "go.tar.gz"
    4248- "dzip.sh"
     49- "go.crypto.tar.bz2"
     50- "go.net.tar.bz2"
    4351script: |
    4452  INSTDIR="$HOME/install"
    4553  PTDIR="$INSTDIR/Tor/PluggableTransports"
    script: | 
    184192  cp -a README doc/*.1 $INSTDIR/Docs/meek
    185193  cd ..
    186194  #
     195  cd ed25519
     196  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     197  mkdir -p "$GOPATH/src/github.com/agl/"
     198  ln -sf "$PWD" "$GOPATH/src/github.com/agl/ed25519"
     199  go install github.com/agl/ed25519/extra25519
     200  cd ..
     201  #
     202  cd siphash
     203  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     204  mkdir -p "$GOPATH/src/github.com/dchest/"
     205  ln -sf "$PWD" "$GOPATH/src/github.com/dchest/siphash"
     206  go install github.com/dchest/siphash
     207  cd ..
     208  #
     209  tar xjf go.crypto.tar.bz2
     210  cd go.crypto
     211  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     212  mkdir -p "$GOPATH/src/code.google.com/p/"
     213  ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.crypto"
     214  go install code.google.com/p/go.crypto/curve25519
     215  go install code.google.com/p/go.crypto/hkdf
     216  go install code.google.com/p/go.crypto/nacl/secretbox
     217  cd ..
     218  #
     219  tar xjf go.net.tar.bz2
     220  cd go.net
     221  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     222  mkdir -p "$GOPATH/src/code.google.com/p/"
     223  ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.net"
     224  go install code.google.com/p/go.net/proxy
     225  cd ..
     226  #
     227  cd obfs4
     228  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     229  mkdir -p "$GOPATH/src/github.com/yawning/"
     230  ln -sf "$PWD" "$GOPATH/src/github.com/yawning/obfs4"
     231  go install github.com/yawning/obfs4
     232  cd obfs4proxy
     233  go build
     234  cp -a obfs4proxy $PTDIR
     235  cd ../..
     236  #
    187237  cd $INSTDIR
    188238  #
    189239  ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/
  • gitian/descriptors/mac/gitian-pluggable-transports.yml

    diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
    index 6359798..6ec7cbc 100644
    a b remotes: 
    2929  "dir": "goptlib"
    3030- "url": "https://git.torproject.org/pluggable-transports/meek.git"
    3131  "dir": "meek"
     32- "url": "https://github.com/agl/ed25519.git"
     33  "dir": "ed25519"
     34- "url": "https://github.com/dchest/siphash.git"
     35  "dir": "siphash"
     36- "url": "https://github.com/yawning/obfs4.git"
     37  "dir": "obfs4"
    3238files:
    3339- "openssl.tar.gz"
    3440- "gmp.tar.bz2"
    files: 
    4046- "m2crypto.tar.gz"
    4147- "go.tar.gz"
    4248- "cross-cgo.patch"
     49- "go.crypto.tar.bz2"
     50- "go.net.tar.bz2"
    4351- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb"
    4452- "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz"
    4553- "dzip.sh"
    script: | 
    218226  cp -a README doc/*.1 $INSTDIR/TorBrowserBundle.app/Docs/meek
    219227  cd ..
    220228  #
     229  cd ed25519
     230  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     231  mkdir -p "$GOPATH/src/github.com/agl/"
     232  ln -sf "$PWD" "$GOPATH/src/github.com/agl/ed25519"
     233  CGO_ENABLED=1 CC="$CC $CFLAGS $LDFLAGS" go install github.com/agl/ed25519/extra25519
     234  cd ..
     235  #
     236  cd siphash
     237  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     238  mkdir -p "$GOPATH/src/github.com/dchest/"
     239  ln -sf "$PWD" "$GOPATH/src/github.com/dchest/siphash"
     240  CGO_ENABLED=1 CC="$CC $CFLAGS $LDFLAGS" go install github.com/dchest/siphash
     241  cd ..
     242  #
     243  tar xjf go.crypto.tar.bz2
     244  cd go.crypto
     245  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     246  mkdir -p "$GOPATH/src/code.google.com/p/"
     247  ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.crypto"
     248  CGO_ENABLED=1 CC="$CC $CFLAGS $LDFLAGS" go install code.google.com/p/go.crypto/curve25519
     249  CGO_ENABLED=1 CC="$CC $CFLAGS $LDFLAGS" go install code.google.com/p/go.crypto/hkdf
     250  CGO_ENABLED=1 CC="$CC $CFLAGS $LDFLAGS" go install code.google.com/p/go.crypto/nacl/secretbox
     251  cd ..
     252  #
     253  tar xjf go.net.tar.bz2
     254  cd go.net
     255  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     256  mkdir -p "$GOPATH/src/code.google.com/p/"
     257  ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.net"
     258  CGO_ENABLED=1 CC="$CC $CFLAGS $LDFLAGS" go install code.google.com/p/go.net/proxy
     259  cd ..
     260  #
     261  cd obfs4
     262  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     263  mkdir -p "$GOPATH/src/github.com/yawning/"
     264  ln -sf "$PWD" "$GOPATH/src/github.com/yawning/obfs4"
     265  go install github.com/yawning/obfs4
     266  cd obfs4proxy
     267  CGO_ENABLED=1 CC="$CC $CFLAGS $LDFLAGS" go build
     268  cp -a obfs4proxy $PTDIR
     269  cd ../..
     270  #
    221271  cd $INSTDIR
    222272  ~/build/dzip.sh pluggable-transports-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app
    223273  cp pluggable-transports-mac$GBUILD_BITS-gbuilt.zip $OUTDIR/
  • gitian/descriptors/windows/gitian-pluggable-transports.yml

    diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
    index 25448a2..302de03 100644
    a b remotes: 
    3030  "dir": "goptlib"
    3131- "url": "https://git.torproject.org/pluggable-transports/meek.git"
    3232  "dir": "meek"
     33- "url": "https://github.com/agl/ed25519.git"
     34  "dir": "ed25519"
     35- "url": "https://github.com/dchest/siphash.git"
     36  "dir": "siphash"
     37- "url": "https://github.com/yawning/obfs4.git"
     38  "dir": "obfs4"
    3339files:
    3440- "openssl.tar.gz"
    3541- "gmp.tar.bz2"
    files: 
    4652- "py2exe.exe"
    4753- "go.tar.gz"
    4854- "cross-cgo.patch"
     55- "go.crypto.tar.bz2"
     56- "go.net.tar.bz2"
    4957- "dzip.sh"
    5058- "pyc-timestamp.sh"
    5159script: |
    script: | 
    294302  cp -a README doc/*.1.txt $INSTDIR/Docs/meek
    295303  cd ..
    296304  #
     305  cd ed25519
     306  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     307  mkdir -p "$GOPATH/src/github.com/agl/"
     308  ln -sf "$PWD" "$GOPATH/src/github.com/agl/ed25519"
     309  CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go install github.com/agl/ed25519/extra25519
     310  cd ..
     311  #
     312  cd siphash
     313  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     314  mkdir -p "$GOPATH/src/github.com/dchest/"
     315  ln -sf "$PWD" "$GOPATH/src/github.com/dchest/siphash"
     316  CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go install github.com/dchest/siphash
     317  cd ..
     318  #
     319  tar xjf go.crypto.tar.bz2
     320  cd go.crypto
     321  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     322  mkdir -p "$GOPATH/src/code.google.com/p/"
     323  ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.crypto"
     324  CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go install code.google.com/p/go.crypto/curve25519
     325  CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go install code.google.com/p/go.crypto/hkdf
     326  CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go install code.google.com/p/go.crypto/nacl/secretbox
     327  cd ..
     328  #
     329  tar xjf go.net.tar.bz2
     330  cd go.net
     331  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     332  mkdir -p "$GOPATH/src/code.google.com/p/"
     333  ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.net"
     334  CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go install code.google.com/p/go.net/proxy
     335  cd ..
     336  #
     337  cd obfs4
     338  find -type f | xargs touch --date="$REFERENCE_DATETIME"
     339  mkdir -p "$GOPATH/src/github.com/yawning/"
     340  ln -sf "$PWD" "$GOPATH/src/github.com/yawning/obfs4"
     341  go install github.com/yawning/obfs4
     342  cd obfs4proxy
     343  CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go build
     344  cp -a obfs4proxy.exe $PTDIR
     345  cd ../..
     346  #
    297347  # http://bugs.winehq.org/show_bug.cgi?id=3591
    298348  cp -a $INSTDIR/python/python27.dll $PTDIR/
    299349  #
  • gitian/fetch-inputs.sh

    diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
    index affbfd6..6a1eb41 100755
    a b  
    66MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/
    77MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/
    88MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/
     9MIRROR_URL_YAWNING=https://people.torproject.org/~yawning/mirrors/sources/
    910set -e
    1011set -u
    1112umask 0022
    do 
    183184  get "${!PACKAGE}" "${!URL}"
    184185done
    185186
     187# XXX/Yawning.  As far as I can tell, this gitian thing doesn't support
     188# fetching from hg repositories.
     189for i in GOCRYPTO GONET
     190do
     191  PACKAGE="${i}_PACKAGE"
     192  URL="${MIRROR_URL_YAWNING}${!PACKAGE}"
     193  get "${!PACKAGE}" "${MIRROR_URL_YAWNING}${!PACKAGE}"
     194done
     195
    186196# Verify packages with weak or no signatures via multipath downloads
    187197# (OpenSSL is signed with MD5, and OSXSDK is not signed at all)
    188198# XXX: Google won't allow wget -N.. We need to re-download the whole
    fi 
    227237
    228238# Verify packages with weak or no signatures via direct sha256 check
    229239# (OpenSSL is signed with MD5, and OSXSDK is not signed at all)
    230 for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP GO
     240for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP GO GOCRYPTO GONET
    231241do
    232242   PACKAGE="${i}_PACKAGE"
    233243   HASH="${i}_HASH"
    ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz 
    280290ln -sf "$GMP_PACKAGE" gmp.tar.bz2
    281291ln -sf "$LXML_PACKAGE" lxml.tar.gz
    282292ln -sf "$GO_PACKAGE" go.tar.gz
     293ln -sf "$GONET_PACKAGE" go.net.tar.bz2
     294ln -sf "$GOCRYPTO_PACKAGE" go.crypto.tar.bz2
    283295
    284296# Fetch latest gitian-builder itself
    285297# XXX - this is broken if a non-standard inputs dir is selected using the command line flag.
    fteproxy https://github.com/kpdyer/fteproxy.git $FTEPROXY_TAG 
    309321libdmg-hfsplus        https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG
    310322goptlib               https://git.torproject.org/pluggable-transports/goptlib.git $GOPTLIB_TAG
    311323meek                  https://git.torproject.org/pluggable-transports/meek.git $MEEK_TAG
     324ed25519               https://github.com/agl/ed25519.git $GOED25519_TAG
     325siphash               https://github.com/dchest/siphash.git $GOSIPHASH_TAG
     326obfs4                 https://github.com/yawning/obfs4.git $OBFS4_TAG
    312327EOF
    313328
    314329exit 0
  • gitian/mkbundle-linux.sh

    diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh
    index 1c7ad51..a6f4db4 100755
    a b then 
    195195  echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******"
    196196  echo
    197197
    198   ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml
     198  ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml
    199199  if [ $? -ne 0 ];
    200200  then
    201201    #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S`
    then 
    219219
    220220  cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR
    221221
    222   ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG,meek=$MEEK_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml
     222  ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml
    223223  if [ $? -ne 0 ];
    224224  then
    225225    #mv var/build.log ./bundle-fail-linux.log.`date +%Y%m%d%H%M%S`
  • gitian/mkbundle-mac.sh

    diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
    index 3ee08c8..cd85139 100755
    a b then 
    141141  echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******"
    142142  echo
    143143
    144   ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml
     144  ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml
    145145  if [ $? -ne 0 ];
    146146  then
    147147    #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S`
    then 
    165165 
    166166  cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR
    167167 
    168   ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libdmg-hfsplus=$LIBDMG_TAG,https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,meek=$MEEK_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml
     168  ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libdmg-hfsplus=$LIBDMG_TAG,https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml
    169169  if [ $? -ne 0 ];
    170170  then
    171171    #mv var/build.log ./bundle-fail-mac.log.`date +%Y%m%d%H%M%S`
  • gitian/mkbundle-windows.sh

    diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh
    index 20d60b0..259ead7 100755
    a b then 
    134134  echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******"
    135135  echo
    136136
    137   ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml
     137  ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml
    138138  if [ $? -ne 0 ];
    139139  then
    140140    #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S`
    then 
    158158  cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions
    159159  cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR
    160160 
    161   ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG,meek=$MEEK_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml
     161  ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml
    162162  if [ $? -ne 0 ];
    163163  then
    164164    #mv var/build.log ./bundle-fail-win32.log.`date +%Y%m%d%H%M%S`
  • gitian/versions.nightly

    diff --git a/gitian/versions.nightly b/gitian/versions.nightly
    index 84fd290..9d58edd 100755
    a b FTEPROXY_TAG=0.2.13 
    2323LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
    2424GOPTLIB_TAG=master
    2525MEEK_TAG=master
     26GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
     27GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
     28OBFS4_TAG=master
    2629
    2730GITIAN_TAG=tor-browser-builder-3.x-5
    2831
    PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe 
    6871SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz
    6972LXML_PACKAGE=lxml-${LXML_VER}.tar.gz
    7073GO_PACKAGE=go${GO_VER}.src.tar.gz
     74GOCRYPTO_PACKAGE=go.crypto-5478be1963aa.tar.bz2
     75GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2
    7176
    7277# Hashes for packages with weak sigs or no sigs
    7378OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028
    M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a 
    8893PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
    8994SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
    9095GO_HASH=9ab83fb8eafe39f4204ef0f8e84e5ff7e8f1d533ddb05f51e6dc81503e8c0ae4
     96GOCRYPTO_HASH=a8e301714f5724999321f0397b867a5670a5e5c4f808ba157bdd93ee0d028827
     97GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353
    9198
    9299## Non-git package URLs
    93100OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
    PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${PY2EX 
    112119SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUPTOOLS_PACKAGE}
    113120LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE}
    114121GO_URL=https://go.googlecode.com/files/${GO_PACKAGE}
     122GOCRYPTO_URL=https://people.torproject.org/~yawning/mirrors/sources/${GOCRYPTO_PACKAGE}
     123GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/${GONET_PACKAGE}