tor-commits June 2014

tor-commits@lists.torproject.org

21 participants
1212 discussions

r26844: {website} add a new mirror. (website/trunk/include)
by Andrew Lewman 20 Jun '14

20 Jun '14

Author: phobos Date: 2014-06-20 20:14:40 +0000 (Fri, 20 Jun 2014) New Revision: 26844 Modified: website/trunk/include/tor-mirrors.csv Log: add a new mirror. Modified: website/trunk/include/tor-mirrors.csv =================================================================== --- website/trunk/include/tor-mirrors.csv 2014-06-20 15:12:56 UTC (rev 26843) +++ website/trunk/include/tor-mirrors.csv 2014-06-20 20:14:40 UTC (rev 26844) @@ -95,3 +95,4 @@ calebcenter(a)live.com, alebcay.tk, US, United States, US, TRUE, FALSE, NO, http://tor.alebcay.tk, , rsync://alebcay.tk/tor, ftp://ftp.alebcay.tk, http://tor.alebcay.tk/dist, , , , Sun Jun 15 04:19:57 2014 kevinmg(a)pressfreedomfoundation.org, Freedom of the Press Foundation,US,United States, US, True, False, No, http://tor.pressfreedomfoundation.org, https://tor.pressfreedomfoundation.org, , , http://tor.pressfreedomfoundation.org/dist/, https://tor.pressfreedomfoundation.org/dist/, , , Sun Jun 15 04:19:57 2014 tor(a)moparisthebest.com, moparisthebest.com, DE, Germany, Europe, TRUE, TRUE, No, http://www.moparisthebest.com/tor/, https://www.moparisthebest.com/tor/, , , http://www.moparisthebest.com/tor/dist/, https://www.moparisthebest.com/tor/dist/, , , Sun Jun 15 04:19:57 2014 +tor(a)fodt.it // FoDT.it Webteam,FoDT.it,AT,Austria,Europe,TRUE,FALSE,No,http://tor.fodt.it,https://…,,,

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 20 Jun '14

20 Jun '14

commit 2f36f54e8bff9ca64793e57cd9401c6a3f59a4e3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 20 15:45:15 2014 +0000 Update translations for torcheck_completed --- uk/torcheck.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/uk/torcheck.po b/uk/torcheck.po index 2311bc7..f360c73 100644 --- a/uk/torcheck.po +++ b/uk/torcheck.po @@ -2,15 +2,16 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# azdk94 <azdk94(a)gmail.com>, 2013 +# Andri <azdk94(a)gmail.com>, 2013 # LinuxChata, 2014 -# AVATOR <sclub2018(a)yandex.ua>, 2013 +# Oleksii Golub <sclub2018(a)yandex.ua>, 2013 +# Volodymyr Kustlyvy <kustlyvy(a)hotmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-12 19:25+0000\n" -"Last-Translator: LinuxChata\n" +"PO-Revision-Date: 2014-06-20 15:40+0000\n" +"Last-Translator: Volodymyr Kustlyvy <kustlyvy(a)hotmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,16 +21,16 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "Вітання. Цей браузер налаштований для використання Tor." +msgstr "Вітааємо! Цей браузер налаштований для використання Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Будь ласка, скористайтесь посиланням <a href=\"https://www.torproject.org/\">TorProject</a> аби більше дізнатися про безпечне користування браузером Tor. Тепер Ви можете користуватись Інтернетом анонімно." +msgstr "Будь ласка, скористайтесь посиланням <a href=\"https://www.torproject.org/\">TorProject</a> щоб більше дізнатися про безпечне користування браузером Tor. Тепер Ви можете анонімно користуватись Інтернетом." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "Доступно оновлення безпеки для Tor Browser Bundle." +msgstr "Доступне оновлення безпеки для Tor Browser Bundle." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " @@ -44,7 +45,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "Якщо Ви збираєтеся використовувати Tor клієнт, будь ласка, зайдіть на <a href=\"https://www.torproject.org/\">Tor website</a> і, зокрема <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">інструкції з налаштування клієнта Tor</a>." +msgstr "Якщо Ви збираєтеся використовувати Tor клієнт, будь ласка, зайдіть на <a href=\"https://www.torproject.org/\">Tor website</a> і, зокрема на <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">для інструкцій з налаштування клієнта Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Вибачте, Ваш запит невдалий або отримана неочікувана відповідь." @@ -52,7 +53,7 @@ msgstr "Вибачте, Ваш запит невдалий або отриман msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "Тимчасове відключення послуг запобігає виявлення, якщо Вашим вихідним IP адресою є <a href=\"https://www.torproject.org/\">Tor</a> вузол." +msgstr "Тимчасова служба відключення послуг запобігає нашому виявленню, чи Вашою вихідною IP адресою є <a href=\"https://www.torproject.org/\">Tor</a> вузол." msgid "Your IP address appears to be: " msgstr "Ваша IP адреса, яку зараз видно:"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 20 Jun '14

20 Jun '14

commit c9138534b3c2eb603f7482be0fb8bb168cda0e9d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 20 15:45:11 2014 +0000 Update translations for torcheck --- uk/torcheck.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/uk/torcheck.po b/uk/torcheck.po index 2311bc7..f360c73 100644 --- a/uk/torcheck.po +++ b/uk/torcheck.po @@ -2,15 +2,16 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# azdk94 <azdk94(a)gmail.com>, 2013 +# Andri <azdk94(a)gmail.com>, 2013 # LinuxChata, 2014 -# AVATOR <sclub2018(a)yandex.ua>, 2013 +# Oleksii Golub <sclub2018(a)yandex.ua>, 2013 +# Volodymyr Kustlyvy <kustlyvy(a)hotmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-12 19:25+0000\n" -"Last-Translator: LinuxChata\n" +"PO-Revision-Date: 2014-06-20 15:40+0000\n" +"Last-Translator: Volodymyr Kustlyvy <kustlyvy(a)hotmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,16 +21,16 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "Вітання. Цей браузер налаштований для використання Tor." +msgstr "Вітааємо! Цей браузер налаштований для використання Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Будь ласка, скористайтесь посиланням <a href=\"https://www.torproject.org/\">TorProject</a> аби більше дізнатися про безпечне користування браузером Tor. Тепер Ви можете користуватись Інтернетом анонімно." +msgstr "Будь ласка, скористайтесь посиланням <a href=\"https://www.torproject.org/\">TorProject</a> щоб більше дізнатися про безпечне користування браузером Tor. Тепер Ви можете анонімно користуватись Інтернетом." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "Доступно оновлення безпеки для Tor Browser Bundle." +msgstr "Доступне оновлення безпеки для Tor Browser Bundle." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " @@ -44,7 +45,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "Якщо Ви збираєтеся використовувати Tor клієнт, будь ласка, зайдіть на <a href=\"https://www.torproject.org/\">Tor website</a> і, зокрема <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">інструкції з налаштування клієнта Tor</a>." +msgstr "Якщо Ви збираєтеся використовувати Tor клієнт, будь ласка, зайдіть на <a href=\"https://www.torproject.org/\">Tor website</a> і, зокрема на <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">для інструкцій з налаштування клієнта Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Вибачте, Ваш запит невдалий або отримана неочікувана відповідь." @@ -52,7 +53,7 @@ msgstr "Вибачте, Ваш запит невдалий або отриман msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "Тимчасове відключення послуг запобігає виявлення, якщо Вашим вихідним IP адресою є <a href=\"https://www.torproject.org/\">Tor</a> вузол." +msgstr "Тимчасова служба відключення послуг запобігає нашому виявленню, чи Вашою вихідною IP адресою є <a href=\"https://www.torproject.org/\">Tor</a> вузол." msgid "Your IP address appears to be: " msgstr "Ваша IP адреса, яку зараз видно:"

1 0

r26843: {website} Clearly distinguish by Tor packages and Tor Browser packages (website/trunk/docs/en)
by Matt Pagan 20 Jun '14

20 Jun '14

Author: mttp Date: 2014-06-20 15:12:56 +0000 (Fri, 20 Jun 2014) New Revision: 26843 Modified: website/trunk/docs/en/verifying-signatures.wml Log: Clearly distinguish by Tor packages and Tor Browser packages. Modified: website/trunk/docs/en/verifying-signatures.wml =================================================================== --- website/trunk/docs/en/verifying-signatures.wml 2014-06-18 20:58:53 UTC (rev 26842) +++ website/trunk/docs/en/verifying-signatures.wml 2014-06-20 15:12:56 UTC (rev 26843) @@ -163,16 +163,17 @@ <hr> Most Linux distributions come with gpg preinstalled, so users - who want to verify the Tor Browser Bundle for Linux (or the source + who want to verify the Tor Browser for Linux (or the source tarball) can just follow along with the instructions above for - "Mac OS X". Note that sometimes Sebastian Hahn (key 0x140C961B) - signs the Linux TBB packages. + "Mac OS X". - If you're using the Debian packages, you should read the + If you're using the Debian Tor (not Tor Browser) packages, you + should read the instructions on <a href="<page docs/debian>#packages">importing these keys to apt</a>. - If you're using the RPMs, you can manually verify the + If you're using the RPMs (for Tor, not Tor Browser), you can + manually verify the signatures on the RPM packages by <pre>rpm -K filename.rpm</pre> See <a

1 0

[tor-browser-bundle/master] Port fix-info-plist from shell to Python.
by gk＠torproject.org 20 Jun '14

20 Jun '14

commit eae09200b44e70f45a9bd267912b06bb560f238d Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 19 01:32:11 2014 -0700 Port fix-info-plist from shell to Python. https://trac.torproject.org/projects/tor/ticket/12400 --- gitian/build-helpers/fix-info-plist.py | 32 ++++++++++++++++++++++++++++ gitian/build-helpers/fix-info-plist.sh | 33 ----------------------------- gitian/descriptors/mac/gitian-firefox.yml | 4 ++-- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/gitian/build-helpers/fix-info-plist.py b/gitian/build-helpers/fix-info-plist.py new file mode 100755 index 0000000..ccb6c68 --- /dev/null +++ b/gitian/build-helpers/fix-info-plist.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python + +# Sets these keys in a property list file: +# CFBundleGetInfoString +# CFBundleShortVersionString +# NSHumanReadableCopyright + +import getopt +import plistlib +import sys + +def usage(): + print >> sys.stderr, "usage: %s TORBROWSER_VERSION < Info.plist > FixedInfo.plist" % sys.argv[0] + sys.exit(2) + +_, args = getopt.gnu_getopt(sys.argv[1:], "") + +if len(args) != 1: + usage() + +TORBROWSER_VERSION = args[0] + +YEAR = "2014" +COPYRIGHT = "Tor Browser %s Copyright %s The Tor Project" % (TORBROWSER_VERSION, YEAR) + +plist = plistlib.readPlist(sys.stdin) + +plist["CFBundleGetInfoString"] = "TorBrowser %s" % TORBROWSER_VERSION +plist["CFBundleShortVersionString"] = TORBROWSER_VERSION +plist["NSHumanReadableCopyright"] = COPYRIGHT + +plistlib.writePlist(plist, sys.stdout) diff --git a/gitian/build-helpers/fix-info-plist.sh b/gitian/build-helpers/fix-info-plist.sh deleted file mode 100755 index 77c6af7..0000000 --- a/gitian/build-helpers/fix-info-plist.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# We cannot use set -e in this script because read returns a non-zero value. -export LC_ALL=C - -usage() -{ - echo "usage: $0 TORBROWSER_VERSION < Info.plist > FixedInfo.plist" 1>&2 - exit 2 -} - -if [ $# -ne 1 ]; then - usage; -fi - -TORBROWSER_VERSION="$1"; shift - -# Replace version numbers. -# Add NSHumanReadableCopyright - -YEAR=2014 -COPYRIGHT="Tor Browser $TORBROWSER_VERSION Copyright $YEAR The Tor Project" -read -r -d "" SED_SCRIPT <<END -\#<key>CFBundleGetInfoString</key>#,\#</string>\$#{ - \#</string>\$#s#>.*<#>TorBrowser $TORBROWSER_VERSION<# -} -\#<key>CFBundleShortVersionString</key>#,\#</string>\$#{ - \#</string>\$#s#>.*<#>$TORBROWSER_VERSION<# - \#</string>\$#a\ <key>NSHumanReadableCopyright</key>\n <string>$COPYRIGHT</string> - -} -END - -sed -e "$SED_SCRIPT" diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 2616216..10077f5 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -21,7 +21,7 @@ files: - "x86_64-apple-darwin10.tar.xz" - "re-dzip.sh" - "dzip.sh" -- "fix-info-plist.sh" +- "fix-info-plist.py" - "versions" script: | INSTDIR="$HOME/install/" @@ -73,7 +73,7 @@ script: | # Adjust the Info.plist file INFO_PLIST=TorBrowser.app/Contents/Info.plist mv $INFO_PLIST tmp.plist - ~/build/fix-info-plist.sh $TORBROWSER_VERSION < tmp.plist > $INFO_PLIST + ~/build/fix-info-plist.py $TORBROWSER_VERSION < tmp.plist > $INFO_PLIST rm -f tmp.plist ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/omni.ja ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/webapprt/omni.ja

1 0

[tor/master] Thread support is now required
by nickm＠torproject.org 20 Jun '14

20 Jun '14

commit 58f4200789d0cc47ebd88f3091207cf4dd493573 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 20 10:20:10 2014 -0400 Thread support is now required Long ago we supported systems where there was no support for threads, or where the threading library was broken. We shouldn't have do that any more: on every OS that matters, threads exist, and the OS supports running threads across multiple CPUs. This resolves tickets 9495 and 12439. It's a prerequisite to making our workqueue code work better, since sensible workqueue implementations don't split across multiple processes. --- changes/threads-required | 12 ++++++++++++ configure.ac | 28 +++------------------------- src/common/compat.c | 4 +--- src/common/compat.h | 22 +++------------------- src/common/crypto.c | 15 ++------------- src/or/cpuworker.c | 10 ---------- src/test/test_util.c | 6 ------ src/win32/orconfig.h | 2 -- 8 files changed, 21 insertions(+), 78 deletions(-) diff --git a/changes/threads-required b/changes/threads-required new file mode 100644 index 0000000..a56cfe3 --- /dev/null +++ b/changes/threads-required @@ -0,0 +1,12 @@ + o Removed features: + - Tor no longer supports systems without threading support. + When we began working on Tor, there were several systems that didn't + have threads, or where the thread support wasn't able to run the + threads of a single process on multiple CPUs. That no longer holds: + every system where Tor needs to run well now has threading support. + Resolves ticket 12439. + + o Minor features: + - Threads are no longer disabled by default on Solaris; we believe that + the versions of Solaris with broken threading support are all obsolete + by now. Resolves ticket 9495. diff --git a/configure.ac b/configure.ac index 0d37581..e858d0c 100644 --- a/configure.ac +++ b/configure.ac @@ -107,26 +107,6 @@ AC_ARG_ENABLE(upnp, * ) AC_MSG_ERROR(bad value for --enable-upnp) ;; esac], [upnp=false]) - -AC_ARG_ENABLE(threads, - AS_HELP_STRING(--disable-threads, disable multi-threading support)) - -if test x$enable_threads = x; then - case $host in - *-*-solaris* ) - # Don't try multithreading on solaris -- cpuworkers seem to lock. - AC_MSG_NOTICE([You are running Solaris; Sometimes threading makes -cpu workers lock up here, so I will disable threads.]) - enable_threads="no";; - *) - enable_threads="yes";; - esac -fi - -if test "$enable_threads" = "yes"; then - AC_DEFINE(ENABLE_THREADS, 1, [Defined if we will try to use multithreading]) -fi - case $host in *-*-solaris* ) AC_DEFINE(_REENTRANT, 1, [Define on some platforms to activate x_r() functions in time.h]) @@ -326,10 +306,8 @@ if test "$LIBS" != "$saved_LIBS"; then have_rt=yes fi -if test "$enable_threads" = "yes"; then - AC_SEARCH_LIBS(pthread_create, [pthread]) - AC_SEARCH_LIBS(pthread_detach, [pthread]) -fi +AC_SEARCH_LIBS(pthread_create, [pthread]) +AC_SEARCH_LIBS(pthread_detach, [pthread]) dnl ------------------------------------------------------------------- dnl Check for functions before libevent, since libevent-1.2 apparently @@ -372,7 +350,7 @@ AC_CHECK_FUNCS( _vscprintf ) -if test "$enable_threads" = "yes"; then +if test "$bwin32" != true; then AC_CHECK_HEADERS(pthread.h) AC_CHECK_FUNCS(pthread_create) fi diff --git a/src/common/compat.c b/src/common/compat.c index 6fb9c21..1760684 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2722,7 +2722,7 @@ tor_gettimeofday(struct timeval *timeval) return; } -#if defined(TOR_IS_MULTITHREADED) && !defined(_WIN32) +#if !defined(_WIN32) /** Defined iff we need to add locks when defining fake versions of reentrant * versions of time-related functions. */ #define TIME_FNS_NEED_LOCKS @@ -2982,7 +2982,6 @@ tor_get_thread_id(void) } #endif -#ifdef TOR_IS_MULTITHREADED /** Return a newly allocated, ready-for-use mutex. */ tor_mutex_t * tor_mutex_new(void) @@ -3000,7 +2999,6 @@ tor_mutex_free(tor_mutex_t *m) tor_mutex_uninit(m); tor_free(m); } -#endif /* Conditions. */ #ifdef USE_PTHREADS diff --git a/src/common/compat.h b/src/common/compat.h index 635e427..296042f 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -633,15 +633,12 @@ int get_total_system_memory(size_t *mem_out); int spawn_func(void (*func)(void *), void *data); void spawn_exit(void) ATTR_NORETURN; -#if defined(ENABLE_THREADS) && defined(_WIN32) +#if defined(_WIN32) #define USE_WIN32_THREADS -#define TOR_IS_MULTITHREADED 1 -#elif (defined(ENABLE_THREADS) && defined(HAVE_PTHREAD_H) && \ - defined(HAVE_PTHREAD_CREATE)) +#elif defined(HAVE_PTHREAD_H) && defined(HAVE_PTHREAD_CREATE) #define USE_PTHREADS -#define TOR_IS_MULTITHREADED 1 #else -#undef TOR_IS_MULTITHREADED +#error "No threading system was found" #endif int compute_num_cpus(void); @@ -667,7 +664,6 @@ typedef struct tor_mutex_t { int tor_mlockall(void); -#ifdef TOR_IS_MULTITHREADED tor_mutex_t *tor_mutex_new(void); void tor_mutex_init(tor_mutex_t *m); void tor_mutex_acquire(tor_mutex_t *m); @@ -676,21 +672,10 @@ void tor_mutex_free(tor_mutex_t *m); void tor_mutex_uninit(tor_mutex_t *m); unsigned long tor_get_thread_id(void); void tor_threads_init(void); -#else -#define tor_mutex_new() ((tor_mutex_t*)tor_malloc(sizeof(int))) -#define tor_mutex_init(m) STMT_NIL -#define tor_mutex_acquire(m) STMT_VOID(m) -#define tor_mutex_release(m) STMT_NIL -#define tor_mutex_free(m) STMT_BEGIN tor_free(m); STMT_END -#define tor_mutex_uninit(m) STMT_NIL -#define tor_get_thread_id() (1UL) -#define tor_threads_init() STMT_NIL -#endif void set_main_thread(void); int in_main_thread(void); -#ifdef TOR_IS_MULTITHREADED #if 0 typedef struct tor_cond_t tor_cond_t; tor_cond_t *tor_cond_new(void); @@ -699,7 +684,6 @@ int tor_cond_wait(tor_cond_t *cond, tor_mutex_t *mutex); void tor_cond_signal_one(tor_cond_t *cond); void tor_cond_signal_all(tor_cond_t *cond); #endif -#endif /** Macros for MIN/MAX. Never use these when the arguments could have * side-effects. diff --git a/src/common/crypto.c b/src/common/crypto.c index a247a87..1629245 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -75,12 +75,10 @@ /** Macro: is k a valid RSA private key? */ #define PRIVATE_KEY_OK(k) ((k) && (k)->key && (k)->key->p) -#ifdef TOR_IS_MULTITHREADED /** A number of preallocated mutexes for use by OpenSSL. */ static tor_mutex_t **openssl_mutexes_ = NULL; /** How many mutexes have we allocated for use by OpenSSL? */ static int n_openssl_mutexes_ = 0; -#endif /** A public key, or a public/private key-pair. */ struct crypto_pk_t @@ -3090,8 +3088,6 @@ memwipe(void *mem, uint8_t byte, size_t sz) memset(mem, byte, sz); } -#ifdef TOR_IS_MULTITHREADED - #ifndef OPENSSL_THREADS #error OpenSSL has been built without thread support. Tor requires an \ OpenSSL library with thread support enabled. @@ -3178,13 +3174,6 @@ setup_openssl_threading(void) CRYPTO_set_dynlock_destroy_callback(openssl_dynlock_destroy_cb_); return 0; } -#else -static int -setup_openssl_threading(void) -{ - return 0; -} -#endif /** Uninitialize the crypto library. Return 0 on success, -1 on failure. */ @@ -3208,7 +3197,7 @@ crypto_global_cleanup(void) CONF_modules_unload(1); CRYPTO_cleanup_all_ex_data(); -#ifdef TOR_IS_MULTITHREADED + if (n_openssl_mutexes_) { int n = n_openssl_mutexes_; tor_mutex_t **ms = openssl_mutexes_; @@ -3220,7 +3209,7 @@ crypto_global_cleanup(void) } tor_free(ms); } -#endif + tor_free(crypto_openssl_version_str); tor_free(crypto_openssl_header_version_str); return 0; diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 61b2c29..62af8e2 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -414,12 +414,6 @@ cpuworker_main(void *data) cpuworker_reply_t rpl; fd = fdarray[1]; /* this side is ours */ -#ifndef TOR_IS_MULTITHREADED - tor_close_socket(fdarray[0]); /* this is the side of the socketpair the - * parent uses */ - tor_free_all(1); /* so the child doesn't hold the parent's fd's open */ - handle_signals(0); /* ignore interrupts from the keyboard, etc */ -#endif tor_free(data); setup_server_onion_keys(&onion_keys); @@ -535,10 +529,6 @@ spawn_cpuworker(void) return -1; } log_debug(LD_OR,"just spawned a cpu worker."); -#ifndef TOR_IS_MULTITHREADED - tor_close_socket(fdarray[1]); /* don't need the worker's side of the pipe */ - tor_free(fdarray); -#endif conn = connection_new(CONN_TYPE_CPUWORKER, AF_UNIX); diff --git a/src/test/test_util.c b/src/test/test_util.c index 151ec69..86ff747 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1383,12 +1383,6 @@ test_util_threads(void) tv.tv_sec=0; tv.tv_usec=100*1000; #endif -#ifndef TOR_IS_MULTITHREADED - /* Skip this test if we aren't threading. We should be threading most - * everywhere by now. */ - if (1) - return; -#endif thread_test_mutex_ = tor_mutex_new(); thread_test_start1_ = tor_mutex_new(); thread_test_start2_ = tor_mutex_new(); diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index d12d667..030341a 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -14,8 +14,6 @@ /* Define to 1 if you have the <ctype.h> header file. */ #define HAVE_CTYPE_H -#define ENABLE_THREADS - /* Define to 1 if you have the <errno.h> header file. */ #define HAVE_ERRNO_H

1 0

[tor-browser-bundle/master] Update component versions for alpha and nightlies.
by gk＠torproject.org 20 Jun '14

20 Jun '14

commit 7dae61fbd8e3074f5611ed3d892a669f8429f5b7 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 16 14:10:03 2014 -0400 Update component versions for alpha and nightlies. Use NSIS tag (v0.2) instead of hash. Use Firefox 24.6.x code for alpha builds. Use symbolic Tor Launcher tag for alpha builds. --- gitian/versions.alpha | 8 ++++---- gitian/versions.nightly | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ce3520c..562acd2 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,14 +4,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=24.5.0esr +FIREFOX_VERSION=24.6.0esr -TORBROWSER_TAG=tor-browser-24.5.0esr-4.x-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1 TOR_TAG=tor-0.2.4.22 -TORLAUNCHER_TAG=master +TORLAUNCHER_TAG=0.2.6.0 TORBUTTON_TAG=1.6.9.0 HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 -NSIS_TAG=00133b8741eb8ca34fc8153d344c7c54a5e3fae9 +NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 7bcec3e..72b0b47 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -11,7 +11,7 @@ TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master HTTPSE_TAG=master -NSIS_TAG=00133b8741eb8ca34fc8153d344c7c54a5e3fae9 +NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184

1 0

[tor-browser-bundle/master] Bug 12406: Bump mingw-w64/gcc/binutils versions.
by gk＠torproject.org 20 Jun '14

20 Jun '14

commit 24677e9dad9092ba9fdaff751aef37b9ad3953e1 Merge: 792c193 ad43e17 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 20 16:14:58 2014 +0000 Bug 12406: Bump mingw-w64/gcc/binutils versions. Merge remote-tracking branch 'pc/bug12406-02' gitian/descriptors/windows/gitian-bundle.yml | 2 -- gitian/descriptors/windows/gitian-utils.yml | 14 ++++++-------- gitian/fetch-inputs.sh | 26 +++----------------------- gitian/gpg/GCC.gpg | Bin 2635 -> 9931 bytes gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 3 ++- gitian/versions | 8 +++----- gitian/versions.alpha | 16 +++++++--------- gitian/versions.nightly | 10 ++++------ 10 files changed, 27 insertions(+), 56 deletions(-)

1 0

[tor-browser-bundle/master] Bug 12406: use MinGW-w64 v3.1.0 for TBB 4.x
by gk＠torproject.org 20 Jun '14

20 Jun '14

commit ad43e17f6fdec22be8c971483d5123c172b76c61 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jun 19 15:10:12 2014 -0400 Bug 12406: use MinGW-w64 v3.1.0 for TBB 4.x This also requires newer versions of gcc and binutils. We now fetch MinGW-w64 using git instead of svn. --- gitian/descriptors/windows/gitian-bundle.yml | 2 -- gitian/descriptors/windows/gitian-utils.yml | 14 ++++++-------- gitian/fetch-inputs.sh | 26 +++----------------------- gitian/gpg/GCC.gpg | Bin 2635 -> 9931 bytes gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 3 ++- gitian/versions | 8 +++----- gitian/versions.alpha | 8 +++----- gitian/versions.nightly | 8 +++----- 10 files changed, 22 insertions(+), 51 deletions(-) diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 8f21b3b..fc4fb35 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -8,8 +8,6 @@ packages: - "git-core" - "unzip" - "zip" -# This package is needed for compiling the StartTorBrowserBundle.exe. -- "mingw-w64" - "nsis" - "faketime" - "python" diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 530e716..d9bf928 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -20,13 +20,13 @@ packages: - "libmpc-dev" reference_datetime: "2000-01-01 00:00:00" remotes: +- "url": "http://git.code.sf.net/p/mingw-w64/mingw-w64" + "dir": "mingw-w64-git" - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" - "url": "https://github.com/madler/zlib.git" "dir": "zlib" files: -# XXX: we need to make this input tarball deterministic :/ -- "mingw-w64-svn-snapshot.zip" - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" @@ -61,10 +61,8 @@ script: | # Building mingw-w64 mkdir -p mingw-w64/mingw-w64-headers32 - cd mingw-w64 - unzip ../mingw-w64-svn-snapshot.zip - cd mingw-w64-headers32 - ../mingw-w64-svn/mingw-w64-headers/configure --host=i686-w64-mingw32 --prefix=$INSTDIR/mingw-w64/i686-w64-mingw32 --enable-sdk=all --enable-secure-api --enable-idl + cd mingw-w64/mingw-w64-headers32 + ../../mingw-w64-git/mingw-w64-headers/configure --host=i686-w64-mingw32 --prefix=$INSTDIR/mingw-w64/i686-w64-mingw32 --enable-sdk=all --enable-secure-api --enable-idl make install cd .. cd .. @@ -89,13 +87,13 @@ script: | # cd mingw-w64 mkdir mingw-w64-crt32 && cd mingw-w64-crt32 - ../mingw-w64-svn/mingw-w64-crt/configure --host=i686-w64-mingw32 --prefix=$INSTDIR/mingw-w64/i686-w64-mingw32 + ../../mingw-w64-git/mingw-w64-crt/configure --host=i686-w64-mingw32 --prefix=$INSTDIR/mingw-w64/i686-w64-mingw32 make $MAKEOPTS make install cd .. # mkdir widl32 && cd widl32 - ../mingw-w64-svn/mingw-w64-tools/widl/configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 + ../../mingw-w64-git/mingw-w64-tools/widl/configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 make $MAKEOPTS make install cd .. diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 34e8727..1b0b4c1 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -92,7 +92,7 @@ update_git() { then (cd "$dir" && git remote set-url origin $url && git fetch --prune origin && git fetch --prune --tags origin) else - if ! git clone "$url"; then + if ! git clone "$url" "$dir"; then echo >&2 "Error: Cloning $url failed" exit 1 fi @@ -110,12 +110,6 @@ update_git() { fi } -checkout_mingw() { - svn co -r $MINGW_REV https://svn.code.sf.net/p/mingw-w64/code/trunk/ mingw-w64-svn || exit 1 - # XXX: Path - ZIPOPTS="-x*/.svn/*" faketime -f "2000-01-01 00:00:00" "$WRAPPER_DIR/build-helpers/dzip.sh" mingw-w64-svn-snapshot.zip mingw-w64-svn -} - ############################################################################## # Get package files from mirror @@ -212,24 +206,9 @@ cd .. wget -U "" -N ${NOSCRIPT_URL} wget -U "" -N ${HTTPSE_URL} -# So is mingw: -if [ ! -f mingw-w64-svn-snapshot.zip ]; -then - checkout_mingw -else - # We do have mingw-w64 already but is it the correct revision? We check the - # hash of the zip archive as it has to be changed as well if a new revision - # should be used. - if ! echo "${MINGW_HASH} ${MINGW_PACKAGE}" | sha256sum -c -; then - # We need to update the local mingw-w64 copy - rm -rf mingw-w64-svn* - checkout_mingw - fi -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 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -304,6 +283,7 @@ https-everywhere https://git.torproject.org/https-everywhere.git $HTTPSE_TA torbutton https://git.torproject.org/torbutton.git $TORBUTTON_TAG tor-launcher https://git.torproject.org/tor-launcher.git $TORLAUNCHER_TAG tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG +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 diff --git a/gitian/gpg/GCC.gpg b/gitian/gpg/GCC.gpg index e62de27..d94d692 100644 Binary files a/gitian/gpg/GCC.gpg and b/gitian/gpg/GCC.gpg differ diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 019ddec..281f4f8 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -107,7 +107,7 @@ then echo "****** Starting Utilities Component of Windows Bundle (1/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/windows/gitian-utils.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit mingw-w64-git=$MINGW_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/windows/gitian-utils.yml if [ $? -ne 0 ]; then #mv var/build.log ./utils-fail-win.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index bbae06f..7ca4416 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -26,7 +26,6 @@ rm -f bundle.inputs sha256sum $OSXSDK_PACKAGE >> bundle.inputs sha256sum $OPENSSL_PACKAGE >> bundle.inputs sha256sum $TOOLCHAIN4_PACKAGE >> bundle.inputs -sha256sum mingw-w64-svn-snapshot.zip >> bundle.inputs echo >> bundle.inputs sha256sum noscript(a)noscript.net.xpi >> bundle.inputs echo >> bundle.inputs @@ -53,6 +52,7 @@ echo "`cd torbutton && git log --format=%H -1 $TORBUTTON_TAG` torbutton.git" >> echo "`cd tor-launcher && git log --format=%H -1 $TORLAUNCHER_TAG` tor-launcher.git" >> bundle.inputs echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs echo "`cd tbb-windows-installer && git log --format=%H -1 $NSIS_TAG` tbb-windows-installer.git" >> bundle.inputs +echo "`cd mingw-w64-git && git log --format=%H -1 $MINGW_TAG` mingw-w64.git" >> bundle.inputs echo "`cd $INPUTS_DIR && git log --format=%H -1` gitian-builder.git" >> bundle.inputs echo "`cd $WRAPPER_DIR && git log --format=%H -1` tor-browser-bundle.git" >> bundle.inputs diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 324a27a..c66a83b 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -105,6 +105,7 @@ EOF while read dir commit; do check_git_hash "$dir" "$commit" done << EOF +mingw-w64-git $MINGW_TAG libdmg-hfsplus $LIBDMG_TAG libfte $LIBFTE_TAG fteproxy $FTEPROXY_TAG @@ -132,7 +133,7 @@ done # 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 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 6c78434..2185194 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,7 +14,7 @@ HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_REV=6184 +MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 @@ -28,8 +28,8 @@ GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -BINUTILS_VER=2.22 -GCC_VER=4.6.3 +BINUTILS_VER=2.24 +GCC_VER=4.8.3 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -51,7 +51,6 @@ HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.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 @@ -76,7 +75,6 @@ TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 -MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 562acd2..e0e1e60 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,7 +14,7 @@ HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_REV=6184 +MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 @@ -28,8 +28,8 @@ GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -BINUTILS_VER=2.22 -GCC_VER=4.6.3 +BINUTILS_VER=2.24 +GCC_VER=4.8.3 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -51,7 +51,6 @@ HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.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 @@ -76,7 +75,6 @@ TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 -MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 72b0b47..1042e78 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -14,7 +14,7 @@ HTTPSE_TAG=master NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_REV=6184 +MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master @@ -28,8 +28,8 @@ GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1h GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -BINUTILS_VER=2.22 -GCC_VER=4.6.3 +BINUTILS_VER=2.24 +GCC_VER=4.8.3 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -51,7 +51,6 @@ HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.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 @@ -76,7 +75,6 @@ TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=aea2ef3a262a70e871df0de937ac8f53cd2c5d1913066200d192bb6e30924275 HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 -MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor/master] Remove code for Windows CE support
by nickm＠torproject.org 20 Jun '14

20 Jun '14

commit 5b4ee475aa00bb30675e819a0096209e5e427668 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 20 09:49:36 2014 -0400 Remove code for Windows CE support As far as I know, nobody has used this in ages. It would be a pretty big surprise if it had worked. Closes ticket 11446. --- changes/no-wince | 4 ++++ src/common/compat.c | 9 --------- src/common/compat.h | 15 --------------- src/common/tortls.c | 4 ---- src/common/util.c | 2 +- src/or/main.c | 50 ------------------------------------------------ src/or/ntmain.h | 2 -- src/test/test_config.c | 10 +++++----- src/win32/orconfig.h | 9 +-------- 9 files changed, 11 insertions(+), 94 deletions(-) diff --git a/changes/no-wince b/changes/no-wince new file mode 100644 index 0000000..833bf46 --- /dev/null +++ b/changes/no-wince @@ -0,0 +1,4 @@ + o Removed platform support: + - We no longer include special code to build on Windows CE; as far + as we know, nobody has used Tor on Windows CE in a very long + time. Closes ticket 11446. diff --git a/src/common/compat.c b/src/common/compat.c index e25ecc4..6fb9c21 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2485,14 +2485,12 @@ get_uname(void) "Unrecognized version of Windows [major=%d,minor=%d]", (int)info.dwMajorVersion,(int)info.dwMinorVersion); } -#if !defined (WINCE) #ifdef VER_NT_SERVER if (info.wProductType == VER_NT_SERVER || info.wProductType == VER_NT_DOMAIN_CONTROLLER) { strlcat(uname_result, " [server]", sizeof(uname_result)); } #endif -#endif #else strlcpy(uname_result, "Unknown platform", sizeof(uname_result)); #endif @@ -2697,15 +2695,8 @@ tor_gettimeofday(struct timeval *timeval) uint64_t ft_64; FILETIME ft_ft; } ft; -#if defined (WINCE) - /* wince do not have GetSystemTimeAsFileTime */ - SYSTEMTIME stime; - GetSystemTime(&stime); - SystemTimeToFileTime(&stime,&ft.ft_ft); -#else /* number of 100-nsec units since Jan 1, 1601 */ GetSystemTimeAsFileTime(&ft.ft_ft); -#endif if (ft.ft_64 < EPOCH_BIAS) { log_err(LD_GENERAL,"System time is before 1970; failing."); exit(1); diff --git a/src/common/compat.h b/src/common/compat.h index ec7d241..635e427 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -56,21 +56,6 @@ #include <stdio.h> #include <errno.h> -#if defined (WINCE) -#include <fcntl.h> -#include <io.h> -#include <math.h> -#include <projects.h> -/* this is not exported as W .... */ -#define SHGetPathFromIDListW SHGetPathFromIDList -/* wcecompat has vasprintf */ -#define HAVE_VASPRINTF -/* no service here */ -#ifdef NT_SERVICE -#undef NT_SERVICE -#endif -#endif // WINCE - #ifndef NULL_REP_IS_ZERO_BYTES #error "It seems your platform does not represent NULL as zero. We can't cope." #endif diff --git a/src/common/tortls.c b/src/common/tortls.c index ea0f21c..e06a2ae 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -16,10 +16,6 @@ #include "orconfig.h" -#if defined (WINCE) -#include <WinSock2.h> -#endif - #include <assert.h> #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ #ifndef _WIN32_WINNT diff --git a/src/common/util.c b/src/common/util.c index 2d7893b..8589344 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1893,7 +1893,7 @@ check_private_dir(const char *dirname, cpd_check_t check, } if (check & CPD_CREATE) { log_info(LD_GENERAL, "Creating directory %s", dirname); -#if defined (_WIN32) && !defined (WINCE) +#if defined (_WIN32) r = mkdir(dirname); #else r = mkdir(dirname, 0700); diff --git a/src/or/main.c b/src/or/main.c index 1c49ba1..8ba4fef 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2706,31 +2706,6 @@ do_dump_config(void) return 0; } -#if defined (WINCE) -int -find_flashcard_path(PWCHAR path, size_t size) -{ - WIN32_FIND_DATA d = {0}; - HANDLE h = NULL; - - if (!path) - return -1; - - h = FindFirstFlashCard(&d); - if (h == INVALID_HANDLE_VALUE) - return -1; - - if (wcslen(d.cFileName) == 0) { - FindClose(h); - return -1; - } - - wcsncpy(path,d.cFileName,size); - FindClose(h); - return 0; -} -#endif - static void init_addrinfo(void) { @@ -2959,31 +2934,6 @@ int tor_main(int argc, char *argv[]) { int result = 0; -#if defined (WINCE) - WCHAR path [MAX_PATH] = {0}; - WCHAR fullpath [MAX_PATH] = {0}; - PWCHAR p = NULL; - FILE* redir = NULL; - FILE* redirdbg = NULL; - - // this is to facilitate debugging by opening - // a file on a folder shared by the wm emulator. - // if no flashcard (real or emulated) is present, - // log files will be written in the root folder - if (find_flashcard_path(path,MAX_PATH) == -1) { - redir = _wfreopen( L"\\stdout.log", L"w", stdout ); - redirdbg = _wfreopen( L"\\stderr.log", L"w", stderr ); - } else { - swprintf(fullpath,L"\\%s\\tor",path); - CreateDirectory(fullpath,NULL); - - swprintf(fullpath,L"\\%s\\tor\\stdout.log",path); - redir = _wfreopen( fullpath, L"w", stdout ); - - swprintf(fullpath,L"\\%s\\tor\\stderr.log",path); - redirdbg = _wfreopen( fullpath, L"w", stderr ); - } -#endif #ifdef _WIN32 /* Call SetProcessDEPPolicy to permanently enable DEP. diff --git a/src/or/ntmain.h b/src/or/ntmain.h index d302793..d09a413 100644 --- a/src/or/ntmain.h +++ b/src/or/ntmain.h @@ -13,10 +13,8 @@ #define TOR_NTMAIN_H #ifdef _WIN32 -#if !defined (WINCE) #define NT_SERVICE #endif -#endif #ifdef NT_SERVICE int nt_service_parse_options(int argc, char **argv, int *should_exit); diff --git a/src/test/test_config.c b/src/test/test_config.c index 94ac4dc..b35984f 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -184,7 +184,7 @@ is_private_dir(const char* path) if (r) { return 0; } -#if !defined (_WIN32) || defined (WINCE) +#if !defined (_WIN32) if ((st.st_mode & (S_IFDIR | 0777)) != (S_IFDIR | 0700)) { return 0; } @@ -201,7 +201,7 @@ test_config_check_or_create_data_subdir(void *arg) char *subpath; struct stat st; int r; -#if !defined (_WIN32) || defined (WINCE) +#if !defined (_WIN32) unsigned group_permission; #endif (void)arg; @@ -210,7 +210,7 @@ test_config_check_or_create_data_subdir(void *arg) datadir = options->DataDirectory = tor_strdup(get_fname("datadir-0")); subpath = get_datadir_fname(subdir); -#if defined (_WIN32) && !defined (WINCE) +#if defined (_WIN32) tt_int_op(mkdir(options->DataDirectory), ==, 0); #else tt_int_op(mkdir(options->DataDirectory, 0700), ==, 0); @@ -233,7 +233,7 @@ test_config_check_or_create_data_subdir(void *arg) tt_abort_perror("stat"); } -#if !defined (_WIN32) || defined (WINCE) +#if !defined (_WIN32) group_permission = st.st_mode | 0070; r = chmod(subpath, group_permission); @@ -284,7 +284,7 @@ test_config_write_to_data_subdir(void *arg) datadir = options->DataDirectory = tor_strdup(get_fname("datadir-1")); filepath = get_datadir_fname2(subdir, fname); -#if defined (_WIN32) && !defined (WINCE) +#if defined (_WIN32) tt_int_op(mkdir(options->DataDirectory), ==, 0); #else tt_int_op(mkdir(options->DataDirectory, 0700), ==, 0); diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 2f1a53c..d12d667 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -86,18 +86,11 @@ #define HAVE_STRING_H /* Define to 1 if you have the `strlcat' function. */ -#if defined (WINCE) -#define HAVE_STRLCAT -#else #undef HAVE_STRLCAT -#endif /* Define to 1 if you have the `strlcpy' function. */ -#if defined (WINCE) -#define HAVE_STRLCPY -#else #undef HAVE_STRLCPY -#endif + /* Define to 1 if you have the `strptime' function. */ #undef HAVE_STRPTIME

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2014