January 2014 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Upgrade a couple more bridges to obfs3.
by mikeperry＠torproject.org 20 Jan '14

20 Jan '14

commit 4b6f87eb8a8bf789b9f4874a559b8b459646b558 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 17 11:58:32 2013 -0800 Upgrade a couple more bridges to obfs3. --- Bundle-Data/linux/Data/Tor/torrc-defaults | 4 ++-- Bundle-Data/mac/Data/Tor/torrc-defaults | 4 ++-- Bundle-Data/windows/Data/Tor/torrc-defaults | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults index 2fbfb04..9bf703e 100644 --- a/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -16,13 +16,13 @@ CookieAuthentication 1 # Bridge obfs3 83.212.101.2:443 # Bridge obfs3 169.229.59.75:46328 # Bridge obfs3 169.229.59.74:31493 +# Bridge obfs3 209.141.36.236:45496 +# Bridge obfs3 208.79.90.242:35658 # # Bridge obfs2 83.212.100.216:47870 # Bridge obfs2 83.212.96.182:46602 # Bridge obfs2 109.105.109.163:46924 # Bridge obfs2 70.182.182.109:54542 -# Bridge obfs2 209.141.36.236:60783 -# Bridge obfs2 208.79.90.242:55564 # Bridge obfs2 128.31.0.34:1051 # Bridge obfs2 83.212.101.2:45235 diff --git a/Bundle-Data/mac/Data/Tor/torrc-defaults b/Bundle-Data/mac/Data/Tor/torrc-defaults index ee928aa..a95a863 100644 --- a/Bundle-Data/mac/Data/Tor/torrc-defaults +++ b/Bundle-Data/mac/Data/Tor/torrc-defaults @@ -16,13 +16,13 @@ CookieAuthentication 1 # Bridge obfs3 83.212.101.2:443 # Bridge obfs3 169.229.59.75:46328 # Bridge obfs3 169.229.59.74:31493 +# Bridge obfs3 209.141.36.236:45496 +# Bridge obfs3 208.79.90.242:35658 # # Bridge obfs2 83.212.100.216:47870 # Bridge obfs2 83.212.96.182:46602 # Bridge obfs2 109.105.109.163:46924 # Bridge obfs2 70.182.182.109:54542 -# Bridge obfs2 209.141.36.236:60783 -# Bridge obfs2 208.79.90.242:55564 # Bridge obfs2 128.31.0.34:1051 # Bridge obfs2 83.212.101.2:45235 diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults index 4830a1e..f7c712a 100644 --- a/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -16,13 +16,13 @@ CookieAuthentication 1 # Bridge obfs3 83.212.101.2:443 # Bridge obfs3 169.229.59.75:46328 # Bridge obfs3 169.229.59.74:31493 +# Bridge obfs3 209.141.36.236:45496 +# Bridge obfs3 208.79.90.242:35658 # # Bridge obfs2 83.212.100.216:47870 # Bridge obfs2 83.212.96.182:46602 # Bridge obfs2 109.105.109.163:46924 # Bridge obfs2 70.182.182.109:54542 -# Bridge obfs2 209.141.36.236:60783 -# Bridge obfs2 208.79.90.242:55564 # Bridge obfs2 128.31.0.34:1051 # Bridge obfs2 83.212.101.2:45235

1 0

[tor-browser-bundle/master] Upgrade another obfs2 bridge to obfs3.
by mikeperry＠torproject.org 20 Jan '14

20 Jan '14

commit cfdb53eaf8ddb9852e43f9a8c2fdb2c31e46bf5c Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 19 00:51:49 2013 -0800 Upgrade another obfs2 bridge to obfs3. --- Bundle-Data/linux/Data/Tor/torrc-defaults | 3 ++- Bundle-Data/mac/Data/Tor/torrc-defaults | 3 ++- Bundle-Data/windows/Data/Tor/torrc-defaults | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults index 9bf703e..afa9793 100644 --- a/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -18,10 +18,11 @@ CookieAuthentication 1 # Bridge obfs3 169.229.59.74:31493 # Bridge obfs3 209.141.36.236:45496 # Bridge obfs3 208.79.90.242:35658 +# Bridge obfs3 109.105.109.163:38980 +# Bridge obfs3 109.105.109.163:47779 # # Bridge obfs2 83.212.100.216:47870 # Bridge obfs2 83.212.96.182:46602 -# Bridge obfs2 109.105.109.163:46924 # Bridge obfs2 70.182.182.109:54542 # Bridge obfs2 128.31.0.34:1051 # Bridge obfs2 83.212.101.2:45235 diff --git a/Bundle-Data/mac/Data/Tor/torrc-defaults b/Bundle-Data/mac/Data/Tor/torrc-defaults index a95a863..efcba98 100644 --- a/Bundle-Data/mac/Data/Tor/torrc-defaults +++ b/Bundle-Data/mac/Data/Tor/torrc-defaults @@ -18,10 +18,11 @@ CookieAuthentication 1 # Bridge obfs3 169.229.59.74:31493 # Bridge obfs3 209.141.36.236:45496 # Bridge obfs3 208.79.90.242:35658 +# Bridge obfs3 109.105.109.163:38980 +# Bridge obfs3 109.105.109.163:47779 # # Bridge obfs2 83.212.100.216:47870 # Bridge obfs2 83.212.96.182:46602 -# Bridge obfs2 109.105.109.163:46924 # Bridge obfs2 70.182.182.109:54542 # Bridge obfs2 128.31.0.34:1051 # Bridge obfs2 83.212.101.2:45235 diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults index f7c712a..58fa47d 100644 --- a/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -18,10 +18,11 @@ CookieAuthentication 1 # Bridge obfs3 169.229.59.74:31493 # Bridge obfs3 209.141.36.236:45496 # Bridge obfs3 208.79.90.242:35658 +# Bridge obfs3 109.105.109.163:38980 +# Bridge obfs3 109.105.109.163:47779 # # Bridge obfs2 83.212.100.216:47870 # Bridge obfs2 83.212.96.182:46602 -# Bridge obfs2 109.105.109.163:46924 # Bridge obfs2 70.182.182.109:54542 # Bridge obfs2 128.31.0.34:1051 # Bridge obfs2 83.212.101.2:45235

1 0

[tor-browser-bundle/master] Add "beta" target.
by mikeperry＠torproject.org 20 Jan '14

20 Jan '14

commit 9af3918b6ee2146f6add2d779eee9303e8cb1ebf Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 12 08:00:40 2014 -0800 Add "beta" target. --- gitian/Makefile | 18 +++++++++++ gitian/versions.beta | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) diff --git a/gitian/Makefile b/gitian/Makefile index b781f34..dea589e 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -2,6 +2,8 @@ all: clean prep build alpha: clean prep-alpha build-alpha +beta: clean prep-beta build-beta + build: ./mkbundle-linux.sh ./mkbundle-windows.sh @@ -14,18 +16,30 @@ build-alpha: ./mkbundle-mac.sh versions.alpha ./hash-bundles.sh versions.alpha +build-beta: + ./mkbundle-linux.sh versions.beta + ./mkbundle-windows.sh versions.beta + ./mkbundle-mac.sh versions.beta + ./hash-bundles.sh versions.beta + sign: torsocks ./upload-signature.sh versions sign-alpha: torsocks ./upload-signature.sh versions.alpha +sign-beta: + torsocks ./upload-signature.sh versions.beta + match: torsocks ./check-match.sh versions match-alpha: torsocks ./check-match.sh versions.alpha +match-beta: + torsocks ./check-match.sh versions.beta + prep: ./check-prerequisites.sh torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions @@ -34,6 +48,10 @@ prep-alpha: ./check-prerequisites.sh torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha +prep-beta: + ./check-prerequisites.sh + torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta + clean: rm -f ../../gitian-builder/inputs/*gbuilt* rm -f ../../gitian-builder/inputs/*.yml diff --git a/gitian/versions.beta b/gitian/versions.beta new file mode 100755 index 0000000..ec7d5f8 --- /dev/null +++ b/gitian/versions.beta @@ -0,0 +1,85 @@ +TORBROWSER_VERSION=3.5.1 +BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" + +VERIFY_TAGS=1 + +TORBROWSER_TAG=tor-browser-24.2.0esr-3.5.1-build1 +TOR_TAG=tor-0.2.4.20 +OPENSSL_TAG=openssl-101e-no-gmt-time-v1 +TORLAUNCHER_TAG=0.2.4.2 +TORBUTTON_TAG=1.6.5.3 +HTTPSE_TAG=3.4.4tbb +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 +FLASHPROXY_TAG=1.4 + +GITIAN_TAG=tor-browser-builder-3.0-4 + +# OPENSSL_VER=1.0.1e +FIREFOX_LANG_VER=24.2.0esr +BINUTILS_VER=2.22 +GCC_VER=4.6.3 +PYTHON_VER=2.7.5 +PYCRYPTO_VER=2.6.1 +ARGPARSE_VER=1.2.1 +ZOPEINTERFACE_VER=4.0.5 +TWISTED_VER=13.1.0 +M2CRYPTO_VER=0.21.1 +PY2EXE_VER=0.6.9 +SETUPTOOLS_VER=1.4 + +## File names for the source packages +# OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.7-sm+fx+fn.xpi +TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb +MINGW_PACKAGE=mingw-w64-svn-snapshot.zip +MSVCR100_PACKAGE=msvcr100.dll +BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 +GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 +PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi +PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz +ARGPARSE_PACKAGE=argparse-${ARGPARSE_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 + +# Hashes for packages with weak sigs or no sigs +# OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 +OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc +TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e +MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f +MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 +PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c +ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 +ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc +TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 +M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a +PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c +SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 + +## Non-git package URLs +# OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} +OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE} +BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} +GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} +NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE} +PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} +PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE} +PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PACKAGE} +ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} +ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/${ZOPEINTERFACE_PACKAGE} +TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PACKAGE} +# 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/${M2CRYPTO_PACKAGE} +PY2EXE_URL=http://downloads.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUPTOOLS_PACKAGE}

1 0

[tor-browser-bundle/master] Use version number 3.6-beta-1 for the "beta" target.
by mikeperry＠torproject.org 20 Jan '14

20 Jan '14

commit e975a3714b9b2980312a1b585c1481a8e5da9da0 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 12 08:02:38 2014 -0800 Use version number 3.6-beta-1 for the "beta" target. --- gitian/versions.beta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.beta b/gitian/versions.beta index ec7d5f8..f5fa840 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.5.1 +TORBROWSER_VERSION=3.6-beta-1 BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1

1 0

[tor-browser-bundle/master] Source versions in gitian-bundle.yml.
by mikeperry＠torproject.org 20 Jan '14

20 Jan '14

commit 8e459e12cc091046086be0c1d61c3f1139ab6722 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 12 17:20:56 2014 +0000 Source versions in gitian-bundle.yml. --- gitian/descriptors/linux/gitian-bundle.yml | 1 + gitian/descriptors/mac/gitian-bundle.yml | 1 + gitian/descriptors/windows/gitian-bundle.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index a511e13..7d5cac3 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -42,6 +42,7 @@ files: - "tbb-docs.zip" script: | INSTDIR="$HOME/install" + source versions export LIBRARY_PATH="$INSTDIR/lib" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index cb7c9d6..b06ebf7 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -37,6 +37,7 @@ files: - "mac-tor.sh" script: | INSTDIR="$HOME/install" + source versions export LIBRARY_PATH="$INSTDIR/lib" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index cbb2707..a96985c 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -38,6 +38,7 @@ files: - "tbb-docs.zip" script: | INSTDIR="$HOME/install" + source versions export LIBRARY_PATH="$INSTDIR/lib" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME

1 0

[tor-browser-bundle/master] Copy PT programs and config only when making "beta".
by mikeperry＠torproject.org 20 Jan '14

20 Jan '14

commit d1558e365be1938c11a3fddd1595f59f83073dce Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 12 16:42:02 2014 +0000 Copy PT programs and config only when making "beta". --- gitian/descriptors/linux/gitian-bundle.yml | 6 ++++-- gitian/descriptors/mac/gitian-bundle.yml | 8 ++++++-- gitian/descriptors/windows/gitian-bundle.yml | 6 ++++-- gitian/versions.beta | 1 + 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 4d25eb7..f7f6e0b 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -101,10 +101,12 @@ script: | cd tor-browser unzip ~/build/tor-browser-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/tor-linux$GBUILD_BITS-gbuilt.zip - unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/linux-skeleton.zip unzip ~/build/tbb-docs.zip - cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults + if [ "$TORBROWSER_VERSION_SPECIAL" == "beta" ]; then + unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip + cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults + fi chmod 700 Data/Browser chmod 700 Data/Tor cd .. diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 5ae6997..3700e46 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -99,11 +99,15 @@ script: | cd .. # unzip ~/build/tor-mac$GBUILD_BITS-gbuilt.zip - unzip ~/build/pluggable-transports-mac$GBUILD_BITS-gbuilt.zip + if [ "$TORBROWSER_VERSION_SPECIAL" == "beta" ]; then + unzip ~/build/pluggable-transports-mac$GBUILD_BITS-gbuilt.zip + fi cd TorBrowserBundle.app unzip ~/build/mac-skeleton.zip unzip ~/build/tbb-docs.zip - cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults + if [ "$TORBROWSER_VERSION_SPECIAL" == "beta" ]; then + cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults + fi # Install a "tor" shim that sets the working directory. See #10030. mv Tor/tor Tor/tor.real cp ~/build/mac-tor.sh Tor/tor diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 393d5d8..4ee42d5 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -103,10 +103,12 @@ script: | cd "Tor Browser" unzip ~/build/tor-browser-win32-gbuilt.zip unzip ~/build/tor-win32-gbuilt.zip - unzip ~/build/pluggable-transports-win32-gbuilt.zip unzip ~/build/windows-skeleton.zip unzip ~/build/tbb-docs.zip - cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults + if [ "$TORBROWSER_VERSION_SPECIAL" == "beta" ]; then + unzip ~/build/pluggable-transports-win32-gbuilt.zip + cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults + fi cd .. # # Copy reproducibility info diff --git a/gitian/versions.beta b/gitian/versions.beta index f5fa840..cc2080e 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,5 @@ TORBROWSER_VERSION=3.6-beta-1 +TORBROWSER_VERSION_SPECIAL=beta BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1

1 0

[tor-browser-bundle/master] Move PT config into separate torrc-appendix files.
by mikeperry＠torproject.org 20 Jan '14

20 Jan '14

commit 2485b30f4fa03a2acfc3c89e3933fec0805ebca8 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 12 08:19:49 2014 -0800 Move PT config into separate torrc-appendix files. --- Bundle-Data/beta/linux/torrc-defaults-appendix | 33 +++++++++++++++++++++ Bundle-Data/beta/mac/torrc-defaults-appendix | 33 +++++++++++++++++++++ Bundle-Data/beta/windows/torrc-defaults-appendix | 33 +++++++++++++++++++++ Bundle-Data/linux/Data/Tor/torrc-defaults | 34 ---------------------- Bundle-Data/mac/Data/Tor/torrc-defaults | 34 ---------------------- Bundle-Data/windows/Data/Tor/torrc-defaults | 34 ---------------------- gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/descriptors/mac/gitian-bundle.yml | 2 ++ gitian/descriptors/windows/gitian-bundle.yml | 2 ++ gitian/mkbundle-linux.sh | 1 + gitian/mkbundle-mac.sh | 1 + gitian/mkbundle-windows.sh | 1 + 12 files changed, 108 insertions(+), 102 deletions(-) diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix new file mode 100644 index 0000000..2274863 --- /dev/null +++ b/Bundle-Data/beta/linux/torrc-defaults-appendix @@ -0,0 +1,33 @@ + +## obfsproxy configuration +# +# Bridge obfs3 83.212.101.2:42782 +# Bridge obfs3 83.212.101.2:443 +# Bridge obfs3 169.229.59.75:46328 +# Bridge obfs3 169.229.59.74:31493 +# Bridge obfs3 209.141.36.236:45496 +# Bridge obfs3 208.79.90.242:35658 +# Bridge obfs3 109.105.109.163:38980 +# Bridge obfs3 109.105.109.163:47779 +# +# Bridge obfs2 83.212.100.216:47870 +# Bridge obfs2 83.212.96.182:46602 +# Bridge obfs2 70.182.182.109:54542 +# Bridge obfs2 128.31.0.34:1051 +# Bridge obfs2 83.212.101.2:45235 + +ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed + + +## flash proxy configuration +# +# LearnCircuitBuildTimeout 0 +# CircuitBuildTimeout 60 +# +# # The flashproxy bridge address and port are ignored. +# Bridge flashproxy 0.0.1.0:1 + +# 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 ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix new file mode 100644 index 0000000..b711e60 --- /dev/null +++ b/Bundle-Data/beta/mac/torrc-defaults-appendix @@ -0,0 +1,33 @@ + +## obfsproxy configuration +# +# Bridge obfs3 83.212.101.2:42782 +# Bridge obfs3 83.212.101.2:443 +# Bridge obfs3 169.229.59.75:46328 +# Bridge obfs3 169.229.59.74:31493 +# Bridge obfs3 209.141.36.236:45496 +# Bridge obfs3 208.79.90.242:35658 +# Bridge obfs3 109.105.109.163:38980 +# Bridge obfs3 109.105.109.163:47779 +# +# Bridge obfs2 83.212.100.216:47870 +# Bridge obfs2 83.212.96.182:46602 +# Bridge obfs2 70.182.182.109:54542 +# Bridge obfs2 128.31.0.34:1051 +# Bridge obfs2 83.212.101.2:45235 + +ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed + + +## flash proxy configuration +# +# LearnCircuitBuildTimeout 0 +# CircuitBuildTimeout 60 +# +# # The flashproxy bridge address and port are ignored. +# Bridge flashproxy 0.0.1.0:1 + +# 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 diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix new file mode 100644 index 0000000..0fad86d --- /dev/null +++ b/Bundle-Data/beta/windows/torrc-defaults-appendix @@ -0,0 +1,33 @@ + +## obfsproxy configuration +# +# Bridge obfs3 83.212.101.2:42782 +# Bridge obfs3 83.212.101.2:443 +# Bridge obfs3 169.229.59.75:46328 +# Bridge obfs3 169.229.59.74:31493 +# Bridge obfs3 209.141.36.236:45496 +# Bridge obfs3 208.79.90.242:35658 +# Bridge obfs3 109.105.109.163:38980 +# Bridge obfs3 109.105.109.163:47779 +# +# Bridge obfs2 83.212.100.216:47870 +# Bridge obfs2 83.212.96.182:46602 +# Bridge obfs2 70.182.182.109:54542 +# Bridge obfs2 128.31.0.34:1051 +# Bridge obfs2 83.212.101.2:45235 + +ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed + + +## flash proxy configuration +# +# LearnCircuitBuildTimeout 0 +# CircuitBuildTimeout 60 +# +# # The flashproxy bridge address and port are ignored. +# Bridge flashproxy 0.0.1.0:1 + +# 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 Tor\PluggableTransports\flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults index afa9793..819b9e8 100644 --- a/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -8,37 +8,3 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 - - -## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 -# Bridge obfs3 83.212.101.2:443 -# Bridge obfs3 169.229.59.75:46328 -# Bridge obfs3 169.229.59.74:31493 -# Bridge obfs3 209.141.36.236:45496 -# Bridge obfs3 208.79.90.242:35658 -# Bridge obfs3 109.105.109.163:38980 -# Bridge obfs3 109.105.109.163:47779 -# -# Bridge obfs2 83.212.100.216:47870 -# Bridge obfs2 83.212.96.182:46602 -# Bridge obfs2 70.182.182.109:54542 -# Bridge obfs2 128.31.0.34:1051 -# Bridge obfs2 83.212.101.2:45235 - -ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed - - -## flash proxy configuration -# -# LearnCircuitBuildTimeout 0 -# CircuitBuildTimeout 60 -# -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - -# 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 ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/mac/Data/Tor/torrc-defaults b/Bundle-Data/mac/Data/Tor/torrc-defaults index efcba98..819b9e8 100644 --- a/Bundle-Data/mac/Data/Tor/torrc-defaults +++ b/Bundle-Data/mac/Data/Tor/torrc-defaults @@ -8,37 +8,3 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 - - -## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 -# Bridge obfs3 83.212.101.2:443 -# Bridge obfs3 169.229.59.75:46328 -# Bridge obfs3 169.229.59.74:31493 -# Bridge obfs3 209.141.36.236:45496 -# Bridge obfs3 208.79.90.242:35658 -# Bridge obfs3 109.105.109.163:38980 -# Bridge obfs3 109.105.109.163:47779 -# -# Bridge obfs2 83.212.100.216:47870 -# Bridge obfs2 83.212.96.182:46602 -# Bridge obfs2 70.182.182.109:54542 -# Bridge obfs2 128.31.0.34:1051 -# Bridge obfs2 83.212.101.2:45235 - -ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed - - -## flash proxy configuration -# -# LearnCircuitBuildTimeout 0 -# CircuitBuildTimeout 60 -# -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - -# 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 diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults index 58fa47d..819b9e8 100644 --- a/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -8,37 +8,3 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 - - -## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 -# Bridge obfs3 83.212.101.2:443 -# Bridge obfs3 169.229.59.75:46328 -# Bridge obfs3 169.229.59.74:31493 -# Bridge obfs3 209.141.36.236:45496 -# Bridge obfs3 208.79.90.242:35658 -# Bridge obfs3 109.105.109.163:38980 -# Bridge obfs3 109.105.109.163:47779 -# -# Bridge obfs2 83.212.100.216:47870 -# Bridge obfs2 83.212.96.182:46602 -# Bridge obfs2 70.182.182.109:54542 -# Bridge obfs2 128.31.0.34:1051 -# Bridge obfs2 83.212.101.2:45235 - -ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed - - -## flash proxy configuration -# -# LearnCircuitBuildTimeout 0 -# CircuitBuildTimeout 60 -# -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - -# 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 Tor\PluggableTransports\flashproxy-client --register :0 :9000 diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 7d5cac3..4d25eb7 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -30,6 +30,7 @@ files: - "tor-linux64-gbuilt.zip" - "pluggable-transports-linux32-gbuilt.zip" - "pluggable-transports-linux64-gbuilt.zip" +- "torrc-defaults-appendix-linux" - "relativelink-src.zip" - "linux-skeleton.zip" - "linux-langpacks.zip" @@ -103,6 +104,7 @@ script: | unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/linux-skeleton.zip unzip ~/build/tbb-docs.zip + cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults chmod 700 Data/Browser chmod 700 Data/Tor cd .. diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index b06ebf7..5ae6997 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -25,6 +25,7 @@ files: - "tor-browser-mac32-gbuilt.zip" - "tor-mac32-gbuilt.zip" - "pluggable-transports-mac32-gbuilt.zip" +- "torrc-defaults-appendix-mac" - "relativelink-src.zip" - "mac-skeleton.zip" - "mac-langpacks.zip" @@ -102,6 +103,7 @@ script: | cd TorBrowserBundle.app unzip ~/build/mac-skeleton.zip unzip ~/build/tbb-docs.zip + cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults # Install a "tor" shim that sets the working directory. See #10030. mv Tor/tor Tor/tor.real cp ~/build/mac-tor.sh Tor/tor diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index a96985c..393d5d8 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -27,6 +27,7 @@ files: - "tor-browser-win32-gbuilt.zip" - "tor-win32-gbuilt.zip" - "pluggable-transports-win32-gbuilt.zip" +- "torrc-defaults-appendix-windows" - "relativelink-src.zip" - "windows-skeleton.zip" - "win32-langpacks.zip" @@ -105,6 +106,7 @@ script: | unzip ~/build/pluggable-transports-win32-gbuilt.zip unzip ~/build/windows-skeleton.zip unzip ~/build/tbb-docs.zip + cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults cd .. # # Copy reproducibility info diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 37788f8..4232cf7 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -51,6 +51,7 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ +cp beta/linux/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-linux cd linux rm -f $GITIAN_DIR/inputs/linux-skeleton.zip diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 772dd84..f990d3c 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -51,6 +51,7 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ +cp beta/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index fbc6668..d45ec51 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -53,6 +53,7 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ +cp beta/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows cd windows rm -f $GITIAN_DIR/inputs/windows-skeleton.zip

1 0

[tor-browser-bundle/master] Add remaining obfs3 fingerprints.
by mikeperry＠torproject.org 20 Jan '14

20 Jan '14

commit a2da12db1d6586e03a2986a6826db300f73c312f Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jan 15 20:01:24 2014 -0800 Add remaining obfs3 fingerprints. --- Bundle-Data/beta/linux/torrc-defaults-appendix | 4 ++-- Bundle-Data/beta/mac/torrc-defaults-appendix | 4 ++-- Bundle-Data/beta/windows/torrc-defaults-appendix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix index fff3147..2f5ad32 100644 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ b/Bundle-Data/beta/linux/torrc-defaults-appendix @@ -5,8 +5,8 @@ # Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D # Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 # Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 -# Bridge obfs3 208.79.90.242:35658 +# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 +# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F # Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD # Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E # diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix index c3b90fc..3738142 100644 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ b/Bundle-Data/beta/mac/torrc-defaults-appendix @@ -5,8 +5,8 @@ # Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D # Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 # Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 -# Bridge obfs3 208.79.90.242:35658 +# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 +# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F # Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD # Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E # diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix index 6ac0f95..550e7b5 100644 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ b/Bundle-Data/beta/windows/torrc-defaults-appendix @@ -5,8 +5,8 @@ # Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D # Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 # Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 -# Bridge obfs3 208.79.90.242:35658 +# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 +# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F # Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD # Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E #

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'dcf/3.6-beta'
by mikeperry＠torproject.org 20 Jan '14

20 Jan '14

commit e7cc748cd1eeaa68f44fa135fe2567918c82ce15 Merge: 7185cc5 a2da12d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jan 16 13:50:53 2014 -0800 Merge remote-tracking branch 'dcf/3.6-beta' Conflicts: gitian/descriptors/mac/gitian-tor.yml gitian/fetch-inputs.sh gitian/verify-tags.sh Bundle-Data/Docs/PluggableTransports/LICENSE | 422 +++++++++++ .../Docs/PluggableTransports/LICENSE.PYTHON | 773 ++++++++++++++++++++ Bundle-Data/beta/linux/torrc-defaults-appendix | 30 + Bundle-Data/beta/mac/torrc-defaults-appendix | 30 + Bundle-Data/beta/windows/torrc-defaults-appendix | 30 + Bundle-Data/mac-tor.sh | 11 + gitian/Makefile | 18 + gitian/build-helpers/pyc-timestamp.sh | 18 + gitian/build-helpers/wine-wrappers/common.py | 27 + gitian/build-helpers/wine-wrappers/dllwrap.py | 36 + gitian/build-helpers/wine-wrappers/gcc.py | 36 + gitian/build-helpers/wine-wrappers/settings.py | 2 + gitian/build-helpers/wine-wrappers/setup.py | 7 + gitian/build-helpers/wine-wrappers/swig.py | 33 + gitian/descriptors/linux/gitian-bundle.yml | 9 + .../linux/gitian-pluggable-transports.yml | 126 ++++ gitian/descriptors/linux/gitian-tor.yml | 8 + gitian/descriptors/mac/gitian-bundle.yml | 14 + .../mac/gitian-pluggable-transports.yml | 146 ++++ gitian/descriptors/mac/gitian-tor.yml | 8 + gitian/descriptors/windows/gitian-bundle.yml | 8 + .../windows/gitian-pluggable-transports.yml | 196 +++++ gitian/descriptors/windows/gitian-tor.yml | 8 + gitian/fetch-inputs.sh | 34 +- gitian/gpg/M2CRYPTO.gpg | Bin 0 -> 2441 bytes gitian/gpg/PYCRYPTO.gpg | Bin 0 -> 4710 bytes gitian/gpg/PYTHON_MSI.gpg | Bin 0 -> 1167 bytes gitian/gpg/flashproxy.gpg | Bin 0 -> 5876 bytes gitian/gpg/obfsproxy.gpg | Bin 0 -> 2215 bytes gitian/gpg/pyptlib.gpg | Bin 0 -> 2215 bytes gitian/gpg/ubuntu-wine.gpg | Bin 0 -> 363 bytes gitian/mkbundle-linux.sh | 38 +- gitian/mkbundle-mac.sh | 38 +- gitian/mkbundle-windows.sh | 38 +- gitian/patches/bug10297.patch | 55 ++ gitian/patches/bug5018.patch | 195 +++++ gitian/verify-tags.sh | 3 + gitian/versions | 34 + gitian/versions.alpha | 34 + gitian/versions.beta | 86 +++ 40 files changed, 2527 insertions(+), 24 deletions(-) diff --cc gitian/descriptors/linux/gitian-tor.yml index a251f65,6925663..ea44fe0 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@@ -22,9 -22,12 +22,11 @@@ remotes "dir": "tor" - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" -- "url": "https://github.com/nmathewson/openssl.git" - "dir": "openssl" files: + - "bug10297.patch" + - "bug5018.patch" - "dzip.sh" +- "openssl.tar.gz" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" diff --cc gitian/descriptors/mac/gitian-tor.yml index 15b867f,c9dba1f..3e27ffb --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@@ -22,8 -22,11 +22,10 @@@ remotes "dir": "libevent" - "url": "https://github.com/madler/zlib.git" "dir": "zlib" -- "url": "https://github.com/nmathewson/openssl.git" - "dir": "openssl" files: +- "openssl.tar.gz" + - "bug10297.patch" + - "bug5018.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" diff --cc gitian/descriptors/windows/gitian-tor.yml index 660d2a7,db7951b..df5a798 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@@ -22,10 -22,13 +22,12 @@@ remotes "dir": "libevent" - "url": "https://github.com/madler/zlib.git" "dir": "zlib" -- "url": "https://github.com/nmathewson/openssl.git" - "dir": "openssl" files: + - "bug10297.patch" + - "bug5018.patch" - "binutils.tar.bz2" - "dzip.sh" +- "openssl.tar.gz" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" diff --cc gitian/fetch-inputs.sh index 862f8af,6277984..d4eda0e --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@@ -116,22 -117,22 +117,22 @@@ checkout_mingw() # Get package files from mirror # Get+verify sigs that exist -#for i in OPENSSL # OBFSPROXY -#do -# PACKAGE="${i}_PACKAGE" -# URL="${MIRROR_URL}${!PACKAGE}" -# SUFFIX="asc" -# get "${!PACKAGE}" "$URL" -# get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX" -# -# if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then -# echo "$i: GPG signature is broken for ${URL}" -# mv "${!PACKAGE}" "${!PACKAGE}.badgpg" -# exit 1 -# fi -#done +for i in OPENSSL # OBFSPROXY +do + PACKAGE="${i}_PACKAGE" + URL="${MIRROR_URL}${!PACKAGE}" + SUFFIX="asc" + get "${!PACKAGE}" "$URL" + get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX" + + if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then + echo "$i: GPG signature is broken for ${URL}" + mv "${!PACKAGE}" "${!PACKAGE}.badgpg" + exit 1 + fi +done - for i in BINUTILS GCC PYTHON + for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI do PACKAGE="${i}_PACKAGE" URL="${i}_URL" @@@ -200,7 -217,7 +217,7 @@@ f # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) - for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 OPENSSL -for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS # OPENSSL ++for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --cc gitian/mkbundle-linux.sh index 7c6bd60,4232cf7..62d433d --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@@ -78,10 -81,10 +80,10 @@@ cd $GITIAN_DI if [ ! -f $GITIAN_DIR/inputs/tor-linux32-gbuilt.zip -o ! -f $GITIAN_DIR/inputs/tor-linux64-gbuilt.zip ]; then echo - echo "****** Starting Tor Component of Linux Bundle (1/3 for Linux) ******" + echo "****** Starting Tor Component of Linux Bundle (1/4 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-linux.log.`date +%Y%m%d%H%M%S` diff --cc gitian/mkbundle-mac.sh index 531db8f,f990d3c..1eebfb8 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@@ -78,10 -82,10 +81,10 @@@ cd $GITIAN_DI if [ ! -f $GITIAN_DIR/inputs/tor-mac32-gbuilt.zip ]; then echo - echo "****** Starting Tor Component of Mac Bundle (1/3 for Mac) ******" + echo "****** Starting Tor Component of Mac Bundle (1/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-mac.log.`date +%Y%m%d%H%M%S` diff --cc gitian/mkbundle-windows.sh index 183c737,d45ec51..4f27840 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@@ -79,10 -83,10 +82,10 @@@ cd $GITIAN_DI if [ ! -f $GITIAN_DIR/inputs/tor-win32-gbuilt.zip ]; then echo - echo "****** Starting Tor Component of Windows Bundle (1/3 for Windows) ******" + echo "****** Starting Tor Component of Windows Bundle (1/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-win32.log.`date +%Y%m%d%H%M%S` diff --cc gitian/verify-tags.sh index 055cac5,9b75a47..28c16f1 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@@ -60,6 -60,10 +60,9 @@@ zlib zlib.gp libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG https-everywhere https-everywhere.gpg $HTTPSE_TAG -openssl tor.gpg $OPENSSL_TAG + pyptlib pyptlib.gpg $PYPTLIB_TAG + obfsproxy obfsproxy.gpg $OBFSPROXY_TAG + flashproxy flashproxy.gpg $FLASHPROXY_TAG EOF cd "$INPUTS_DIR" diff --cc gitian/versions index 3e0dda1,ec7d5f8..f41f46b --- a/gitian/versions +++ b/gitian/versions @@@ -20,10 -24,17 +23,17 @@@ FIREFOX_LANG_VER=24.2.0es BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 + PYCRYPTO_VER=2.6.1 + ARGPARSE_VER=1.2.1 + ZOPEINTERFACE_VER=4.0.5 + TWISTED_VER=13.1.0 + M2CRYPTO_VER=0.21.1 + PY2EXE_VER=0.6.9 + SETUPTOOLS_VER=1.4 ## File names for the source packages -# OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.7-sm+fx+fn.xpi +OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.12-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@@ -31,17 -42,32 +41,32 @@@ MSVCR100_PACKAGE=msvcr100.dl BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 + PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi + PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz + ARGPARSE_PACKAGE=argparse-${ARGPARSE_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 # Hashes for packages with weak sigs or no sigs -# OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 +OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 -NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e +NOSCRIPT_HASH=5a1a501dae3f1c6e82d9328ee7dea6d6b12552989199dc2d1b49a0d7001ad779 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 + PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c + ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 + ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc + TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 + M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a + PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c + SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 ## Non-git package URLs -# OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_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 --cc gitian/versions.alpha index 1467d1d,81035bb..1b0cf80 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@@ -20,10 -24,17 +23,17 @@@ FIREFOX_LANG_VER=24.2.0es BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 + PYCRYPTO_VER=2.6.1 + ARGPARSE_VER=1.2.1 + ZOPEINTERFACE_VER=4.0.5 + TWISTED_VER=13.1.0 + M2CRYPTO_VER=0.21.1 + PY2EXE_VER=0.6.9 + SETUPTOOLS_VER=1.4 ## File names for the source packages -# OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.7-sm+fx+fn.xpi +OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.12-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@@ -31,17 -42,32 +41,32 @@@ MSVCR100_PACKAGE=msvcr100.dl BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 + PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi + PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz + ARGPARSE_PACKAGE=argparse-${ARGPARSE_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 # Hashes for packages with weak sigs or no sigs -# OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 +OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 -NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e +NOSCRIPT_HASH=5a1a501dae3f1c6e82d9328ee7dea6d6b12552989199dc2d1b49a0d7001ad779 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 + PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c + ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 + ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc + TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 + M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a + PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c + SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 ## Non-git package URLs -# OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_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] Add Georg Koppen's build signing key.
by mikeperry＠torproject.org 20 Jan '14

20 Jan '14

commit 7185cc5dfb26989564271a43a1a636fc0335b193 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jan 16 12:36:19 2014 -0800 Add Georg Koppen's build signing key. --- gitian/gpg/gk.gpg | Bin 0 -> 1283 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg new file mode 100644 index 0000000..837dff0 Binary files /dev/null and b/gitian/gpg/gk.gpg differ

1 0