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

[tor-browser-bundle/master] Set GIT_COMMITTER_{NAME, EMAIL, DATE} in preparation for applying patches.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit b6947a08e1cac8ecb02c4ac087dc9d7f968ea3f6 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 6 05:27:53 2013 +0000 Set GIT_COMMITTER_{NAME,EMAIL,DATE} in preparation for applying patches. These values are included in the commit hash (which is in turn included in the tor source code as tor_git_revision). GIT_COMMITTER_NAME is probably always "Ubuntu" in our configuration, and GIT_COMMITTER_DATE isn't strictly needed as it's taken care of by libfaketime. But GIT_COMMITTER_EMAIL, if not set, is constructed as something like "ubuntu@$(hostname --fqdn)", which can vary between hosts even within the build VM. --- gitian/descriptors/linux/gitian-tor.yml | 3 +++ gitian/descriptors/mac/gitian-tor.yml | 3 +++ gitian/descriptors/windows/gitian-tor.yml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 4181a38..28a2d5b 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -69,6 +69,9 @@ script: | # cd tor git update-index --refresh -q + export GIT_COMMITTER_NAME="nobody" + export GIT_COMMITTER_EMAIL="nobody@localhost" + export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 6a14980..e6e4528 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -85,6 +85,9 @@ script: | # cd tor git update-index --refresh -q + export GIT_COMMITTER_NAME="nobody" + export GIT_COMMITTER_EMAIL="nobody@localhost" + export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 1d7ea7c..cd1838d 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -81,6 +81,9 @@ script: | # cd tor git update-index --refresh -q + export GIT_COMMITTER_NAME="nobody" + export GIT_COMMITTER_EMAIL="nobody@localhost" + export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh

1 0

[tor-browser-bundle/master] Copy in patch files.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 53882c08cdb16d8d13a748b7d80da709c27b17bf Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 13 21:36:19 2013 -0800 Copy in patch files. --- gitian/mkbundle-linux.sh | 1 + gitian/mkbundle-mac.sh | 1 + gitian/mkbundle-windows.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 3b92216..37788f8 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -42,6 +42,7 @@ echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ +cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ cd $WRAPPER_DIR/.. rm -f $GITIAN_DIR/inputs/relativelink-src.zip diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 69ef3ed..772dd84 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -42,6 +42,7 @@ echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ +cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ cd $WRAPPER_DIR/.. rm -f $GITIAN_DIR/inputs/relativelink-src.zip diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index c2920d1..fbc6668 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -43,6 +43,7 @@ echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ +cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/gpg/ubuntu-wine.gpg $GITIAN_DIR/inputs/ cd $WRAPPER_DIR/..

1 0

[tor-browser-bundle/master] Add bug5018.patch. (Don't start ClientTransportPlugin without Bridges.)
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 34cbb917fe937b0ae60eafdfeb3d73599913ec2c Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 13 21:52:59 2013 +0000 Add bug5018.patch. (Don't start ClientTransportPlugin without Bridges.) This patch prevents transport plugins from being started if there is no bridge that needs them. It corresponds to merge 4b6f074df9c540cb4847793b7e8243c8f642de0a in the tor repo. I made it by doing git format-patch master..bug5018 git cat 000* > bug5018.patch in the tor repo, then I applied it on top of tor-0.2.4.18-rc with GIT_COMMITTER_NAME="nobody" GIT_COMMITTER_EMAIL="nobody@localhost" GIT_COMMITTER_DATE="2000-01-01 00:00:00" git am bug5018.patch and did another format-patch and cat. --- gitian/patches/bug5018.patch | 195 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/gitian/patches/bug5018.patch b/gitian/patches/bug5018.patch new file mode 100644 index 0000000..4784027 --- /dev/null +++ b/gitian/patches/bug5018.patch @@ -0,0 +1,195 @@ +From e967595b931c92650250cc385ef7f6aeabd887f5 Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Thu, 28 Feb 2013 18:58:36 +0200 +Subject: [PATCH 1/3] Only launch transport proxies that provide useful + transports. + +--- + changes/bug5018 | 3 +++ + src/or/config.c | 20 ++++++++++++++++---- + src/or/entrynodes.c | 23 +++++++++++++++++++++++ + src/or/entrynodes.h | 1 + + 4 files changed, 43 insertions(+), 4 deletions(-) + create mode 100644 changes/bug5018 + +diff --git a/changes/bug5018 b/changes/bug5018 +new file mode 100644 +index 0000000..c5c12ef +--- /dev/null ++++ b/changes/bug5018 +@@ -0,0 +1,3 @@ ++ o Minor features: ++ - Don't launch pluggable transport proxies that contribute ++ transports we don't need. Resolves ticket 5018. +diff --git a/src/or/config.c b/src/or/config.c +index 3984755..5f905d5 100644 +--- a/src/or/config.c ++++ b/src/or/config.c +@@ -4242,7 +4242,8 @@ parse_client_transport_line(const char *line, int validate_only) + int is_managed=0; + char **proxy_argv=NULL; + char **tmp=NULL; +- int proxy_argc,i; ++ int proxy_argc, i; ++ int is_useless_proxy=1; + + int line_length; + +@@ -4264,11 +4265,16 @@ parse_client_transport_line(const char *line, int validate_only) + smartlist_split_string(transport_list, transports, ",", + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); + SMARTLIST_FOREACH_BEGIN(transport_list, const char *, transport_name) { ++ /* validate transport names */ + if (!string_is_C_identifier(transport_name)) { + log_warn(LD_CONFIG, "Transport name is not a C identifier (%s).", + transport_name); + goto err; + } ++ ++ /* see if we actually need the transports provided by this proxy */ ++ if (!validate_only && transport_is_needed(transport_name)) ++ is_useless_proxy = 0; + } SMARTLIST_FOREACH_END(transport_name); + + /* field2 is either a SOCKS version or "exec" */ +@@ -4287,9 +4293,15 @@ parse_client_transport_line(const char *line, int validate_only) + } + + if (is_managed) { /* managed */ +- if (!validate_only) { /* if we are not just validating, use the +- rest of the line as the argv of the proxy +- to be launched */ ++ if (!validate_only && is_useless_proxy) { ++ log_warn(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " ++ "any needed transports and will not be launched.", line); ++ } ++ ++ /* If we are not just validating, use the rest of the line as the ++ argv of the proxy to be launched. Also, make sure that we are ++ only launching proxies that contribute useful transports. */ ++ if (!validate_only && !is_useless_proxy) { + proxy_argc = line_length-2; + tor_assert(proxy_argc > 0); + proxy_argv = tor_malloc_zero(sizeof(char*)*(proxy_argc+1)); +diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c +index 2aa063c..4062cee 100644 +--- a/src/or/entrynodes.c ++++ b/src/or/entrynodes.c +@@ -1773,6 +1773,29 @@ bridge_resolve_conflicts(const tor_addr_t *addr, uint16_t port, + } SMARTLIST_FOREACH_END(bridge); + } + ++/** Return True if we have a bridge that uses a transport with name ++ * transport_name. */ ++int ++transport_is_needed(const char *transport_name) ++{ ++ int retval; ++ smartlist_t *needed_transports = NULL; ++ ++ if (!bridge_list) ++ return 0; ++ ++ needed_transports = smartlist_new(); ++ ++ SMARTLIST_FOREACH_BEGIN(bridge_list, const bridge_info_t *, bridge) { ++ if (bridge->transport_name) ++ smartlist_add(needed_transports, bridge->transport_name); ++ } SMARTLIST_FOREACH_END(bridge); ++ ++ retval = smartlist_string_isin(needed_transports, transport_name); ++ smartlist_free(needed_transports); ++ return retval; ++} ++ + /** Remember a new bridge at addr:port. If digest + * is set, it tells us the identity key too. If we already had the + * bridge in our list, unmark it, and don't actually add anything new. +diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h +index 52b8dc0..b02cd48 100644 +--- a/src/or/entrynodes.h ++++ b/src/or/entrynodes.h +@@ -118,6 +118,7 @@ struct transport_t; + int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, + const struct transport_t **transport); + ++int transport_is_needed(const char *transport_name); + int validate_pluggable_transports_config(void); + + double pathbias_get_close_success_count(entry_guard_t *guard); +-- +1.7.9.5 + +From d222f04e3a4093efc7be19f43def04d9c0704653 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Sat, 26 Oct 2013 14:34:48 -0700 +Subject: [PATCH 2/3] Simplify transport_is_needed. + +By Roger at +https://trac.torproject.org/projects/tor/ticket/5018#comment:11. +--- + src/or/entrynodes.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) + +diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c +index 4062cee..98a01c5 100644 +--- a/src/or/entrynodes.c ++++ b/src/or/entrynodes.c +@@ -1778,22 +1778,16 @@ bridge_resolve_conflicts(const tor_addr_t *addr, uint16_t port, + int + transport_is_needed(const char *transport_name) + { +- int retval; +- smartlist_t *needed_transports = NULL; +- + if (!bridge_list) + return 0; + +- needed_transports = smartlist_new(); +- + SMARTLIST_FOREACH_BEGIN(bridge_list, const bridge_info_t *, bridge) { +- if (bridge->transport_name) +- smartlist_add(needed_transports, bridge->transport_name); ++ if (bridge->transport_name && ++ !strcmp(bridge->transport_name, transport_name)) ++ return 1; + } SMARTLIST_FOREACH_END(bridge); + +- retval = smartlist_string_isin(needed_transports, transport_name); +- smartlist_free(needed_transports); +- return retval; ++ return 0; + } + + /** Remember a new bridge at addr:port. If digest +-- +1.7.9.5 + +From c1e396e66773813e051e8c96df86b585031a833b Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Sat, 26 Oct 2013 14:37:50 -0700 +Subject: [PATCH 3/3] Document that unneeded transports are ignored. + +Suggested by Roger in +https://trac.torproject.org/projects/tor/ticket/5018#comment:11. +--- + src/or/config.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/or/config.c b/src/or/config.c +index 5f905d5..3ae0216 100644 +--- a/src/or/config.c ++++ b/src/or/config.c +@@ -4220,7 +4220,8 @@ parse_bridge_line(const char *line, int validate_only) + * line. Return 0 if the line is well-formed, and -1 if it + * isn't. + * +- * If validate_only is 0, and the line is well-formed: ++ * If validate_only is 0, the line is well-formed, and the ++ * transport is needed by some bridge: + * - If it's an external proxy line, add the transport described in the line to + * our internal transport list. + * - If it's a managed proxy line, launch the managed proxy. */ +-- +1.7.9.5 +

1 0

[tor-browser-bundle/master] Download zope.interface.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 55089aa8df6c4758911fe9b6575984973ee4ab9a Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 7 04:57:04 2013 +0000 Download zope.interface. --- gitian/fetch-inputs.sh | 10 +++++++++- gitian/versions | 4 ++++ gitian/versions.alpha | 4 ++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index dc6332b..8ee6ed4 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -168,6 +168,13 @@ do get "${!PACKAGE}" "${MIRROR_URL_DCF}${!PACKAGE}" done +for i in ZOPEINTERFACE +do + URL="${i}_URL" + PACKAGE="${i}_PACKAGE" + get "${!PACKAGE}" "${!URL}" +done + # Verify packages with weak or no signatures via multipath downloads # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) # XXX: Google won't allow wget -N.. We need to re-download the whole @@ -210,7 +217,7 @@ fi # 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 PYCRYPTO ARGPARSE # OPENSSL +for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE # OPENSSL do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -251,6 +258,7 @@ ln -sf "$GCC_PACKAGE" gcc.tar.bz2 ln -sf "$PYTHON_PACKAGE" python.tar.bz2 ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz +ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/versions b/gitian/versions index fe0b1e0..20c146c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -24,6 +24,7 @@ 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 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -37,6 +38,7 @@ GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz +ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -47,6 +49,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 +ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -58,3 +61,4 @@ NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} +ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/${ZOPEINTERFACE_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 8c8d58d..138a490 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -24,6 +24,7 @@ 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 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -37,6 +38,7 @@ GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz +ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -47,6 +49,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 +ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -58,3 +61,4 @@ NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} +ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/${ZOPEINTERFACE_PACKAGE}

1 0

[tor-browser-bundle/master] Download twisted.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 9fb676b6d9066cc40f0a39ad8b11adafc659431d Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 7 05:22:46 2013 +0000 Download twisted. --- gitian/fetch-inputs.sh | 5 +++-- gitian/versions | 5 +++++ gitian/versions.alpha | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 8ee6ed4..70b8166 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -168,7 +168,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_DCF}${!PACKAGE}" done -for i in ZOPEINTERFACE +for i in ZOPEINTERFACE TWISTED do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -217,7 +217,7 @@ fi # 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 PYCRYPTO ARGPARSE ZOPEINTERFACE # OPENSSL +for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED # OPENSSL do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -259,6 +259,7 @@ ln -sf "$PYTHON_PACKAGE" python.tar.bz2 ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip +ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/versions b/gitian/versions index 20c146c..cb98b87 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,6 +25,7 @@ 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 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -39,6 +40,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 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 # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -50,6 +52,7 @@ MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc +TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -62,3 +65,5 @@ PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… +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} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 138a490..b111c8c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,6 +25,7 @@ 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 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -39,6 +40,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 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 # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -50,6 +52,7 @@ MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc +TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -62,3 +65,5 @@ PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… +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}

1 0

[tor-browser-bundle/master] Download flashproxy.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 2452c5f3630b563914241976837cf2ef07ac17db Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 11 07:52:47 2013 +0000 Download flashproxy. gpg --output gpg/flashproxy.gpg --export --export-options export-minimal 0xC11F6276 --- gitian/fetch-inputs.sh | 1 + gitian/gpg/flashproxy.gpg | Bin 0 -> 5876 bytes gitian/verify-tags.sh | 1 + gitian/versions | 1 + gitian/versions.alpha | 1 + 5 files changed, 4 insertions(+) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9aa1513..281f500 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -286,6 +286,7 @@ tor-launcher https://git.torproject.org/tor-launcher.git $TORLA tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git +flashproxy https://git.torproject.org/flashproxy.git EOF exit 0 diff --git a/gitian/gpg/flashproxy.gpg b/gitian/gpg/flashproxy.gpg new file mode 100644 index 0000000..f3b543f Binary files /dev/null and b/gitian/gpg/flashproxy.gpg differ diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index e30ebbb..9b75a47 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -63,6 +63,7 @@ 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 --git a/gitian/versions b/gitian/versions index b588f84..5933c51 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,6 +15,7 @@ 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 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index bf13dfc..f38bc5c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,6 +15,7 @@ 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

1 0

[tor-browser-bundle/master] Download obfsproxy.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 3554d3b0f48ac67658ade3897e510f46eff2b84b Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 7 05:59:29 2013 +0000 Download obfsproxy. I copied pyptlib.gpg to obfsproxy.gpg. --- gitian/fetch-inputs.sh | 1 + gitian/gpg/obfsproxy.gpg | Bin 0 -> 2215 bytes gitian/verify-tags.sh | 1 + gitian/versions | 1 + gitian/versions.alpha | 1 + 5 files changed, 4 insertions(+) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 70b8166..f13d5f5 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -284,6 +284,7 @@ torbutton https://git.torproject.org/torbutton.git $TORBU tor-launcher https://git.torproject.org/tor-launcher.git $TORLAUNCHER_TAG tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git +obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git EOF exit 0 diff --git a/gitian/gpg/obfsproxy.gpg b/gitian/gpg/obfsproxy.gpg new file mode 100644 index 0000000..4381baa Binary files /dev/null and b/gitian/gpg/obfsproxy.gpg differ diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 2e3f92a..e30ebbb 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -62,6 +62,7 @@ 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 EOF cd "$INPUTS_DIR" diff --git a/gitian/versions b/gitian/versions index cb98b87..43dd9c0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,6 +14,7 @@ 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 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b111c8c..6e2e58b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,6 +14,7 @@ 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 GITIAN_TAG=tor-browser-builder-3.0-4

1 0

[tor-browser-bundle/master] Add gitian-pluggable-transports.yml for linux.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 598d1ee779c523ef57e645f8f394c7aa3dc6d893 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 13 22:09:14 2013 -0800 Add gitian-pluggable-transports.yml for linux. Empty except for copied openssl build from gitian-tor.yml. --- .../linux/gitian-pluggable-transports.yml | 52 ++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml new file mode 100644 index 0000000..104bb14 --- /dev/null +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -0,0 +1,52 @@ +--- +name: "pluggable-transports-linux" +suites: +- "lucid" +architectures: +- "i386" +- "amd64" +packages: +- "git-core" +- "zip" +- "faketime" +- "hardening-wrapper" +reference_datetime: "2000-01-01 00:00:00" +remotes: +- "url": "https://github.com/nmathewson/openssl.git" + "dir": "openssl" +files: +- "dzip.sh" +script: | + INSTDIR="$HOME/install" + PTDIR="$INSTDIR/Tor/PluggableTransports" + export LIBRARY_PATH="$INSTDIR/lib" + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export FAKETIME=$REFERENCE_DATETIME + export TZ=UTC + export LC_ALL=C + umask 0022 + # + # Config options for hardening-wrapper + export DEB_BUILD_HARDENING=1 + export DEB_BUILD_HARDENING_STACKPROTECTOR=1 + export DEB_BUILD_HARDENING_FORTIFY=1 + export DEB_BUILD_HARDENING_FORMAT=1 + export DEB_BUILD_HARDENING_PIE=1 + # + mkdir -p $PTDIR/ + mkdir -p $INSTDIR/Debug/ + # + cd openssl + find -type f | xargs touch --date="$REFERENCE_DATETIME" + #./Configure -shared --prefix=$INSTDIR/openssl linux-elf + ./config -shared --prefix=$INSTDIR/openssl + make + make install + cd .. + # + cd $INSTDIR + # + ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ + ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-debug.zip Debug/ + cp pluggable-transports-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ + cp pluggable-transports-linux$GBUILD_BITS-debug.zip $OUTDIR/

1 0

[tor-browser-bundle/master] Download m2crypto.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 38ab594fa6ba4a08f7e024b3537616356f616e8e Author: David Fifield <david(a)bamsoftware.com> Date: Sun Nov 10 10:27:17 2013 +0000 Download m2crypto. gpg --output gpg/M2CRYPTO.gpg --export --export-options export-minimal 0x83FE26EC --- gitian/fetch-inputs.sh | 7 ++++--- gitian/gpg/M2CRYPTO.gpg | Bin 0 -> 2441 bytes gitian/versions | 4 ++++ gitian/versions.alpha | 4 ++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index f13d5f5..9aa1513 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -132,11 +132,11 @@ checkout_mingw() { # fi #done -for i in BINUTILS GCC PYTHON PYCRYPTO +for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -217,7 +217,7 @@ fi # 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 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED # OPENSSL +for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO # OPENSSL do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -260,6 +260,7 @@ ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 +ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/gpg/M2CRYPTO.gpg b/gitian/gpg/M2CRYPTO.gpg new file mode 100644 index 0000000..d6d889a Binary files /dev/null and b/gitian/gpg/M2CRYPTO.gpg differ diff --git a/gitian/versions b/gitian/versions index 43dd9c0..b588f84 100755 --- a/gitian/versions +++ b/gitian/versions @@ -27,6 +27,7 @@ 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 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -42,6 +43,7 @@ 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 # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -54,6 +56,7 @@ PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 +M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -68,3 +71,4 @@ ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # 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} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6e2e58b..bf13dfc 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -27,6 +27,7 @@ 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 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -42,6 +43,7 @@ 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 # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -54,6 +56,7 @@ PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 +M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -68,3 +71,4 @@ ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # 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}

1 0

[tor-browser-bundle/master] Install pluggable-transports into linux bundle.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 380c6037fca9c191badb685d95a7ac1d9110ce4f Author: David Fifield <david(a)bamsoftware.com> Date: Wed Nov 6 06:52:39 2013 +0000 Install pluggable-transports into linux bundle. --- gitian/descriptors/linux/gitian-bundle.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 7dc1104..508123a 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -27,6 +27,8 @@ files: - "tor-browser-linux64-gbuilt.zip" - "tor-linux32-gbuilt.zip" - "tor-linux64-gbuilt.zip" +- "pluggable-transports-linux32-gbuilt.zip" +- "pluggable-transports-linux64-gbuilt.zip" - "relativelink-src.zip" - "linux-skeleton.zip" - "linux-langpacks.zip" @@ -96,6 +98,7 @@ 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 chmod 700 Data/Browser

1 0