commit 4ebec5b9feaae342ed53c70005c6946c96fa0fe1 Author: Georg Koppen gk@torproject.org Date: Thu Jan 14 15:16:01 2016 +0000
Bug 17428: Removing Flashproxy from Tor Browser
Remove M2crypto as well as this was only used by Flashproxy. --- .../PTConfigs/linux/torrc-defaults-appendix | 7 ----- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 7 ----- .../PTConfigs/windows/torrc-defaults-appendix | 7 ----- .../linux/gitian-pluggable-transports.yml | 21 --------------- .../mac/gitian-pluggable-transports.yml | 27 -------------------- .../windows/gitian-pluggable-transports.yml | 26 ------------------- gitian/fetch-inputs.sh | 10 +++----- gitian/mkbundle-linux.sh | 3 +-- gitian/mkbundle-mac.sh | 3 +-- gitian/mkbundle-windows.sh | 3 +-- gitian/verify-tags.sh | 9 +++---- gitian/versions.alpha | 5 ---- gitian/versions.nightly | 5 ---- 13 files changed, 11 insertions(+), 122 deletions(-)
diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index d0885ff..c79efde 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy
-## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./TorBrowser/Tor/PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 0dee29b..f5eb5e4 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy
-## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index ad1eb07..2c1b636 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --man ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy
-## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser -- TorBrowser\Tor\PluggableTransports\meek-client diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index d9b8338..25b5a1b 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -19,8 +19,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -47,7 +45,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "dzip.sh" @@ -164,24 +161,6 @@ script: | cp -a {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd ..
- # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - $PYTHON setup.py build_ext --build-lib build --openssl $INSTDIR/openssl - $PYTHON setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d483462..fd62919 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -18,8 +18,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +44,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" @@ -188,30 +185,6 @@ script: | sed 's/python2/python/' -i $PTDIR/obfsproxy.bin cd ..
- # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # We have to put $INSTDIR/openssl at the beginning of the header and library - # search paths (build_ext otherwise puts it at the end, after CFLAGS and - # LDFLAGS). The reason for this is that /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr - # (part of CFLAGS and LDFLAGS) has its own openssl headers and library files. - # It also has necessary headers like stdio.h, so we can't remove it - # completely, but our locally built openssl must take precedence. - CFLAGS="-I$INSTDIR/openssl/include $CFLAGS" LDFLAGS="-L$INSTDIR/openssl/lib $LDFLAGS" LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build --openssl $INSTDIR/openssl -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers $SDK_INCLUDES - python setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $TBDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $TBDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 1d8caba..9c1642d 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -8,8 +8,6 @@ packages: - "faketime" - "unzip" - "p7zip-full" -# Needed by M2Crypto -- "swig" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -17,8 +15,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +42,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "ubuntu-wine.gpg" - "wine-wrappers" @@ -260,27 +255,6 @@ script: | cp {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd ..
- # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --openssl $INSTDIR/openssl/ -lssl.dll,crypto.dll - LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null - cd .. - # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py - # file. - find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" - py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip - cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9252aea..206023b 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,12 +112,12 @@ update_git() {
############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -167,7 +167,7 @@ wget -U "" -N ${NOSCRIPT_URL}
# Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -233,7 +233,6 @@ ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz ln -sf "$PYYAML_PACKAGE" pyyaml.tar.gz ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 -ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 @@ -265,7 +264,6 @@ tor-browser https://git.torproject.org/tor-browser.git $TORBR mingw-w64-git http://git.code.sf.net/p/mingw-w64/mingw-w64 $MINGW_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG -flashproxy https://git.torproject.org/flashproxy.git $FLASHPROXY_TAG libfte https://github.com/kpdyer/libfte.git $LIBFTE_TAG fteproxy https://github.com/kpdyer/fteproxy.git $FTEPROXY_TAG libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 64a0fd4..5fa3966 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -95,7 +95,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi
@@ -199,7 +198,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" echo
- ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 670d152..39dac5f 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -100,7 +100,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi
@@ -193,7 +192,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" echo
- ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 6aeec8a..2de0f1e 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -94,7 +94,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi
@@ -198,7 +197,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******" echo
- ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index a1ce6a1..82a810a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -98,7 +98,6 @@ libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG pyptlib pyptlib.gpg $PYPTLIB_TAG obfsproxy obfsproxy.gpg $OBFSPROXY_TAG -flashproxy flashproxy.gpg $FLASHPROXY_TAG goptlib goptlib.gpg $GOPTLIB_TAG meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG @@ -122,12 +121,12 @@ noto-fonts $NOTOFONTS_TAG EOF
# Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -142,7 +141,7 @@ done
# Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 22eb8df..fd03b8b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -26,7 +26,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 -FLASHPROXY_TAG=1.6 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -55,7 +54,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -81,7 +79,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -104,7 +101,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -130,7 +126,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/$%7BPYYAML_PACKAGE%7D ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/$%7BZOPEINTERFACE_P... TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/$%7BTWISTED_PACKAGE%7D # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/$%7BM2CRYPTO_PACKAGE%7D PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/$%7BPY2EXE_VER... SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/$%7BSETUPTOOLS_PACKAGE%... LXML_URL=https://pypi.python.org/packages/source/l/lxml/$%7BLXML_PACKAGE%7D diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a5407a6..d209c6a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -29,7 +29,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=master OBFSPROXY_TAG=master -FLASHPROXY_TAG=master LIBFTE_TAG=master FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -58,7 +57,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -84,7 +82,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -107,7 +104,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -133,7 +129,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/$%7BPYYAML_PACKAGE%7D ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/$%7BZOPEINTERFACE_P... TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/$%7BTWISTED_PACKAGE%7D # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/$%7BM2CRYPTO_PACKAGE%7D PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/$%7BPY2EXE_VER... SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/$%7BSETUPTOOLS_PACKAGE%... LXML_URL=https://pypi.python.org/packages/source/l/lxml/$%7BLXML_PACKAGE%7D